mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Hide SSL options when not using custom trust manager

This commit is contained in:
M66B 2023-12-20 10:30:25 +01:00
parent d78ad87c5f
commit d28b8a3d91
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
View File

@ -118,6 +118,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
private TextView tvNetworkInfo; private TextView tvNetworkInfo;
private Group grpValidated; private Group grpValidated;
private Group grpCustomSsl;
private final static String[] RESET_OPTIONS = new String[]{ private final static String[] RESET_OPTIONS = new String[]{
"metered", "download", "download_limited", "roaming", "rlah", "metered", "download", "download_limited", "roaming", "rlah",
@ -181,6 +182,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
tvNetworkInfo = view.findViewById(R.id.tvNetworkInfo); tvNetworkInfo = view.findViewById(R.id.tvNetworkInfo);
grpValidated = view.findViewById(R.id.grpValidated); grpValidated = view.findViewById(R.id.grpValidated);
grpCustomSsl = view.findViewById(R.id.grpCustomSsl);
setOptions(); setOptions();
@ -587,6 +589,7 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
FragmentDialogTheme.setBackground(getContext(), view, false); FragmentDialogTheme.setBackground(getContext(), view, false);
tvNetworkMetered.setVisibility(View.GONE); tvNetworkMetered.setVisibility(View.GONE);
tvNetworkRoaming.setVisibility(View.GONE); tvNetworkRoaming.setVisibility(View.GONE);
grpCustomSsl.setVisibility(SSLHelper.customTrustManager() ? View.VISIBLE : View.GONE);
cardDebug.setVisibility(View.GONE); cardDebug.setVisibility(View.GONE);
PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this); PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);

8
app/src/main/res/layout/fragment_options_connection.xml
View File

@ -657,6 +657,14 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:constraint_referenced_ids="swValidated,tvValidatedHint,swVpnOnly" /> app:constraint_referenced_ids="swValidated,tvValidatedHint,swVpnOnly" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpCustomSsl"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="
swSslHarden,tvSslHardenHint,swSslHardenStrict,
swCertStrict,tvCertStrictHint,swCheckNames" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>