From 51b51c159c71022d503761a4a71c42363d558be0 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Wed, 6 Dec 2017 12:01:04 +0100 Subject: [PATCH] Clean up earlier merge blunder. --- .../java/info/nightscout/androidaps/PreferencesActivity.java | 2 -- .../plugins/Overview/Dialogs/NewTreatmentDialog.java | 3 ++- .../nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java index 40983a0c19..14b1f099c1 100644 --- a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java +++ b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java @@ -173,8 +173,6 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre } */ - addPreferencesFromResourceIfEnabled(VirtualPumpPlugin.getPlugin(), PluginBase.PUMP); - addPreferencesFromResourceIfEnabled(InsulinOrefFreePeakPlugin.getPlugin(), PluginBase.INSULIN); addPreferencesFromResourceIfEnabled(NSClientInternalPlugin.getPlugin(), PluginBase.GENERAL); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java index b902da9b1b..5b18b7c385 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java @@ -108,12 +108,13 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene public synchronized void onClick(View view) { switch (view.getId()) { case R.id.ok: -if (okClicked){ + if (okClicked) { log.debug("guarding: ok already clicked"); dismiss(); return; } okClicked = true; + try { Double insulin = SafeParse.stringToDouble(editInsulin.getText()); final Integer carbs = SafeParse.stringToInt(editCarbs.getText()); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java index acaf26011c..87d8ccad5d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java @@ -357,6 +357,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface, } // Pump interface + @Override public boolean isInitialized() { return pump.lastConnection.getTime() > 0 && pump.maxBasal > 0;