From dadcd5cd961f5dbe96985fb0960778b2d6526878 Mon Sep 17 00:00:00 2001
From: Volker Richert <v.richert@addmore.de>
Date: Wed, 4 Jan 2017 12:38:24 +0100
Subject: [PATCH] code cleanup
---
.../java/info/nightscout/android/medtronic/MainActivity.java | 2 +-
.../android/medtronic/service/MedtronicCnlAlarmReceiver.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
index 33b2510..271992f 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
@@ -123,8 +123,8 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
final String packageName = getPackageName();
- //Log.d(TAG, "Maybe ignoring battery optimization");
final PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+
if (!pm.isIgnoringBatteryOptimizations(packageName)) {
Log.d(TAG, "Requesting ignore battery optimization");
try {
diff --git a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmReceiver.java b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmReceiver.java
index 1da9df6..69b0270 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmReceiver.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmReceiver.java
@@ -66,9 +66,12 @@ public class MedtronicCnlAlarmReceiver extends WakefulBroadcastReceiver {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
alarmManager.setAlarmClock(new AlarmManager.AlarmClockInfo(millis, null), pendingIntent);
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+ // Android 5.0.0 + 5.0.1 (e.g. Galaxy S4) has a bug.
+ // Alarms are not exact. Fixed in 5.0.2 oder CM12
alarmManager.setExact(AlarmManager.RTC_WAKEUP, millis, pendingIntent);
- } else
+ } else {
alarmManager.set(AlarmManager.RTC_WAKEUP, millis, pendingIntent);
+ }
}
// restarting the alarm after MedtronicCnlIntentService.POLL_PERIOD_MS from now
--
GitLab