Merge pull request #4014 from Navid200/Navid_2025_05_20

Override Silent Mode to reduce dependence on notification channels

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/MissedReadingActivity.java

@@ -35,6 +35,7 @@ public class MissedReadingActivity extends ActivityWithMenu {
     private CheckBox checkboxEnableAlert;
     private CheckBox checkboxAllDay;
     private CheckBox checkboxEnableReraise;
+    private CheckBox checkboxOverrideSilent;
     private String audioPath; // Local representation of the path to the sound file
     private EditText alertMp3File; // Sound file title
 
@@ -74,6 +75,7 @@ protected void onCreate(Bundle savedInstanceState) {
         buttonalertMp3 = (Button)findViewById(R.id.Button_mra_mp3_file);
         checkboxAllDay = (CheckBox) findViewById(R.id.missed_reading_all_day);
         checkboxEnableAlert = (CheckBox) findViewById(R.id.missed_reading_enable_alert);
+        checkboxOverrideSilent = (CheckBox) findViewById(R.id.bg_missed_alerts_override_silent);
         checkboxEnableReraise = (CheckBox) findViewById(R.id.missed_reading_enable_alerts_reraise);
         /** xDrip used to use the other alerts sound file for the missed readings alert.
          * To avoid causing an unexpected behavior for a previous user of xDrip, the missed reading alert
@@ -104,11 +106,13 @@ protected void onCreate(Bundle savedInstanceState) {
         boolean enableAlert = prefs.getBoolean("bg_missed_alerts",false);
         boolean allDay = prefs.getBoolean("missed_readings_all_day",true);
         boolean enableReraise = prefs.getBoolean("bg_missed_alerts_enable_alerts_reraise",false);
+        boolean overrideSilentMode = prefs.getBoolean("bg_missed_alerts_override_silent", false);
         audioPath = Pref.getString("bg_missed_alerts_sound", null);
 
         checkboxAllDay.setChecked(allDay);
         checkboxEnableAlert.setChecked(enableAlert);
         checkboxEnableReraise.setChecked(enableReraise);
+        checkboxOverrideSilent.setChecked(overrideSilentMode);
 
         startHour = AlertType.time2Hours(startMinutes);
         startMinute = AlertType.time2Minutes(startMinutes);
@@ -142,6 +146,7 @@ public void onDestroy() {
         prefs.edit().putBoolean("bg_missed_alerts", checkboxEnableAlert.isChecked()).apply();
         prefs.edit().putBoolean("missed_readings_all_day", checkboxAllDay.isChecked()).apply();
         prefs.edit().putBoolean("bg_missed_alerts_enable_alerts_reraise", checkboxEnableReraise.isChecked()).apply();
+        prefs.edit().putBoolean("bg_missed_alerts_override_silent", checkboxOverrideSilent.isChecked()).apply();
 
         MissedReadingService.delayedLaunch();
       //  context.startService(new Intent(context, MissedReadingService.class));
@@ -157,6 +162,7 @@ void EnableControls(boolean enabled) {
         timeInstructions.setEnabled(enabled);
         checkboxAllDay.setEnabled(enabled);
         checkboxEnableReraise.setEnabled(enabled);
+        checkboxOverrideSilent.setEnabled(enabled);
         bgMissedMinutes.setEnabled(enabled);
         bgMissedSnoozeMin.setEnabled(enabled);
         bgMissedReraiseSec.setEnabled(enabled);
@@ -211,6 +217,13 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             }
         });
 
+        checkboxOverrideSilent.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            // @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
+                enableAllControls();
+            }
+        });
+
 
         View.OnClickListener startTimeListener = new View.OnClickListener() {
 

app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java

@@ -65,6 +65,7 @@ public void performAll() {
         CompatibleApps.notifyAboutCompatibleApps();
         legacySettingsMoveLanguageFromNoToNb();
         prefSettingRangeVerification();
+        inheritPrefSettingsAfterUpdate();
 
     }
 
@@ -181,4 +182,15 @@ private static void prefSettingRangeVerification() {
         Preferences.applyPrefSettingRange("forecast_low_threshold", "70", MIN_GLUCOSE_INPUT, MAX_GLUCOSE_INPUT);
     }
 
+    // Set new settings such that a version update does not cause a surprise
+    private static void inheritPrefSettingsAfterUpdate() {
+        if (!Pref.getBooleanDefaultFalse("has_been_explicitly_set_persistent_high_alert_override_silent")) { // If override silent mode has never been explicitly set for the Persistent High alert
+            Pref.setBoolean("persistent_high_alert_override_silent", Pref.getBooleanDefaultFalse("other_alerts_override_silent")); // Inherit Persistent High override silent mode from other alerts
+            Pref.setBoolean("bg_predict_alert_override_silent", Pref.getBooleanDefaultFalse("other_alerts_override_silent")); // Inherit Forecasted Low override silent mode from other alerts
+            Pref.setBoolean("bg_missed_alerts_override_silent", Pref.getBooleanDefaultFalse("other_alerts_override_silent")); // Inherit Missed Reading override silent mode from other alerts
+            Pref.setBoolean("has_been_explicitly_set_persistent_high_alert_override_silent", true); // Set this setting so that we never inherit again.
+        }
+        //
+    }
+
 }

app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/Notifications.java

@@ -969,6 +969,7 @@ private static void OtherAlert(Context context, String type, String title, Strin
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         String otherAlertsSound = prefs.getString(type+"_sound",prefs.getString("other_alerts_sound", "content://settings/system/notification_sound"));
         Boolean otherAlertsOverrideSilent = prefs.getBoolean("other_alerts_override_silent", false);
+        Boolean extraAlertsOverrideSilent = prefs.getBoolean(type+"_override_silent", otherAlertsOverrideSilent); // Inherit from other alerts if the alert itself does not have a dedicated setting
 
         Log.d(TAG,"OtherAlert called " + type + " " + message + " reraiseSec = " + reraiseSec);
         UserNotification userNotification = UserNotification.GetNotificationByType(type); //"bg_unclear_readings_alert"
@@ -1008,10 +1009,11 @@ private static void OtherAlert(Context context, String type, String title, Strin
             mBuilder.setVibrate(vibratePattern);
             mBuilder.setLights(0xff00ff00, 300, 1000);
             if (AlertPlayer.notSilencedDueToCall()) {
-                if (otherAlertsOverrideSilent && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                if (extraAlertsOverrideSilent) {
                     mBuilder.setSound(Uri.parse(otherAlertsSound), AudioAttributes.USAGE_ALARM);
                 } else {
                     mBuilder.setSound(Uri.parse(otherAlertsSound));
+                    Log.ueh(TAG, "No " + type + " in silent mode");
                 }
             }
             NotificationManager mNotifyMgr = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

app/src/main/res/layout/activity_missed_readings.xml

@@ -303,6 +303,17 @@
                         android:text="@string/choose_file"
                         android:textAllCaps="false" />
 
+                    <CheckBox
+                        android:id="@+id/bg_missed_alerts_override_silent"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/override_silent_mode"
+                        android:textSize="15sp"
+                        android:padding="5dp"
+                        android:layout_gravity="left"
+                        android:layout_marginLeft="10dp"
+                        android:gravity="left" />
+
                 </LinearLayout>
 
             </LinearLayout>

app/src/main/res/values/strings.xml

@@ -807,7 +807,7 @@
     <string name="calibrations_request_time_time_difference">How many hours between calibration requests</string>
     <string name="hours_between_calibrations">Hours between calibrations</string>
     <string name="calibrations_sound">Set sound used for calibration requests.</string>
-    <string name="override_silent_mode">Override Silent mode</string>
+    <string name="override_silent_mode">Override Silent Mode</string>
     <string name="even_when_charging">Even when charging</string>
     <string name="no_calibration_requests_charging">Uncheck to not ask for calibrations when phone is charging</string>
     <string name="keep_alert_no_calibration">Keep alerting if no calibration is performed</string>

app/src/main/res/xml/pref_notifications.xml

@@ -343,6 +343,10 @@
                         android:showSilent="true"
                         android:summary="@string/choose_sound_used_for_persistent_high_alarm"
                         android:title="@string/persistent_high_sound" />
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="persistent_high_alert_override_silent"
+                        android:title="@string/override_silent_mode" />
                 </PreferenceScreen>
                 <PreferenceScreen
                     android:key="@string/forecasted_low_alert"
@@ -388,6 +392,10 @@
                         android:showSilent="true"
                         android:summary="@string/choose_sound_used_for_predicted_low_alarm"
                         android:title="@string/predicted_low_sound" />
+                    <CheckBoxPreference
+                        android:defaultValue="false"
+                        android:key="bg_predict_alert_override_silent"
+                        android:title="@string/override_silent_mode" />
                 </PreferenceScreen>
                 <PreferenceScreen
                     android:key="@string/title_sens_expiry"