From d97e3e36f79923fb794a67fa1adc33fc623a8e6f Mon Sep 17 00:00:00 2001 From: Navid Date: Thu, 17 Aug 2023 22:34:25 -0400 Subject: [PATCH 1/2] Remove the fallback setting --- .../dexdrip/utilitymodels/IdempotentMigrations.java | 1 + .../java/com/eveningoutpost/dexdrip/utils/Preferences.java | 1 + app/src/main/res/xml/pref_data_source.xml | 6 ------ 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java index 1e21d581f3..713d86f0e5 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java @@ -145,6 +145,7 @@ public static void migrateOOP2CalibrationPreferences() { // Force legacy settings to be at their recommended values private static void legacySettingsFix() { Pref.setBoolean("use_ob1_g5_collector_service", true); + Pref.setBoolean("ob1_g5_fallback_to_xdrip", false); } } diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java index d4233c89a3..678d02933f 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java @@ -2456,6 +2456,7 @@ public void run() { private void removeLegacyPreferences() { // removePreferenceFromCategory("use_ob1_g5_collector_service", "ob1_options"); + // removePreferenceFromCategory("ob1_g5_fallback_to_xdrip", "ob1_options"); } private void removePreferenceFromCategory(final String preference, final String category) { diff --git a/app/src/main/res/xml/pref_data_source.xml b/app/src/main/res/xml/pref_data_source.xml index a91fd521ed..ef43b0ff5e 100644 --- a/app/src/main/res/xml/pref_data_source.xml +++ b/app/src/main/res/xml/pref_data_source.xml @@ -344,12 +344,6 @@ android:key="ob1_g5_use_insufficiently_calibrated" android:summary="@string/summary_ob1_g5_use_insufficiently_calibrated" android:title="@string/title_ob1_g5_use_insufficiently_calibrated" /> - Date: Tue, 29 Aug 2023 10:48:14 +0300 Subject: [PATCH 2/2] fix for aidex missing bg updates --- .../eveningoutpost/dexdrip/receivers/aidex/AidexReceiver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/receivers/aidex/AidexReceiver.java b/app/src/main/java/com/eveningoutpost/dexdrip/receivers/aidex/AidexReceiver.java index 99e8da3124..147a864c53 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/receivers/aidex/AidexReceiver.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/receivers/aidex/AidexReceiver.java @@ -149,7 +149,7 @@ private void processNewBGEstimate(Bundle bundle) { checkIfCorrectSensorIsRunning(sensorId, timeStamp); UserError.Log.i(TAG, "Aidex Broadcast NewBGEstimate received: bg=" + bgValueMgDl + ", time=" + JoH.dateTimeText(timeStamp)); - BgReading.bgReadingInsertFromInt(bgValueMgDl, timeStamp, segmentation_timeslice, false); + BgReading.bgReadingInsertFromInt(bgValueMgDl, timeStamp, segmentation_timeslice, true); }