From 2dd428527ad92d78b710d55adfa92d572ef0ec2b Mon Sep 17 00:00:00 2001
From: Volker Richert <v.richert@addmore.de>
Date: Wed, 29 Mar 2017 16:39:45 +0200
Subject: [PATCH] add check on successfull while pushing to NS rename bolusApi
to bolusEndpoints to be consistant
---
.../upload/nightscout/NightScoutUpload.java | 22 ++++++++++++-------
.../java/info/nightscout/api/UploadApi.java | 9 ++++----
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/info/nightscout/android/upload/nightscout/NightScoutUpload.java b/app/src/main/java/info/nightscout/android/upload/nightscout/NightScoutUpload.java
index 790bf02..4fe14f2 100644
--- a/app/src/main/java/info/nightscout/android/upload/nightscout/NightScoutUpload.java
+++ b/app/src/main/java/info/nightscout/android/upload/nightscout/NightScoutUpload.java
@@ -27,6 +27,9 @@ import info.nightscout.api.DeviceEndpoints.Battery;
import info.nightscout.api.DeviceEndpoints.PumpStatus;
import info.nightscout.api.DeviceEndpoints.PumpInfo;
import info.nightscout.api.DeviceEndpoints.DeviceStatus;
+import okhttp3.ResponseBody;
+import retrofit2.Response;
+import retrofit2.Retrofit;
class NightScoutUpload {
@@ -59,7 +62,7 @@ class NightScoutUpload {
UploadApi uploadApi = new UploadApi(baseURL, formToken(secret));
boolean eventsUploaded = uploadEvents(uploadApi.getGlucoseEndpoints(),
- uploadApi.getBolusApi(),
+ uploadApi.getBolusEndpoints(),
records);
boolean deviceStatusUploaded = uploadDeviceStatus(uploadApi.getDeviceEndpoints(),
@@ -103,15 +106,16 @@ class NightScoutUpload {
}
+ boolean uploaded = true;
if (glucoseEntries.size() > 0) {
- glucoseEndpoints.sendEntries(glucoseEntries).execute();
+ Response<ResponseBody> result = glucoseEndpoints.sendEntries(glucoseEntries).execute();
+ uploaded = uploaded && result.isSuccessful();
}
if (bolusEntries.size() > 0) {
- bolusEndpoints.sendEntries(bolusEntries).execute();
+ Response<ResponseBody> result = bolusEndpoints.sendEntries(bolusEntries).execute();
+ uploaded = uploaded && result.isSuccessful();
}
-
-
- return true;
+ return uploaded;
}
private boolean uploadDeviceStatus(DeviceEndpoints deviceEndpoints,
@@ -152,11 +156,13 @@ class NightScoutUpload {
deviceEntries.add(deviceStatus);
}
+ boolean uploaded = true;
for (DeviceStatus status : deviceEntries) {
- deviceEndpoints.sendDeviceStatus(status).execute();
+ Response<ResponseBody> result = deviceEndpoints.sendDeviceStatus(status).execute();
+ uploaded = uploaded && result.isSuccessful();
}
- return true;
+ return uploaded;
}
@NonNull
diff --git a/app/src/main/java/info/nightscout/api/UploadApi.java b/app/src/main/java/info/nightscout/api/UploadApi.java
index 1c429b7..165203f 100644
--- a/app/src/main/java/info/nightscout/api/UploadApi.java
+++ b/app/src/main/java/info/nightscout/api/UploadApi.java
@@ -15,15 +15,15 @@ import retrofit2.converter.gson.GsonConverterFactory;
public class UploadApi {
private Retrofit retrofit;
private GlucoseEndpoints glucoseEndpoints;
- private BolusEndpoints bolusApi;
+ private BolusEndpoints bolusEndpoints;
private DeviceEndpoints deviceEndpoints;
public GlucoseEndpoints getGlucoseEndpoints() {
return glucoseEndpoints;
}
- public BolusEndpoints getBolusApi() {
- return bolusApi;
+ public BolusEndpoints getBolusEndpoints() {
+ return bolusEndpoints;
}
public DeviceEndpoints getDeviceEndpoints() {
@@ -71,8 +71,7 @@ public class UploadApi {
.build();
glucoseEndpoints = retrofit.create(GlucoseEndpoints.class);
- bolusApi = retrofit.create(BolusEndpoints.class);
+ bolusEndpoints = retrofit.create(BolusEndpoints.class);
deviceEndpoints = retrofit.create(DeviceEndpoints.class);
-
}
}
--
GitLab