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

NightscoutFoundation · Sep 8, 2023 · f9346ab · f9346ab
2 parents 7f23a25 + 1fee98b
commit f9346ab
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
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
@@ -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);
 
     }
 

diff --git 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
@@ -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
@@ -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" />
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:dependency="ob1_g5_use_transmitter_alg"
-                    android:key="ob1_g5_fallback_to_xdrip"
-                    android:summary="@string/summary_ob1_g5_fallback_to_xdrip"
-                    android:title="@string/title_ob1_g5_fallback_to_xdrip" />
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="ob1_minimize_scanning"