Make the BolusProgress dialog a bit more self-contained.
(cherry picked from commit 75db72a)
This commit is contained in:
parent
c227e0e5fa
commit
c11455dff1
|
@ -455,7 +455,6 @@ 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();
|
||||||
|
|
|
@ -33,8 +33,8 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
|
||||||
BolusProgressHelperActivity helperActivity;
|
BolusProgressHelperActivity helperActivity;
|
||||||
|
|
||||||
static double amount;
|
static double amount;
|
||||||
public static boolean bolusEnded = false;
|
private static boolean bolusEnded = false;
|
||||||
public static boolean running = true;
|
private static boolean running = true;
|
||||||
|
|
||||||
public BolusProgressDialog() {
|
public BolusProgressDialog() {
|
||||||
super();
|
super();
|
||||||
|
@ -124,6 +124,7 @@ 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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue