caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1000 from MilosKozak/bolusprogress-dismiss

Browse source 
IDEA: dismiss bolus progress dialog when Queue is empty
This commit is contained in:
AdrianLxM 2018-05-04 19:03:11 +02:00 committed by GitHub
commit f511b9ed39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,6 +70,9 @@ public class BolusProgressDialog extends DialogFragment implements View.OnClickL
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if(!ConfigBuilderPlugin.getCommandQueue().bolusInQueue()) {
bolusEnded = true;
}
if (bolusEnded) { if (bolusEnded) {
dismiss(); dismiss();
} else { } else {

12
app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
View file

@ -162,8 +162,18 @@ public class CommandQueue {
tempCommandQueue.readStatus(reason, callback); tempCommandQueue.readStatus(reason, callback);
} }
public synchronized boolean bolusInQueue(){
if(isRunning(Command.CommandType.BOLUS)) return true;
for (int i = 0; i < queue.size(); i++) {
if (queue.get(i).commandType == Command.CommandType.BOLUS) {
return true;
}
}
return false;
}
// returns true if command is queued // returns true if command is queued
public boolean bolus(DetailedBolusInfo detailedBolusInfo, Callback callback) { public synchronized boolean bolus(DetailedBolusInfo detailedBolusInfo, Callback callback) {
Command.CommandType type = detailedBolusInfo.isSMB ? Command.CommandType.SMB_BOLUS : Command.CommandType.BOLUS; Command.CommandType type = detailedBolusInfo.isSMB ? Command.CommandType.SMB_BOLUS : Command.CommandType.BOLUS;
if(type.equals(Command.CommandType.BOLUS) && detailedBolusInfo.carbs > 0 && detailedBolusInfo.insulin == 0){ if(type.equals(Command.CommandType.BOLUS) && detailedBolusInfo.carbs > 0 && detailedBolusInfo.insulin == 0){