Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge

This commit is contained in:
Bart Sopers 2020-12-26 20:48:17 +01:00
commit 46f4b6da44

View file

@ -395,11 +395,16 @@ public class RileyLinkBLE {
aapsLogger.debug(LTag.PUMPBTCOMM, "Gatt Connected.");
}
rileyLinkServiceData.rileyLinkAddress = bluetoothConnectionGatt.getDevice().getAddress();
rileyLinkServiceData.rileyLinkName = bluetoothConnectionGatt.getDevice().getName();
String deviceName = 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, rileyLinkServiceData.rileyLinkName);
sp.putString(RileyLinkConst.Prefs.RileyLinkName, deviceName);
} else {
sp.remove(RileyLinkConst.Prefs.RileyLinkName);
}
rileyLinkServiceData.rileyLinkName = deviceName;
rileyLinkServiceData.rileyLinkAddress = bluetoothConnectionGatt.getDevice().getAddress();
}
}