From f23fb373fff8dbc119a433c3012d2fc8b90a64c8 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 21 Aug 2023 08:23:30 +0200 Subject: [PATCH] Removed photo picker option --- app/src/main/java/eu/faircode/email/ApplicationEx.java | 4 +++- .../main/java/eu/faircode/email/FragmentOptionsBehavior.java | 2 +- app/src/main/res/layout/fragment_options_behavior.xml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index a552d49406..f8a709d7d0 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -375,6 +375,8 @@ public class ApplicationEx extends Application if (version < BuildConfig.VERSION_CODE) editor.remove("crash_report_count"); + editor.remove("photo_picker"); + if (!BuildConfig.TEST_RELEASE) editor.remove("test1").remove("test2").remove("test3").remove("test4").remove("test5"); @@ -730,7 +732,7 @@ public class ApplicationEx extends Application if (override_width) editor.putBoolean("overview_mode", true); editor.remove("override_width"); - } else if (version < 2089){ + } else if (version < 2089) { if (!prefs.contains("auto_hide_answer")) editor.putBoolean("auto_hide_answer", !Helper.isAccessibilityEnabled(context)); } diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index 9efb716e71..3031c3bf0e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -519,7 +519,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe } }); - swPhotoPicker.setVisibility(Helper.hasPhotoPicker() ? View.VISIBLE : View.GONE); + swPhotoPicker.setVisibility(Helper.hasPhotoPicker() && false ? View.VISIBLE : View.GONE); swPhotoPicker.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { diff --git a/app/src/main/res/layout/fragment_options_behavior.xml b/app/src/main/res/layout/fragment_options_behavior.xml index 1e068f08a8..d621a61052 100644 --- a/app/src/main/res/layout/fragment_options_behavior.xml +++ b/app/src/main/res/layout/fragment_options_behavior.xml @@ -759,6 +759,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:checked="true" + android:tag="nosuggest" android:text="@string/title_advanced_photo_picker" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"