caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Revert "Make the BolusProgress dialog a bit more self-contained."

Browse source 
Breaks dismissal of dialog (only one invocation of
EventDismissBolusprogressIfRunning also sets bolusEnded=true).

This reverts commit c11455dff1.
This commit is contained in:
Johannes Mockenhaupt 2017-09-09 18:16:13 +02:00
parent c11455dff1
commit 612efa6a13
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
View file

@ -455,6 +455,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain
result = activePump.deliverTreatment(detailedBolusInfo); result = activePump.deliverTreatment(detailedBolusInfo);
BolusProgressDialog.bolusEnded = true;
MainApp.bus().post(new EventDismissBolusprogressIfRunning(result)); MainApp.bus().post(new EventDismissBolusprogressIfRunning(result));
mWakeLock.release(); mWakeLock.release();

5
app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/BolusProgressDialog.java
View file

@ -33,8 +33,8 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
BolusProgressHelperActivity helperActivity; BolusProgressHelperActivity helperActivity;
static double amount; static double amount;
private static boolean bolusEnded = false; public static boolean bolusEnded = false;
private static boolean running = true; public static boolean running = true;
public BolusProgressDialog() { public BolusProgressDialog() {
super(); super();
@ -124,7 +124,6 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
@Subscribe @Subscribe
public void onStatusEvent(final EventDismissBolusprogressIfRunning ev) { public void onStatusEvent(final EventDismissBolusprogressIfRunning ev) {
if(BolusProgressDialog.running){ if(BolusProgressDialog.running){
bolusEnded = true;
dismiss(); dismiss();
} }
} }