Merge pull request #142 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge

Rework RL scan and add option to remove RL

app/src/main/java/info/nightscout/androidaps/dependencyInjection/ActivitiesModule.kt

@@ -10,7 +10,7 @@ import info.nightscout.androidaps.plugins.general.maintenance.activities.PrefImp
 import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansLoginActivity
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
 import info.nightscout.androidaps.plugins.general.smsCommunicator.activities.SmsCommunicatorOtpActivity
-import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEScanActivity
+import info.nightscout.androidaps.plugins.pump.common.dialog.RileyLinkBLEConfigActivity
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightAlertActivity
 import info.nightscout.androidaps.plugins.pump.insight.activities.InsightPairingActivity
@@ -33,7 +33,7 @@ abstract class ActivitiesModule {
     @ContributesAndroidInjector abstract fun contributesQuickWizardListActivity(): QuickWizardListActivity
     @ContributesAndroidInjector abstract fun contributesRequestDexcomPermissionActivity(): RequestDexcomPermissionActivity
     @ContributesAndroidInjector abstract fun contributesRileyLinkStatusActivity(): RileyLinkStatusActivity
-    @ContributesAndroidInjector abstract fun contributesRileyLinkBLEScanActivity(): RileyLinkBLEScanActivity
+    @ContributesAndroidInjector abstract fun contributesRileyLinkBLEConfigActivity(): RileyLinkBLEConfigActivity
     @ContributesAndroidInjector abstract fun contributesSetupWizardActivity(): SetupWizardActivity
     @ContributesAndroidInjector abstract fun contributesSingleFragmentActivity(): SingleFragmentActivity
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorOtpActivity(): SmsCommunicatorOtpActivity

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

@@ -918,8 +918,8 @@
     <string name="diawarning">Please remember: new insulin profiles require DIA at least 5h. DIA 5–6h on new profile is equal to DIA 3h on old insulin profiles.</string>
     <string name="setupwizard_profile_description">Please select source of profile. If patient is a child you should use NS profile. If there is nobody following you on Nightscout you will probably prefer Local profile. Please remember that you are only selecting the profile source. To use it you must activate it by executing \"Profile switch\"</string>
     <string name="setupwizard_aps_description">Select one from availables algorithms. They are sorted from oldest to newest. Newer algorithm is usually more powerful and more aggressive. Thus if you are new looper you may probably start with AMA and not with latest one. Do not forget to read the OpenAPS documentation and configure it before use.</string>
-    <string name="setupwizard_pump_waiting_for_riley_link_connection">Waiting for RileyLink connection…\n</string>
+    <string name="setupwizard_pump_waiting_for_riley_link_connection">Please configure your RileyLink below. After selecting a RileyLink, it will be possible to continue setup once the RileyLink status is \"Connected\". This might take a minute.\n</string>
-    <string name="setupwizard_pump_pump_not_initialized"><b>Note:</b> You can continue setup once the pump has been initialized.\n</string>
+    <string name="setupwizard_pump_pump_not_initialized"><b>Note:</b> You can continue setup once the pump has been set up.\n</string>
     <string name="startobjective">Start your first objective</string>
     <string name="permission">Permission</string>
     <string name="askforpermission">Ask for permission</string>

medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java

@@ -96,8 +96,9 @@ public class RileyLinkMedtronicService extends RileyLinkService {
 
         setPumpIDString(sp.getString(MedtronicConst.Prefs.PumpSerial, "000000"));
 
-        // get most recently used RileyLink address
+        // get most recently used RileyLink address and name
-        rileyLinkServiceData.rileylinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
+        rileyLinkServiceData.rileyLinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
+        rileyLinkServiceData.rileyLinkName = sp.getString(RileyLinkConst.Prefs.RileyLinkName, "");
 
         rfspy.startReader();
 

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

@@ -111,6 +111,7 @@
     <string name="medtronic_notification_check_time_date">Pump clock update needed</string> <!-- combo_notification_check_time_date -->
     <string name="common_on">On</string>
     <string name="common_off">Off</string>
+    <string name="mdt_last_bolus" translatable="false">%1$.1f %2$s (%3$s)</string>
     <string name="pump_time_updated">Pump time updated</string>
     <string name="key_set_neutral_temps" translatable="false">set_neutral_temps</string>
 

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

@@ -95,7 +95,7 @@
             android:key="@string/key_rileylink_mac_address"
             android:summary=""
             android:title="RileyLink Configuration">
-            <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEScanActivity" />
+            <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
         </Preference>
 
         <SwitchPreference

omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/service/RileyLinkOmnipodService.java

@@ -72,7 +72,8 @@ public class RileyLinkOmnipodService extends RileyLinkService {
         rileyLinkServiceData.targetDevice = RileyLinkTargetDevice.Omnipod;
         rileyLinkServiceData.rileyLinkTargetFrequency = RileyLinkTargetFrequency.Omnipod;
 
-        rileyLinkServiceData.rileylinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
+        rileyLinkServiceData.rileyLinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
+        rileyLinkServiceData.rileyLinkName = sp.getString(RileyLinkConst.Prefs.RileyLinkName, "");
 
         rfspy.startReader();
 

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

@@ -37,6 +37,7 @@
     <string name="omnipod_overview_last_bolus_value" translatable="false">%1$.2f %2$s (%3$s)</string>
 
     <!-- Omnipod - Preferences -->
+    <string name="omnipod_config_riley_link_configuration">RileyLink Configuration</string>
     <string name="omnipod_config_bolus_beeps_enabled">Bolus beeps enabled</string>
     <string name="omnipod_config_basal_beeps_enabled">Basal beeps enabled</string>
     <string name="omnipod_config_smb_beeps_enabled">SMB beeps enabled</string>

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

@@ -7,9 +7,8 @@
         <Preference
             android:enabled="true"
             android:key="@string/key_rileylink_mac_address"
-            android:summary=""
+            android:title="@string/omnipod_config_riley_link_configuration">
-            android:title="RileyLink Configuration">
+            <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
-            <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEScanActivity" />
         </Preference>
 
     </PreferenceCategory>

rileylink/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="info.nightscout.androidaps.plugins.pump.common" >
+    package="info.nightscout.androidaps.plugins.pump.common">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -8,12 +8,13 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application>
-        <activity android:name=".dialog.RileyLinkBLEScanActivity">
+        <activity android:name=".dialog.RileyLinkBLEConfigActivity">
             <intent-filter>
-                <action android:name="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEScanActivity" />
+                <action android:name="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEConfigActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".hw.rileylink.dialog.RileyLinkStatusActivity"
             android:label="@string/title_activity_rileylink_settings"

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.java

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.common.dialog;
 
+import android.app.AlertDialog;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.le.BluetoothLeScanner;
@@ -7,23 +8,19 @@ import android.bluetooth.le.ScanCallback;
 import android.bluetooth.le.ScanFilter;
 import android.bluetooth.le.ScanResult;
 import android.bluetooth.le.ScanSettings;
-import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ParcelUuid;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.appcompat.widget.Toolbar;
-
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -37,7 +34,7 @@ import javax.inject.Inject;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
@@ -48,64 +45,65 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 // IMPORTANT: This activity needs to be called from RileyLinkSelectPreference (see pref_medtronic.xml as example)
-public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
+public class RileyLinkBLEConfigActivity extends NoSplashAppCompatActivity {
 
     @Inject AAPSLogger aapsLogger;
     @Inject SP sp;
-    @Inject RxBusWrapper rxBus;
     @Inject ResourceHelper resourceHelper;
     @Inject BlePreCheck blePrecheck;
     @Inject RileyLinkUtil rileyLinkUtil;
     @Inject ActivePluginProvider activePlugin;
 
-    private static final int PERMISSION_REQUEST_COARSE_LOCATION = 30241; // arbitrary.
+    private static final String TAG = "RileyLinkBLEConfigActivity";
-    private static final int REQUEST_ENABLE_BT = 30242; // arbitrary
+    private static final long SCAN_PERIOD_MILLIS = 15_000;
 
-    private static final String TAG = "RileyLinkBLEScanActivity";
+    private ScanSettings settings;
-
+    private List<ScanFilter> filters;
-    // Stops scanning after 30 seconds.
+    private TextView currentlySelectedRileyLinkName;
-    private static final long SCAN_PERIOD = 30000;
+    private TextView currentlySelectedRileyLinkAddress;
-    public boolean mScanning;
+    private Button buttonRemoveRileyLink;
-    public ScanSettings settings;
+    private Button buttonStartScan;
-    public List<ScanFilter> filters;
+    private Button buttonStopScan;
-    public ListView listBTScan;
+    private BluetoothAdapter bluetoothAdapter;
-    public Toolbar toolbarBTScan;
+    private BluetoothLeScanner bleScanner;
-    public Context mContext = this;
+    private LeDeviceListAdapter deviceListAdapter;
-    private BluetoothAdapter mBluetoothAdapter;
+    private Handler handler;
-    private BluetoothLeScanner mLEScanner;
+    public boolean scanning;
-    private LeDeviceListAdapter mLeDeviceListAdapter;
-    private Handler mHandler;
-
-    private String actionTitleStart, actionTitleStop;
-    private MenuItem menuItem;
-
-    private boolean rlDisconnected;
 
+    private final Runnable stopScanAfterTimeoutRunnable = () -> {
+        if (scanning) {
+            stopLeDeviceScan();
+            rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this); // Reconnect current RL
+        }
+    };
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.rileylink_scan_activity);
+        setContentView(R.layout.riley_link_ble_config_activity);
 
         // Initializes Bluetooth adapter.
-        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-        mHandler = new Handler();
+        deviceListAdapter = new LeDeviceListAdapter();
-
+        handler = new Handler();
-        mLeDeviceListAdapter = new LeDeviceListAdapter();
+        currentlySelectedRileyLinkName = findViewById(R.id.riley_link_ble_config_currently_selected_riley_link_name);
-        listBTScan = findViewById(R.id.rileylink_listBTScan);
+        currentlySelectedRileyLinkAddress = findViewById(R.id.riley_link_ble_config_currently_selected_riley_link_address);
-        listBTScan.setAdapter(mLeDeviceListAdapter);
+        buttonRemoveRileyLink = findViewById(R.id.riley_link_ble_config_button_remove_riley_link);
-        listBTScan.setOnItemClickListener((parent, view, position, id) -> {
+        buttonStartScan = findViewById(R.id.riley_link_ble_config_scan_start);
-
+        buttonStopScan = findViewById(R.id.riley_link_ble_config_button_scan_stop);
+        ListView deviceList = findViewById(R.id.riley_link_ble_config_scan_device_list);
+        deviceList.setAdapter(deviceListAdapter);
+        deviceList.setOnItemClickListener((parent, view, position, id) -> {
             // stop scanning if still active
-            if (mScanning) {
+            if (scanning) {
-                mScanning = false;
+                stopLeDeviceScan();
-                mLEScanner.stopScan(mScanCallback2);
             }
 
-            TextView textview = view.findViewById(R.id.rileylink_device_address);
+            String bleAddress = ((TextView) view.findViewById(R.id.riley_link_ble_config_scan_item_device_address)).getText().toString();
-            String bleAddress = textview.getText().toString();
+            String deviceName = ((TextView) view.findViewById(R.id.riley_link_ble_config_scan_item_device_name)).getText().toString();
 
             sp.putString(RileyLinkConst.Prefs.RileyLinkAddress, bleAddress);
+            sp.putString(RileyLinkConst.Prefs.RileyLinkName, deviceName);
 
             RileyLinkPumpDevice rileyLinkPump = (RileyLinkPumpDevice) activePlugin.getActivePump();
             rileyLinkPump.getRileyLinkService().verifyConfiguration(true); // force reloading of address to assure that the RL gets reconnected (even if the address didn't change)
@@ -114,93 +112,88 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
             finish();
         });
 
-        toolbarBTScan = findViewById(R.id.rileylink_toolbarBTScan);
+        buttonStartScan.setOnClickListener(view -> {
-        toolbarBTScan.setTitle(R.string.rileylink_scanner_title);
+            // disable currently selected RL, so that we can discover it
-        setSupportActionBar(toolbarBTScan);
+            rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkDisconnect, this);
+            startLeDeviceScan();
+        });
+
+        buttonStopScan.setOnClickListener(view -> {
+            if (scanning) {
+                stopLeDeviceScan();
+                rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this); // Reconnect current RL
+            }
+        });
+
+        buttonRemoveRileyLink.setOnClickListener(view -> new AlertDialog.Builder(this)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setTitle(getString(R.string.riley_link_ble_config_remove_riley_link_confirmation_title))
+                .setMessage(getString(R.string.riley_link_ble_config_remove_riley_link_confirmation))
+                .setPositiveButton(getString(R.string.riley_link_common_yes), (dialog, which) -> {
+                    rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkDisconnect, RileyLinkBLEConfigActivity.this);
+                    sp.remove(RileyLinkConst.Prefs.RileyLinkAddress);
+                    sp.remove(RileyLinkConst.Prefs.RileyLinkName);
+                    updateCurrentlySelectedRileyLink();
+                })
+                .setNegativeButton(getString(R.string.riley_link_common_no), null)
+                .show());
+    }
+
+    private void updateCurrentlySelectedRileyLink() {
+        String address = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
+        if (StringUtils.isEmpty(address)) {
+            currentlySelectedRileyLinkName.setText(R.string.riley_link_ble_config_no_riley_link_selected);
+            currentlySelectedRileyLinkAddress.setVisibility(View.GONE);
+            buttonRemoveRileyLink.setVisibility(View.GONE);
+        } else {
+            currentlySelectedRileyLinkAddress.setVisibility(View.VISIBLE);
+            buttonRemoveRileyLink.setVisibility(View.VISIBLE);
+
+            currentlySelectedRileyLinkName.setText(sp.getString(RileyLinkConst.Prefs.RileyLinkName, "RileyLink (?)"));
+            currentlySelectedRileyLinkAddress.setText(address);
+        }
     }
 
     @Override protected void onResume() {
         super.onResume();
         prepareForScanning();
-    }
 
-    @Override
+        updateCurrentlySelectedRileyLink();
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_rileylink_ble_scan, menu);
-
-        actionTitleStart = resourceHelper.gs(R.string.rileylink_scanner_scan_scan);
-        actionTitleStop = resourceHelper.gs(R.string.rileylink_scanner_scan_stop);
-
-        menuItem = menu.getItem(0);
-
-        menuItem.setTitle(actionTitleStart);
-
-        return true;
-    }
-
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getTitle().equals(actionTitleStart)) {
-            // disable currently selected RL, so that we can discover it
-            rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkDisconnect, this);
-            rlDisconnected = true;
-
-            scanLeDevice(true);
-            return true;
-        } else if (item.getTitle().equals(actionTitleStop)) {
-            scanLeDevice(false);
-            return true;
-        } else {
-            return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override public void onBackPressed() {
-        super.onBackPressed();
-        if (rlDisconnected) {
-            // Reconnect RL if it was disconnected for the scan
-            rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this);
-        }
     }
 
     @Override protected void onDestroy() {
         super.onDestroy();
-        mScanning = false;
+        if (scanning) {
-        mLEScanner.stopScan(mScanCallback2);
+            stopLeDeviceScan();
+            rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this); // Reconnect current RL
+        }
     }
 
     private void prepareForScanning() {
         boolean checkOK = blePrecheck.prerequisitesCheck(this);
 
         if (checkOK) {
-            mLEScanner = mBluetoothAdapter.getBluetoothLeScanner();
+            bleScanner = bluetoothAdapter.getBluetoothLeScanner();
             settings = new ScanSettings.Builder().setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build();
             filters = Collections.singletonList(new ScanFilter.Builder().setServiceUuid(
                     ParcelUuid.fromString(GattAttributes.SERVICE_RADIO)).build());
         }
     }
 
-
+    private final ScanCallback bleScanCallback = new ScanCallback() {
-    private final ScanCallback mScanCallback2 = new ScanCallback() {
-
         @Override
         public void onScanResult(int callbackType, final ScanResult scanRecord) {
-
             Log.d(TAG, scanRecord.toString());
 
             runOnUiThread(() -> {
                 if (addDevice(scanRecord))
-                    mLeDeviceListAdapter.notifyDataSetChanged();
+                    deviceListAdapter.notifyDataSetChanged();
             });
         }
 
-
         @Override
         public void onBatchScanResults(final List<ScanResult> results) {
-
             runOnUiThread(() -> {
-
                 boolean added = false;
 
                 for (ScanResult result : results) {
@@ -209,13 +202,11 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
                 }
 
                 if (added)
-                    mLeDeviceListAdapter.notifyDataSetChanged();
+                    deviceListAdapter.notifyDataSetChanged();
             });
         }
 
-
         private boolean addDevice(ScanResult result) {
-
             BluetoothDevice device = result.getDevice();
 
             List<ParcelUuid> serviceUuids = result.getScanRecord().getServiceUuids();
@@ -225,12 +216,11 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
             } else if (serviceUuids.size() > 1) {
                 Log.v(TAG, "Device " + device.getAddress() + " has too many serviceUuids (Not RileyLink).");
             } else {
-
                 String uuid = serviceUuids.get(0).getUuid().toString().toLowerCase();
 
                 if (uuid.equals(GattAttributes.SERVICE_RADIO)) {
                     Log.i(TAG, "Found RileyLink with address: " + device.getAddress());
-                    mLeDeviceListAdapter.addDevice(result);
+                    deviceListAdapter.addDevice(result);
                     return true;
                 } else {
                     Log.v(TAG, "Device " + device.getAddress() + " has incorrect uuid (Not RileyLink).");
@@ -240,84 +230,63 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
             return false;
         }
 
-
-        private String getDeviceDebug(BluetoothDevice device) {
-            return "BluetoothDevice [name=" + device.getName() + ", address=" + device.getAddress() + //
-                    ", type=" + device.getType(); // + ", alias=" + device.getAlias();
-        }
-
-
         @Override
         public void onScanFailed(int errorCode) {
             Log.e("Scan Failed", "Error Code: " + errorCode);
-            Toast.makeText(mContext, resourceHelper.gs(R.string.rileylink_scanner_scanning_error, errorCode),
+            Toast.makeText(RileyLinkBLEConfigActivity.this, resourceHelper.gs(R.string.riley_link_ble_config_scan_error, errorCode),
                     Toast.LENGTH_LONG).show();
         }
 
     };
 
-
+    private void startLeDeviceScan() {
-    private void scanLeDevice(final boolean enable) {
+        if (bleScanner == null) {
-
+            aapsLogger.error(LTag.PUMPBTCOMM, "startLeDeviceScan failed: bleScanner is null");
-        if (mLEScanner == null)
             return;
-
-        if (enable) {
-
-            mLeDeviceListAdapter.clear();
-            mLeDeviceListAdapter.notifyDataSetChanged();
-
-            // Stops scanning after a pre-defined scan period.
-            mHandler.postDelayed(() -> {
-
-                if (mScanning) {
-                    mScanning = false;
-                    mLEScanner.stopScan(mScanCallback2);
-                    aapsLogger.debug("scanLeDevice: Scanning Stop");
-                    Toast.makeText(mContext, R.string.rileylink_scanner_scanning_finished, Toast.LENGTH_SHORT).show();
-                    menuItem.setTitle(actionTitleStart);
         }
-            }, SCAN_PERIOD);
 
-            mScanning = true;
+        deviceListAdapter.clear();
-            mLEScanner.startScan(filters, settings, mScanCallback2);
+        deviceListAdapter.notifyDataSetChanged();
-            aapsLogger.debug("scanLeDevice: Scanning Start");
-            Toast.makeText(this, R.string.rileylink_scanner_scanning, Toast.LENGTH_SHORT).show();
 
-            menuItem.setTitle(actionTitleStop);
+        handler.postDelayed(stopScanAfterTimeoutRunnable, SCAN_PERIOD_MILLIS);
 
-        } else {
+        buttonStartScan.setEnabled(false);
-            if (mScanning) {
+        buttonStopScan.setVisibility(View.VISIBLE);
-                mScanning = false;
-                mLEScanner.stopScan(mScanCallback2);
 
-                aapsLogger.debug("scanLeDevice: Scanning Stop");
+        scanning = true;
-                Toast.makeText(this, R.string.rileylink_scanner_scanning_finished, Toast.LENGTH_SHORT).show();
+        bleScanner.startScan(filters, settings, bleScanCallback);
-
+        aapsLogger.debug(LTag.PUMPBTCOMM, "startLeDeviceScan: Scanning Start");
-                menuItem.setTitle(actionTitleStart);
+        Toast.makeText(RileyLinkBLEConfigActivity.this, R.string.riley_link_ble_config_scan_scanning, Toast.LENGTH_SHORT).show();
     }
+
+    private void stopLeDeviceScan() {
+        if (scanning) {
+            scanning = false;
+
+            bleScanner.stopScan(bleScanCallback);
+
+            aapsLogger.debug(LTag.PUMPBTCOMM, "stopLeDeviceScan: Scanning Stop");
+            Toast.makeText(this, R.string.riley_link_ble_config_scan_finished, Toast.LENGTH_SHORT).show();
+            handler.removeCallbacks(stopScanAfterTimeoutRunnable);
         }
+
+        buttonStartScan.setEnabled(true);
+        buttonStopScan.setVisibility(View.GONE);
     }
 
     private class LeDeviceListAdapter extends BaseAdapter {
-
         private final ArrayList<BluetoothDevice> mLeDevices;
         private final Map<BluetoothDevice, Integer> rileyLinkDevices;
         private final LayoutInflater mInflator;
-        String currentlySelectedAddress;
-
 
         public LeDeviceListAdapter() {
             super();
             mLeDevices = new ArrayList<>();
             rileyLinkDevices = new HashMap<>();
-            mInflator = RileyLinkBLEScanActivity.this.getLayoutInflater();
+            mInflator = RileyLinkBLEConfigActivity.this.getLayoutInflater();
-            currentlySelectedAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
         }
 
-
         public void addDevice(ScanResult result) {
-
             if (!mLeDevices.contains(result.getDevice())) {
                 mLeDevices.add(result.getDevice());
             }
@@ -325,42 +294,36 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
             notifyDataSetChanged();
         }
 
-
         public void clear() {
             mLeDevices.clear();
             rileyLinkDevices.clear();
             notifyDataSetChanged();
         }
 
-
         @Override
         public int getCount() {
             return mLeDevices.size();
         }
 
-
         @Override
         public Object getItem(int i) {
             return mLeDevices.get(i);
         }
 
-
         @Override
         public long getItemId(int i) {
             return i;
         }
 
-
         @Override
         public View getView(int i, View view, ViewGroup viewGroup) {
-
             ViewHolder viewHolder;
             // General ListView optimization code.
             if (view == null) {
-                view = mInflator.inflate(R.layout.rileylink_scan_item, null);
+                view = mInflator.inflate(R.layout.riley_link_ble_config_scan_item, null);
                 viewHolder = new ViewHolder();
-                viewHolder.deviceAddress = view.findViewById(R.id.rileylink_device_address);
+                viewHolder.deviceAddress = view.findViewById(R.id.riley_link_ble_config_scan_item_device_address);
-                viewHolder.deviceName = view.findViewById(R.id.rileylink_device_name);
+                viewHolder.deviceName = view.findViewById(R.id.riley_link_ble_config_scan_item_device_name);
                 view.setTag(viewHolder);
             } else {
                 viewHolder = (ViewHolder) view.getTag();
@@ -370,15 +333,15 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
             String deviceName = device.getName();
 
             if (StringUtils.isBlank(deviceName)) {
-                deviceName = "RileyLink";
+                deviceName = "RileyLink (?)";
             }
 
-            deviceName += " [" + rileyLinkDevices.get(device).intValue() + "]";
+            deviceName += " [" + rileyLinkDevices.get(device) + "]";
+
+            String currentlySelectedAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
 
             if (currentlySelectedAddress.equals(device.getAddress())) {
-                // viewHolder.deviceName.setTextColor(getColor(R.color.secondary_text_light));
+                deviceName += " (" + getResources().getString(R.string.riley_link_ble_config_scan_selected) + ")";
-                // viewHolder.deviceAddress.setTextColor(getColor(R.color.secondary_text_light));
-                deviceName += " (" + getResources().getString(R.string.rileylink_scanner_selected_device) + ")";
             }
 
             viewHolder.deviceName.setText(deviceName);
@@ -386,11 +349,9 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
 
             return view;
         }
-
     }
 
     static class ViewHolder {
-
         TextView deviceName;
         TextView deviceAddress;
     }

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

@@ -33,6 +33,7 @@ public class RileyLinkConst {
         //public static final String PrefPrefix = "pref_rileylink_";
         //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 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

@@ -35,6 +35,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.common.utils.ThreadUtil;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by geoff on 5/26/16.
@@ -46,6 +47,7 @@ public class RileyLinkBLE {
     @Inject AAPSLogger aapsLogger;
     @Inject RileyLinkServiceData rileyLinkServiceData;
     @Inject RileyLinkUtil rileyLinkUtil;
+    @Inject SP sp;
 
     private final Context context;
     private final boolean gattDebugEnabled = true;
@@ -393,8 +395,16 @@ public class RileyLinkBLE {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Gatt Connected.");
             }
 
-            rileyLinkServiceData.rileylinkAddress = bluetoothConnectionGatt.getDevice().getAddress();
+            String deviceName = bluetoothConnectionGatt.getDevice().getName();
-            rileyLinkServiceData.rileyLinkName = bluetoothConnectionGatt.getDevice().getName();
+            if (StringUtils.isNotEmpty(deviceName)) {
+                // Update stored name upon connecting (also for backwards compatibility for device where a name was not yet stored)
+                sp.putString(RileyLinkConst.Prefs.RileyLinkName, deviceName);
+            } else {
+                sp.remove(RileyLinkConst.Prefs.RileyLinkName);
+            }
+
+            rileyLinkServiceData.rileyLinkName = deviceName;
+            rileyLinkServiceData.rileyLinkAddress = bluetoothConnectionGatt.getDevice().getAddress();
         }
     }
 

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bAbstract.java

@@ -23,10 +23,10 @@ public abstract class Encoding4b6bAbstract implements Encoding4b6b {
 
     // 21, 49, 50, 35, 52, 37, 38, 22, 26, 25, 42, 11, 44, 13, 14, 28
 
-    public abstract byte[] encode4b6b(byte[] data);
+    @Override public abstract byte[] encode4b6b(byte[] data);
 
 
-    public abstract byte[] decode4b6b(byte[] data) throws RileyLinkCommunicationException;
+    @Override public abstract byte[] decode4b6b(byte[] data) throws RileyLinkCommunicationException;
 
 
     protected short convertUnsigned(byte x) {

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGeoff.java

@@ -19,7 +19,7 @@ public class Encoding4b6bGeoff extends Encoding4b6bAbstract {
     public static final Logger LOG = StacktraceLoggerWrapper.getLogger(Encoding4b6bGeoff.class);
 
 
-    public byte[] encode4b6b(byte[] data) {
+    @Override public byte[] encode4b6b(byte[] data) {
         // if ((data.length % 2) != 0) {
         // LOG.error("Warning: data is odd number of bytes");
         // }
@@ -77,7 +77,7 @@ public class Encoding4b6bGeoff extends Encoding4b6bAbstract {
      * @return
      * @throws NumberFormatException
      */
-    public byte[] decode4b6b(byte[] raw) throws RileyLinkCommunicationException {
+    @Override public byte[] decode4b6b(byte[] raw) throws RileyLinkCommunicationException {
 
         StringBuilder errorMessageBuilder = new StringBuilder();
 

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bGo.java

@@ -20,7 +20,7 @@ public class Encoding4b6bGo extends Encoding4b6bAbstract {
     private static Map<Short, Short> decodeGoMap;
 
 
-    public byte[] encode4b6b(byte[] src) {
+    @Override public byte[] encode4b6b(byte[] src) {
         // 2 input bytes produce 3 output bytes.
         // Odd final input byte, if any, produces 2 output bytes.
         int n = src.length;
@@ -54,7 +54,7 @@ public class Encoding4b6bGo extends Encoding4b6bAbstract {
      * @param src
      * @return
      */
-    public byte[] decode4b6b(byte[] src) throws RileyLinkCommunicationException {
+    @Override public byte[] decode4b6b(byte[] src) throws RileyLinkCommunicationException {
         int n = src.length;
 
         if (decodeGoMap == null)

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/data/encoding/Encoding4b6bLoop.java

@@ -33,7 +33,7 @@ public class Encoding4b6bLoop extends Encoding4b6bAbstract {
      * @param data
      * @return
      */
-    public byte[] encode4b6b(byte[] data) {
+    @Override public byte[] encode4b6b(byte[] data) {
 
         List<Byte> buffer = new ArrayList<Byte>();
         int bitAccumulator = 0x0;
@@ -78,7 +78,7 @@ public class Encoding4b6bLoop extends Encoding4b6bAbstract {
      * @return
      * @throws RileyLinkCommunicationException
      */
-    public byte[] decode4b6b(byte[] data) throws RileyLinkCommunicationException {
+    @Override public byte[] decode4b6b(byte[] data) throws RileyLinkCommunicationException {
         List<Byte> buffer = new ArrayList<Byte>();
         int availBits = 0;
         int bitAccumulator = 0;

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

@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog;
 
 import android.os.Bundle;
-import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -19,29 +18,18 @@ import javax.inject.Inject;
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity;
 import info.nightscout.androidaps.plugins.pump.common.R;
 import info.nightscout.androidaps.plugins.pump.common.dialog.RefreshableInterface;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkServiceData;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 public class RileyLinkStatusActivity extends NoSplashAppCompatActivity {
 
     @Inject ResourceHelper resourceHelper;
-    @Inject RileyLinkUtil rileyLinkUtil;
-    @Inject RileyLinkServiceData rileyLinkServiceData;
 
-    TextView connectionStatus;
+    private SectionsPagerAdapter sectionsPagerAdapter;
-    TextView configuredAddress;
-    TextView connectedDevice;
-    TextView connectionError;
-
-    private SectionsPagerAdapter mSectionsPagerAdapter;
-    private FloatingActionButton floatingActionButton;
     private TabLayout tabLayout;
     /**
      * The {@link ViewPager} that will host the section contents.
      */
-    private ViewPager mViewPager;
+    private ViewPager viewPager;
-
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -52,36 +40,28 @@ public class RileyLinkStatusActivity extends NoSplashAppCompatActivity {
         // primary sections of the activity.
 
         // Set up the ViewPager with the sections adapter.
-        mViewPager = findViewById(R.id.rileylink_settings_container);
+        viewPager = findViewById(R.id.rileylink_settings_container);
         // mViewPager.setAdapter(mSectionsPagerAdapter);
-        setupViewPager(mViewPager);
+        setupViewPager();
 
         tabLayout = findViewById(R.id.rileylink_settings_tabs);
-        tabLayout.setupWithViewPager(mViewPager);
+        tabLayout.setupWithViewPager(viewPager);
 
-        floatingActionButton = findViewById(R.id.rileylink_settings_fab);
+        FloatingActionButton floatingActionButton = findViewById(R.id.rileylink_settings_fab);
         floatingActionButton.setOnClickListener(v -> {
 
-            RefreshableInterface selectableInterface = (RefreshableInterface) mSectionsPagerAdapter
+            RefreshableInterface selectableInterface = (RefreshableInterface) sectionsPagerAdapter
                     .getItem(tabLayout.getSelectedTabPosition());
             selectableInterface.refreshData();
         });
-
-        this.connectionStatus = findViewById(R.id.rls_t1_connection_status);
-        this.configuredAddress = findViewById(R.id.rls_t1_configured_address);
-        this.connectedDevice = findViewById(R.id.rls_t1_connected_device);
-        this.connectionError = findViewById(R.id.rls_t1_connection_error);
     }
 
-    public void setupViewPager(ViewPager pager) {
+    public void setupViewPager() {
+        sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
 
-        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+        sectionsPagerAdapter.addFragment(new RileyLinkStatusGeneralFragment(), resourceHelper.gs(R.string.rileylink_settings_tab1));
-
+        sectionsPagerAdapter.addFragment(new RileyLinkStatusHistoryFragment(), resourceHelper.gs(R.string.rileylink_settings_tab2));
-        mSectionsPagerAdapter.addFragment(new RileyLinkStatusGeneralFragment(), resourceHelper.gs(R.string.rileylink_settings_tab1));
+        viewPager.setAdapter(sectionsPagerAdapter);
-        mSectionsPagerAdapter.addFragment(new RileyLinkStatusHistoryFragment(), resourceHelper.gs(R.string.rileylink_settings_tab2));
-        //mSectionsPagerAdapter.addFragment(new RileyLinkStatusDevice(), "Medtronic");
-
-        mViewPager.setAdapter(mSectionsPagerAdapter);
     }
 
     /**
@@ -94,32 +74,27 @@ public class RileyLinkStatusActivity extends NoSplashAppCompatActivity {
         List<String> fragmentTitle = new ArrayList<>();
         int lastSelectedPosition = 0;
 
-
         public SectionsPagerAdapter(FragmentManager fm) {
             super(fm);
         }
 
-
         @Override
         public Fragment getItem(int position) {
             this.lastSelectedPosition = position;
             return fragmentList.get(position);
         }
 
-
         @Override
         public int getCount() {
             // Show 3 total pages.
             return fragmentList.size();
         }
 
-
         public void addFragment(Fragment fragment, String title) {
             this.fragmentList.add(fragment);
             this.fragmentTitle.add(title);
         }
 
-
         @Override
         public CharSequence getPageTitle(int position) {
             return fragmentTitle.get(position);

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

@@ -41,8 +41,8 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
     @Inject DateUtil dateUtil;
 
     private TextView connectionStatus;
-    private TextView configuredAddress;
+    private TextView configuredRileyLinkAddress;
-    private TextView connectedRileyLinkName;
+    private TextView configuredRileyLinkName;
     private TextView connectedDevice;
     private TextView connectionError;
     private TextView deviceType;
@@ -63,8 +63,8 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
         super.onStart();
 
         this.connectionStatus = getActivity().findViewById(R.id.rls_t1_connection_status);
-        this.configuredAddress = getActivity().findViewById(R.id.rls_t1_configured_address);
+        this.configuredRileyLinkAddress = getActivity().findViewById(R.id.rls_t1_configured_riley_link_address);
-        this.connectedRileyLinkName = getActivity().findViewById(R.id.rls_t1_connected_riley_link_name);
+        this.configuredRileyLinkName = getActivity().findViewById(R.id.rls_t1_configured_riley_link_name);
         this.connectedDevice = getActivity().findViewById(R.id.rls_t1_connected_device);
         this.connectionError = getActivity().findViewById(R.id.rls_t1_connection_error);
         this.deviceType = getActivity().findViewById(R.id.rls_t1_device_type);
@@ -78,15 +78,15 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
         refreshData();
     }
 
-    public void refreshData() {
+    @Override public void refreshData() {
         RileyLinkTargetDevice targetDevice = rileyLinkServiceData.targetDevice;
 
         this.connectionStatus.setText(resourceHelper.gs(rileyLinkServiceData.rileyLinkServiceState.getResourceId()));
 
         // BS FIXME rileyLinkServiceData is injected so I suppose it cannot be null?
         if (rileyLinkServiceData != null) {
-            this.configuredAddress.setText(StringUtils.isEmpty(rileyLinkServiceData.rileylinkAddress) ? PLACEHOLDER : rileyLinkServiceData.rileylinkAddress);
+            this.configuredRileyLinkAddress.setText(StringUtils.isEmpty(rileyLinkServiceData.rileyLinkAddress) ? PLACEHOLDER : rileyLinkServiceData.rileyLinkAddress);
-            this.connectedRileyLinkName.setText(StringUtils.isEmpty(rileyLinkServiceData.rileyLinkName) ? PLACEHOLDER : rileyLinkServiceData.rileyLinkName);
+            this.configuredRileyLinkName.setText(StringUtils.isEmpty(rileyLinkServiceData.rileyLinkName) ? PLACEHOLDER : rileyLinkServiceData.rileyLinkName);
             this.connectionError.setText(rileyLinkServiceData.rileyLinkError == null ? //
                     PLACEHOLDER
                     : resourceHelper.gs(rileyLinkServiceData.rileyLinkError.getResourceId(targetDevice)));
@@ -114,7 +114,7 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
 
         long lastConnectionTimeMillis = pumpPlugin.getLastConnectionTimeMillis();
         if (lastConnectionTimeMillis == 0) {
-            this.lastDeviceContact.setText(resourceHelper.gs(R.string.common_never));
+            this.lastDeviceContact.setText(resourceHelper.gs(R.string.riley_link_ble_config_connected_never));
         } else {
             this.lastDeviceContact.setText(StringUtil.toDateTimeString(dateUtil, new LocalDateTime(lastConnectionTimeMillis)));
         }

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

@@ -154,19 +154,19 @@ public abstract class RileyLinkService extends DaggerService {
         rileyLinkServiceData.setRileyLinkServiceState(RileyLinkServiceState.RileyLinkInitializing);
 
         if (rileyLinkBLE.isConnected()) {
-            if (deviceAddress.equals(rileyLinkServiceData.rileylinkAddress)) {
+            if (deviceAddress.equals(rileyLinkServiceData.rileyLinkAddress)) {
                 aapsLogger.info(LTag.PUMPBTCOMM, "No change to RL address.  Not reconnecting.");
                 return false;
             } else {
-                aapsLogger.warn(LTag.PUMPBTCOMM, "Disconnecting from old RL (" + rileyLinkServiceData.rileylinkAddress
+                aapsLogger.warn(LTag.PUMPBTCOMM, "Disconnecting from old RL (" + rileyLinkServiceData.rileyLinkAddress
                         + "), reconnecting to new: " + deviceAddress);
 
                 rileyLinkBLE.disconnect();
                 // prolly need to shut down listening thread too?
                 // SP.putString(MedtronicConst.Prefs.RileyLinkAddress, deviceAddress);
 
-                rileyLinkServiceData.rileylinkAddress = deviceAddress;
+                rileyLinkServiceData.rileyLinkAddress = deviceAddress;
-                rileyLinkBLE.findRileyLink(rileyLinkServiceData.rileylinkAddress);
+                rileyLinkBLE.findRileyLink(rileyLinkServiceData.rileyLinkAddress);
                 return true;
             }
         } else {
@@ -229,7 +229,7 @@ public abstract class RileyLinkService extends DaggerService {
 
         if (rileyLinkBLE.isConnected()) {
             rileyLinkBLE.disconnect();
-            rileyLinkServiceData.rileylinkAddress = null;
+            rileyLinkServiceData.rileyLinkAddress = null;
             rileyLinkServiceData.rileyLinkName = null;
         }
 

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

@@ -34,7 +34,7 @@ public class RileyLinkServiceData {
     private long lastServiceStateChange = 0L;
     public RileyLinkFirmwareVersion firmwareVersion; // here we have "compatibility level" version
     public RileyLinkTargetFrequency rileyLinkTargetFrequency;
-    public String rileylinkAddress;
+    public String rileyLinkAddress;
     public String rileyLinkName;
     long lastTuneUpTime = 0L;
     public Double lastGoodFrequency;

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/data/ServiceTransport.java

@@ -135,7 +135,7 @@ public class ServiceTransport extends ServiceMessage {
     }
 
 
-    public ServiceTransport clone() {
+    @Override public ServiceTransport clone() {
         Parcel p = Parcel.obtain();
         Parcel p2 = Parcel.obtain();
         getMap().writeToParcel(p, 0);

rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ServiceTaskExecutor.java

@@ -33,7 +33,7 @@ public class ServiceTaskExecutor extends ThreadPoolExecutor {
     }
 
     // FIXME
-    protected void beforeExecute(Thread t, Runnable r) {
+    @Override protected void beforeExecute(Thread t, Runnable r) {
         // This is run on either caller UI thread or Service UI thread.
         ServiceTask task = (ServiceTask) r;
         aapsLogger.debug(LTag.PUMPBTCOMM, "About to run task " + task.getClass().getSimpleName());
@@ -43,7 +43,7 @@ public class ServiceTaskExecutor extends ThreadPoolExecutor {
 
 
     // FIXME
-    protected void afterExecute(Runnable r, Throwable t) {
+    @Override protected void afterExecute(Runnable r, Throwable t) {
         // This is run on either caller UI thread or Service UI thread.
         ServiceTask task = (ServiceTask) r;
         task.postOp();

rileylink/src/main/res/layout/riley_link_ble_config_activity.xml

@@ -0,0 +1,82 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="5dp">
+
+    <!-- Currently selected RileyLink -->
+    <TextView
+        style="@style/TextAppearance.AppCompat.Title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/riley_link_ble_config_scan_currently_selected_riley_link" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/riley_link_ble_config_currently_selected_riley_link_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="10dp"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/riley_link_ble_config_currently_selected_riley_link_address"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="10dp"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/riley_link_ble_config_button_remove_riley_link"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/riley_link_ble_config_remove_riley_link"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <!-- RileyLink scan -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            style="@style/TextAppearance.AppCompat.Title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/riley_link_ble_config_scan_title" />
+
+        <Button
+            android:id="@+id/riley_link_ble_config_scan_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/riley_link_ble_config_button_scan_start" />
+
+        <Button
+            android:id="@+id/riley_link_ble_config_button_scan_stop"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/riley_link_ble_config_scan_stop"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <!-- RileyLink scan results -->
+    <ListView
+        android:id="@+id/riley_link_ble_config_scan_device_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
+

rileylink/src/main/res/layout/riley_link_ble_config_scan_item.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:layout_width="match_parent"
+    android:paddingStart="10dp"
-    android:layout_height="wrap_content"
+    android:paddingTop="5dp"
-    android:paddingLeft="32dp">
+    android:paddingBottom="5dp">
 
     <TextView
-        android:id="@+id/rileylink_device_name"
+        android:id="@+id/riley_link_ble_config_scan_item_device_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="24dp"
+        android:textSize="16sp" />
-
-        android:text="name" />
 
     <TextView
-        android:id="@+id/rileylink_device_address"
+        android:id="@+id/riley_link_ble_config_scan_item_device_address"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="12dp" />
+        android:textSize="12sp" />
 
 </LinearLayout>

rileylink/src/main/res/layout/rileylink_scan_activity.xml

@@ -1,43 +0,0 @@
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context="com.gxwtech.roundtrip2.RileyLinkScan">
-
-        <com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:elevation="0dp">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/rileylink_toolbarBTScan"
-                android:minHeight="?attr/actionBarSize"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"></androidx.appcompat.widget.Toolbar>
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:paddingTop="?attr/actionBarSize">
-
-            <ListView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:id="@+id/rileylink_listBTScan"
-
-                android:layout_weight="1" />
-
-        </LinearLayout>
-
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-
-</androidx.drawerlayout.widget.DrawerLayout>

rileylink/src/main/res/layout/rileylink_status_general.xml

@@ -42,10 +42,10 @@
                     android:layout_marginLeft="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
-                    android:text="@string/rileylink_configured_address" />
+                    android:text="@string/rileylink_configured_riley_link_address" />
 
                 <TextView
-                    android:id="@+id/rls_t1_configured_address"
+                    android:id="@+id/rls_t1_configured_riley_link_address"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="10dp"
@@ -69,10 +69,10 @@
                     android:layout_marginLeft="30dp"
                     android:layout_weight="35"
                     android:gravity="center_vertical"
-                    android:text="@string/rileylink_connected_riley_link_name" />
+                    android:text="@string/rileylink_configured_riley_link_name" />
 
                 <TextView
-                    android:id="@+id/rls_t1_connected_riley_link_name"
+                    android:id="@+id/rls_t1_configured_riley_link_name"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_marginLeft="10dp"

rileylink/src/main/res/menu/menu_rileylink_ble_scan.xml

@@ -6,5 +6,5 @@
     <item
         android:id="@+id/rileylink_miScan"
         app:showAsAction="ifRoom"
-        android:title="@string/rileylink_scanner_scan_scan"></item>
+        android:title="@string/riley_link_ble_config_button_scan_start"></item>
 </menu>

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

@@ -1,17 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- RL BLE Scanning -->
+    <!-- RL keys -->
-    <string name="rileylink_scanner_scan_scan">SCAN</string>
+    <string name="key_medtronic_pump_encoding_4b6b_local" translatable="false">medtronic_pump_encoding_4b6b_local</string>
-    <string name="rileylink_scanner_scan_stop">STOP</string>
+    <string name="key_medtronic_pump_encoding_4b6b_rileylink" translatable="false">medtronic_pump_encoding_4b6b_rileylink</string>
-    <string name="rileylink_scanner_selected_device">Selected</string>
+    <string name="key_rileylink_mac_address" translatable="false">pref_rileylink_mac_address</string>
-    <string name="rileylink_scanner_title">RileyLink Scan</string>
+    <string name="key_rileylink_name" translatable="false">pref_rileylink_name</string>
-    <string name="location_yes">Enable</string>
+    <string name="key_medtronic_encoding" translatable="false">pref_medtronic_encoding</string>
-    <string name="location_no">No</string>
+
-    <string name="rileylink_scanner_scanning">Scanning</string>
+    <!-- RL BLE Config -->
-    <string name="rileylink_scanner_scanning_finished">Scanning finished</string>
+    <string name="riley_link_ble_config_button_scan_start">Scan</string>
-    <string name="rileylink_scanner_scanning_error">Scanning error: %1$d</string>
+    <string name="riley_link_ble_config_scan_stop">Stop</string>
-    <string name="common_never">Never</string>
+    <string name="riley_link_ble_config_scan_selected">Selected</string>
+    <string name="riley_link_ble_config_scan_title">RileyLink Scan</string>
+    <string name="riley_link_ble_config_scan_scanning">Scanning</string>
+    <string name="riley_link_ble_config_scan_finished">Scanning finished</string>
+    <string name="riley_link_ble_config_scan_error">Scanning error: %1$d</string>
+    <string name="riley_link_ble_config_connected_never">Never</string>
+    <string name="riley_link_ble_config_scan_currently_selected_riley_link">Currently Selected RileyLink</string>
+    <string name="riley_link_ble_config_remove_riley_link">Remove</string>
+    <string name="riley_link_ble_config_remove_riley_link_confirmation">Are you sure that you want to remove your RileyLink?</string>
+    <string name="riley_link_ble_config_remove_riley_link_confirmation_title">Remove RileyLink</string>
+    <string name="riley_link_ble_config_no_riley_link_selected">No RileyLink selected</string>
 
     <!-- RL Status Page -->
     <string name="rileylink_settings_tab1">Settings</string>
@@ -20,7 +30,8 @@
     <string name="medtronic_pump_status">Pump Status</string>
     <string name="title_activity_rileylink_settings">RileyLink Settings</string>
     <string name="rileylink_title">RileyLink</string>
-    <string name="rileylink_configured_address">Configured Address:</string>
+    <string name="rileylink_configured_riley_link_address">Configured RileyLink Address:</string>
+    <string name="rileylink_configured_riley_link_name">Configured RileyLink Name:</string>
     <string name="rileylink_connected_device">Connected Device:</string>
     <string name="rileylink_connection_status">Connection Status:</string>
     <string name="rileylink_connection_error">Connection Error:</string>
@@ -30,11 +41,9 @@
     <string name="rileylink_last_used_frequency">Last Used Frequency:</string>
     <string name="rileylink_last_device_contact">Last Device Contact:</string>
     <string name="rileylink_firmware_version">Firmware Version:</string>
-    <string name="rileylink_connected_riley_link_name">Connected RileyLink Name:</string>
     <string name="rileylink_pump_serial_number">Pump Serial Number:</string>
     <string name="rileylink_pump_frequency">Pump Frequency:</string>
 
-
     <!-- RL State -->
     <string name="rileylink_state_bt_init">Bluetooth Initializing…</string>
     <string name="rileylink_state_bt_error">Bluetooth Error</string>
@@ -56,17 +65,11 @@
     <string name="rileylink_error_pump_unreachable">Pump unreachable</string>
     <string name="rileylink_error_pod_unreachable">Pod unreachable</string>
 
-    <!-- RL Target Device -->
+    <!-- RileyLink - Common -->
     <string name="rileylink_target_device_medtronic">Medtronic Pump</string>
     <string name="rileylink_target_device_omnipod">Omnipod</string>
-
+    <string name="riley_link_common_yes">Yes</string>
-    <string name="key_medtronic_pump_encoding_4b6b_local" translatable="false">medtronic_pump_encoding_4b6b_local</string>
+    <string name="riley_link_common_no">No</string>
-    <string name="key_medtronic_pump_encoding_4b6b_rileylink" translatable="false">medtronic_pump_encoding_4b6b_rileylink</string>
-
-    <string name="key_rileylink_mac_address" translatable="false">pref_rileylink_mac_address</string>
-    <string name="key_medtronic_encoding" translatable="false">pref_medtronic_encoding</string>
-
-    <string name="mdt_last_bolus" translatable="false">%1$.1f %2$s (%3$s)</string>
 
     <plurals name="duration_days">
         <item quantity="one">%1$d day</item>
@@ -77,5 +80,4 @@
         <item quantity="other">%1$d hours</item>
     </plurals>
 
-
 </resources>