Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 15, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ....paho.android.service/src/main/java/org/eclipse/paho/android/service/AlarmPingSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down
10 changes: 8 additions & 2 deletions ...e.paho.android.service/src/main/java/org/eclipse/paho/android/service/MqttConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()) {
Expand Down