Merge branch 'master' of https://github.com/NightscoutFoundation/xDrip

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/BaseCallback.java

@@ -1,5 +1,7 @@
 package com.eveningoutpost.dexdrip.cgm.nsfollow;
 
+import com.eveningoutpost.dexdrip.utils.framework.RetrofitService.BaseCallback;
+
 import retrofit2.Call;
 import retrofit2.Response;
 

app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutCallback.java

@@ -10,34 +10,19 @@
 import com.eveningoutpost.dexdrip.cgm.nsfollow.messages.Entry;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.utils.NightscoutUrl;
 import com.eveningoutpost.dexdrip.evaluators.MissedReadingsEstimator;
-import com.eveningoutpost.dexdrip.tidepool.InfoInterceptor;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonSyntaxException;
-import com.google.gson.TypeAdapter;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.internal.bind.TypeAdapters;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
+import com.eveningoutpost.dexdrip.utils.framework.RetrofitService;
+
 import java.util.List;
 
-import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;
-import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Call;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.Headers;
 import retrofit2.http.Query;
 
 import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
 import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
-import static com.eveningoutpost.dexdrip.utilitymodels.OkHttpWrapper.enableTls12OnPreLollipop;
 import static com.eveningoutpost.dexdrip.cgm.nsfollow.NightscoutFollowService.msg;
 
 /**
@@ -52,7 +37,6 @@ public class NightscoutFollow {
 
     private static final boolean D = true;
 
-    private static Retrofit retrofit;
     private static Nightscout service;
 
 
@@ -71,7 +55,7 @@ public interface Nightscout {
     private static Nightscout getService() {
         if (service == null) {
             try {
-                service = getRetrofitInstance().create(Nightscout.class);
+                service = RetrofitService.getRetrofitInstance(getUrl(), TAG, D).create(Nightscout.class);
             } catch (NullPointerException e) {
                 UserError.Log.e(TAG, "Null pointer trying to getService()");
             }
@@ -142,72 +126,8 @@ static boolean treatmentDownloadEnabled() {
         return Pref.getBooleanDefaultFalse("nsfollow_download_treatments");
     }
 
-    public static final TypeAdapter<Number> UNRELIABLE_INTEGER = new TypeAdapter<Number>() {
-        @Override
-        public Number read(JsonReader in) throws IOException {
-            JsonToken jsonToken = in.peek();
-            switch (jsonToken) {
-                case NUMBER:
-                case STRING:
-                    String s = in.nextString();
-                    try {
-                        return Integer.parseInt(s);
-                    } catch (NumberFormatException ignored) {
-                    }
-                    try {
-                        return (int)Double.parseDouble(s);
-                    } catch (NumberFormatException ignored) {
-                    }
-                    return null;
-                case NULL:
-                    in.nextNull();
-                    return null;
-                case BOOLEAN:
-                    in.nextBoolean();
-                    return null;
-                default:
-                    throw new JsonSyntaxException("Expecting number, got: " + jsonToken);
-            }
-        }
-        @Override
-        public void write(JsonWriter out, Number value) throws IOException {
-            out.value(value);
-        }
-    };
-    public static final TypeAdapterFactory UNRELIABLE_INTEGER_FACTORY = TypeAdapters.newFactory(int.class, Integer.class, UNRELIABLE_INTEGER);
-
-    // TODO make reusable
-    public static Retrofit getRetrofitInstance() throws IllegalArgumentException {
-        if (retrofit == null) {
-            final String url = getUrl();
-            if (emptyString(url)) {
-                UserError.Log.d(TAG, "Empty url - cannot create instance");
-                return null;
-            }
-            final HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor();
-            if (D) {
-                httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
-            }
-            final OkHttpClient client = enableTls12OnPreLollipop(new OkHttpClient.Builder())
-                    .addInterceptor(httpLoggingInterceptor)
-                    .addInterceptor(new InfoInterceptor(TAG))
-                    .addInterceptor(new GzipRequestInterceptor())
-                    .build();
-
-            final Gson gson = new GsonBuilder()
-                    .registerTypeAdapterFactory(UNRELIABLE_INTEGER_FACTORY)
-                    .create();
-            retrofit = new retrofit2.Retrofit.Builder()
-                    .baseUrl(url)
-                    .client(client)
-                    .addConverterFactory(GsonConverterFactory.create(gson))
-                    .build();
-        }
-        return retrofit;
-    }
-
     public static void resetInstance() {
-        retrofit = null;
+        RetrofitService.remove(getUrl(), TAG, D);
         service = null;
         UserError.Log.d(TAG, "Instance reset");
         CollectionServiceStarter.restartCollectionServiceBackground();

app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java

@@ -2,6 +2,7 @@
 
 import com.eveningoutpost.dexdrip.cgm.nsfollow.messages.Entry;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.utils.NightscoutUrl;
+import com.eveningoutpost.dexdrip.utils.framework.RetrofitService.BaseCallback;
 
 import java.util.List;
 

app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/Session.java

@@ -1,6 +1,6 @@
 package com.eveningoutpost.dexdrip.cgm.sharefollow;
 
-import com.eveningoutpost.dexdrip.cgm.nsfollow.BaseCallback;
+import com.eveningoutpost.dexdrip.utils.framework.RetrofitService.BaseCallback;
 
 import retrofit2.Call;
 import retrofit2.Response;

app/src/main/java/com/eveningoutpost/dexdrip/cgm/sharefollow/ShareFollowCallback.java

@@ -48,6 +48,7 @@
 import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -467,6 +468,11 @@ private boolean doRESTUpload(SharedPreferences prefs, List<BgReading> glucoseDat
         // Starting a loop run; resetting local failure and success flags
         boolean any_successes = false;
         boolean any_failures = false;
+        final long THIS_QUEUE = UploaderQueue.NIGHTSCOUT_RESTAPI;
+        List<UploaderQueue> tups = Collections.emptyList();
+        if (Pref.getBooleanDefaultFalse("send_treatments_to_nightscout")) {
+            tups = UploaderQueue.getPendingbyType(Treatments.class.getSimpleName(), THIS_QUEUE);
+        }
         for (String baseURI : baseURIs) {
             try {
                 baseURI = TryResolveName(baseURI);
@@ -495,7 +501,7 @@ private boolean doRESTUpload(SharedPreferences prefs, List<BgReading> glucoseDat
                 if (apiVersion == 1) {
                     String hashedSecret = Hashing.sha1().hashBytes(secret.getBytes(Charsets.UTF_8)).toString();
                     doStatusUpdate(nightscoutService, retrofit.baseUrl().url().toString(), hashedSecret); // update status if needed
-                    doRESTUploadTo(nightscoutService, hashedSecret, glucoseDataSets, meterRecords, calRecords);
+                    doRESTUploadTo(nightscoutService, hashedSecret, glucoseDataSets, meterRecords, calRecords, tups, THIS_QUEUE);
                 } else {
                     doLegacyRESTUploadTo(nightscoutService, glucoseDataSets);
                 }
@@ -542,7 +548,7 @@ private void doLegacyRESTUploadTo(NightscoutService nightscoutService, List<BgRe
         }
     }
 
-    private void doRESTUploadTo(NightscoutService nightscoutService, String secret, List<BgReading> glucoseDataSets, List<BloodTest> meterRecords, List<Calibration> calRecords) throws Exception {
+    private void doRESTUploadTo(NightscoutService nightscoutService, String secret, List<BgReading> glucoseDataSets, List<BloodTest> meterRecords, List<Calibration> calRecords, List<UploaderQueue> tups, long THIS_QUEUE) throws Exception {
         final JSONArray array = new JSONArray();
 
         for (BgReading record : glucoseDataSets) {
@@ -574,8 +580,8 @@ private void doRESTUploadTo(NightscoutService nightscoutService, String secret,
         }
 
         try {
-            if (Pref.getBooleanDefaultFalse("send_treatments_to_nightscout")) {
-                postTreatments(nightscoutService, secret);
+            if (!tups.isEmpty()) {
+                postTreatments(nightscoutService, secret, tups, THIS_QUEUE);
             } else {
                 Log.d(TAG, "Skipping treatment upload due to preference disabled");
             }
@@ -779,10 +785,8 @@ private void populateV1APITreatmentEntry(JSONArray array, Treatments treatment)
         array.put(record);
     }
 
-    private void postTreatments(NightscoutService nightscoutService, String apiSecret) throws Exception {
+    private void postTreatments(NightscoutService nightscoutService, String apiSecret, List<UploaderQueue> tups, long THIS_QUEUE) throws Exception {
         Log.d(TAG, "Processing treatments for RESTAPI");
-        final long THIS_QUEUE = UploaderQueue.NIGHTSCOUT_RESTAPI;
-        final List<UploaderQueue> tups = UploaderQueue.getPendingbyType(Treatments.class.getSimpleName(), THIS_QUEUE);
         if (tups != null) {
             JSONArray insert_array = new JSONArray();
             JSONArray upsert_array = new JSONArray();