From bbf15f471ac4a5e79348e872f3baec442a8e7f77 Mon Sep 17 00:00:00 2001 From: Navid200 <51497406+Navid200@users.noreply.github.com> Date: Tue, 17 Dec 2024 22:22:03 -0500 Subject: [PATCH 1/3] Retire sensor location setting --- .../com/eveningoutpost/dexdrip/NewSensorLocation.java | 4 ++-- .../java/com/eveningoutpost/dexdrip/StartNewSensor.java | 6 +----- .../dexdrip/utilitymodels/IdempotentMigrations.java | 1 + app/src/main/res/xml/pref_advanced_settings.xml | 9 --------- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/NewSensorLocation.java b/app/src/main/java/com/eveningoutpost/dexdrip/NewSensorLocation.java index aeca18aa4e..46c9134d9b 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/NewSensorLocation.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/NewSensorLocation.java @@ -116,7 +116,7 @@ public void onClick(View v) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - prefs.edit().putBoolean("store_sensor_location", !DontAskAgain.isChecked()).apply(); + // prefs.edit().putBoolean("store_sensor_location", !DontAskAgain.isChecked()).apply(); Intent intent = new Intent(getApplicationContext(), Home.class); startActivity(intent); @@ -129,7 +129,7 @@ public void onClick(View v) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - prefs.edit().putBoolean("store_sensor_location", !DontAskAgain.isChecked()).apply(); + // prefs.edit().putBoolean("store_sensor_location", !DontAskAgain.isChecked()).apply(); Intent intent = new Intent(getApplicationContext(), Home.class); startActivity(intent); diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/StartNewSensor.java b/app/src/main/java/com/eveningoutpost/dexdrip/StartNewSensor.java index c01bb1791b..a3688c2805 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/StartNewSensor.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/StartNewSensor.java @@ -224,11 +224,7 @@ private void startSensorAndSetIntent() { startSensorForTime(startTime); Intent intent; - if (Pref.getBoolean("store_sensor_location", false) && Experience.gotData()) { - intent = new Intent(getApplicationContext(), NewSensorLocation.class); - } else { - intent = new Intent(getApplicationContext(), Home.class); - } + intent = new Intent(getApplicationContext(), Home.class); startActivity(intent); finish(); diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java index f38fe38bb9..7eb7abc0a7 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java @@ -157,6 +157,7 @@ private static void legacySettingsFix() { Pref.setBoolean("run_ble_scan_constantly", false); Pref.setBoolean("run_G5_ble_tasks_on_uithread", false); Pref.setBoolean("ob1_initiate_bonding_flag", true); + Pref.setBoolean("store_sensor_location", false); } private static void legacySettingsMoveLanguageFromNoToNb() { // Check if the user's language preference is set to "no" diff --git a/app/src/main/res/xml/pref_advanced_settings.xml b/app/src/main/res/xml/pref_advanced_settings.xml index b06ee2d9df..1ef58aec09 100644 --- a/app/src/main/res/xml/pref_advanced_settings.xml +++ b/app/src/main/res/xml/pref_advanced_settings.xml @@ -1618,15 +1618,6 @@ android:title="@string/title_NOT_FOR_PRODUCTION_USE" /> - - - From da311e14b412871a03066e57d97de92e5ca51d0e Mon Sep 17 00:00:00 2001 From: Navid200 <51497406+Navid200@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:26:37 -0500 Subject: [PATCH 2/3] Daily intent service no charging requirement --- .../java/com/eveningoutpost/dexdrip/utils/jobs/DailyJob.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/DailyJob.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/DailyJob.java index 77a57976b7..029ed38a83 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/DailyJob.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/jobs/DailyJob.java @@ -37,7 +37,8 @@ public static void schedule() { new JobRequest.Builder(TAG) .setPeriodic(Constants.DAY_IN_MS, Constants.HOUR_IN_MS * 12) .setRequiresDeviceIdle(true) - .setRequiresCharging(true) +// .setRequiresCharging(true) // If the battery level is not low, we should run even if it is not being charged. + .setRequiresBatteryNotLow(true) .setRequiredNetworkType(JobRequest.NetworkType.UNMETERED) .setUpdateCurrent(true) .build() From a03a1cc746353734696302eb7871a0962a247608 Mon Sep 17 00:00:00 2001 From: Navid200 <51497406+Navid200@users.noreply.github.com> Date: Sat, 28 Dec 2024 15:18:17 -0500 Subject: [PATCH 3/3] Auto Format Code - NightscoutUploader --- .../utilitymodels/NightscoutUploader.java | 898 +++++++++--------- 1 file changed, 452 insertions(+), 446 deletions(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutUploader.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutUploader.java index 21e18b8f32..f466fdbf4a 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutUploader.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutUploader.java @@ -89,100 +89,100 @@ */ public class NightscoutUploader { - private static final String TAG = NightscoutUploader.class.getSimpleName(); - private static final int SOCKET_TIMEOUT = 60000; - private static final int CONNECTION_TIMEOUT = 30000; - private static final boolean d = false; - private static final boolean USE_GZIP = true; // conditional inside interceptor - public static final String VIA_NIGHTSCOUT_LOADER_TAG = "Nightscout Loader"; + private static final String TAG = NightscoutUploader.class.getSimpleName(); + private static final int SOCKET_TIMEOUT = 60000; + private static final int CONNECTION_TIMEOUT = 30000; + private static final boolean d = false; + private static final boolean USE_GZIP = true; // conditional inside interceptor + public static final String VIA_NIGHTSCOUT_LOADER_TAG = "Nightscout Loader"; - public static long last_success_time = -1; - public static long last_exception_time = -1; - public static int last_exception_count = 0; - public static int last_exception_log_count = 0; - public static String last_exception; - public static final String VIA_NIGHTSCOUT_TAG = "via Nightscout"; + public static long last_success_time = -1; + public static long last_exception_time = -1; + public static int last_exception_count = 0; + public static int last_exception_log_count = 0; + public static String last_exception; + public static final String VIA_NIGHTSCOUT_TAG = "via Nightscout"; - private static boolean notification_shown = false; + private static boolean notification_shown = false; - private static final String LAST_SUCCESS_TREATMENT_DOWNLOAD = "NS-Last-Treatment-Download-Modified"; - private static final String ETAG = "ETAG"; + private static final String LAST_SUCCESS_TREATMENT_DOWNLOAD = "NS-Last-Treatment-Download-Modified"; + private static final String ETAG = "ETAG"; - private static int failurecount = 0; + private static int failurecount = 0; - public static final int FAIL_NOTIFICATION_PERIOD = 24 * 60 * 60; // Failed upload notification will be shown if there is no upload for 24 hours. - public static final int FAIl_COUNT_NOTIFICATION = FAIL_NOTIFICATION_PERIOD / 60 / 5 -1; // Number of 5-minute read cycles corresponding to notification period - public static final int FAIL_LOG_PERIOD = 6 * 60 * 60; // FAILED upload/download log will be shown if there is no upload/download for 6 hours. - public static final int FAIL_COUNT_LOG = FAIL_LOG_PERIOD / 60 / 5 -1; // Number of 5-minute read cycles corresponding to log period + public static final int FAIL_NOTIFICATION_PERIOD = 24 * 60 * 60; // Failed upload notification will be shown if there is no upload for 24 hours. + public static final int FAIl_COUNT_NOTIFICATION = FAIL_NOTIFICATION_PERIOD / 60 / 5 - 1; // Number of 5-minute read cycles corresponding to notification period + public static final int FAIL_LOG_PERIOD = 6 * 60 * 60; // FAILED upload/download log will be shown if there is no upload/download for 6 hours. + public static final int FAIL_COUNT_LOG = FAIL_LOG_PERIOD / 60 / 5 - 1; // Number of 5-minute read cycles corresponding to log period - private Context mContext; - private Boolean enableRESTUpload; - private Boolean enableMongoUpload; - private SharedPreferences prefs; - private OkHttpClient client; + private Context mContext; + private Boolean enableRESTUpload; + private Boolean enableMongoUpload; + private SharedPreferences prefs; + private OkHttpClient client; - public interface NightscoutService { - @POST("entries") - Call upload(@Header("api-secret") String secret, @Body RequestBody body); + public interface NightscoutService { + @POST("entries") + Call upload(@Header("api-secret") String secret, @Body RequestBody body); - @POST("entries") - Call upload(@Body RequestBody body); + @POST("entries") + Call upload(@Body RequestBody body); - @POST("devicestatus") - Call uploadDeviceStatus(@Body RequestBody body); + @POST("devicestatus") + Call uploadDeviceStatus(@Body RequestBody body); - @POST("devicestatus") - Call uploadDeviceStatus(@Header("api-secret") String secret, @Body RequestBody body); + @POST("devicestatus") + Call uploadDeviceStatus(@Header("api-secret") String secret, @Body RequestBody body); - @GET("status.json") - Call getStatus(@Header("api-secret") String secret); + @GET("status.json") + Call getStatus(@Header("api-secret") String secret); - @POST("treatments") - Call uploadTreatments(@Header("api-secret") String secret, @Body RequestBody body); + @POST("treatments") + Call uploadTreatments(@Header("api-secret") String secret, @Body RequestBody body); - @PUT("treatments") - Call upsertTreatments(@Header("api-secret") String secret, @Body RequestBody body); + @PUT("treatments") + Call upsertTreatments(@Header("api-secret") String secret, @Body RequestBody body); - @GET("treatments") - // retrofit2/okhttp3 could do the if-modified-since natively using cache - Call downloadTreatments(@Header("api-secret") String secret, @Header("BROKEN-If-Modified-Since") String ifmodified); + @GET("treatments") + // retrofit2/okhttp3 could do the if-modified-since natively using cache + Call downloadTreatments(@Header("api-secret") String secret, @Header("BROKEN-If-Modified-Since") String ifmodified); - @GET("treatments.json") - Call findTreatmentByUUID(@Header("api-secret") String secret, @Query("find[uuid]") String uuid); + @GET("treatments.json") + Call findTreatmentByUUID(@Header("api-secret") String secret, @Query("find[uuid]") String uuid); - @DELETE("treatments/{id}") - Call deleteTreatment(@Header("api-secret") String secret, @Path("id") String id); + @DELETE("treatments/{id}") + Call deleteTreatment(@Header("api-secret") String secret, @Path("id") String id); - @POST("activity") - Call uploadActivity(@Header("api-secret") String secret, @Body RequestBody body); + @POST("activity") + Call uploadActivity(@Header("api-secret") String secret, @Body RequestBody body); - } + } - private class UploaderException extends RuntimeException { - int code; + private class UploaderException extends RuntimeException { + int code; - public UploaderException (String message, int code) { - super(message); - this.code = code; - } + public UploaderException(String message, int code) { + super(message); + this.code = code; } + } - public NightscoutUploader(Context context) { - mContext = context; - prefs = PreferenceManager.getDefaultSharedPreferences(mContext); - final OkHttpClient.Builder okHttp3Builder = enableTls12OnPreLollipop(new OkHttpClient.Builder()); - if (UserError.ExtraLogTags.shouldLogTag(TAG, android.util.Log.VERBOSE)) { - okHttp3Builder.addInterceptor(new SSLHandshakeInterceptor()); - } - if (USE_GZIP) okHttp3Builder.addInterceptor(new GzipRequestInterceptor()); - okHttp3Builder.connectTimeout(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS); - okHttp3Builder.writeTimeout(SOCKET_TIMEOUT, TimeUnit.MILLISECONDS); - okHttp3Builder.readTimeout(SOCKET_TIMEOUT, TimeUnit.MILLISECONDS); - client = okHttp3Builder.build(); - enableRESTUpload = prefs.getBoolean("cloud_storage_api_enable", false); - enableMongoUpload = prefs.getBoolean("cloud_storage_mongodb_enable", false); + public NightscoutUploader(Context context) { + mContext = context; + prefs = PreferenceManager.getDefaultSharedPreferences(mContext); + final OkHttpClient.Builder okHttp3Builder = enableTls12OnPreLollipop(new OkHttpClient.Builder()); + if (UserError.ExtraLogTags.shouldLogTag(TAG, android.util.Log.VERBOSE)) { + okHttp3Builder.addInterceptor(new SSLHandshakeInterceptor()); } + if (USE_GZIP) okHttp3Builder.addInterceptor(new GzipRequestInterceptor()); + okHttp3Builder.connectTimeout(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS); + okHttp3Builder.writeTimeout(SOCKET_TIMEOUT, TimeUnit.MILLISECONDS); + okHttp3Builder.readTimeout(SOCKET_TIMEOUT, TimeUnit.MILLISECONDS); + client = okHttp3Builder.build(); + enableRESTUpload = prefs.getBoolean("cloud_storage_api_enable", false); + enableMongoUpload = prefs.getBoolean("cloud_storage_mongodb_enable", false); + } public static void launchDownloadRest() { if (Pref.getBooleanDefaultFalse("cloud_storage_api_enable") @@ -242,7 +242,7 @@ public static String uuid_to_id(String uuid) { if (uuid.length() == 24) return uuid; // already converted if (uuid.length() < 24) { // convert non-standard uuids to compatible ones - return CipherUtils.getMD5(uuid).substring(0,24); + return CipherUtils.getMD5(uuid).substring(0, 24); } return uuid.replaceAll("-", "").substring(0, 24); } @@ -298,15 +298,15 @@ public boolean uploadMongo(List glucoseDataSets, List me if (enableMongoUpload) { double start = new Date().getTime(); mongoStatus = doMongoUpload(prefs, glucoseDataSets, meterRecords, calRecords, transmittersData, libreBlock); - Log.i(TAG, String.format("Finished upload of %s record using a Mongo in %s ms result: %b", + Log.i(TAG, String.format("Finished upload of %s record using a Mongo in %s ms result: %b", glucoseDataSets.size() + meterRecords.size() + calRecords.size() + transmittersData.size() + libreBlock.size(), System.currentTimeMillis() - start, mongoStatus)); } return mongoStatus; } - + private String TryResolveName(String baseURI) { - Log.d(TAG, "Resolveing name" ); + Log.d(TAG, "Resolveing name"); URI uri; try { uri = new URI(baseURI); @@ -317,17 +317,17 @@ private String TryResolveName(String baseURI) { String host = uri.getHost(); Log.d(TAG, "host = " + host); // Host has either to end with .local, or be one word (with no dots) for us to try and resolve it. - if (host == null || (host.contains(".") && (!host.endsWith(".local")))) { + if (host == null || (host.contains(".") && (!host.endsWith(".local")))) { return baseURI; } // So, we need to resolve this name String fullHost = host; try { - if(!fullHost.endsWith(".local")) { + if (!fullHost.endsWith(".local")) { fullHost += ".local"; } String ip = Mdns.genericResolver(fullHost); - if(ip == null) { + if (ip == null) { Log.d(TAG, "Recieved null resolving " + fullHost); return baseURI; } @@ -335,14 +335,14 @@ private String TryResolveName(String baseURI) { String newUri = baseURI.replace(host, ip); Log.d(TAG, "Returning new uri " + newUri); return newUri; - - + + } catch (UnknownHostException e) { Log.w(TAG, "UnknownHostException error nanme not resovled" + fullHost); return baseURI; } } - + private synchronized boolean doRESTtreatmentDownload(SharedPreferences prefs) { final String baseURLSettings = prefs.getString("cloud_storage_api_base", ""); final ArrayList baseURIs = new ArrayList<>(); @@ -362,7 +362,6 @@ private synchronized boolean doRESTtreatmentDownload(SharedPreferences prefs) { } - // process a list of base uris for (String baseURI : baseURIs) { try { @@ -403,7 +402,8 @@ private synchronized boolean doRESTtreatmentDownload(SharedPreferences prefs) { doStatusUpdate(nightscoutService, retrofit.baseUrl().url().toString(), hashedSecret); // update status if needed final String LAST_MODIFIED_KEY = LAST_SUCCESS_TREATMENT_DOWNLOAD + CipherUtils.getMD5(uri.toString()); // per uri marker String last_modified_string = PersistentStore.getString(LAST_MODIFIED_KEY); - if (last_modified_string.equals("")) last_modified_string = JoH.getRFC822String(0); + if (last_modified_string.equals("")) + last_modified_string = JoH.getRFC822String(0); final long request_start = JoH.tsl(); r = nightscoutService.downloadTreatments(hashedSecret, last_modified_string).execute(); @@ -450,140 +450,139 @@ private synchronized boolean doRESTtreatmentDownload(SharedPreferences prefs) { } private boolean doRESTUpload(SharedPreferences prefs, List glucoseDataSets, List meterRecords, List calRecords) { - String baseURLSettings = prefs.getString("cloud_storage_api_base", ""); - ArrayList baseURIs = new ArrayList(); + String baseURLSettings = prefs.getString("cloud_storage_api_base", ""); + ArrayList baseURIs = new ArrayList(); + try { + for (String baseURLSetting : baseURLSettings.split(" ")) { + String baseURL = baseURLSetting.trim(); + if (baseURL.isEmpty()) continue; + baseURIs.add(baseURL + (baseURL.endsWith("/") ? "" : "/")); + } + } catch (Exception e) { + Log.e(TAG, "Unable to process API Base URL: " + e); + return false; + } + boolean any_successes = false; + for (String baseURI : baseURIs) { try { - for (String baseURLSetting : baseURLSettings.split(" ")) { - String baseURL = baseURLSetting.trim(); - if (baseURL.isEmpty()) continue; - baseURIs.add(baseURL + (baseURL.endsWith("/") ? "" : "/")); + baseURI = TryResolveName(baseURI); + int apiVersion = 0; + URI uri = new URI(baseURI); + if ((uri.getHost().startsWith("192.168.")) && prefs.getBoolean("skip_lan_uploads_when_no_lan", true) && (!JoH.isLANConnected())) { + Log.d(TAG, "Skipping Nighscout upload to: " + uri.getHost() + " due to no LAN connection"); + continue; + } + if (uri.getPath().endsWith("/v1/")) apiVersion = 1; + String baseURL; + String secret = uri.getUserInfo(); + if ((secret == null || secret.isEmpty()) && apiVersion == 0) { + baseURL = baseURI; + } else if ((secret == null || secret.isEmpty())) { + throw new Exception("Starting with API v1, a pass phase is required"); + } else if (apiVersion > 0) { + baseURL = baseURI.replaceFirst("//[^@]+@", "//"); + } else { + throw new Exception("Unexpected baseURI: " + baseURI); } - } catch (Exception e) { - Log.e(TAG, "Unable to process API Base URL: "+e); - return false; - } - boolean any_successes = false; - for (String baseURI : baseURIs) { - try { - baseURI = TryResolveName(baseURI); - int apiVersion = 0; - URI uri = new URI(baseURI); - if ((uri.getHost().startsWith("192.168.")) && prefs.getBoolean("skip_lan_uploads_when_no_lan", true) && (!JoH.isLANConnected())) - { - Log.d(TAG,"Skipping Nighscout upload to: "+uri.getHost()+" due to no LAN connection"); - continue; - } - if (uri.getPath().endsWith("/v1/")) apiVersion = 1; - String baseURL; - String secret = uri.getUserInfo(); - if ((secret == null || secret.isEmpty()) && apiVersion == 0) { - baseURL = baseURI; - } else if ((secret == null || secret.isEmpty())) { - throw new Exception("Starting with API v1, a pass phase is required"); - } else if (apiVersion > 0) { - baseURL = baseURI.replaceFirst("//[^@]+@", "//"); - } else { - throw new Exception("Unexpected baseURI: "+baseURI); - } - final Retrofit retrofit = new Retrofit.Builder().baseUrl(baseURL).client(client).build(); - final NightscoutService nightscoutService = retrofit.create(NightscoutService.class); + final Retrofit retrofit = new Retrofit.Builder().baseUrl(baseURL).client(client).build(); + final NightscoutService nightscoutService = retrofit.create(NightscoutService.class); - 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); - } else { - doLegacyRESTUploadTo(nightscoutService, glucoseDataSets); - } - any_successes = true; - last_success_time = JoH.tsl(); - last_exception_count = 0; - last_exception_log_count = 0; - } catch (Exception e) { - String msg = "Unable to do REST API Upload: " + e.getMessage() + " marking record: " + (any_successes ? "succeeded" : "failed"); - handleRestFailure(msg); + 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); + } else { + doLegacyRESTUploadTo(nightscoutService, glucoseDataSets); } + any_successes = true; + last_success_time = JoH.tsl(); + last_exception_count = 0; + last_exception_log_count = 0; + } catch (Exception e) { + String msg = "Unable to do REST API Upload: " + e.getMessage() + " marking record: " + (any_successes ? "succeeded" : "failed"); + handleRestFailure(msg); } - return any_successes; } + return any_successes; + } - private void doLegacyRESTUploadTo(NightscoutService nightscoutService, List glucoseDataSets) throws Exception { - for (BgReading record : glucoseDataSets) { - Response r = nightscoutService.upload(populateLegacyAPIEntry(record)).execute(); - if (!r.isSuccessful()) throw new UploaderException(r.message(), r.code()); + private void doLegacyRESTUploadTo(NightscoutService nightscoutService, List glucoseDataSets) throws Exception { + for (BgReading record : glucoseDataSets) { + Response r = nightscoutService.upload(populateLegacyAPIEntry(record)).execute(); + if (!r.isSuccessful()) throw new UploaderException(r.message(), r.code()); + } + try { + postDeviceStatus(nightscoutService, null); + } catch (Exception e) { + Log.e(TAG, "Ignoring legacy devicestatus post exception: " + e); + } + } + + private void doRESTUploadTo(NightscoutService nightscoutService, String secret, List glucoseDataSets, List meterRecords, List calRecords) throws Exception { + final JSONArray array = new JSONArray(); + + for (BgReading record : glucoseDataSets) { + populateV1APIBGEntry(array, record); + } + for (BloodTest record : meterRecords) { + populateV1APIMeterReadingEntry(array, record); + } + for (Calibration record : calRecords) { + final BloodTest dupe = BloodTest.getForPreciseTimestamp(record.timestamp, 60000); + if (dupe == null) { + populateV1APIMeterReadingEntry(array, record); // also add calibrations as meter records + } else { + Log.d(TAG, "Found duplicate blood test entry for this calibration record: " + record.bg + " vs " + dupe.mgdl + " mg/dl"); } + populateV1APICalibrationEntry(array, record); + } + + if (array.length() > 0) {//KS + final RequestBody body = RequestBody.create(MediaType.parse("application/json"), array.toString()); + final Response r = nightscoutService.upload(secret, body).execute(); + if (!r.isSuccessful()) throw new UploaderException(r.message(), r.code()); + checkGzipSupport(r); try { - postDeviceStatus(nightscoutService, null); + postDeviceStatus(nightscoutService, secret); } catch (Exception e) { - Log.e(TAG, "Ignoring legacy devicestatus post exception: " + e); + Log.e(TAG, "Ignoring devicestatus post exception: " + e); } } - private void doRESTUploadTo(NightscoutService nightscoutService, String secret, List glucoseDataSets, List meterRecords, List calRecords) throws Exception { - final JSONArray array = new JSONArray(); - - for (BgReading record : glucoseDataSets) { - populateV1APIBGEntry(array, record); - } - for (BloodTest record : meterRecords) { - populateV1APIMeterReadingEntry(array, record); - } - for (Calibration record : calRecords) { - final BloodTest dupe = BloodTest.getForPreciseTimestamp(record.timestamp, 60000); - if (dupe == null) { - populateV1APIMeterReadingEntry(array, record); // also add calibrations as meter records - } else { - Log.d(TAG, "Found duplicate blood test entry for this calibration record: " + record.bg + " vs " + dupe.mgdl + " mg/dl"); - } - populateV1APICalibrationEntry(array, record); + try { + if (Pref.getBooleanDefaultFalse("send_treatments_to_nightscout")) { + postTreatments(nightscoutService, secret); + } else { + Log.d(TAG, "Skipping treatment upload due to preference disabled"); } - - if (array.length() > 0) {//KS - final RequestBody body = RequestBody.create(MediaType.parse("application/json"), array.toString()); - final Response r = nightscoutService.upload(secret, body).execute(); - if (!r.isSuccessful()) throw new UploaderException(r.message(), r.code()); - checkGzipSupport(r); - try { - postDeviceStatus(nightscoutService, secret); - } catch (Exception e) { - Log.e(TAG, "Ignoring devicestatus post exception: " + e); - } + } catch (Exception e) { + Log.e(TAG, "Exception uploading REST API treatments: ", e); + if (e.getMessage().equals("Not Found")) { + final String msg = "Please ensure careportal plugin is enabled on nightscout for treatment upload!"; + Log.wtf(TAG, msg); + Home.toaststaticnext(msg); + handleRestFailure(msg); } - + } + // TODO we may want to check nightscout version before trying to upload!! + // TODO in the future we may want to merge these in to a single post + if (Pref.getBooleanDefaultFalse("use_pebble_health") && (Home.get_engineering_mode())) { try { - if (Pref.getBooleanDefaultFalse("send_treatments_to_nightscout")) { - postTreatments(nightscoutService, secret); - } else { - Log.d(TAG,"Skipping treatment upload due to preference disabled"); - } + postHeartRate(nightscoutService, secret); + postStepsCount(nightscoutService, secret); + postMotionTracking(nightscoutService, secret); } catch (Exception e) { - Log.e(TAG, "Exception uploading REST API treatments: ", e); - if (e.getMessage().equals("Not Found")) { - final String msg = "Please ensure careportal plugin is enabled on nightscout for treatment upload!"; - Log.wtf(TAG, msg); - Home.toaststaticnext(msg); - handleRestFailure(msg); + if (JoH.ratelimit("heartrate-upload-exception", 3600)) { + Log.e(TAG, "Exception uploading REST API heartrate: " + e.getMessage()); } } - // TODO we may want to check nightscout version before trying to upload!! - // TODO in the future we may want to merge these in to a single post - if (Pref.getBooleanDefaultFalse("use_pebble_health") && (Home.get_engineering_mode())) { - try { - postHeartRate(nightscoutService, secret); - postStepsCount(nightscoutService, secret); - postMotionTracking(nightscoutService, secret); - } catch (Exception e) { - if (JoH.ratelimit("heartrate-upload-exception", 3600)) { - Log.e(TAG, "Exception uploading REST API heartrate: " + e.getMessage()); - } - } - } - } + } + private static synchronized void handleRestFailure(String msg) { last_exception = msg; last_exception_time = JoH.tsl(); @@ -634,12 +633,12 @@ private void populateV1APIBGEntry(JSONArray array, BgReading record) throws Exce if (record != null) {//KS json.put("date", record.timestamp); json.put("dateString", format.format(record.timestamp)); - if(prefs.getBoolean("cloud_storage_api_use_best_glucose", false)){ + if (prefs.getBoolean("cloud_storage_api_use_best_glucose", false)) { json.put("sgv", (int) record.getDg_mgdl()); try { json.put("delta", new BigDecimal(record.getDg_slope() * 5 * 60 * 1000).setScale(3, BigDecimal.ROUND_HALF_UP)); } catch (NumberFormatException e) { - UserError.Log.e(TAG, "Problem calculating delta from getDg_slope() for Nightscout REST Upload, skipping"); + UserError.Log.e(TAG, "Problem calculating delta from getDg_slope() for Nightscout REST Upload, skipping"); } json.put("direction", record.getDg_deltaName()); } else { @@ -647,7 +646,7 @@ private void populateV1APIBGEntry(JSONArray array, BgReading record) throws Exce try { json.put("delta", new BigDecimal(record.currentSlope() * 5 * 60 * 1000).setScale(3, BigDecimal.ROUND_HALF_UP)); // jamorham for automation } catch (NumberFormatException e) { - UserError.Log.e(TAG, "Problem calculating delta from currentSlope() for Nightscout REST Upload, skipping"); + UserError.Log.e(TAG, "Problem calculating delta from currentSlope() for Nightscout REST Upload, skipping"); } json.put("direction", record.slopeName()); } @@ -658,90 +657,90 @@ private void populateV1APIBGEntry(JSONArray array, BgReading record) throws Exce json.put("noise", record.noiseValue()); json.put("sysTime", format.format(record.timestamp)); array.put(json); - } - else + } else Log.e(TAG, "doRESTUploadTo BG record is null."); } - private RequestBody populateLegacyAPIEntry(BgReading record) throws Exception { - JSONObject json = new JSONObject(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); - format.setTimeZone(TimeZone.getDefault()); - json.put("device", getDeviceString(record)); - json.put("date", record.timestamp); - json.put("dateString", format.format(record.timestamp)); - json.put("sgv", (int)record.calculated_value); - json.put("direction", record.slopeName()); - return RequestBody.create(MediaType.parse("application/json"), json.toString()); - } + private RequestBody populateLegacyAPIEntry(BgReading record) throws Exception { + JSONObject json = new JSONObject(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); + format.setTimeZone(TimeZone.getDefault()); + json.put("device", getDeviceString(record)); + json.put("date", record.timestamp); + json.put("dateString", format.format(record.timestamp)); + json.put("sgv", (int) record.calculated_value); + json.put("direction", record.slopeName()); + return RequestBody.create(MediaType.parse("application/json"), json.toString()); + } - private void populateV1APIMeterReadingEntry(JSONArray array, Calibration record) throws Exception { - if (record == null) { - Log.e(TAG, "Received null calibration record in populateV1ApiMeterReadingEntry !"); - return; - } - JSONObject json = new JSONObject(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); - format.setTimeZone(TimeZone.getDefault()); - json.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); - json.put("type", "mbg"); - json.put("date", record.timestamp); - json.put("dateString", format.format(record.timestamp)); - json.put("mbg", record.bg); - json.put("sysTime", format.format(record.timestamp)); - array.put(json); + private void populateV1APIMeterReadingEntry(JSONArray array, Calibration record) throws Exception { + if (record == null) { + Log.e(TAG, "Received null calibration record in populateV1ApiMeterReadingEntry !"); + return; } + JSONObject json = new JSONObject(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); + format.setTimeZone(TimeZone.getDefault()); + json.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); + json.put("type", "mbg"); + json.put("date", record.timestamp); + json.put("dateString", format.format(record.timestamp)); + json.put("mbg", record.bg); + json.put("sysTime", format.format(record.timestamp)); + array.put(json); + } - private void populateV1APIMeterReadingEntry(JSONArray array, BloodTest record) throws Exception { - if (record == null) { - Log.e(TAG, "Received null bloodtest record in populateV1ApiMeterReadingEntry !"); - return; - } - JSONObject json = new JSONObject(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); - format.setTimeZone(TimeZone.getDefault()); - json.put("device", record.source); - json.put("type", "mbg"); - json.put("date", record.timestamp); - json.put("dateString", format.format(record.timestamp)); - json.put("mbg", record.mgdl); - json.put("sysTime", format.format(record.timestamp)); - array.put(json); + private void populateV1APIMeterReadingEntry(JSONArray array, BloodTest record) throws Exception { + if (record == null) { + Log.e(TAG, "Received null bloodtest record in populateV1ApiMeterReadingEntry !"); + return; } + JSONObject json = new JSONObject(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); + format.setTimeZone(TimeZone.getDefault()); + json.put("device", record.source); + json.put("type", "mbg"); + json.put("date", record.timestamp); + json.put("dateString", format.format(record.timestamp)); + json.put("mbg", record.mgdl); + json.put("sysTime", format.format(record.timestamp)); + array.put(json); + } - private void populateV1APICalibrationEntry(JSONArray array, Calibration record) throws Exception { - if (record == null) { - Log.e(TAG, "Received null calibration record in populateV1ApiCalibrationEntry !"); - return; - } - //do not upload undefined slopes - if(record.slope == 0d) return; - - JSONObject json = new JSONObject(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); - format.setTimeZone(TimeZone.getDefault()); - json.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); - json.put("type", "cal"); - json.put("date", record.timestamp); - json.put("dateString", format.format(record.timestamp)); - if(record.check_in) { - json.put("slope", (record.first_slope)); - json.put("intercept", ((record.first_intercept))); - json.put("scale", record.first_scale); - } else { - json.put("slope", (1000/record.slope)); - json.put("intercept", ((record.intercept * -1000) / (record.slope))); - json.put("scale", 1); - } - json.put("sysTime", format.format(record.timestamp)); - array.put(json); + private void populateV1APICalibrationEntry(JSONArray array, Calibration record) throws Exception { + if (record == null) { + Log.e(TAG, "Received null calibration record in populateV1ApiCalibrationEntry !"); + return; } + //do not upload undefined slopes + if (record.slope == 0d) return; + + JSONObject json = new JSONObject(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); + format.setTimeZone(TimeZone.getDefault()); + json.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); + json.put("type", "cal"); + json.put("date", record.timestamp); + json.put("dateString", format.format(record.timestamp)); + if (record.check_in) { + json.put("slope", (record.first_slope)); + json.put("intercept", ((record.first_intercept))); + json.put("scale", record.first_scale); + } else { + json.put("slope", (1000 / record.slope)); + json.put("intercept", ((record.intercept * -1000) / (record.slope))); + json.put("scale", 1); + } + json.put("sysTime", format.format(record.timestamp)); + array.put(json); + } private void populateV1APITreatmentEntry(JSONArray array, Treatments treatment) throws Exception { if (treatment == null) return; - if (treatment.enteredBy != null && ((treatment.enteredBy.endsWith(VIA_NIGHTSCOUT_TAG)) || (treatment.enteredBy.contains(VIA_NIGHTSCOUT_LOADER_TAG)))) return; // don't send back to nightscout what came from there + if (treatment.enteredBy != null && ((treatment.enteredBy.endsWith(VIA_NIGHTSCOUT_TAG)) || (treatment.enteredBy.contains(VIA_NIGHTSCOUT_LOADER_TAG)))) + return; // don't send back to nightscout what came from there final JSONObject record = new JSONObject(); final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); record.put("timestamp", treatment.timestamp); @@ -861,10 +860,11 @@ private void postTreatments(NightscoutService nightscoutService, String apiSecre Log.d(TAG, "Success for RESTAPI treatment upsert upload: " + match_uuid); for (UploaderQueue up : tups) { - if (d) Log.d(TAG, "upsert: " + match_uuid + " / " + up.reference_uuid + " " + up.action + " " + up.reference_id); + if (d) + Log.d(TAG, "upsert: " + match_uuid + " / " + up.reference_uuid + " " + up.action + " " + up.reference_id); if ((up.action.equals("update") || (up.action.equals("insert"))) && (up.reference_uuid.equals(match_uuid) || (uuid_to_id(up.reference_uuid).equals(match_uuid)))) { - if( d) Log.d(TAG, "upsert: matched"); + if (d) Log.d(TAG, "upsert: matched"); up.completed(THIS_QUEUE); // approve all types for this queue break; } @@ -921,9 +921,9 @@ private void postHeartRate(NightscoutService nightscoutService, String apiSecret if (!r.isSuccessful()) { activityErrorCount++; - if (JoH.ratelimit("heartrate-unable-upload",3600)) { - UserError.Log.e(TAG, "Unable to upload heart-rate data to Nightscout - check nightscout version"); - } + if (JoH.ratelimit("heartrate-unable-upload", 3600)) { + UserError.Log.e(TAG, "Unable to upload heart-rate data to Nightscout - check nightscout version"); + } throw new UploaderException(r.message(), r.code()); } else { PersistentStore.setLong(STORE_COUNTER, highest_timestamp); @@ -937,7 +937,6 @@ private void postHeartRate(NightscoutService nightscoutService, String apiSecret } - private void postStepsCount(NightscoutService nightscoutService, String apiSecret) throws Exception { Log.d(TAG, "Processing steps for RESTAPI"); final String STORE_COUNTER = "nightscout-rest-steps-synced-time"; @@ -998,7 +997,8 @@ private void postMotionTracking(NightscoutService nightscoutService, String apiS if (readings.size() > 0) { for (ActivityRecognizedService.motionData reading : readings) { counter++; - if (counter > (MAX_ACTIVITY_RECORDS / Math.min(1, Math.max(activityErrorCount, MAX_ACTIVITY_RECORDS / 10)))) break; + if (counter > (MAX_ACTIVITY_RECORDS / Math.min(1, Math.max(activityErrorCount, MAX_ACTIVITY_RECORDS / 10)))) + break; final JSONObject json = new JSONObject(); json.put("type", "motion-class"); @@ -1152,205 +1152,206 @@ private void postDeviceStatus(NightscoutService nightscoutService, String apiSec } - private boolean doMongoUpload(SharedPreferences prefs, List glucoseDataSets, - List meterRecords, List calRecords, List transmittersData, - List libreBlock) { - final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); - format.setTimeZone(TimeZone.getDefault()); + private boolean doMongoUpload(SharedPreferences prefs, List glucoseDataSets, + List meterRecords, List calRecords, List transmittersData, + List libreBlock) { + final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.US); + format.setTimeZone(TimeZone.getDefault()); - final String dbURI = prefs.getString("cloud_storage_mongodb_uri", null); - if (dbURI != null) { - try { - final URI uri = new URI(dbURI.trim()); - if ((uri.getHost().startsWith("192.168.")) && prefs.getBoolean("skip_lan_uploads_when_no_lan", true) && (!JoH.isLANConnected())) { - Log.d(TAG, "Skipping mongo upload to: " + dbURI + " due to no LAN connection"); - return false; - } - } catch (URISyntaxException e) { - UserError.Log.e(TAG, "Invalid mongo URI: " + e); + final String dbURI = prefs.getString("cloud_storage_mongodb_uri", null); + if (dbURI != null) { + try { + final URI uri = new URI(dbURI.trim()); + if ((uri.getHost().startsWith("192.168.")) && prefs.getBoolean("skip_lan_uploads_when_no_lan", true) && (!JoH.isLANConnected())) { + Log.d(TAG, "Skipping mongo upload to: " + dbURI + " due to no LAN connection"); + return false; } + } catch (URISyntaxException e) { + UserError.Log.e(TAG, "Invalid mongo URI: " + e); } + } - final String collectionName = prefs.getString("cloud_storage_mongodb_collection", null); - final String dsCollectionName = prefs.getString("cloud_storage_mongodb_device_status_collection", "devicestatus"); + final String collectionName = prefs.getString("cloud_storage_mongodb_collection", null); + final String dsCollectionName = prefs.getString("cloud_storage_mongodb_device_status_collection", "devicestatus"); - if (dbURI != null && collectionName != null) { - try { + if (dbURI != null && collectionName != null) { + try { - // connect to db - MongoClientURI uri = new MongoClientURI(dbURI.trim()+"?socketTimeoutMS=180000"); - MongoClient client = new MongoClient(uri); + // connect to db + MongoClientURI uri = new MongoClientURI(dbURI.trim() + "?socketTimeoutMS=180000"); + MongoClient client = new MongoClient(uri); - // get db - DB db = client.getDB(uri.getDatabase()); + // get db + DB db = client.getDB(uri.getDatabase()); - // get collection - DBCollection dexcomData = db.getCollection(collectionName.trim()); + // get collection + DBCollection dexcomData = db.getCollection(collectionName.trim()); - try { - Log.i(TAG, "The number of EGV records being sent to MongoDB is " + glucoseDataSets.size()); - for (BgReading record : glucoseDataSets) { - // make db object - BasicDBObject testData = new BasicDBObject(); - testData.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); - if (record != null) {//KS - testData.put("date", record.timestamp); - testData.put("dateString", format.format(record.timestamp)); - testData.put("sgv", Math.round(record.calculated_value)); - testData.put("direction", record.slopeName()); - testData.put("type", "sgv"); - testData.put("filtered", record.ageAdjustedFiltered() * 1000); - testData.put("unfiltered", record.usedRaw() * 1000); - testData.put("rssi", 100); - testData.put("noise", record.noiseValue()); - dexcomData.insert(testData, WriteConcern.UNACKNOWLEDGED); - } - else - Log.e(TAG, "MongoDB BG record is null."); + try { + Log.i(TAG, "The number of EGV records being sent to MongoDB is " + glucoseDataSets.size()); + for (BgReading record : glucoseDataSets) { + // make db object + BasicDBObject testData = new BasicDBObject(); + testData.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); + if (record != null) {//KS + testData.put("date", record.timestamp); + testData.put("dateString", format.format(record.timestamp)); + testData.put("sgv", Math.round(record.calculated_value)); + testData.put("direction", record.slopeName()); + testData.put("type", "sgv"); + testData.put("filtered", record.ageAdjustedFiltered() * 1000); + testData.put("unfiltered", record.usedRaw() * 1000); + testData.put("rssi", 100); + testData.put("noise", record.noiseValue()); + dexcomData.insert(testData, WriteConcern.UNACKNOWLEDGED); + } else + Log.e(TAG, "MongoDB BG record is null."); + } + + Log.i(TAG, "REST - The number of MBG records being sent to MongoDB is " + meterRecords.size()); + for (Calibration meterRecord : meterRecords) { + // make db object + BasicDBObject testData = new BasicDBObject(); + testData.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); + testData.put("type", "mbg"); + testData.put("date", meterRecord.timestamp); + testData.put("dateString", format.format(meterRecord.timestamp)); + testData.put("mbg", meterRecord.bg); + dexcomData.insert(testData, WriteConcern.UNACKNOWLEDGED); + } + Log.i(TAG, "REST - Finshed upload of mbg"); + + for (Calibration calRecord : calRecords) { + //do not upload undefined slopes + if (calRecord.slope == 0d) break; + // make db object + BasicDBObject testData = new BasicDBObject(); + testData.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); + testData.put("date", calRecord.timestamp); + testData.put("dateString", format.format(calRecord.timestamp)); + if (calRecord.check_in) { + testData.put("slope", (calRecord.first_slope)); + testData.put("intercept", ((calRecord.first_intercept))); + testData.put("scale", calRecord.first_scale); + } else { + testData.put("slope", (1000 / calRecord.slope)); + testData.put("intercept", ((calRecord.intercept * -1000) / (calRecord.slope))); + testData.put("scale", 1); } + testData.put("type", "cal"); + dexcomData.insert(testData, WriteConcern.UNACKNOWLEDGED); + } + DBCollection libreCollection = db.getCollection("libre"); + for (LibreBlock libreBlockEntry : libreBlock) { - Log.i(TAG, "REST - The number of MBG records being sent to MongoDB is " + meterRecords.size()); - for (Calibration meterRecord : meterRecords) { - // make db object - BasicDBObject testData = new BasicDBObject(); - testData.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); - testData.put("type", "mbg"); - testData.put("date", meterRecord.timestamp); - testData.put("dateString", format.format(meterRecord.timestamp)); - testData.put("mbg", meterRecord.bg); - dexcomData.insert(testData, WriteConcern.UNACKNOWLEDGED); + + Log.d(TAG, "uploading new item to mongo"); + // Checksum might be wrong, for libre 2 or libre us 14 days. + boolean ChecksumOk = LibreUtils.verify(libreBlockEntry.blockbytes, libreBlockEntry.patchInfo); + + // make db object + BasicDBObject testData = new BasicDBObject(); + testData.put("SensorId", PersistentStore.getString("LibreSN")); + testData.put("CaptureDateTime", libreBlockEntry.timestamp); + testData.put("BlockBytes", Base64.encodeToString(libreBlockEntry.blockbytes, Base64.NO_WRAP)); + if (libreBlockEntry.patchUid != null && libreBlockEntry.patchUid.length != 0) { + testData.put("patchUid", Base64.encodeToString(libreBlockEntry.patchUid, Base64.NO_WRAP)); } - Log.i(TAG, "REST - Finshed upload of mbg"); - - for (Calibration calRecord : calRecords) { - //do not upload undefined slopes - if(calRecord.slope == 0d) break; - // make db object - BasicDBObject testData = new BasicDBObject(); - testData.put("device", "xDrip-" + prefs.getString("dex_collection_method", "BluetoothWixel")); - testData.put("date", calRecord.timestamp); - testData.put("dateString", format.format(calRecord.timestamp)); - if (calRecord.check_in) { - testData.put("slope", (calRecord.first_slope)); - testData.put("intercept", ((calRecord.first_intercept))); - testData.put("scale", calRecord.first_scale); - } else { - testData.put("slope", (1000/calRecord.slope)); - testData.put("intercept", ((calRecord.intercept * -1000) / (calRecord.slope))); - testData.put("scale", 1); - } - testData.put("type", "cal"); - dexcomData.insert(testData, WriteConcern.UNACKNOWLEDGED); + if (libreBlockEntry.patchInfo != null && libreBlockEntry.patchInfo.length != 0) { + testData.put("patchInfo", Base64.encodeToString(libreBlockEntry.patchInfo, Base64.NO_WRAP)); } - DBCollection libreCollection = db.getCollection("libre"); - for (LibreBlock libreBlockEntry : libreBlock) { - - - Log.d(TAG, "uploading new item to mongo"); - // Checksum might be wrong, for libre 2 or libre us 14 days. - boolean ChecksumOk = LibreUtils.verify(libreBlockEntry.blockbytes, libreBlockEntry.patchInfo); - - // make db object - BasicDBObject testData = new BasicDBObject(); - testData.put("SensorId", PersistentStore.getString("LibreSN")); - testData.put("CaptureDateTime", libreBlockEntry.timestamp); - testData.put("BlockBytes",Base64.encodeToString(libreBlockEntry.blockbytes, Base64.NO_WRAP)); - if(libreBlockEntry.patchUid != null && libreBlockEntry.patchUid.length != 0) { - testData.put("patchUid",Base64.encodeToString(libreBlockEntry.patchUid, Base64.NO_WRAP)); - } - if(libreBlockEntry.patchInfo != null && libreBlockEntry.patchInfo.length != 0) { - testData.put("patchInfo",Base64.encodeToString(libreBlockEntry.patchInfo, Base64.NO_WRAP)); - } - testData.put("ChecksumOk",ChecksumOk ? 1 : 0); - testData.put("Uploaded", 1); - testData.put("UploaderBatteryLife",getBatteryLevel()); - testData.put("DebugInfo", android.os.Build.MODEL + " " + new Date(libreBlockEntry.timestamp).toLocaleString()); - - try { - testData.put("TomatoBatteryLife", Integer.parseInt(PersistentStore.getString("Tomatobattery"))); - } catch (NumberFormatException e) { - Log.e(TAG, "Error reading battery daya" + PersistentStore.getString("Tomatobattery") ); - } - testData.put("FwVersion", PersistentStore.getString("TomatoFirmware")); - testData.put("HwVersion", PersistentStore.getString("TomatoHArdware")); - - WriteResult wr = libreCollection.insert(testData, WriteConcern.ACKNOWLEDGED); - Log.d(TAG, "uploaded libreblock data with " + new Date(libreBlockEntry.timestamp).toLocaleString()+ " wr = " + wr); + testData.put("ChecksumOk", ChecksumOk ? 1 : 0); + testData.put("Uploaded", 1); + testData.put("UploaderBatteryLife", getBatteryLevel()); + testData.put("DebugInfo", android.os.Build.MODEL + " " + new Date(libreBlockEntry.timestamp).toLocaleString()); + + try { + testData.put("TomatoBatteryLife", Integer.parseInt(PersistentStore.getString("Tomatobattery"))); + } catch (NumberFormatException e) { + Log.e(TAG, "Error reading battery daya" + PersistentStore.getString("Tomatobattery")); } + testData.put("FwVersion", PersistentStore.getString("TomatoFirmware")); + testData.put("HwVersion", PersistentStore.getString("TomatoHArdware")); - // TODO: quick port from original code, revisit before release - DBCollection dsCollection = db.getCollection(dsCollectionName); - BasicDBObject devicestatus = new BasicDBObject(); - devicestatus.put("uploaderBattery", getBatteryLevel()); - devicestatus.put("created_at", format.format(System.currentTimeMillis())); - dsCollection.insert(devicestatus, WriteConcern.UNACKNOWLEDGED); - - // treatments mongo sync using unified queue - Log.d(TAG,"Starting treatments mongo direct"); - final long THIS_QUEUE = UploaderQueue.MONGO_DIRECT; - final DBCollection treatmentDb = db.getCollection("treatments"); - final List tups = UploaderQueue.getPendingbyType(Treatments.class.getSimpleName(), THIS_QUEUE); - if (tups != null) { - for (UploaderQueue up : tups) { - if ((up.action.equals("insert") || (up.action.equals("update")))) { - Treatments treatment = Treatments.byid(up.reference_id); - if (treatment != null) { - BasicDBObject record = new BasicDBObject(); - record.put("timestamp", treatment.timestamp); - record.put("eventType", treatment.eventType); - record.put("enteredBy", treatment.enteredBy); - if (treatment.notes != null) record.put("notes", treatment.notes); - record.put("uuid", treatment.uuid); - record.put("carbs", treatment.carbs); - record.put("insulin", treatment.insulin); - if (treatment.insulinJSON != null) { - record.put("insulinInjections", treatment.insulinJSON); - } - record.put("created_at", treatment.created_at); - final BasicDBObject searchQuery = new BasicDBObject().append("uuid", treatment.uuid); - //treatmentDb.insert(record, WriteConcern.UNACKNOWLEDGED); - Log.d(TAG, "Sending upsert for: " + treatment.toJSON()); - treatmentDb.update(searchQuery, record, true, false); - } else { - Log.d(TAG, "Got null for treatment id: " + up.reference_id); - } - up.completed(THIS_QUEUE); - } else if (up.action.equals("delete")) { - if (up.reference_uuid != null) { - Log.d(TAG,"Processing treatment delete mongo sync for: "+up.reference_uuid); - final BasicDBObject searchQuery = new BasicDBObject().append("uuid", up.reference_uuid); - Log.d(TAG,treatmentDb.remove(searchQuery, WriteConcern.UNACKNOWLEDGED).toString()); + WriteResult wr = libreCollection.insert(testData, WriteConcern.ACKNOWLEDGED); + Log.d(TAG, "uploaded libreblock data with " + new Date(libreBlockEntry.timestamp).toLocaleString() + " wr = " + wr); + } + // TODO: quick port from original code, revisit before release + DBCollection dsCollection = db.getCollection(dsCollectionName); + BasicDBObject devicestatus = new BasicDBObject(); + devicestatus.put("uploaderBattery", getBatteryLevel()); + devicestatus.put("created_at", format.format(System.currentTimeMillis())); + dsCollection.insert(devicestatus, WriteConcern.UNACKNOWLEDGED); + + // treatments mongo sync using unified queue + Log.d(TAG, "Starting treatments mongo direct"); + final long THIS_QUEUE = UploaderQueue.MONGO_DIRECT; + final DBCollection treatmentDb = db.getCollection("treatments"); + final List tups = UploaderQueue.getPendingbyType(Treatments.class.getSimpleName(), THIS_QUEUE); + if (tups != null) { + for (UploaderQueue up : tups) { + if ((up.action.equals("insert") || (up.action.equals("update")))) { + Treatments treatment = Treatments.byid(up.reference_id); + if (treatment != null) { + BasicDBObject record = new BasicDBObject(); + record.put("timestamp", treatment.timestamp); + record.put("eventType", treatment.eventType); + record.put("enteredBy", treatment.enteredBy); + if (treatment.notes != null) + record.put("notes", treatment.notes); + record.put("uuid", treatment.uuid); + record.put("carbs", treatment.carbs); + record.put("insulin", treatment.insulin); + if (treatment.insulinJSON != null) { + record.put("insulinInjections", treatment.insulinJSON); } - up.completed(THIS_QUEUE); + record.put("created_at", treatment.created_at); + final BasicDBObject searchQuery = new BasicDBObject().append("uuid", treatment.uuid); + //treatmentDb.insert(record, WriteConcern.UNACKNOWLEDGED); + Log.d(TAG, "Sending upsert for: " + treatment.toJSON()); + treatmentDb.update(searchQuery, record, true, false); } else { - Log.e(TAG, "Unsupported operation type for treatment: " + up.action); + Log.d(TAG, "Got null for treatment id: " + up.reference_id); + } + up.completed(THIS_QUEUE); + } else if (up.action.equals("delete")) { + if (up.reference_uuid != null) { + Log.d(TAG, "Processing treatment delete mongo sync for: " + up.reference_uuid); + final BasicDBObject searchQuery = new BasicDBObject().append("uuid", up.reference_uuid); + Log.d(TAG, treatmentDb.remove(searchQuery, WriteConcern.UNACKNOWLEDGED).toString()); + } + up.completed(THIS_QUEUE); + } else { + Log.e(TAG, "Unsupported operation type for treatment: " + up.action); } - Log.d(TAG, "Processed " + tups.size() + " Treatment mongo direct upload records"); } + Log.d(TAG, "Processed " + tups.size() + " Treatment mongo direct upload records"); + } - client.close(); + client.close(); - failurecount=0; - return true; + failurecount = 0; + return true; - } catch (Exception e) { - Log.e(TAG, "Unable to upload data to mongo " + e.getMessage()); - failurecount++; - if (failurecount>4) - { - Home.toaststaticnext("Mongo "+failurecount+" up fails: "+e.getMessage().substring(0,51)); - } - } finally { - if(client != null) { client.close(); } - } } catch (Exception e) { Log.e(TAG, "Unable to upload data to mongo " + e.getMessage()); + failurecount++; + if (failurecount > 4) { + Home.toaststaticnext("Mongo " + failurecount + " up fails: " + e.getMessage().substring(0, 51)); + } + } finally { + if (client != null) { + client.close(); + } } + } catch (Exception e) { + Log.e(TAG, "Unable to upload data to mongo " + e.getMessage()); } - return false; } + return false; + } public int getBatteryLevel() { return NightscoutBatteryDevice.PHONE.getBatteryLevel(mContext); @@ -1373,7 +1374,9 @@ private static void setSupportsGzip(String id, boolean value) { } } - /** Prints TLS Version and Cipher Suite for SSL Calls through OkHttp3 */ + /** + * Prints TLS Version and Cipher Suite for SSL Calls through OkHttp3 + */ public class SSLHandshakeInterceptor implements Interceptor { @Override @@ -1414,15 +1417,18 @@ public okhttp3.Response intercept(Chain chain) throws IOException { private RequestBody gzip(final RequestBody body) { return new RequestBody() { - @Override public MediaType contentType() { + @Override + public MediaType contentType() { return body.contentType(); } - @Override public long contentLength() { + @Override + public long contentLength() { return -1; // We don't know the compressed length in advance! } - @Override public void writeTo(BufferedSink sink) throws IOException { + @Override + public void writeTo(BufferedSink sink) throws IOException { BufferedSink gzipSink = Okio.buffer(new GzipSink(sink)); body.writeTo(gzipSink); gzipSink.close();