Merge pull request #4047 from Navid200/Navid_2025_06_10

Session start time update for alt (corrects Nightscout SAGE)

Author: jamorham

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

@@ -18,6 +18,7 @@
 import com.activeandroid.util.SQLiteUtils;
 import com.eveningoutpost.dexdrip.GcmActivity;
 import com.eveningoutpost.dexdrip.Home;
+import com.eveningoutpost.dexdrip.g5model.DexSessionKeeper;
 import com.eveningoutpost.dexdrip.models.UserError.Log;
 import com.eveningoutpost.dexdrip.R;
 import com.eveningoutpost.dexdrip.services.SyncService;
@@ -58,7 +59,6 @@
 import static com.eveningoutpost.dexdrip.models.JoH.msSince;
 import static com.eveningoutpost.dexdrip.utilitymodels.Constants.HOUR_IN_MS;
 import static com.eveningoutpost.dexdrip.utilitymodels.Constants.MINUTE_IN_MS;
-import com.eveningoutpost.dexdrip.utilitymodels.Pref;
 import static java.lang.StrictMath.abs;
 import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 
@@ -449,6 +449,15 @@ public static void sensorStartIfNeeded() {
         }
     }
 
+    public static void sensorUpdateStartTimeIfNeeded() {
+        val lastSensorStart = Treatments.lastEventTypeFromXdrip(Treatments.SENSOR_START_EVENT_TYPE);
+        long localStartedAt = lastSensorStart.timestamp; // When the xDrip local session started
+        long dexStartedAt = DexSessionKeeper.getStart(); // When the current session on the transmitter started
+        if (dexStartedAt > 0 && !(dexStartedAt - localStartedAt < MINUTE_IN_MS * 5)) { // If the start time of the local session is more than 5 minutes older than the one on the transmitter
+            Treatments.sensorStart(dexStartedAt, "Start time updated");
+        }
+    }
+
     private static void pushTreatmentSync(Treatments treatment) {
         pushTreatmentSync(treatment, true, null); // new entry by default
     }

app/src/main/java/com/eveningoutpost/dexdrip/services/Ob1G5CollectionService.java

@@ -1945,6 +1945,10 @@ public static void processCalibrationState(final CalibrationState state) {
         updateG5State(needs_calibration, was_needing_calibration, NEEDING_CALIBRATION);
         updateG5State(is_started, was_started, IS_STARTED);
         updateG5State(is_failed, was_failed, IS_FAILED);
+
+        if (is_started && shortTxId() && JoH.pratelimit("update_alternate_dex_session_start_time", 60 * 60)) { // Once an hour if there is a local session
+            Treatments.sensorUpdateStartTimeIfNeeded();
+        }
     }