caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

check for NPE

Browse source
This commit is contained in:
Milos Kozak 2018-06-20 23:56:38 +02:00
parent af8e1fb32f
commit a02961da61
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
View file

@ -1470,14 +1470,19 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
profileSwitch.profileJson = trJson.getString("profileJson"); profileSwitch.profileJson = trJson.getString("profileJson");
else { else {
ProfileStore store = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile(); ProfileStore store = MainApp.getConfigBuilder().getActiveProfileInterface().getProfile();
Profile profile = store.getSpecificProfile(profileSwitch.profileName); if (store != null) {
if (profile != null) { Profile profile = store.getSpecificProfile(profileSwitch.profileName);
profileSwitch.profileJson = profile.getData().toString(); if (profile != null) {
log.debug("Profile switch prefilled with JSON from local store"); profileSwitch.profileJson = profile.getData().toString();
// Update data in NS log.debug("Profile switch prefilled with JSON from local store");
NSUpload.updateProfileSwitch(profileSwitch); // Update data in NS
NSUpload.updateProfileSwitch(profileSwitch);
} else {
log.debug("JSON for profile switch doesn't exist. Ignoring: " + trJson.toString());
return;
}
} else { } else {
log.debug("JSON for profile switch doesn't exist. Ignoring: " + trJson.toString()); log.debug("Store for profile switch doesn't exist. Ignoring: " + trJson.toString());
return; return;
} }
} }