From 08d677b80621e40bf2aecdaf2333e4b65cb6702f Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 3 Jul 2016 17:42:17 +0200
Subject: [PATCH] ns upload entered by fix

---
 .idea/misc.xml                                                  | 2 +-
 .../plugins/Careportal/Dialogs/NewNSTreatmentDialog.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981032..fbb68289f4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <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">
+  <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">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
index b5a54b1871..b3b89cb503 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
@@ -524,7 +524,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
                 prebolus.put("carbs", data.get("carbs"));
                 data.remove("carbs");
                 prebolus.put("eventType", data.get("eventType"));
-                prebolus.put("enteredBy", data.get("enteredBy"));
+                if (data.has("enteredBy")) prebolus.put("enteredBy", data.get("enteredBy"));
                 if (data.has("notes")) prebolus.put("notes", data.get("notes"));
                 long mills = DateUtil.fromISODateString(data.getString("created_at")).getTime();
                 Date preBolusDate = new Date(mills + data.getInt("preBolus") * 60000L);