From 689cbc833060892a31a35a198df61dd29f964741 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 1 Sep 2022 11:26:47 +0200 Subject: [PATCH] Disable photo picker for new installations --- app/src/main/java/eu/faircode/email/ApplicationEx.java | 4 ++++ app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- .../main/java/eu/faircode/email/FragmentOptionsBehavior.java | 2 +- 3 files changed, 6 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 c79755479e..7fa3f9d5b1 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -653,6 +653,10 @@ public class ApplicationEx extends Application editor.putBoolean("doubletap", true); } else if (version < 1960) editor.remove("sqlite_auto_vacuum"); + else if (version < 1961) { + if (!prefs.contains("photo_picker")) + editor.putBoolean("photo_picker", true); + } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) editor.remove("background_service"); diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index cbfb52ba8a..2e3bd0a158 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -3051,7 +3051,7 @@ public class FragmentCompose extends FragmentBase { // https://developer.android.com/reference/android/provider/MediaStore#ACTION_PICK_IMAGES // Android 12: cmd device_config put storage_native_boot picker_intent_enabled true SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - boolean photo_picker = prefs.getBoolean("photo_picker", true); + boolean photo_picker = prefs.getBoolean("photo_picker", false); Intent picker = new Intent(MediaStore.ACTION_PICK_IMAGES); picker.setType("image/*"); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index 789300c236..e796574f46 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -558,7 +558,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe etDefaultSnooze.setText(default_snooze == 1 ? null : Integer.toString(default_snooze)); etDefaultSnooze.setHint("1"); - swPhotoPicker.setChecked(prefs.getBoolean("photo_picker", true)); + swPhotoPicker.setChecked(prefs.getBoolean("photo_picker", false)); swPull.setChecked(prefs.getBoolean("pull", true)); swAutoScroll.setChecked(prefs.getBoolean("autoscroll", false));