caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #983 from jotomo/issue-939

Browse source 
WIP: Fix bolus progress dialog not closing with onPause/onResume cycle
This commit is contained in:
Milos Kozak 2018-05-02 23:20:29 +02:00 committed by GitHub
parent f8310d6974 79458a1c73
commit a35c925930
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/info/nightscout/androidaps/MainApp.java
View file

@ -245,12 +245,27 @@ public class MainApp extends Application {
} }
} }
public void stopKeepAliveService() { public void stopKeepAliveService() {
if (keepAliveReceiver != null) if (keepAliveReceiver != null)
KeepAliveReceiver.cancelAlarm(this); KeepAliveReceiver.cancelAlarm(this);
} }
public static void subscribe(Object subscriber) {
try {
bus().register(subscriber);
} catch (IllegalArgumentException e) {
// already registered
}
}
public static void unsubscribe(Object subscriber) {
try {
bus().unregister(subscriber);
} catch (IllegalArgumentException e) {
// already unregistered
}
}
public static Bus bus() { public static Bus bus() {
return sBus; return sBus;
} }

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

@ -42,7 +42,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
} }
public void setInsulin(double amount) { public void setInsulin(double amount) {
this.amount = amount; BolusProgressDialog.amount = amount;
bolusEnded = false; bolusEnded = false;
} }
@ -55,10 +55,10 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
Bundle savedInstanceState) { Bundle savedInstanceState) {
getDialog().setTitle(String.format(MainApp.gs(R.string.overview_bolusprogress_goingtodeliver), amount)); getDialog().setTitle(String.format(MainApp.gs(R.string.overview_bolusprogress_goingtodeliver), amount));
View view = inflater.inflate(R.layout.overview_bolusprogress_dialog, container, false); View view = inflater.inflate(R.layout.overview_bolusprogress_dialog, container, false);
stopButton = (Button) view.findViewById(R.id.overview_bolusprogress_stop); stopButton = view.findViewById(R.id.overview_bolusprogress_stop);
statusView = (TextView) view.findViewById(R.id.overview_bolusprogress_status); statusView = view.findViewById(R.id.overview_bolusprogress_status);
stopPressedView = (TextView) view.findViewById(R.id.overview_bolusprogress_stoppressed); stopPressedView = view.findViewById(R.id.overview_bolusprogress_stoppressed);
progressBar = (ProgressBar) view.findViewById(R.id.overview_bolusprogress_progressbar); progressBar = view.findViewById(R.id.overview_bolusprogress_progressbar);
stopButton.setOnClickListener(this); stopButton.setOnClickListener(this);
progressBar.setMax(100); progressBar.setMax(100);
statusView.setText(MainApp.gs(R.string.waitingforpump)); statusView.setText(MainApp.gs(R.string.waitingforpump));
@ -70,16 +70,25 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (getDialog() != null) if (bolusEnded) {
getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); dismiss();
MainApp.bus().register(this); } else {
running = true; if (getDialog() != null)
if (bolusEnded) dismiss(); getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
MainApp.subscribe(this);
running = true;
}
} }
@Override @Override
public void dismiss() { public void dismiss() {
super.dismiss(); try {
super.dismiss();
} catch (IllegalStateException e) {
// dialog not running yet. onResume will try again. Set bolusEnded to make extra
// sure onResume will catch this
bolusEnded = true;
}
if (helperActivity != null) { if (helperActivity != null) {
helperActivity.finish(); helperActivity.finish();
} }
@ -88,7 +97,7 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
MainApp.bus().unregister(this); MainApp.unsubscribe(this);
running = false; running = false;
} }
@ -109,16 +118,13 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
public void onStatusEvent(final EventOverviewBolusProgress ev) { public void onStatusEvent(final EventOverviewBolusProgress ev) {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) { if (activity != null) {
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(() -> {
@Override log.debug("Status: " + ev.status + " Percent: " + ev.percent);
public void run() { statusView.setText(ev.status);
log.debug("Status: " + ev.status + " Percent: " + ev.percent); progressBar.setProgress(ev.percent);
statusView.setText(ev.status); if (ev.percent == 100) {
progressBar.setProgress(ev.percent); stopButton.setVisibility(View.INVISIBLE);
if (ev.percent == 100) { scheduleDismiss();
stopButton.setVisibility(View.INVISIBLE);
scheduleDismiss();
}
} }
}); });
} }
@ -133,41 +139,25 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
@Subscribe @Subscribe
public void onStatusEvent(final EventPumpStatusChanged c) { public void onStatusEvent(final EventPumpStatusChanged c) {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) { if (activity != null) {
activity.runOnUiThread( activity.runOnUiThread(() -> statusView.setText(c.textStatus()));
new Runnable() {
@Override
public void run() {
statusView.setText(c.textStatus());
}
}
);
} }
} }
private void scheduleDismiss() { private void scheduleDismiss() {
Thread t = new Thread(new Runnable() { Thread t = new Thread(() -> {
@Override SystemClock.sleep(5000);
public void run() { BolusProgressDialog.bolusEnded = true;
SystemClock.sleep(5000); Activity activity = getActivity();
BolusProgressDialog.bolusEnded = true; if (activity != null) {
Activity activity = getActivity(); activity.runOnUiThread(() -> {
if (activity != null) { try {
activity.runOnUiThread( dismiss();
new Runnable() { } catch (Exception e) {
@Override log.error("Unhandled exception", e);
public void run() { }
try { });
dismiss();
} catch (Exception e) {
log.error("Unhandled exception", e);
}
}
});
}
} }
}); });
t.start(); t.start();