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

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/MegaStatus.java

@@ -190,6 +190,7 @@ private void populateSectionList() {
             }
             if (Pref.getBooleanDefaultFalse("cloud_storage_mongodb_enable")
                     || Pref.getBooleanDefaultFalse("cloud_storage_api_enable")
+                    || Pref.getBooleanDefaultFalse("cloud_storage_tidepool_enable")
                     || Pref.getBooleanDefaultFalse("share_upload")
                     || (Pref.getBooleanDefaultFalse("wear_sync") && Home.get_engineering_mode())) {
                 addAsection(UPLOADERS, "Cloud Uploader Queues");

app/src/main/java/com/eveningoutpost/dexdrip/models/Treatments.java

@@ -252,7 +252,8 @@ public static synchronized Treatments create(final double carbs, final double in
         final long future_seconds = (timestamp - JoH.tsl()) / 1000;
         // if treatment more than 1 hour in the future
         if (future_seconds > (60 * 60)) {
-            JoH.static_toast_long("Refusing to create a treatement more than 1 hours in the future!");
+            JoH.static_toast_long(xdrip.gs(R.string.toast_treatment_more_than_one_hour_in_the_future));
+            UserError.Log.e(TAG, "Refusing to create a treatment more than 1 hour in the future!");
             return null;
         }
         // if treatment more than 3 minutes in the future

app/src/main/res/values/strings.xml

@@ -1641,6 +1641,7 @@
     <string name="calibrate">Calibrate</string>
     <string name="confirm_delete">Confirm Delete</string>
     <string name="are_you_sure_you_want_to_delete_this_treatment">Are you sure you want to delete this Treatment?</string>
+    <string name="toast_treatment_more_than_one_hour_in_the_future">xDrip cannot accept treatments more than one hour in the future.</string>
     <string name="no_data_received_from_master_yet">No data received from master yet</string>
     <string name="last_from_master_">Last from master: </string>
     <string name="prepare_to_test">Prepare to test!</string>