Merge pull request #3530 from Navid200/Navid_2024_06_12b

Retire old G5 settings
NightscoutFoundation · Jun 25, 2024 · 8c26da8 · 8c26da8
2 parents c964007 + 0ef8feb
commit 8c26da8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 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
@@ -149,6 +149,8 @@ private static void legacySettingsFix() {
         Pref.setBoolean("ob1_g5_fallback_to_xdrip", false);
         Pref.setBoolean("always_unbond_G5", false);
         Pref.setBoolean("always_get_new_keys", true);
+        Pref.setBoolean("run_ble_scan_constantly", false);
+        Pref.setBoolean("run_G5_ble_tasks_on_uithread", false);
     }
     private static void legacySettingsMoveLanguageFromNoToNb() {
         // Check if the user's language preference is set to "no"

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
@@ -2522,6 +2522,8 @@ private void removeLegacyPreferences() {
            //  removePreferenceFromCategory("ob1_g5_fallback_to_xdrip", "ob1_options");
            //  removePreferenceFromCategory("always_unbond_G5", "ob1_options");
            //  removePreferenceFromCategory("always_get_new_keys", "ob1_options");
+           // removePreferenceFromCategory("run_ble_scan_constantly", "ob1_options");
+           // removePreferenceFromCategory("run_G5_ble_tasks_on_uithread", "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
@@ -410,20 +410,6 @@
                     android:summary="@string/summary_dex_specified_slot"
                     android:title="@string/title_dex_specified_slot" />
             </PreferenceCategory>
-            <PreferenceCategory
-                android:key="old_g5_options"
-                android:title="@string/title_old_g5_options">
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="run_ble_scan_constantly"
-                    android:summary="@string/g5_scan_constantly"
-                    android:title="@string/scan_for_g5_constantly" />
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="run_G5_ble_tasks_on_uithread"
-                    android:summary="@string/g5_force_ui_thread"
-                    android:title="@string/force_g5_ui_thread" />
-            </PreferenceCategory>
             <PreferenceCategory
                 android:key="dex_battery_category"
                 android:title="@string/title_g5g6_battery_options">