diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index 349e6d9d2a..9f4d52d0bf 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -126,7 +126,6 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared private SwitchCompat swMessagingStyle; private ImageButton ibCar; private SwitchCompat swBiometricsNotify; - private SwitchCompat swNotifyMinimal; private SwitchCompat swNotifyOpenFolder; private SwitchCompat swBackground; private Spinner spRateLimit; @@ -154,7 +153,7 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared "notify_subtext", "notify_preview", "notify_preview_all", "notify_preview_only", "notify_transliterate", "notify_ascii", "wearable_preview", "notify_messaging", - "biometrics_notify", "notify_minimal", "notify_open_folder", "background_service", "notify_rate_limit", "alert_once" + "biometrics_notify", "notify_open_folder", "background_service", "notify_rate_limit", "alert_once" )); @Override @@ -220,7 +219,6 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared swMessagingStyle = view.findViewById(R.id.swMessagingStyle); ibCar = view.findViewById(R.id.ibCar); swBiometricsNotify = view.findViewById(R.id.swBiometricsNotify); - swNotifyMinimal = view.findViewById(R.id.swNotifyMinimal); swNotifyOpenFolder = view.findViewById(R.id.swNotifyOpenFolder); swBackground = view.findViewById(R.id.swBackground); spRateLimit = view.findViewById(R.id.spRateLimit); @@ -735,15 +733,6 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared @Override public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { prefs.edit().putBoolean("biometrics_notify", checked).apply(); - enableOptions(); - } - }); - - swNotifyMinimal.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { - prefs.edit().putBoolean("notify_minimal", checked).apply(); - enableOptions(); } }); @@ -937,7 +926,6 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared swWearablePreview.setChecked(prefs.getBoolean("wearable_preview", false)); swMessagingStyle.setChecked(prefs.getBoolean("notify_messaging", false)); swBiometricsNotify.setChecked(prefs.getBoolean("biometrics_notify", true)); - swNotifyMinimal.setChecked(prefs.getBoolean("notify_minimal", false)); swNotifyOpenFolder.setChecked(prefs.getBoolean("notify_open_folder", false)); swBackground.setChecked(prefs.getBoolean("background_service", false)); swAlertOnce.setChecked(!prefs.getBoolean("alert_once", true)); @@ -968,7 +956,6 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared swNotifyPreviewOnly.setEnabled(!summary && swNotifyPreview.isChecked()); swWearablePreview.setEnabled(!summary && swNotifyPreview.isChecked()); swBiometricsNotify.setEnabled(!summary); - swNotifyMinimal.setEnabled(summary || !swBiometricsNotify.isChecked()); } @Override diff --git a/app/src/main/java/eu/faircode/email/NotificationHelper.java b/app/src/main/java/eu/faircode/email/NotificationHelper.java index 6de3e946cc..19b9ce164b 100644 --- a/app/src/main/java/eu/faircode/email/NotificationHelper.java +++ b/app/src/main/java/eu/faircode/email/NotificationHelper.java @@ -727,7 +727,6 @@ class NotificationHelper { boolean alert_once = prefs.getBoolean("alert_once", true); boolean perform_expunge = prefs.getBoolean("perform_expunge", true); boolean delete_notification = prefs.getBoolean("delete_notification", false); - boolean notify_minimal = prefs.getBoolean("notify_minimal", false); // Get contact info Long latest = null; @@ -865,7 +864,7 @@ class NotificationHelper { } if (notify_preview) - if (redacted && !notify_minimal) + if (redacted) builder.setContentText(context.getString(R.string.title_notification_redacted)); else { DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.SHORT, SimpleDateFormat.SHORT); @@ -874,7 +873,7 @@ class NotificationHelper { Address[] afrom = messageFrom.get(message.id); String from = MessageHelper.formatAddresses(afrom, email_format, false); sb.append("").append(Html.escapeHtml(from)).append(""); - if (!TextUtils.isEmpty(message.subject) && !notify_minimal) + if (!TextUtils.isEmpty(message.subject)) sb.append(": ").append(Html.escapeHtml(message.subject)); sb.append(" ").append(Html.escapeHtml(DTF.format(message.received))); sb.append("
"); diff --git a/app/src/main/res/layout/fragment_options_notifications.xml b/app/src/main/res/layout/fragment_options_notifications.xml index 4047994c34..40cd8915e2 100644 --- a/app/src/main/res/layout/fragment_options_notifications.xml +++ b/app/src/main/res/layout/fragment_options_notifications.xml @@ -890,19 +890,6 @@ app:layout_constraintTop_toBottomOf="@id/ibCar" app:switchPadding="12dp" /> - - Only send notifications with a message preview to wearables Use Android \'messaging style\' notification format Show notification content when using biometric authentication - Show sender only Open folder when opening new message Use notification light Select notification sound