diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 53608dc..1cb9e38 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,10 +10,8 @@
-
-
-
+
@@ -37,8 +35,8 @@
-
-
+
+
@@ -48,11 +46,11 @@
-
-
+
+
-
-
+
+
@@ -60,24 +58,24 @@
-
-
+
+
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
@@ -1783,6 +1781,7 @@
+
@@ -2137,7 +2136,7 @@
-
+
@@ -2742,16 +2741,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -2832,26 +2821,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2899,16 +2868,42 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -2917,11 +2912,13 @@
-
+
-
-
-
+
+
+
+
+
diff --git a/app/src/main/java/info/nightscout/android/upload/UploadHelper.java b/app/src/main/java/info/nightscout/android/upload/UploadHelper.java
index 13505ea..a9df4ed 100644
--- a/app/src/main/java/info/nightscout/android/upload/UploadHelper.java
+++ b/app/src/main/java/info/nightscout/android/upload/UploadHelper.java
@@ -87,7 +87,7 @@ public class UploadHelper extends AsyncTask {
public MongoCollection deviceData = null;
public MongoCollection dsCollection = null;
public static Boolean isModifyingRecords = false;
- public static Object isModifyingRecordsLock = new Object();
+ public static final Object isModifyingRecordsLock = new Object();
private MongoClient client = null;
public UploadHelper(Context context) {
this(context, Medtronic640gActivity.DEXCOMG4);
@@ -516,7 +516,7 @@ private void doRESTUploadTo(String baseURI, Record[] records) {
String jsonString = json.toString();
- Log.i(TAG, "DEXCOM JSON: " + jsonString);
+ Log.i(TAG, "Upload JSON: " + jsonString);
log.debug("JSON to Upload "+ jsonString);
try {
@@ -589,8 +589,8 @@ private void doRESTUploadTo(String baseURI, Record[] records) {
String jsonString = json.toString();
- Log.i(TAG, "DEXCOM JSON: " + jsonString);
- log.info("DEXCOM JSON: " + jsonString);
+ Log.i(TAG, "Upload JSON: " + jsonString);
+ log.info("Upload JSON: " + jsonString);
try {
StringEntity se = new StringEntity(jsonString);
@@ -614,7 +614,6 @@ private void doRESTUploadTo(String baseURI, Record[] records) {
log.warn( "Unable to post data to: '" + post.getURI().toString() + "'", e);
}
}
- postDeviceStatus(baseURL, httpclient);
} catch (Exception e) {
Log.e(TAG, "Unable to post data", e);
log.error("Unable to post data", e);
@@ -689,6 +688,8 @@ private void postDeviceStatus(String baseURL, DefaultHttpClient httpclient) thro
pumpInfo.put( "battery", battery );
json.put( "pump", pumpInfo );
String jsonString = json.toString();
+ Log.i(TAG, "Device Status JSON: " + jsonString);
+ log.debug("Device Status JSON: "+ jsonString);
HttpPost post = new HttpPost(devicestatusURL);
StringEntity se = new StringEntity(jsonString);