Merge branch 'master' of https://github.com/NightscoutFoundation/xDrip

jamorham · jamorham · commit 0a649c2f155f · 2025-10-15T10:15:12.000Z
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -368,7 +368,7 @@
         <activity
             android:name=".stats.StatsActivity"
             android:configChanges="orientation|screenSize"
-            android:label="Statistics"
+            android:label="@string/statistics"
             android:theme="@style/AppTheme" />
         <activity
             android:name=".SnoozeActivity"
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/AlertList.java b/app/src/main/java/com/eveningoutpost/dexdrip/AlertList.java
@@ -190,11 +190,11 @@ public void run() {
 
                 if (!isFinishing()) {
                     new AlertDialog.Builder(AlertList.this)
-                            .setTitle("Warning !")
-                            .setMessage("No low alert is active. You won’t be notified of low glucose—please add or enable one.")
+                            .setTitle(getString(R.string.alert_warning))
+                            .setMessage(getString(R.string.no_active_low_alert_warning))
                             .setCancelable(false)
                             .setPositiveButton(
-                                    "Ok",
+                                    getString(R.string.ok),
                                     new DialogInterface.OnClickListener() {
                                         public void onClick(DialogInterface dialog, int id) {
                                             dialog.cancel();
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/EditAlertActivity.java
@@ -390,15 +390,15 @@ private boolean verifyThreshold(double threshold, boolean allDay, int startTime,
         List<AlertType> highAlerts = AlertType.getAll(true);
 
         if(threshold < MIN_ALERT || threshold > MAX_ALERT) {
-            Toast.makeText(getApplicationContext(), "Threshold must be between " +unitsConvert2Disp(doMgdl, MIN_ALERT) + " and " + unitsConvert2Disp(doMgdl, MAX_ALERT) + ".", Toast.LENGTH_LONG).show();
+            Toast.makeText(getApplicationContext(), getString(R.string.threshold_has_to_be_between, unitsConvert2Disp(doMgdl, MIN_ALERT), unitsConvert2Disp(doMgdl, MAX_ALERT)),Toast.LENGTH_LONG).show();
             return false;
         }
         // We want to make sure that for each threashold there is only one alert. Otherwise, which file should we play.
         for (AlertType lowAlert : lowAlerts) {
             if(lowAlert.threshold == threshold  && overlapping(lowAlert, allDay, startTime, endTime) && lowAlert.active) {
                 if(uuid == null || ! uuid.equals(lowAlert.uuid)){ //new alert or not myself
                     Toast.makeText(getApplicationContext(),
-                            "Each alert needs a unique threshold. Please choose a different one.",Toast.LENGTH_LONG).show();
+                            getString(R.string.alert_threshold_already_in_use),Toast.LENGTH_LONG).show();
                     return false;
                 }
             }
@@ -407,7 +407,7 @@ private boolean verifyThreshold(double threshold, boolean allDay, int startTime,
             if(highAlert.threshold == threshold  && overlapping(highAlert, allDay, startTime, endTime) && highAlert.active) {
                 if(uuid == null || ! uuid.equals(highAlert.uuid)){ //new alert or not myself
                     Toast.makeText(getApplicationContext(),
-                            "Each alert needs a unique threshold. Please choose a different one.",Toast.LENGTH_LONG).show();
+                            getString(R.string.alert_threshold_already_in_use),Toast.LENGTH_LONG).show();
                     return false;
                 }
             }
@@ -418,7 +418,7 @@ private boolean verifyThreshold(double threshold, boolean allDay, int startTime,
             for (AlertType lowAlert : lowAlerts) {
                 if(threshold < lowAlert.threshold  && overlapping(lowAlert, allDay, startTime, endTime) && lowAlert.active) {
                     Toast.makeText(getApplicationContext(),
-                            "High alerts must be set above all low alerts. Please adjust the threshold.",Toast.LENGTH_LONG).show();
+                            getString(R.string.high_alert_threshold_error),Toast.LENGTH_LONG).show();
                     return false;
                 }
             }
@@ -427,7 +427,7 @@ private boolean verifyThreshold(double threshold, boolean allDay, int startTime,
             for (AlertType highAlert : highAlerts) {
                 if(threshold > highAlert.threshold  && overlapping(highAlert, allDay, startTime, endTime) && highAlert.active) {
                     Toast.makeText(getApplicationContext(),
-                            "Low alerts must be set below all high alerts. Please adjust the threshold.",Toast.LENGTH_LONG).show();
+                            getString(R.string.low_alert_threshold_error),Toast.LENGTH_LONG).show();
                     return false;
                 }
             }
@@ -513,10 +513,10 @@ public void onClick(View v) {
                 int defaultSnooze = safeGetDefaultSnooze();
 
                 if(alertReraise < 1) {
-                    Toast.makeText(getApplicationContext(), "Reraise Value must be 1 minute or greater", Toast.LENGTH_LONG).show();
+                    Toast.makeText(getApplicationContext(), getString(R.string.alert_reraise_value_too_small), Toast.LENGTH_LONG).show();
                     return;
                 } else if (alertReraise >= defaultSnooze) {
-                    Toast.makeText(getApplicationContext(), "Reraise Value must be less than snooze length", Toast.LENGTH_LONG).show();
+                    Toast.makeText(getApplicationContext(), getString(R.string.alert_reraise_value_too_big), Toast.LENGTH_LONG).show();
                     return;
                 }
 
@@ -536,7 +536,7 @@ public void onClick(View v) {
                     allDay = true;
                 }
                 if (timeStart == timeEnd && (allDay==false)) {
-                    Toast.makeText(getApplicationContext(), "Alert start and end times cannot be equal.", Toast.LENGTH_LONG).show();
+                    Toast.makeText(getApplicationContext(), getString(R.string.start_and_end_time_same),Toast.LENGTH_LONG).show();
                     return;
                 }
                 boolean disabled = checkboxDisabled.isChecked();
@@ -592,7 +592,7 @@ public void onClick(View v) {
         buttonalertMp3.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-                builder.setTitle("What type of sound?")
+                builder.setTitle(getString(R.string.what_type_of_alert))
                         .setItems(R.array.alertType, new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
                                 if (which == 0) {
@@ -857,7 +857,7 @@ public void onClick(View v) {
                 d.setContentView(R.layout.snooze_picker);
                 Button b1 = (Button) d.findViewById(R.id.button1);
                 Button b2 = (Button) d.findViewById(R.id.button2);
-                b1.setText("pre-Snooze");
+                b1.setText(getString(R.string.pre_snooze));
 
                 final NumberPicker snoozeValue = (NumberPicker) d.findViewById(R.id.numberPicker1);
 
@@ -928,7 +928,7 @@ public void testAlert() {
             allDay = true;
         }
         if (timeStart == timeEnd && (!allDay)) {
-            Toast.makeText(getApplicationContext(), "Alert start and end times cannot be equal.", Toast.LENGTH_LONG).show();
+            Toast.makeText(getApplicationContext(), getString(R.string.start_and_end_time_same),Toast.LENGTH_LONG).show();
             return;
         }
         if(!verifyThreshold(threshold, allDay, timeStart, timeEnd)) {
@@ -942,11 +942,11 @@ public void testAlert() {
             int defaultSnooze = safeGetDefaultSnooze();
 
             if (Pref.getBooleanDefaultFalse("start_snoozed"))  {
-                JoH.static_toast_long("Start Snoozed setting means alert would normally start silent");
+                JoH.static_toast_long(getString(R.string.start_snoozed_enabled));
             } else if (Pref.getStringDefaultBlank("bg_alert_profile").equals("ascending") && Pref.getBoolean("delay_ascending_3min", true)) {
-                JoH.static_toast_long("Ascending Volume Profile + delayed ascending means it will start silent");
+                JoH.static_toast_long(getString(R.string.volume_profile_set_to_ascending_with_delay));
             } else if (Pref.getStringDefaultBlank("bg_alert_profile").equals("Silent")) {
-                JoH.static_toast_long("Volume Profile is set to silent!");
+                JoH.static_toast_long(getString(R.string.volume_profile_set_to_silent));
             }
 
             AlertType.testAlert(alertText.getText().toString(), above, threshold, allDay, 1, mp3_file, timeStart, timeEnd, overrideSilentMode, forceSpeaker, defaultSnooze, vibrate, mContext);
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java
@@ -42,6 +42,7 @@
 
 import static com.eveningoutpost.dexdrip.models.BgReading.isDataSuitableForDoubleCalibration;
 import static com.eveningoutpost.dexdrip.calibrations.PluggableCalibration.newFingerStickData;
+import static com.eveningoutpost.dexdrip.utils.DexCollectionType.getBestCollectorHardwareName;
 
 
 class DexParameters extends SlopeParameters {
@@ -640,7 +641,8 @@ public static Calibration create(double bg, long timeoffset, Context context, bo
                     } else {
                         Log.d(TAG, "Follower mode or note so not processing calibration deeply");
                     }
-                } else {
+                } else if (!getBestCollectorHardwareName().equals("G7")) {
+                    // Only if we are not using newer devices, which are limited to native behavior
                     final String msg = "Sensor data fails sanity test - Cannot Calibrate! raw:" + bgReading.raw_data;
                     UserError.Log.e(TAG, msg);
                     JoH.static_toast_long(msg);
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/models/SensorSanity.java b/app/src/main/java/com/eveningoutpost/dexdrip/models/SensorSanity.java
@@ -1,5 +1,7 @@
 package com.eveningoutpost.dexdrip.models;
 
+import static com.eveningoutpost.dexdrip.utils.DexCollectionType.getBestCollectorHardwareName;
+
 import com.eveningoutpost.dexdrip.Home;
 import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.utilitymodels.PersistentStore;
@@ -71,7 +73,7 @@ public static boolean isRawValueSane(double raw_value, DexCollectionType type, b
             else if (raw_value > DEXCOM_MAX_RAW) state = false;
         }
 
-        if (!state) {
+        if (!state && !getBestCollectorHardwareName().equals("G7")) {
             if (JoH.ratelimit("sanity-failure", 20)) {
                 final String msg = "Sensor Raw Data Sanity Failure: " + raw_value;
                 UserError.Log.e(TAG, msg);
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
@@ -1133,7 +1133,6 @@ public void onCreate(Bundle savedInstanceState) {
             bindPreferenceSummaryToValue(findPreference("falling_bg_val"));
             bindPreferenceSummaryToValue(findPreference("rising_bg_val"));
             bindPreferenceSummaryToValue(findPreference("other_alerts_sound"));
-            bindPreferenceSummaryToValue(findPreference("bridge_battery_alert_level"));
             bindPreferenceSummaryToUnitizedValueAndEnsureNumeric(findPreference("persistent_high_threshold"));
             bindPreferenceSummaryToUnitizedValueAndEnsureNumeric(findPreference("forecast_low_threshold"));
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -166,11 +166,11 @@
 
     <!--     make sure to keep this values in sync with AlertPlayer.getAlertProfile -->
     <string-array name="BgAlertProfileEntries">
-        <item>High</item>
-        <item>Medium</item>
-        <item>Ascending</item>
-        <item>Vibrate only</item>
-        <item>Silent</item>
+        <item>@string/volume_profile_high</item>
+        <item>@string/volume_profile_medium</item>
+        <item>@string/volume_profile_ascending</item>
+        <item>@string/volume_profile_vibrate_only</item>
+        <item>@string/volume_profile_silent</item>
     </string-array>
 
     <string-array name="BgAlertProfileValues">
@@ -194,9 +194,9 @@
     </string-array>
 
     <string-array name="alertType">
-        <item>System Sound/Alarm</item>
-        <item>Custom Sound/Alarm</item>
-        <item>Default xDrip sound</item>
+        <item>@string/system_sound_alarm</item>
+        <item>@string/custom_sound_alarm</item>
+        <item>@string/default_xdrip_sound</item>
     </string-array>
 
     <string-array name="reminderAlertType">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1983,4 +1983,26 @@
     <string name="last_90_days">Last 90 days</string>
     <string name="scan_with_xdrip_settings_auto_configure"><![CDATA[Scan with\nxDrip Settings -> Auto Configure]]></string>
     <string name="could_not_create_qr_code">Could not create QR code</string>
+    <string name="alert_warning">Warning !</string>
+    <string name="no_active_low_alert_warning">No low alert is active. You won\'t be notified of low glucose—please add or enable one.</string>
+    <string name="volume_profile_set_to_silent">Volume Profile is set to silent!</string>
+    <string name="volume_profile_set_to_ascending_with_delay">Ascending Volume Profile + delayed ascending means it will start silent</string>
+    <string name="start_snoozed_enabled">Start Snoozed setting means alert would normally start silent</string>
+    <string name="pre_snooze">pre-Snooze</string>
+    <string name="volume_profile_high">High</string>
+    <string name="volume_profile_medium">Medium</string>
+    <string name="volume_profile_ascending">Ascending</string>
+    <string name="volume_profile_vibrate_only">Vibrate only</string>
+    <string name="volume_profile_silent">Silent</string>
+    <string name="alert_threshold_already_in_use">Each alert needs a unique threshold. Please choose a different one.</string>
+    <string name="high_alert_threshold_error">High alerts must be set above all low alerts. Please adjust the threshold.</string>
+    <string name="low_alert_threshold_error">Low alerts must be set below all high alerts. Please adjust the threshold.</string>
+    <string name="threshold_has_to_be_between">Threshold must be between %1$s and %2$s.</string>
+    <string name="alert_reraise_value_too_small">Reraise Value must be 1 minute or greater</string>
+    <string name="alert_reraise_value_too_big">Reraise Value must be less than snooze length</string>
+    <string name="start_and_end_time_same">Alert start and end times cannot be equal.</string>
+    <string name="what_type_of_alert">What type of sound?</string>
+    <string name="system_sound_alarm">System Sound/Alarm</string>
+    <string name="custom_sound_alarm">Custom Sound/Alarm</string>
+    <string name="default_xdrip_sound">Default xDrip sound</string>
 </resources>
