From 519033503a841d506288c99143d9e000fbbbd183 Mon Sep 17 00:00:00 2001
From: Volker Richert <v.richert@addmore.de>
Date: Mon, 9 Jan 2017 19:56:34 +0100
Subject: [PATCH] - upgrade to Realm 2.2.2 - minor changes
---
app/build.gradle | 1 -
.../medtronic/service/MedtronicCnlAlarmManager.java | 8 ++++----
build.gradle | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 5d3c76b..bc39a10 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,6 @@ buildscript {
dependencies {
classpath 'io.fabric.tools:gradle:1.21.6'
- classpath 'io.realm:realm-gradle-plugin:2.2.2'
classpath 'org.ajoberstar:grgit:1.5.0'
}
}
diff --git a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmManager.java b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmManager.java
index e283f3e..87a79d8 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmManager.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmManager.java
@@ -56,15 +56,15 @@ public class MedtronicCnlAlarmManager {
millis = now;
// only accept alarm nearer than the last one
- if (nextAlarm < millis && nextAlarm >= now) {
- return;
- }
+ //if (nextAlarm < millis && nextAlarm > now) {
+ // return;
+ //}
cancelAlarm();
nextAlarm = millis;
- Log.d(TAG, "AlarmManager set to fire at " + new Date(millis));
+ Log.d(TAG, "Alarm set to fire at " + new Date(millis));
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) {
diff --git a/build.gradle b/build.gradle
index 9da42b0..fa34379 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:2.2.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
- classpath "io.realm:realm-gradle-plugin:1.0.0"
+ classpath 'io.realm:realm-gradle-plugin:2.2.2'
}
}
--
GitLab