diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneral.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneral.java index 66a5c69e58..59938605c4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneral.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneral.java @@ -160,9 +160,10 @@ public class RileyLinkStatusGeneral extends Fragment implements RefreshableInter this.pumpFrequency.setText(MainApp.gs(R.string.omnipod_frequency)); if (omnipodPumpStatus.podAvailable) { - this.serialNumber.setText(omnipodPumpStatus.podSessionState.getLot()); + this.serialNumber.setText(omnipodPumpStatus.podLotNumber); this.connectedDevice.setText(omnipodPumpStatus.pumpType == PumpType.Insulet_Omnipod ? "Eros Pod" : "Dash Pod"); } else { + this.serialNumber.setText("??"); this.connectedDevice.setText("-"); } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt index 5181e2a44f..0cd2758482 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt @@ -222,10 +222,12 @@ class OmnipodFragment : Fragment() { pumpStatus.podNumber == null } else { //podAvailable = true + pumpStatus.podLotNumber = "" + pumpStatus.podSessionState.lot pumpStatus.podAvailable = true omnipod_pod_address.text = pumpStatus.podSessionState.address.toString() omnipod_pod_expiry.text = pumpStatus.podSessionState.expiryDateAsString - pumpStatus.podNumber == pumpStatus.podSessionState.address.toString() + pumpStatus.podNumber = pumpStatus.podSessionState.address.toString() + //pumpStatus.podSessionState = checkStatusSet(pumpStatus.podSessionState, // OmnipodUtil.getPodSessionState()) as PodSessionState? diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java index 58a22ed04b..d83a8a81ea 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/OmnipodPumpStatus.java @@ -1,5 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.driver; +import org.jetbrains.annotations.NotNull; import org.joda.time.LocalDateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -60,6 +61,7 @@ public class OmnipodPumpStatus extends PumpStatus { public boolean beepSMBEnabled = true; public boolean beepTBREnabled = true; public boolean podDebuggingOptionsEnabled = false; + public String podLotNumber = "???"; public OmnipodPumpStatus(PumpDescription pumpDescription) { super(pumpDescription);