diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/GcmActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/GcmActivity.java index 141e4e8d7e..730f0704b0 100644 --- 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 index 483b51eaaf..b25bf5f246 100644 --- 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)); } } }