caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Make accessing pump/cmd state in Fragment safer.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-07-20 18:28:57 +02:00
parent cb8a22582a
commit 46b1dff334
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
View file

@ -109,33 +109,33 @@ public class ComboFragment extends Fragment implements View.OnClickListener {
statusText.setText(getPlugin().statusSummary); statusText.setText(getPlugin().statusSummary);
if (getPlugin().isInitialized()) { if (getPlugin().isInitialized()) {
PumpState ps = getPlugin().pumpState; PumpState ps = getPlugin().pumpState;
if (ps == null) { if (ps != null) {
return; boolean tbrActive = ps.tbrPercent != -1 && ps.tbrPercent != 100;
} if (tbrActive) {
boolean tbrActive = ps.tbrPercent != -1 && ps.tbrPercent != 100; tbrPercentageText.setText("" + ps.tbrPercent + "%");
if (tbrActive) { tbrDurationText.setText("" + ps.tbrRemainingDuration + " min");
tbrPercentageText.setText("" + ps.tbrPercent + "%"); tbrRateText.setText("" + ps.tbrRate + " U/h");
tbrDurationText.setText("" + ps.tbrRemainingDuration + " min");
tbrRateText.setText("" + ps.tbrRate + " U/h");
} else {
tbrPercentageText.setText("Default basal rate running");
tbrDurationText.setText("");
tbrRateText.setText("" + getPlugin().getBaseBasalRate() + " U/h");
}
pumpErrorText.setText(ps.errorMsg != null ? ps.errorMsg :"");
if (getPlugin().lastCmd != null) {
lastCmdText.setText("" + getPlugin().lastCmd);
lastCmdTimeText.setText(getPlugin().lastCmdTime.toLocaleString());
CommandResult lastCmdResult = getPlugin().lastCmdResult;
if (lastCmdResult != null) {
String message = lastCmdResult.message;
lastCmdResultText.setText(message != null ? message : "");
} else { } else {
lastCmdResultText.setText(""); tbrPercentageText.setText("Default basal rate running");
tbrDurationText.setText("");
tbrRateText.setText("" + getPlugin().getBaseBasalRate() + " U/h");
} }
pumpErrorText.setText(ps.errorMsg != null ? ps.errorMsg : "");
}
Command lastCmd = getPlugin().lastCmd;
if (lastCmd != null) {
lastCmdText.setText(lastCmd.toString());
lastCmdTimeText.setText(getPlugin().lastCmdTime.toLocaleString());
} else { } else {
ComboFragment.this.lastCmdText.setText(""); lastCmdText.setText("");
lastCmdTimeText.setText(""); lastCmdTimeText.setText("");
}
CommandResult lastCmdResult = getPlugin().lastCmdResult;
if (lastCmdResult != null && lastCmdResult.message != null) {
lastCmdResultText.setText(lastCmdResult.message);
} else {
lastCmdResultText.setText(""); lastCmdResultText.setText("");
} }
} }