From 8a5c82cb2c5ffcfb50e7a868b012f6093ef2ed9b Mon Sep 17 00:00:00 2001
From: Pogman <subaziro@gmail.com>
Date: Thu, 30 Mar 2017 23:01:38 +0100
Subject: [PATCH] conflict
---
.../nightscout/android/medtronic/MedtronicCnlReader.java | 2 ++
.../main/java/info/nightscout/android/utils/DataStore.java | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/info/nightscout/android/medtronic/MedtronicCnlReader.java b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCnlReader.java
index 5132673..69106aa 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/MedtronicCnlReader.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MedtronicCnlReader.java
@@ -173,6 +173,7 @@ public class MedtronicCnlReader {
Log.d(TAG, "Begin getPumpTime");
PumpTimeResponseMessage response = new PumpTimeRequestMessage(mPumpSession).send(mDevice);
+
Log.d(TAG, "Finished getPumpTime with date " + response.getPumpTime());
return response.getPumpTime();
}
@@ -182,6 +183,7 @@ public class MedtronicCnlReader {
PumpStatusResponseMessage response = new PumpStatusRequestMessage(mPumpSession).send(mDevice);
response.updatePumpRecord(pumpRecord);
+
Log.d(TAG, "Finished updatePumpStatus");
return pumpRecord;
}
diff --git a/app/src/main/java/info/nightscout/android/utils/DataStore.java b/app/src/main/java/info/nightscout/android/utils/DataStore.java
index db6bcd8..a61fbf7 100644
--- a/app/src/main/java/info/nightscout/android/utils/DataStore.java
+++ b/app/src/main/java/info/nightscout/android/utils/DataStore.java
@@ -42,7 +42,10 @@ public class DataStore {
}
public void setLastPumpStatus(PumpStatusEvent lastPumpStatus) {
- this.lastPumpStatus = Realm.getDefaultInstance().copyFromRealm(lastPumpStatus);
+ Realm realm = Realm.getDefaultInstance();
+
+ this.lastPumpStatus = realm.copyFromRealm(lastPumpStatus);
+ if (!realm.isClosed()) realm.close();
}
public int getUplooaderBatteryLevel() {
--
GitLab