Merge pull request #3087 from Navid200/Navid_2023_09_17

Remove setting: Unbond G5 before each read
jamorham · Sep 24, 2023 · 39370ed · 39370ed
2 parents a5e2495 + f3707dd
commit 39370ed
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 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
@@ -146,6 +146,7 @@ public static void migrateOOP2CalibrationPreferences() {
     private static void legacySettingsFix() {
         Pref.setBoolean("use_ob1_g5_collector_service", true);
         Pref.setBoolean("ob1_g5_fallback_to_xdrip", false);
+        Pref.setBoolean("always_unbond_G5", 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
@@ -2457,6 +2457,7 @@ public void run() {
        private void removeLegacyPreferences() {
            //  removePreferenceFromCategory("use_ob1_g5_collector_service", "ob1_options");
            //  removePreferenceFromCategory("ob1_g5_fallback_to_xdrip", "ob1_options");
+           //  removePreferenceFromCategory("always_unbond_G5", "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
@@ -404,11 +404,6 @@
                     android:key="always_get_new_keys"
                     android:summary="@string/g5_full_authentification"
                     android:title="@string/authentificate_before_reading" />
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="always_unbond_G5"
-                    android:summary="@string/g5_remove_before_read"
-                    android:title="@string/unbond_g5_before_read" />
             </PreferenceCategory>
             <PreferenceCategory
                 android:key="dex_battery_category"