From f596348d85aaf8acace5e255737b1b41efca4534 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Fri, 25 Dec 2020 02:05:37 +0100 Subject: [PATCH 1/3] Workarounds for some bugs in RL scanning UI --- .../service/RileyLinkMedtronicService.java | 10 ++--- .../service/RileyLinkOmnipodService.java | 10 ++--- .../dialog/RileyLinkBLEScanActivity.java | 32 ++++++++++++---- .../common/hw/rileylink/ble/RileyLinkBLE.java | 7 +++- .../dialog/RileyLinkStatusActivity.java | 37 ------------------- .../service/RileyLinkBroadcastReceiver.java | 4 -- .../rileylink/service/RileyLinkService.java | 7 +++- 7 files changed, 46 insertions(+), 61 deletions(-) diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java index 0744545ccc..1b400b7bde 100644 --- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java +++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java @@ -180,7 +180,7 @@ public class RileyLinkMedtronicService extends RileyLinkService { } - public boolean verifyConfiguration() { + public boolean verifyConfiguration(boolean forceRileyLinkAddressRenewal) { try { String regexSN = "[0-9]{6}"; String regexMac = "([\\da-fA-F]{1,2}(?:\\:|$)){6}"; @@ -316,7 +316,7 @@ public class RileyLinkMedtronicService extends RileyLinkService { //boolean bolusDebug = bolusDebugEnabled != null && bolusDebugEnabled.equals(resourceHelper.gs(R.string.common_on)); //MedtronicHistoryData.doubleBolusDebug = bolusDebug; - reconfigureService(); + reconfigureService(forceRileyLinkAddressRenewal); return true; @@ -327,7 +327,7 @@ public class RileyLinkMedtronicService extends RileyLinkService { } } - private boolean reconfigureService() { + private boolean reconfigureService(boolean forceRileyLinkAddressRenewal) { if (!inPreInit) { @@ -336,7 +336,7 @@ public class RileyLinkMedtronicService extends RileyLinkService { serialChanged = false; } - if (rileyLinkAddressChanged) { + if (rileyLinkAddressChanged || forceRileyLinkAddressRenewal) { rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this); rileyLinkAddressChanged = false; } @@ -380,6 +380,6 @@ public class RileyLinkMedtronicService extends RileyLinkService { public boolean setNotInPreInit() { this.inPreInit = false; - return reconfigureService(); + return reconfigureService(false); } } diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/service/RileyLinkOmnipodService.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/service/RileyLinkOmnipodService.java index 8928e5b1f1..b92d26f017 100644 --- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/service/RileyLinkOmnipodService.java +++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/rileylink/service/RileyLinkOmnipodService.java @@ -109,7 +109,7 @@ public class RileyLinkOmnipodService extends RileyLinkService { } @Override - public boolean verifyConfiguration() { + public boolean verifyConfiguration(boolean forceRileyLinkAddressRenewal) { try { errorDescription = null; @@ -133,7 +133,7 @@ public class RileyLinkOmnipodService extends RileyLinkService { rileyLinkServiceData.rileyLinkTargetFrequency = RileyLinkTargetFrequency.Omnipod; - reconfigureService(); + reconfigureService(forceRileyLinkAddressRenewal); return true; @@ -144,9 +144,9 @@ public class RileyLinkOmnipodService extends RileyLinkService { } } - private boolean reconfigureService() { + private boolean reconfigureService(boolean forceRileyLinkAddressRenewal) { if (!inPreInit) { - if (rileyLinkAddressChanged) { + if (rileyLinkAddressChanged || forceRileyLinkAddressRenewal) { rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this); rileyLinkAddressChanged = false; } @@ -158,6 +158,6 @@ public class RileyLinkOmnipodService extends RileyLinkService { public boolean setNotInPreInit() { this.inPreInit = false; - return reconfigureService(); + return reconfigureService(false); } } diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java index 3c298574f9..00fdefea36 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java @@ -79,6 +79,8 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity { private String actionTitleStart, actionTitleStop; private MenuItem menuItem; + private boolean rlDisconnected; + @Override public void onCreate(Bundle savedInstanceState) { @@ -106,7 +108,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity { sp.putString(RileyLinkConst.Prefs.RileyLinkAddress, bleAddress); RileyLinkPumpDevice rileyLinkPump = (RileyLinkPumpDevice) activePlugin.getActivePump(); - rileyLinkPump.getRileyLinkService().verifyConfiguration(); // force reloading of address + rileyLinkPump.getRileyLinkService().verifyConfiguration(true); // force reloading of address rileyLinkPump.triggerPumpConfigurationChangedEvent(); finish(); @@ -115,10 +117,12 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity { toolbarBTScan = findViewById(R.id.rileylink_toolbarBTScan); toolbarBTScan.setTitle(R.string.rileylink_scanner_title); setSupportActionBar(toolbarBTScan); - - prepareForScanning(); } + @Override protected void onResume() { + super.onResume(); + prepareForScanning(); + } @Override public boolean onCreateOptionsMenu(Menu menu) { @@ -138,6 +142,10 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity { @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)) { @@ -148,8 +156,21 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity { } } + @Override public void onBackPressed() { + super.onBackPressed(); + if (rlDisconnected) { + // Reconnect RL if it was disconnected for the scan + rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkNewAddressSet, this); + } + } - public void prepareForScanning() { + @Override protected void onDestroy() { + super.onDestroy(); + mScanning = false; + mLEScanner.stopScan(mScanCallback2); + } + + private void prepareForScanning() { boolean checkOK = blePrecheck.prerequisitesCheck(this); if (checkOK) { @@ -158,9 +179,6 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity { filters = Collections.singletonList(new ScanFilter.Builder().setServiceUuid( ParcelUuid.fromString(GattAttributes.SERVICE_RADIO)).build()); } - - // disable currently selected RL, so that we can discover it - rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkDisconnect, this); } diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java index 8d7f1e44b4..5a26b80dd8 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkBLE.java @@ -151,8 +151,8 @@ public class RileyLinkBLE { } else if ((newState == BluetoothProfile.STATE_CONNECTING) || // (newState == BluetoothProfile.STATE_DISCONNECTING)) { - aapsLogger.debug(LTag.PUMPBTCOMM,"We are in {} state.", status == BluetoothProfile.STATE_CONNECTING ? "Connecting" : - "Disconnecting"); + aapsLogger.debug(LTag.PUMPBTCOMM, "We are in {} state.", status == BluetoothProfile.STATE_CONNECTING ? "Connecting" : + "Disconnecting"); } else if (newState == BluetoothProfile.STATE_DISCONNECTED) { rileyLinkUtil.sendBroadcastMessage(RileyLinkConst.Intents.RileyLinkDisconnected, context); if (manualDisconnect) @@ -392,6 +392,9 @@ public class RileyLinkBLE { if (gattDebugEnabled) { aapsLogger.debug(LTag.PUMPBTCOMM, "Gatt Connected."); } + + rileyLinkServiceData.rileylinkAddress = bluetoothConnectionGatt.getDevice().getAddress(); + rileyLinkServiceData.rileyLinkName = bluetoothConnectionGatt.getDevice().getName(); } } diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java index 7bcc9a93ac..c4e06f8ab1 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.java @@ -16,7 +16,6 @@ import java.util.List; 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; @@ -66,50 +65,14 @@ public class RileyLinkStatusActivity extends NoSplashAppCompatActivity { RefreshableInterface selectableInterface = (RefreshableInterface) mSectionsPagerAdapter .getItem(tabLayout.getSelectedTabPosition()); selectableInterface.refreshData(); - - // refreshData(tabLayout.getSelectedTabPosition()); - - // Toast.makeText(getApplicationContext(), "Test pos: " + tabLayout.getSelectedTabPosition(), - // Toast.LENGTH_LONG); }); 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); - - // // 7-12 - // int[] ids = {R.id.rls_t1_tv02, R.id.rls_t1_tv03, R.id.rls_t1_tv04, R.id.rls_t1_tv05, R.id.rls_t1_tv07, // - // R.id.rls_t1_tv08, R.id.rls_t1_tv09, R.id.rls_t1_tv10, R.id.rls_t1_tv11, R.id.rls_t1_tv12}; - // - // for (int id : ids) { - // - // TextView tv = (TextView) findViewById(id); - // tv.setText(tv.getText() + ":"); - // } - - // refreshData(0); - // refreshData(1); - } - - public void refreshData(int position) { - if (position == 0) { - // FIXME i18n - this.connectionStatus.setText(rileyLinkServiceData.rileyLinkServiceState.name()); - this.configuredAddress.setText(rileyLinkServiceData.rileylinkAddress); - // FIXME - this.connectedDevice.setText("???"); - // FIXME i18n - this.connectionError.setText(rileyLinkServiceData.rileyLinkError.name()); - } else { - - } - - } - - public void setupViewPager(ViewPager pager) { mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java index 387e2922c8..3a80dff4fd 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java @@ -139,7 +139,6 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver { } else { rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.BluetoothDisabled); } - rileyLinkServiceData.rileyLinkName = null; return true; } else if (action.equals(RileyLinkConst.Intents.RileyLinkReady)) { @@ -170,7 +169,6 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver { return true; } else if (action.equals(RileyLinkConst.Intents.RileyLinkNewAddressSet)) { String RileylinkBLEAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, ""); - rileyLinkServiceData.rileyLinkName = null; if (RileylinkBLEAddress.equals("")) { aapsLogger.error("No Rileylink BLE Address saved in app"); } else { @@ -183,8 +181,6 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver { return true; } else if (action.equals(RileyLinkConst.Intents.RileyLinkDisconnect)) { rileyLinkService.disconnectRileyLink(); - rileyLinkServiceData.rileyLinkName = null; - return true; } else { return false; diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java index b039e49c59..7b4e11fd35 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkService.java @@ -230,6 +230,7 @@ public abstract class RileyLinkService extends DaggerService { if (rileyLinkBLE.isConnected()) { rileyLinkBLE.disconnect(); rileyLinkServiceData.rileylinkAddress = null; + rileyLinkServiceData.rileyLinkName = null; } rileyLinkServiceData.setRileyLinkServiceState(RileyLinkServiceState.BluetoothReady); @@ -260,5 +261,9 @@ public abstract class RileyLinkService extends DaggerService { return null; } - public abstract boolean verifyConfiguration(); + public boolean verifyConfiguration() { + return verifyConfiguration(false); + } + + public abstract boolean verifyConfiguration(boolean forceRileyLinkAddressRenewal); } From 33297ae4cf7c7a0bdac5bdfa7abbfd7788db4d75 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Fri, 25 Dec 2020 02:17:43 +0100 Subject: [PATCH 2/3] Remove redundant code and improve comment --- .../pump/common/dialog/RileyLinkBLEScanActivity.java | 2 +- .../plugins/pump/common/hw/rileylink/ble/RFSpy.java | 12 ------------ .../service/RileyLinkBroadcastReceiver.java | 3 --- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java index 00fdefea36..364e0e19c3 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java @@ -108,7 +108,7 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity { sp.putString(RileyLinkConst.Prefs.RileyLinkAddress, bleAddress); RileyLinkPumpDevice rileyLinkPump = (RileyLinkPumpDevice) activePlugin.getActivePump(); - rileyLinkPump.getRileyLinkService().verifyConfiguration(true); // force reloading of address + rileyLinkPump.getRileyLinkService().verifyConfiguration(true); // force reloading of address to assure that the RL gets reconnected (even if the address didn't change) rileyLinkPump.triggerPumpConfigurationChangedEvent(); finish(); diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java index 4df1a22389..bf06acad02 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java @@ -112,18 +112,6 @@ public class RFSpy { reader.newDataIsAvailable(); } - public String getBleDeviceName() { - BLECommOperationResult result = rileyLinkBle.readCharacteristic_blocking(UUID.fromString(GattAttributes.SERVICE_GAP), UUID.fromString(GattAttributes.CHARA_GAP_NAME)); - if (result.resultCode == BLECommOperationResult.RESULT_SUCCESS) { - String value = new String(result.value); - aapsLogger.debug(LTag.PUMPBTCOMM, "BLE device name: {}", value); - return value; - } else { - aapsLogger.error(LTag.PUMPBTCOMM, "getBleDeviceName failed with code: " + result.resultCode); - return null; - } - } - public Integer getBatteryLevel() { BLECommOperationResult result = rileyLinkBle.readCharacteristic_blocking(batteryServiceUUID, batteryLevelUUID); if (result.resultCode == BLECommOperationResult.RESULT_SUCCESS) { diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java index 3a80dff4fd..dbe2731e89 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java @@ -152,9 +152,6 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver { String bleVersion = rileyLinkService.rfspy.getBLEVersionCached(); RileyLinkFirmwareVersion rlVersion = rileyLinkServiceData.firmwareVersion; - rileyLinkServiceData.rileyLinkName = rileyLinkService.rfspy.getBleDeviceName(); - aapsLogger.debug(LTag.PUMPBTCOMM, "BLE device name: {}", rileyLinkServiceData.rileyLinkName); - aapsLogger.debug(LTag.PUMPBTCOMM, "RfSpy version (BLE113): " + bleVersion); rileyLinkService.rileyLinkServiceData.versionBLE113 = bleVersion; From bc04f8137fcc3a7350600db62f53e2b7e1957ff2 Mon Sep 17 00:00:00 2001 From: Bart Sopers Date: Fri, 25 Dec 2020 12:57:28 +0100 Subject: [PATCH 3/3] Code cleanup in RileyLinkStatusGeneralFragment --- .../RileyLinkStatusGeneralFragment.java | 49 +++++-------------- .../res/layout/rileylink_status_general.xml | 16 +----- rileylink/src/main/res/values/strings.xml | 22 +++++---- 3 files changed, 27 insertions(+), 60 deletions(-) diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java index 3c0a156c76..309530cfa9 100644 --- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java +++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java @@ -40,29 +40,24 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re @Inject RileyLinkServiceData rileyLinkServiceData; @Inject DateUtil dateUtil; - TextView connectionStatus; - TextView configuredAddress; - TextView connectedRileyLinkName; - TextView connectedDevice; - TextView connectionError; - TextView deviceType; - TextView deviceModel; - TextView serialNumber; - TextView pumpFrequency; - TextView lastUsedFrequency; - TextView lastDeviceContact; - TextView firmwareVersion; - - boolean first = false; + private TextView connectionStatus; + private TextView configuredAddress; + private TextView connectedRileyLinkName; + private TextView connectedDevice; + private TextView connectionError; + private TextView deviceType; + private TextView deviceModel; + private TextView serialNumber; + private TextView pumpFrequency; + private TextView lastUsedFrequency; + private TextView lastDeviceContact; + private TextView firmwareVersion; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.rileylink_status_general, container, false); - - return rootView; + return inflater.inflate(R.layout.rileylink_status_general, container, false); } - @Override public void onStart() { super.onStart(); @@ -80,28 +75,10 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re this.lastDeviceContact = getActivity().findViewById(R.id.rls_t1_last_device_contact); this.firmwareVersion = getActivity().findViewById(R.id.rls_t1_firmware_version); - // BS: FIXME Remove - if (!first) { - - // 7-14 - int[] ids = {R.id.rls_t1_tv02, R.id.rls_t1_tv14, R.id.rls_t1_tv03, R.id.rls_t1_tv04, R.id.rls_t1_tv05, R.id.rls_t1_tv07, // - R.id.rls_t1_tv08, R.id.rls_t1_tv09, R.id.rls_t1_tv10, R.id.rls_t1_tv11, R.id.rls_t1_tv12, R.id.rls_t1_tv13}; - - for (int id : ids) { - - TextView tv = getActivity().findViewById(id); - tv.setText(tv.getText() + ":"); - } - - first = true; - } - refreshData(); } - public void refreshData() { - RileyLinkTargetDevice targetDevice = rileyLinkServiceData.targetDevice; this.connectionStatus.setText(resourceHelper.gs(rileyLinkServiceData.rileyLinkServiceState.getResourceId())); diff --git a/rileylink/src/main/res/layout/rileylink_status_general.xml b/rileylink/src/main/res/layout/rileylink_status_general.xml index ac72198024..406740a419 100644 --- a/rileylink/src/main/res/layout/rileylink_status_general.xml +++ b/rileylink/src/main/res/layout/rileylink_status_general.xml @@ -37,7 +37,6 @@ android:orientation="horizontal"> + android:text="@string/rileylink_pump_serial_number" /> + android:text="@string/rileylink_pump_frequency" /> Pump Status RileyLink Settings RileyLink - Configured Address - Connected Device - Connection Status - Connection Error + Configured Address: + Connected Device: + Connection Status: + Connection Error: Device - Device Type - Device Model - Last used frequency - Last device contact - Firmware + Device Type: + Device Model: + Last Used Frequency: + Last Device Contact: + Firmware Version: + Connected RileyLink Name: + Pump Serial Number: + Pump Frequency: @@ -64,7 +67,6 @@ pref_medtronic_encoding %1$.1f %2$s (%3$s) - Connected RileyLink name %1$d day