caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Small code improvements for PodStateManager

Browse source
This commit is contained in:
Bart Sopers 2020-08-08 18:52:49 +02:00
parent 76d267dce4
commit 2a73127202
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
View file

@ -128,11 +128,8 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
podStateManager.setStateChangedHandler(manager -> { podStateManager.setStateChangedHandler(manager -> {
// Handle pod state changes // Handle pod state changes
// FIXME only set once (?) (before instantiating AapsOmnipodManager)
// Maybe not, it seems to not only set something, but also fire an event
omnipodUtil.setPodStateManager(manager);
updatePumpStatus(manager); updatePumpStatus(manager);
omnipodUtil.notifyDeviceStatusChanged();
}); });
delegate = new OmnipodManager(aapsLogger, sp, communicationService, podStateManager); delegate = new OmnipodManager(aapsLogger, sp, communicationService, podStateManager);

2
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java
View file

@ -122,8 +122,8 @@ public class RileyLinkOmnipodService extends RileyLinkService {
omnipodUIComm = new OmnipodUIComm(injector, aapsLogger, omnipodUtil, omnipodUIPostprocessor, aapsOmnipodManager); omnipodUIComm = new OmnipodUIComm(injector, aapsLogger, omnipodUtil, omnipodUIPostprocessor, aapsOmnipodManager);
} else { } else {
aapsOmnipodManager = instance;
omnipodUtil.setPodStateManager(instance.getPodStateManager()); omnipodUtil.setPodStateManager(instance.getPodStateManager());
aapsOmnipodManager = instance;
} }
} }

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodConst.java
View file

@ -14,7 +14,6 @@ public class OmnipodConst {
public class Prefs { public class Prefs {
public static final String PodState = Prefix + "pod_state"; public static final String PodState = Prefix + "pod_state";
public static final String NextPodAddress = Prefix + "next_pod_address";
public static final int BeepBasalEnabled = R.string.key_omnipod_beep_basal_enabled; public static final int BeepBasalEnabled = R.string.key_omnipod_beep_basal_enabled;
public static final int BeepBolusEnabled = R.string.key_omnipod_beep_bolus_enabled; public static final int BeepBolusEnabled = R.string.key_omnipod_beep_bolus_enabled;
public static final int BeepSMBEnabled = R.string.key_omnipod_beep_smb_enabled; public static final int BeepSMBEnabled = R.string.key_omnipod_beep_smb_enabled;

13
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
View file

@ -138,10 +138,16 @@ public class OmnipodUtil {
return gsonBuilder.create(); return gsonBuilder.create();
} }
public void setPodStateManager(PodStateManager podStateManager) { public void setPodStateManager(PodStateManager podStateManager) {
if (podStateManager == null) {
throw new IllegalArgumentException("Pod state manager can not be null");
}
omnipodPumpStatus.podStateManager = podStateManager; omnipodPumpStatus.podStateManager = podStateManager;
rxBus.send(new EventOmnipodDeviceStatusChange(podStateManager)); notifyDeviceStatusChanged();
}
public void notifyDeviceStatusChanged() {
rxBus.send(new EventOmnipodDeviceStatusChange(omnipodPumpStatus.podStateManager));
} }
@ -166,6 +172,9 @@ public class OmnipodUtil {
public PodStateManager getPodStateManager() { public PodStateManager getPodStateManager() {
if (omnipodPumpStatus.podStateManager == null) {
throw new IllegalStateException("Pod state manager is null");
}
return omnipodPumpStatus.podStateManager; return omnipodPumpStatus.podStateManager;
} }