caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix null object reference

Browse source
This commit is contained in:
Milos Kozak 2016-07-15 23:27:42 +02:00
parent b69dc35716
commit ce7cddc1da
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml
View file

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

7
app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
View file

@ -432,14 +432,19 @@ public class ConfigBuilderFragment extends Fragment implements PluginBase, PumpI
return result; return result;
} }
@Nullable
@Override @Override
public JSONObject getJSONStatus() { public JSONObject getJSONStatus() {
if (activePump != null)
return activePump.getJSONStatus(); return activePump.getJSONStatus();
else return null;
} }
@Override @Override
public String deviceID() { public String deviceID() {
if (activePump != null)
return activePump.deviceID(); return activePump.deviceID();
else return "Unknown";
} }
/* /*
@ -1015,6 +1020,7 @@ public class ConfigBuilderFragment extends Fragment implements PluginBase, PumpI
deviceStatus.enacted.put("requested", requested); deviceStatus.enacted.put("requested", requested);
} }
} }
if (getActivePump() != null) {
deviceStatus.device = "openaps://" + getActivePump().deviceID(); deviceStatus.device = "openaps://" + getActivePump().deviceID();
deviceStatus.pump = getActivePump().getJSONStatus(); deviceStatus.pump = getActivePump().getJSONStatus();
@ -1022,6 +1028,7 @@ public class ConfigBuilderFragment extends Fragment implements PluginBase, PumpI
deviceStatus.sendToNSClient(); deviceStatus.sendToNSClient();
lastDeviceStatusUpload = new Date(); lastDeviceStatusUpload = new Date();
}
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
} }