Skip to content
Snippets Groups Projects
Commit 8a5c82cb authored by Pogman's avatar Pogman
Browse files

conflict

parent e0dad179
No related branches found
No related tags found
No related merge requests found
......@@ -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;
}
......
......@@ -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() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment