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

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/services/UiBasedCollector.java

@@ -93,6 +93,7 @@ public class UiBasedCollector extends NotificationListenerService {
         coOptedPackages.add("com.camdiab.fx_alert.mgdl");
         coOptedPackages.add("com.camdiab.fx_alert.hx.mmoll");
         coOptedPackages.add("com.camdiab.fx_alert.hx.mgdl");
+        coOptedPackages.add("com.camdiab.fx_alert.mmoll.ca");
         coOptedPackages.add("com.medtronic.diabetes.guardian");
         coOptedPackages.add("com.medtronic.diabetes.guardianconnect");
         coOptedPackages.add("com.medtronic.diabetes.guardianconnect.us");
@@ -108,6 +109,7 @@ public class UiBasedCollector extends NotificationListenerService {
         coOptedPackages.add("com.senseonics.eversense365.us");
         coOptedPackages.add("com.kakaohealthcare.pasta"); // A Health app for sensors that we already collect from
         coOptedPackages.add("com.sinocare.cgm.ce");
+        coOptedPackages.add("com.sinocare.ican.health.ce");
 
         coOptedPackagesAll.add("com.dexcom.dexcomone");
         coOptedPackagesAll.add("com.dexcom.d1plus");
@@ -123,6 +125,7 @@ public class UiBasedCollector extends NotificationListenerService {
         coOptedPackagesAll.add("com.senseonics.eversense365.us");
         coOptedPackagesAll.add("com.kakaohealthcare.pasta"); // Experiment
         coOptedPackagesAll.add("com.sinocare.cgm.ce");
+        coOptedPackagesAll.add("com.sinocare.ican.health.ce");
 
         companionAppIoBPackages.add("com.insulet.myblue.pdm");
 

app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java

@@ -158,6 +158,8 @@ private static void legacySettingsFix() {
         Pref.setBoolean("run_G5_ble_tasks_on_uithread", false);
         Pref.setBoolean("ob1_initiate_bonding_flag", true);
         Pref.setBoolean("store_sensor_location", false);
+        Pref.setBoolean("using_g6", true);
+        // TODO Simplify the code everywhere resolving conditionals based on "using_g6" now that it is always true.
     }
     private static void legacySettingsMoveLanguageFromNoToNb() {
         // Check if the user's language preference is set to "no"

app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SourceWizard.java

@@ -41,22 +41,7 @@ public class SourceWizard {
     private Tree<Item> root = new Tree<>(new Item(gs(R.string.choose_data_source), gs(R.string.which_system_do_you_use)));
 
     {
-        Tree<Item> g5g6 = root.addChild(new Item("G4, G5, G6, G7, 1", gs(R.string.which_type_of_device), R.drawable.g5_icon));
-        {
-            Tree<Item> g4 = g5g6.addChild(new Item("G4", gs(R.string.what_type_of_g4_bridge_device_do_you_use), R.drawable.g4_icon));
-            {
-                Tree<Item> wixel = g4.addChild(new Item(gs(R.string.bluetooth_wixel), gs(R.string.which_software_is_the_wixel_running), R.drawable.wixel_icon));
-                {
-                    wixel.addChild(new Item(gs(R.string.xbridge_compatible), DexCollectionType.DexbridgeWixel, R.drawable.wixel_icon));
-                    wixel.addChild(new Item(gs(R.string.classic_simple), DexCollectionType.BluetoothWixel, R.drawable.wixel_icon));
-                }
-
-                g4.addChild(new Item(gs(R.string.g4_share_receiver), DexCollectionType.DexcomShare, R.drawable.g4_share_icon));
-                g4.addChild(new Item(gs(R.string.parakeet_wifi), DexCollectionType.WifiWixel, R.drawable.jamorham_parakeet_marker));
-            }
-            g5g6.addChild(new Item("G5", DexCollectionType.DexcomG5, R.drawable.g5_icon));
-            g5g6.addChild(new Item("G6, G7, 1", DexCollectionType.DexcomG6, R.drawable.g6_icon));
-        }
+        root.addChild(new Item("Dex", DexCollectionType.DexcomG6, R.drawable.dex_icon));
 
         Tree<Item> libre = root.addChild(new Item(gs(R.string.libre), gs(R.string.what_type_of_libre_bridge_device_do_you_use), R.drawable.libre_icon_image));
         {

app/src/main/res/drawable-xhdpi/dex_icon.png

@@ -231,15 +231,15 @@
                         android:id="@+id/restart_collection_service"
                         style="?android:attr/buttonStyleSmall"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:text="@string/restart_collector" />
 
                     <Button
                         android:id="@+id/forget_device"
                         app:showIfTrue="@{ms.bluetooth()}"
                         style="?android:attr/buttonStyleSmall"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:text="@string/forget_device" />
                 </LinearLayout>
 

app/src/main/res/layout/activity_system_status.xml

@@ -6,7 +6,7 @@
         <item>Wifi Wixel / Parakeet</item>
         <item>Wifi Wixel + BT Wixel</item>
         <item>Wifi Wixel + xBridge Wixel</item>
-        <item>G6/G7/1/1+ Transmitter</item>
+        <item>Dex</item>
         <item>Libre Bluetooth</item>
         <item>Libre Bluetooth + wifi</item>
         <item>Libre wifi</item>

app/src/main/res/values/arrays.xml

@@ -1414,8 +1414,8 @@
     <string name="title_ob1_minimize_scanning">Minimize Scanning</string>
     <string name="summary_ob1_avoid_scanning">Avoid scanning as much as possible (reduces battery usage further)</string>
     <string name="title_ob1_avoid_scanning">Avoid Scanning</string>
-    <string name="summary_using_g6">I am using a G6, G7, Dexcom 1 or One+ Sensor</string>
-    <string name="title_using_g6">G6/G7/Dex1/One+ Support</string>
+    <string name="summary_using_g6">I am using a Dex Sensor</string>
+    <string name="title_using_g6">Dex Support</string>
     <string name="summary_ob1_g5_allow_resetbond">OB1 collector can unbond if it thinks the encryption has failed. If you get problems with it unpairing then disable this option. If you then totally lose connection, make sure this is enabled.</string>
     <string name="title_ob1_g5_allow_resetbond">Allow OB1 unbonding</string>
     <string name="summary_ob1_initiate_bonding_flag">OB1 collector can initiate bonding.</string>
@@ -1433,8 +1433,8 @@
     <string name="title_xdrip_plus_graph_display_settings">Graph Settings</string>
     <string name="summary_show_basal_line">Show TBR information from external status</string>
     <string name="title_show_basal_line">Show Basal TBR</string>
-    <string name="summary_show_g_prediction">Show G6/G7 predictive glucose dots</string>
-    <string name="title_show_g_prediction">G6/G7 Prediction</string>
+    <string name="summary_show_g_prediction">Show Dex predictive glucose dots</string>
+    <string name="title_show_g_prediction">Dex Prediction</string>
     <string name="summary_show_smb_icons">Declutter graph with treatment icons for small boluses</string>
     <string name="title_show_smb_icons">Show micro bolus icons</string>
     <string name="summary_show_medtrum_secondary">Show alternate glucose dots</string>

app/src/main/res/values/strings.xml

@@ -389,11 +389,6 @@
                     android:key="ob1_avoid_scanning"
                     android:summary="@string/summary_ob1_avoid_scanning"
                     android:title="@string/title_ob1_avoid_scanning" />
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="using_g6"
-                    android:summary="@string/summary_using_g6"
-                    android:title="@string/title_using_g6" />
                 <CheckBoxPreference
                     android:defaultValue="false"
                     android:key="ob1_g5_allow_resetbond"