add use scanning

Author: bubbledevteam

medtronic/src/main/res/xml/pref_medtronic.xml

@@ -97,7 +97,11 @@
             android:title="RileyLink Configuration">
             <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
         </Preference>
-
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_orange_use_scanning"
+            android:summary="@string/orange_use_scanning_level_summary"
+            android:title="@string/orange_use_scanning_level" />
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_riley_link_show_battery_level"

omnipod/src/main/res/xml/pref_omnipod.xml

@@ -10,7 +10,11 @@
             android:title="@string/omnipod_config_riley_link_configuration">
             <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
         </Preference>
-
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_orange_use_scanning"
+            android:summary="@string/orange_use_scanning_level_summary"
+            android:title="@string/orange_use_scanning_level" />
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_riley_link_show_battery_level"

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/RileyLinkConst.java

@@ -34,6 +34,7 @@ public static class Prefs {
         //public static final String RileyLinkAddress = PrefPrefix + "mac_address"; // pref_rileylink_mac_address
         public static final int RileyLinkAddress = R.string.key_rileylink_mac_address;
         public static final int RileyLinkName = R.string.key_rileylink_name;
+        public static final int OrangeUseScanning = R.string.key_orange_use_scanning;
         public static final String LastGoodDeviceCommunicationTime = Prefix + "lastGoodDeviceCommunicationTime";
         public static final String LastGoodDeviceFrequency = Prefix + "LastGoodDeviceFrequency";
         public static final int Encoding = R.string.key_medtronic_encoding;

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java

@@ -379,8 +379,8 @@ public void findRileyLink(String RileyLinkAddress) {
         aapsLogger.debug(LTag.PUMPBTCOMM, "RileyLink address: " + RileyLinkAddress);
         // Must verify that this is a valid MAC, or crash.
         macAddress = RileyLinkAddress;
-        String RileyLinkName = sp.getString(RileyLinkConst.Prefs.RileyLinkName, "");
-        if (RileyLinkName.equals("Orange")) {
+        boolean useScanning = sp.getBoolean(RileyLinkConst.Prefs.OrangeUseScanning, false);
+        if (useScanning) {
             startScan();
         } else {
             rileyLinkDevice = bluetoothAdapter.getRemoteDevice(RileyLinkAddress);
@@ -394,8 +394,8 @@ public void findRileyLink(String RileyLinkAddress) {
     }
 
     public void connectGattCheckOrange() {
-        String RileyLinkName = sp.getString(RileyLinkConst.Prefs.RileyLinkName, "");
-        if (RileyLinkName.equals("Orange")) {
+        boolean useScanning = sp.getBoolean(RileyLinkConst.Prefs.OrangeUseScanning, false);
+        if (useScanning) {
             startScan();
         } else {
             connectGatt();

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

@@ -79,6 +79,9 @@
     <!-- RileyLink - Preferences -->
     <string name="riley_link_show_battery_level">Show battery level reported by OrangeLink/EmaLink</string>
     <string name="riley_link_show_battery_level_summary">DOES NOT work with the original RileyLink. May not work with other RileyLink alternatives.</string>
+    <string name="orange_use_scanning_level">Use Scanning</string>
+    <string name="orange_use_scanning_level_summary">Scan before connecting to OrangeLink, it should improve connections (can also be used with other RileyLink clones, if needed)</string>
+    <string name="key_orange_use_scanning" translatable="false">pref_orange_use_scanning</string>
 
     <plurals name="duration_days">
         <item quantity="one">%1$d day</item>