Removed photo picker option

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));
         }

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) {

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"