Prevent NPE on log line. Use monotonically increasing time for alarm …

…manager scheduling calculations. https://developer.android.com/training/scheduling/alarms "There are two general clock types for alarms: "elapsed real time" and "real time clock" (RTC). Elapsed real time uses the "time since system boot" as a reference, and real time clock uses UTC (wall clock) time. This means that elapsed real time is suited to setting an alarm based on the passage of time (for example, an alarm that fires every 30 seconds) since it isn't affected by time zone/locale. The real time clock type is better suited for alarms that are dependent on current locale." https://stackoverflow.com/a/15400014
hannesa2 · Nov 15, 2020 · 20fbc4a · 20fbc4a
1 parent 9200473
commit 20fbc4a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/....paho.android.service/src/main/java/org/eclipse/paho/android/service/AlarmPingSender.java b/....paho.android.service/src/main/java/org/eclipse/paho/android/service/AlarmPingSender.java
@@ -24,6 +24,7 @@
 import android.os.Build;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
+import android.os.SystemClock;
 import android.util.Log;
 
 import org.eclipse.paho.client.mqttv3.IMqttActionListener;
@@ -101,19 +102,20 @@ public void stop() {
 
     @Override
     public void schedule(long delayInMilliseconds) {
-        long nextAlarmInMilliseconds = System.currentTimeMillis() + delayInMilliseconds;
+
+        long nextAlarmInMilliseconds = SystemClock.elapsedRealtime() + delayInMilliseconds;
         Log.d(TAG, "Schedule next alarm at " + nextAlarmInMilliseconds);
         AlarmManager alarmManager = (AlarmManager) service.getSystemService(Service.ALARM_SERVICE);
         if (Build.VERSION.SDK_INT >= 23) {
             // In SDK 23 and above, dosing will prevent setExact, setExactAndAllowWhileIdle will force
             // the device to run this task whilst dosing.
             Log.d(TAG, "Alarm scheule using setExactAndAllowWhileIdle, next: " + delayInMilliseconds);
-            alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, nextAlarmInMilliseconds, pendingIntent);
+            alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextAlarmInMilliseconds, pendingIntent);
         } else if (Build.VERSION.SDK_INT >= 19) {
             Log.d(TAG, "Alarm scheule using setExact, delay: " + delayInMilliseconds);
-            alarmManager.setExact(AlarmManager.RTC_WAKEUP, nextAlarmInMilliseconds, pendingIntent);
+            alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextAlarmInMilliseconds, pendingIntent);
         } else {
-            alarmManager.set(AlarmManager.RTC_WAKEUP, nextAlarmInMilliseconds, pendingIntent);
+            alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextAlarmInMilliseconds, pendingIntent);
         }
     }
 

diff --git a/...e.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttConnection.java b/...e.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttConnection.java
@@ -40,6 +40,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import androidx.annotation.Nullable;
+
 /**
  * <p>
  * MqttConnection holds a MqttAsyncClient {host,port,clientId} instance to perform
@@ -671,8 +673,12 @@ public IMqttDeliveryToken[] getPendingDeliveryTokens() {
      * @param why the exeception causing the break in communications
      */
     @Override
-    public void connectionLost(Throwable why) {
-        service.traceDebug(TAG, "connectionLost(" + why.getMessage() + ")");
+    public void connectionLost(@Nullable Throwable why) {
+        if (why != null) {
+            service.traceDebug(TAG, "connectionLost(" + why.getMessage() + ")");
+        } else {
+            service.traceDebug(TAG, "connectionLost(NO_REASON)");
+        }
         disconnected = true;
         try {
             if (!this.connectOptions.isAutomaticReconnect()) {