From 625bb0dfa837e781ae909c5de4e1d728e65a19da Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 23 Feb 2022 10:43:32 +0100 Subject: [PATCH] Prevent crash --- .../main/java/eu/faircode/email/FragmentOptionsMisc.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index 5fe2c64e5d..70b297db3a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -785,6 +785,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc } }); + swExternalStorage.setEnabled(getContext().getExternalFilesDir(null) != null); swExternalStorage.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -1311,8 +1312,9 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc setLastCleanup(prefs.getLong("last_cleanup", -1)); File external = getContext().getExternalFilesDir(null); - boolean emulated = Environment.isExternalStorageEmulated(external); - tvExternalStorageFolder.setText(external.getAbsolutePath() + (emulated ? " emulated" : "")); + boolean emulated = (external != null && Environment.isExternalStorageEmulated(external)); + tvExternalStorageFolder.setText( + (external == null ? null : external.getAbsolutePath()) + (emulated ? " emulated" : "")); swExactAlarms.setEnabled(AlarmManagerCompatEx.canScheduleExactAlarms(getContext())); swTestIab.setVisibility(BuildConfig.TEST_RELEASE ? View.VISIBLE : View.GONE);