Merge tag '2025.04.03'

Author: Pikernot

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

@@ -88,7 +88,7 @@ public void setupCharts() {
             DecimalFormat df = new DecimalFormat("#");
             df.setMaximumFractionDigits(2);
             df.setMinimumFractionDigits(2);
-            String Header = "slope = " + df.format(calibration.slope) + " intercept = " + df.format(calibration.intercept);
+            String Header = getString(R.string.calibration_slope_intercept, df.format(calibration.slope), df.format(calibration.intercept));
             GraphHeader.setText(Header);
 
             //red line
@@ -133,8 +133,8 @@ public void setupCharts() {
         }
         Axis axisX = new Axis();
         Axis axisY = new Axis().setHasLines(true);
-        axisX.setName("Raw Value");
-        axisY.setName("Glucose " + (doMgdl ? "mg/dl" : "mmol/l"));
+        axisX.setName(getString(R.string.axis_x_raw_value));
+        axisY.setName(getString(R.string.axis_y_glucose_mgdl_mmol, (doMgdl ? "mg/dl" : "mmol/l")));
 
 
         data = new LineChartData(lines);

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

@@ -499,7 +499,7 @@ public void addListenerOnButtons() {
         buttonSave.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 // Check that values are ok.
-                double threshold = parseDouble(alertThreshold.getText().toString());
+                double threshold = JoH.tolerantParseDouble(alertThreshold.getText().toString());
                 if(Double.isNaN(threshold))
                     return;
 

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

@@ -3,11 +3,15 @@
 import android.app.AlertDialog;
 import android.app.TimePickerDialog;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.format.DateFormat;
 import android.view.View;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
@@ -16,17 +20,23 @@
 import android.widget.TimePicker;
 
 import com.eveningoutpost.dexdrip.models.AlertType;
+import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.services.MissedReadingService;
+import com.eveningoutpost.dexdrip.utilitymodels.AlertPlayer;
+import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import com.eveningoutpost.dexdrip.utils.ActivityWithMenu;
 
 
 public class MissedReadingActivity extends ActivityWithMenu {
     public static String menu_name = "Missed reading";
     private Context mContext;
+    private Button buttonalertMp3;
 
     private CheckBox checkboxEnableAlert;
     private CheckBox checkboxAllDay;
     private CheckBox checkboxEnableReraise;
+    private String audioPath; // Local representation of the path to the sound file
+    private EditText alertMp3File; // Sound file title
 
     private LinearLayout layoutTimeBetween;
     private LinearLayout timeInstructions;
@@ -49,6 +59,8 @@ public class MissedReadingActivity extends ActivityWithMenu {
     private int endHour = 23;
     private int endMinute = 59;
     private int missedMinutes = 59;
+    private final static String TAG = AlertPlayer.class.getSimpleName();
+    EditAlertActivity editAlert = new EditAlertActivity();
 
 
     @Override
@@ -59,9 +71,18 @@ protected void onCreate(Bundle savedInstanceState) {
 
         viewTimeStart = (TextView) findViewById(R.id.missed_reading_time_start);
         viewTimeEnd = (TextView) findViewById(R.id.missed_reading_time_end);
+        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);
         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
+         * by default uses the same sound file as the other alerts alert.
+        **/
+        if (Pref.getString("bg_missed_alerts_sound", null) == null) { // If missed reading sound file has never been set
+            Pref.setString("bg_missed_alerts_sound", Pref.getString("other_alerts_sound", "content://settings/system/alarm_alert")); // Set it to the other alerts sound
+        }
+        alertMp3File = (EditText) findViewById(R.id.bg_missed_alerts_sound);
 
         layoutTimeBetween = (LinearLayout) findViewById(R.id.missed_reading_time_between);
         timeInstructions = (LinearLayout) findViewById(R.id.missed_reading_instructions);
@@ -83,6 +104,7 @@ 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);
+        audioPath = Pref.getString("bg_missed_alerts_sound", null);
 
         checkboxAllDay.setChecked(allDay);
         checkboxEnableAlert.setChecked(enableAlert);
@@ -95,9 +117,15 @@ protected void onCreate(Bundle savedInstanceState) {
         bgMissedMinutes.setText(prefs.getString("bg_missed_minutes", "30"));
         bgMissedSnoozeMin.setText("" + MissedReadingService.getOtherAlertSnoozeMinutes(prefs, "bg_missed_alerts"));
         bgMissedReraiseSec.setText(prefs.getString("bg_missed_alerts_reraise_sec", "60"));
+        if (!audioPath.equals("")) {
+            alertMp3File.setText(editAlert.shortPath(audioPath));
+        } else {
+            alertMp3File.setText("Silent");
+        }
 
         addListenerOnButtons();
         enableAllControls();
+        alertMp3File.setKeyListener(null);
     }
 
     @Override
@@ -225,6 +253,35 @@ public void onTimeSet(TimePicker timePicker, int selectedHour, int selectedMinut
         viewTimeEnd.setOnClickListener(endTimeListener);
         timeInstructionsEnd.setOnClickListener(endTimeListener);
 
+        buttonalertMp3.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
+                Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
+                intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true);
+                intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true);
+                intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_ALL);
+                startActivityForResult(intent, 999);
+                AlertDialog dialog = builder.create();
+                dialog.show();
+            }
+        }); //- See more at: http://blog.kerul.net/2011/12/pick-file-using-intentactiongetcontent.html#sthash.c8xtIr1Y.dpuf
+
+
+    }
+
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == RESULT_OK) {
+            Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
+            if (uri != null) {
+                audioPath = uri.toString();
+                alertMp3File.setText(editAlert.shortPath(audioPath));
+            } else {
+                audioPath = "";
+                alertMp3File.setText("Silent");
+            }
+            UserError.Log.d(TAG, "Selected sound path: " + audioPath);
+            Pref.setString("bg_missed_alerts_sound", audioPath); // Update the sound file preference
+        }
     }
 
     public void setTimeRanges() {

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

@@ -1022,7 +1022,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
         dialogBuilder.setTitle(((reminder == null) ? xdrip.getAppContext().getString(R.string.title_add_reminder) : xdrip.getAppContext().getString(R.string.title_edit_reminder)));
         //dialogBuilder.setMessage("Enter text below");
-        dialogBuilder.setPositiveButton("Done", new DialogInterface.OnClickListener() {
+        dialogBuilder.setPositiveButton(xdrip.getAppContext().getString(R.string.done), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int whichButton) {
                 String reminder_title = titleEditText.getText().toString().trim();
                 Log.d(TAG, "Got reminder title: " + reminder_title);

app/src/main/java/com/eveningoutpost/dexdrip/cgm/carelinkfollow/client/CareLinkClient.java

@@ -608,14 +608,26 @@ public RecentData getLast24Hours() {
 
         Map<String, String> queryParams = null;
         RecentData recentData = null;
+        boolean useCloudServer = false;
 
         queryParams = new HashMap<String, String>();
         queryParams.put("cpSerialNumber", "NONE");
         queryParams.put("msgType", "last24hours");
         queryParams.put("requestTime", String.valueOf(System.currentTimeMillis()));
 
+        //use cloud server in every region
+        useCloudServer = true;
+
         try {
-            recentData = this.getData(this.careLinkServer(), "patient/connect/data", queryParams, null, RecentData.class);
+            //Get data
+            //carelink cloud server and no query params
+            if(useCloudServer)
+                recentData = this.getData(this.cloudServer(), "patient/connect/data", null, null, RecentData.class);
+            //old carelink minimed server + query params
+            else
+                recentData = this.getData(this.careLinkServer(), "patient/connect/data", queryParams, null, RecentData.class);
+
+            //Correct time
             if (recentData != null)
                 correctTimeInRecentData(recentData);
         } catch (Exception e) {
@@ -668,7 +680,7 @@ public RecentData getConnectDisplayMessage(String username, String role, String
                     correctTimeInRecentData(recentData);
                 }
             }
-            //Use new data format outside US
+            //Use new data format for new endpoint
             else {
                 displayMessage = this.getData(newEndpointUrl, requestBody, DisplayMessage.class);
                 if (displayMessage != null && displayMessage.patientData != null) {
@@ -686,6 +698,8 @@ public RecentData getConnectDisplayMessage(String username, String role, String
     // New M2M last24hours webapp data
     public RecentData getM2MPatientData(String patientUsername) {
 
+        RecentData recentData = null;
+        boolean useCloudServer = false;
         Map<String, String> queryParams = null;
 
         //Patient username is mandantory!
@@ -697,9 +711,21 @@ public RecentData getM2MPatientData(String patientUsername) {
         queryParams.put("msgType", "last24hours");
         queryParams.put("requestTime", String.valueOf(System.currentTimeMillis()));
 
-        RecentData recentData = this.getData(this.careLinkServer(), "/patient/m2m/connect/data/gc/patients/" + patientUsername, queryParams, null, RecentData.class);
+        //use cloud server in every region
+        useCloudServer = true;
+
+        //Get data
+        //carelink cloud server and no query params
+        if(useCloudServer)
+            recentData = this.getData(this.cloudServer(), "patient/m2m/connect/data/gc/patients/" + patientUsername, null, null, RecentData.class);
+        //old carelink minimed server + query params
+        else
+            recentData = this.getData(this.careLinkServer(), "patient/m2m/connect/data/gc/patients/" + patientUsername, queryParams, null, RecentData.class);
+
+        //Correct time
         if (recentData != null)
             correctTimeInRecentData(recentData);
+
         return recentData;
 
     }

app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java

@@ -381,7 +381,7 @@ private static void handleAuthenticationThrowable(final Throwable throwable, fin
             }
             if ((throwable instanceof BleDisconnectedException) || (throwable instanceof TimeoutException)) {
                 if ((parent.getState() == Ob1G5CollectionService.STATE.BOND) || (parent.getState() == Ob1G5CollectionService.STATE.CHECK_AUTH)) {
-
+                    parent.savePersist();
                     if (parent.getState() == Ob1G5CollectionService.STATE.BOND) {
                         UserError.Log.d(TAG, "SLEEPING BEFORE RECONNECT");
                         threadSleep(15000);

app/src/main/java/com/eveningoutpost/dexdrip/models/Calibration.java

@@ -11,6 +11,7 @@
 import com.activeandroid.Model;
 import com.activeandroid.annotation.Column;
 import com.activeandroid.annotation.Table;
+import com.activeandroid.query.Delete;
 import com.activeandroid.query.Select;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
@@ -1365,6 +1366,12 @@ public static synchronized void invalidateAllForSensor() {
         JoH.static_toast_long(msg);
     }
 
+    public static void deleteAll() {
+        new Delete()
+                .from(Calibration.class)
+                .execute();
+    }
+
 }
 
 abstract class SlopeParameters {