Merge branch workingt:1009

NightscoutFoundation · Oct 10, 2016 · 75fef4f · 75fef4f
1 parent 94a1070
commit 75fef4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GcmActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/GcmActivity.java
@@ -303,7 +303,7 @@ public static void processBFPbundle(String bundle) {
     }
 
     public static void requestSensorBatteryUpdate() {
-        if (Home.get_follower() && JoH.ratelimit("SensorBatteryUpdateRequest", 300)) {
+        if (Home.get_follower() && JoH.ratelimit("SensorBatteryUpdateRequest", 1200)) {
             Log.d(TAG, "Requesting Sensor Battery Update");
             GcmActivity.sendMessage("sbr", ""); // request sensor battery update
         }
@@ -440,6 +440,10 @@ public void onReceive(Context context, Intent intent) {
     protected void onCreate(Bundle savedInstanceState) {
         try {
             super.onCreate(savedInstanceState);
+            if (Home.getPreferencesBooleanDefaultFalse("disable_all_sync")) {
+                cease_all_activity = true;
+                Log.d(TAG, "Sync services disabled");
+            }
             if (cease_all_activity) {
                 finish();
                 return;

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Home.java b/app/src/main/java/com/eveningoutpost/dexdrip/Home.java
@@ -1933,7 +1933,7 @@ public static String extraStatusLine() {
                 BgReading bgReading = BgReading.last();
                 if (bgReading != null) {
                     final boolean doMgdl = prefs.getString("units", "mgdl").equals("mgdl");
-                    extraline.append(" \u21D2 " + BgGraphBuilder.unitized_string(plugin.getGlucoseFromSensorValue(bgReading.raw_data), doMgdl) + " " + BgGraphBuilder.unit(doMgdl));
+                    extraline.append(" \u21D2 " + BgGraphBuilder.unitized_string(plugin.getGlucoseFromSensorValue(bgReading.age_adjusted_raw_value), doMgdl) + " " + BgGraphBuilder.unit(doMgdl));
                 }
             }
         }