caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Clean up earlier merge blunder.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-12-06 12:01:04 +01:00
parent b548d092d1
commit 51b51c159c
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
View file

@ -173,8 +173,6 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
} }
*/ */
addPreferencesFromResourceIfEnabled(VirtualPumpPlugin.getPlugin(), PluginBase.PUMP);
addPreferencesFromResourceIfEnabled(InsulinOrefFreePeakPlugin.getPlugin(), PluginBase.INSULIN); addPreferencesFromResourceIfEnabled(InsulinOrefFreePeakPlugin.getPlugin(), PluginBase.INSULIN);
addPreferencesFromResourceIfEnabled(NSClientInternalPlugin.getPlugin(), PluginBase.GENERAL); addPreferencesFromResourceIfEnabled(NSClientInternalPlugin.getPlugin(), PluginBase.GENERAL);

3
app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
View file

@ -108,12 +108,13 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
public synchronized void onClick(View view) { public synchronized void onClick(View view) {
switch (view.getId()) { switch (view.getId()) {
case R.id.ok: case R.id.ok:
if (okClicked){ if (okClicked) {
log.debug("guarding: ok already clicked"); log.debug("guarding: ok already clicked");
dismiss(); dismiss();
return; return;
} }
okClicked = true; okClicked = true;
try { try {
Double insulin = SafeParse.stringToDouble(editInsulin.getText()); Double insulin = SafeParse.stringToDouble(editInsulin.getText());
final Integer carbs = SafeParse.stringToInt(editCarbs.getText()); final Integer carbs = SafeParse.stringToInt(editCarbs.getText());

1
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java
View file

@ -357,6 +357,7 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
} }
// Pump interface // Pump interface
@Override @Override
public boolean isInitialized() { public boolean isInitialized() {
return pump.lastConnection.getTime() > 0 && pump.maxBasal > 0; return pump.lastConnection.getTime() > 0 && pump.maxBasal > 0;