caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Handle empty RileyLink name correctly

Browse source
This commit is contained in:
Bart Sopers 2020-12-26 20:47:33 +01:00
parent 051e811571
commit f5dbf7d7c9
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -395,11 +395,16 @@ public class RileyLinkBLE {
aapsLogger.debug(LTag.PUMPBTCOMM, "Gatt Connected."); 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) // Update stored name upon connecting (also for backwards compatibility for device where a name was not yet stored)
sp.putString(RileyLinkConst.Prefs.RileyLinkName, rileyLinkServiceData.rileyLinkName); sp.putString(RileyLinkConst.Prefs.RileyLinkName, deviceName);
} else {
sp.remove(RileyLinkConst.Prefs.RileyLinkName);
}
rileyLinkServiceData.rileyLinkName = deviceName;
rileyLinkServiceData.rileyLinkAddress = bluetoothConnectionGatt.getDevice().getAddress();
} }
} }