caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Process review findings from upstream merge

Browse source
This commit is contained in:
Bart Sopers 2020-09-06 15:25:56 +02:00
parent 8a4a237553
commit efc384f39c
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.kt
View file

@ -24,11 +24,9 @@ class CommandStartPump(
} else if (pump.pumpDescription.pumpType == PumpType.Insulet_Omnipod) { } else if (pump.pumpDescription.pumpType == PumpType.Insulet_Omnipod) {
// When using CommandQueue.setProfile, it refuses to set the profile is the same as the current profile // When using CommandQueue.setProfile, it refuses to set the profile is the same as the current profile
// However we need to set the current profile to resume delivery in case the Pod is suspended // However we need to set the current profile to resume delivery in case the Pod is suspended
if (profileFunction.getProfile() != null) {
pump.setNewBasalProfile(profileFunction.getProfile()) pump.setNewBasalProfile(profileFunction.getProfile())
} }
} }
}
override fun status(): String = "START PUMP" override fun status(): String = "START PUMP"
} }

3
core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
View file

@ -71,10 +71,11 @@ public class Notification {
public static final int TIME_OR_TIMEZONE_CHANGE = 58; public static final int TIME_OR_TIMEZONE_CHANGE = 58;
public static final int OMNIPOD_POD_NOT_ATTACHED = 59; public static final int OMNIPOD_POD_NOT_ATTACHED = 59;
public static final int CARBS_REQUIRED = 60; public static final int CARBS_REQUIRED = 60;
public static final int IMPORTANCE_HIGH = 2;
public static final int OMNIPOD_POD_SUSPENDED = 61; public static final int OMNIPOD_POD_SUSPENDED = 61;
public static final int OMNIPOD_POD_ALERTS_UPDATED = 62; public static final int OMNIPOD_POD_ALERTS_UPDATED = 62;
public static final int IMPORTANCE_HIGH = 2;
public static final String CATEGORY_ALARM = "alarm"; public static final String CATEGORY_ALARM = "alarm";
public static final int USERMESSAGE = 1000; public static final int USERMESSAGE = 1000;

2
omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
View file

@ -423,7 +423,7 @@ public class AapsOmnipodManager {
} catch (CommandFailedAfterChangingDeliveryStatusException ex) { } catch (CommandFailedAfterChangingDeliveryStatusException ex) {
String comment = getStringResource(R.string.omnipod_cancelled_old_tbr_failed_to_set_new); String comment = getStringResource(R.string.omnipod_cancelled_old_tbr_failed_to_set_new);
addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, comment); addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, comment);
showNotification(comment, Notification.URGENT, null); showNotification(comment, Notification.NORMAL, null);
return new PumpEnactResult(injector).success(false).enacted(false).comment(comment); return new PumpEnactResult(injector).success(false).enacted(false).comment(comment);
} catch (DeliveryStatusVerificationFailedException ex) { } catch (DeliveryStatusVerificationFailedException ex) {
String comment; String comment;

3
omnipod/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsPodStateManagerTest.java
View file

@ -22,7 +22,8 @@ import static org.junit.Assert.assertEquals;
public class AapsPodStateManagerTest { public class AapsPodStateManagerTest {
@Mock AAPSLogger aapsLogger; @Mock AAPSLogger aapsLogger;
@Mock SP sp; @Mock SP sp;
@Mock RxBusWrapper rxBus;
private RxBusWrapper rxBus = new RxBusWrapper();
@Test @Test
public void times() { public void times() {