Merge pull request #3027 from Navid200/Navid_2023_08_17

Remove the fallback setting
NightscoutFoundation · Sep 8, 2023 · 1fee98b · 1fee98b
2 parents 59055a8 + d97e3e3
commit 1fee98b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 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
@@ -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"