diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index 57a18f02b8..09d9a07dd4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -47,7 +47,6 @@ import androidx.preference.PreferenceManager; public class FragmentOptionsMisc extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener { private SwitchCompat swDoubleBack; private Spinner spBiometricsTimeout; - private SwitchCompat swBiometricsNotify; private SwitchCompat swEnglish; private SwitchCompat swWatchdog; private SwitchCompat swUpdates; @@ -63,7 +62,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc private Group grpDebug; private final static String[] RESET_OPTIONS = new String[]{ - "double_back", "biometrics_timeout", "biometrics_notify", "english", "watchdog", "updates", "crash_reports", "debug" + "double_back", "biometrics_timeout", "english", "watchdog", "updates", "crash_reports", "debug" }; private final static String[] RESET_QUESTIONS = new String[]{ @@ -82,7 +81,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc swDoubleBack = view.findViewById(R.id.swDoubleBack); spBiometricsTimeout = view.findViewById(R.id.spBiometricsTimeout); - swBiometricsNotify = view.findViewById(R.id.swBiometricsNotify); swEnglish = view.findViewById(R.id.swEnglish); swWatchdog = view.findViewById(R.id.swWatchdog); swUpdates = view.findViewById(R.id.swUpdates); @@ -123,13 +121,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc } }); - swBiometricsNotify.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { - prefs.edit().putBoolean("biometrics_notify", checked).apply(); - } - }); - swEnglish.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { @@ -273,8 +264,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc break; } - swBiometricsNotify.setChecked(prefs.getBoolean("biometrics_notify", false)); - swEnglish.setChecked(prefs.getBoolean("english", false)); swWatchdog.setChecked(prefs.getBoolean("watchdog", true)); swUpdates.setChecked(prefs.getBoolean("updates", true)); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index e29e7644ca..8e96f71234 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -59,6 +59,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared private CheckBox cbNotifyActionFlag; private CheckBox cbNotifyActionSeen; private TextView tvNotifyActionsPro; + private SwitchCompat swBiometricsNotify; private Button btnManage; private TextView tvManageHint; private ImageButton ibManage; @@ -69,7 +70,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared private final static String[] RESET_OPTIONS = new String[]{ "badge", "unseen_ignored", - "notify_preview", "notify_trash", "notify_archive", "notify_reply", "notify_flag", "notify_seen", + "notify_preview", "notify_trash", "notify_archive", "notify_reply", "notify_flag", "notify_seen", "biometrics_notify", "light", "sound" }; @@ -92,6 +93,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared cbNotifyActionFlag = view.findViewById(R.id.cbNotifyActionFlag); cbNotifyActionSeen = view.findViewById(R.id.cbNotifyActionSeen); tvNotifyActionsPro = view.findViewById(R.id.tvNotifyActionsPro); + swBiometricsNotify = view.findViewById(R.id.swBiometricsNotify); btnManage = view.findViewById(R.id.btnManage); tvManageHint = view.findViewById(R.id.tvManageHint); ibManage = view.findViewById(R.id.ibManage); @@ -167,6 +169,13 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared Helper.linkPro(tvNotifyActionsPro); + swBiometricsNotify.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { + prefs.edit().putBoolean("biometrics_notify", checked).apply(); + } + }); + final Intent manage = getIntentNotifications(getContext()); btnManage.setVisibility(manage.resolveActivity(pm) == null ? View.GONE : View.VISIBLE); btnManage.setOnClickListener(new View.OnClickListener() { @@ -273,6 +282,8 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared cbNotifyActionFlag.setEnabled(pro); cbNotifyActionSeen.setEnabled(pro); + swBiometricsNotify.setChecked(prefs.getBoolean("biometrics_notify", false)); + swLight.setChecked(prefs.getBoolean("light", false)); grpNotification.setVisibility(Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.O ? View.VISIBLE : View.GONE); diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml index d682fc6ad3..62685346dc 100644 --- a/app/src/main/res/layout/fragment_options_misc.xml +++ b/app/src/main/res/layout/fragment_options_misc.xml @@ -52,17 +52,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvBiometricsTimeout" /> - - + +