caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Revert merge which was committed due to a misunderstanding.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-08-06 21:47:17 +02:00 committed by Sandra Keßler
parent 6dba4e4956
commit 089295188f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -533,7 +533,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
} }
@Override @Override
public PumpEnactResult cancelTempBasal(boolean userRequested) { public PumpEnactResult cancelTempBasal() {
log.debug("cancelTempBasal called"); log.debug("cancelTempBasal called");
CommandResult commandResult = null; CommandResult commandResult = null;
@ -578,14 +578,14 @@ public class ComboPlugin implements PluginBase, PumpInterface {
if (tempBasal != null) { if (tempBasal != null) {
ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder(); ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder();
treatmentsInterface.addToHistoryTempBasal(tempBasal); treatmentsInterface.addToHistoryTempBasal(tempStop);
} }
if (commandResult != null) { PumpEnactResult pumpEnactResult = new PumpEnactResult();
pumpEnactResult.success = commandResult.success; pumpEnactResult.success = commandResult.success;
pumpEnactResult.enacted = commandResult.enacted; pumpEnactResult.enacted = commandResult.enacted;
pumpEnactResult.comment = commandResult.message; pumpEnactResult.comment = commandResult.message;
} pumpEnactResult.isTempCancel = true;
return pumpEnactResult; return pumpEnactResult;
} }