caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

- change string for version if OL is 3.2

Browse source 
- new version string is only displayed if version characteristic was read
This commit is contained in:
Andy Rozman 2021-10-16 20:12:23 +01:00
parent 42c16aafed
commit cd2316e848
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,9 +106,9 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
this.connectionError.setText(rileyLinkError == null ? PLACEHOLDER : resourceHelper.gs(rileyLinkError.getResourceId(targetDevice)));
if (rileyLinkServiceData.isOrange) {
if (rileyLinkServiceData.isOrange && rileyLinkServiceData.versionOrangeFirmware!=null) {
this.firmwareVersion.setText(resourceHelper.gs(R.string.rileylink_firmware_version_value_orange,
Optional.ofNullable(rileyLinkServiceData.versionOrangeFirmware).orElse(PLACEHOLDER),
rileyLinkServiceData.versionOrangeFirmware,
Optional.ofNullable(rileyLinkServiceData.versionOrangeHardware).orElse(PLACEHOLDER)));
} else {
this.firmwareVersion.setText(resourceHelper.gs(R.string.rileylink_firmware_version_value,

2
rileylink/src/main/res/values/strings.xml
View file

@ -45,7 +45,7 @@
<string name="rileylink_last_device_contact">Last Device Contact:</string>
<string name="rileylink_firmware_version">Firmware Version:</string>
<string name="rileylink_firmware_version_value">BLE113: %1$s\nCC110: %2$s</string>
<string name="rileylink_firmware_version_value_orange">FW: %1$s\nHW: %2$s</string>
<string name="rileylink_firmware_version_value_orange">Fw: %1$s\nHw: %2$s</string>
<string name="rileylink_pump_serial_number">Pump Serial Number:</string>
<string name="rileylink_pump_frequency">Pump Frequency:</string>
<string name="rileylink_pump_frequency_value">%1$.2f MHz</string>