caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Quickfix to avoid crashes after staleData merge

Browse source
This commit is contained in:
AdrianLxM 2017-08-12 11:20:56 +02:00 committed by GitHub
parent 73b6235188
commit f861546e12
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/data/NSSettingsStatus.java
View file

@ -201,6 +201,7 @@ public class NSSettingsStatus {
private String getStringOrNull(String key) { private String getStringOrNull(String key) {
String ret = null; String ret = null;
if(data == null) return null;
if (data.has(key)) { if (data.has(key)) {
try { try {
ret = data.getString(key); ret = data.getString(key);
@ -309,6 +310,7 @@ public class NSSettingsStatus {
public JSONObject extentendedPumpSettings() { public JSONObject extentendedPumpSettings() {
try { try {
JSONObject extended = getExtendedSettings(); JSONObject extended = getExtendedSettings();
if(extended == null) return null;
if (extended.has("pump")) { if (extended.has("pump")) {
JSONObject pump = extended.getJSONObject("pump"); JSONObject pump = extended.getJSONObject("pump");
return pump; return pump;