From a76774c20c624c883b636e451d19fc7977adde72 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Tue, 27 Jun 2017 16:26:44 +0200
Subject: [PATCH] Bugfix: fix more instances where sgvDate is desired.
---
.../java/info/nightscout/android/medtronic/MainActivity.java | 1 +
.../android/medtronic/service/MedtronicCnlIntentService.java | 2 +-
.../upload/nightscout/serializer/EntriesSerializer.java | 4 +++-
.../android/xdrip_plus/XDripPlusUploadIntentService.java | 4 ++--
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
index 82e3026..05ec2e5 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
@@ -112,6 +112,7 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
* @param pumpStatusData
* @return timestamp
*/
+ // TODO remove code duplication; this method and MdtCnlIntentService.scheduleNextPoll
public static long getNextPoll(PumpStatusEvent pumpStatusData) {
long nextPoll = pumpStatusData.getSgvDate().getTime() + pumpStatusData.getPumpTimeOffset(),
now = System.currentTimeMillis(),
diff --git a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
index 943c22e..94e7ced 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
@@ -229,7 +229,7 @@ public class MedtronicCnlIntentService extends IntentService {
if (pumpOffset > 0) {
offsetSign = "+";
}
- sendStatus("SGV: " + MainActivity.strFormatSGV(pumpRecord.getSgv()) + " At: " + df.format(pumpRecord.getEventDate().getTime()) + " Pump: " + offsetSign + (pumpOffset / 1000L) + "sec"); //note: event time is currently stored with offset
+ sendStatus("SGV: " + MainActivity.strFormatSGV(pumpRecord.getSgv()) + " At: " + df.format(pumpRecord.getSgvDate().getTime()) + " Pump: " + offsetSign + (pumpOffset / 1000L) + "sec"); //note: event time is currently stored with offset
// Check if pump sent old event when new expected
if (pumpRecord != null &&
diff --git a/app/src/main/java/info/nightscout/android/upload/nightscout/serializer/EntriesSerializer.java b/app/src/main/java/info/nightscout/android/upload/nightscout/serializer/EntriesSerializer.java
index ce79ab7..c33c6e1 100644
--- a/app/src/main/java/info/nightscout/android/upload/nightscout/serializer/EntriesSerializer.java
+++ b/app/src/main/java/info/nightscout/android/upload/nightscout/serializer/EntriesSerializer.java
@@ -71,6 +71,8 @@ public class EntriesSerializer implements JsonSerializer<PumpStatusEvent> {
}
}
+ // TODO currentnly unused, see info.nightscout.android.xdrip_plus.XDripPlusUploadIntentService.addSgvEntry()
+ // TODO also, proper method name
@Override
public JsonElement serialize(PumpStatusEvent src, Type typeOfSrc, JsonSerializationContext context) {
final JsonObject jsonObject = new JsonObject();
@@ -78,7 +80,7 @@ public class EntriesSerializer implements JsonSerializer<PumpStatusEvent> {
jsonObject.addProperty("direction", getDirectionString(src.getCgmTrend()));
jsonObject.addProperty("device", src.getDeviceName());
jsonObject.addProperty("type", "sgv");
- jsonObject.addProperty("date", src.getEventDate().getTime());
+ jsonObject.addProperty("date", src.getSgvDate().getTime());
jsonObject.addProperty("dateString", String.valueOf(src.getEventDate()));
return jsonObject;
diff --git a/app/src/main/java/info/nightscout/android/xdrip_plus/XDripPlusUploadIntentService.java b/app/src/main/java/info/nightscout/android/xdrip_plus/XDripPlusUploadIntentService.java
index 20a1183..e06a88b 100644
--- a/app/src/main/java/info/nightscout/android/xdrip_plus/XDripPlusUploadIntentService.java
+++ b/app/src/main/java/info/nightscout/android/xdrip_plus/XDripPlusUploadIntentService.java
@@ -145,8 +145,8 @@ public class XDripPlusUploadIntentService extends IntentService {
json.put("direction", EntriesSerializer.getDirectionString(pumpRecord.getCgmTrend()));
json.put("device", pumpRecord.getDeviceName());
json.put("type", "sgv");
- json.put("date", pumpRecord.getEventDate().getTime());
- json.put("dateString", pumpRecord.getEventDate());
+ json.put("date", pumpRecord.getSgvDate().getTime());
+ json.put("dateString", pumpRecord.getSgvDate());
entriesArray.put(json);
}
--
GitLab