From 2e2bc2d82fd9dc10f93ec6c6c9d64e32c52a5804 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 7 Aug 2020 15:51:15 +0100 Subject: [PATCH 1/2] Remove @Immutable annotation, which is no longer true. --- .../briarproject/bramble/system/AndroidWakeLockFactoryImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockFactoryImpl.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockFactoryImpl.java index e61af6644..f1e7acf8f 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockFactoryImpl.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockFactoryImpl.java @@ -11,7 +11,6 @@ import org.briarproject.bramble.api.system.AndroidWakeLock; import org.briarproject.bramble.api.system.AndroidWakeLockFactory; import org.briarproject.bramble.api.system.TaskScheduler; -import javax.annotation.concurrent.Immutable; import javax.inject.Inject; import static android.content.Context.POWER_SERVICE; @@ -20,7 +19,6 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.SECONDS; import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; -@Immutable @NotNullByDefault class AndroidWakeLockFactoryImpl implements AndroidWakeLockFactory { From 23f22af6e40085123414ecce0b2f372187719dce Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 10 Aug 2020 11:26:29 +0100 Subject: [PATCH 2/2] Add a comment, wrap logging in an if. --- .../org/briarproject/bramble/system/AndroidTaskScheduler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java index 871f8217d..ae9583b9f 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java @@ -110,7 +110,7 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener { LOG.info("Alarm"); rescheduleAlarm(); runDueTasks(); - } else { + } else if (LOG.isLoggable(INFO)) { LOG.info("Ignoring alarm with PID " + extraPid + ", current PID is " + currentPid); } @@ -143,6 +143,7 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener { } private void rescheduleAlarm() { + // If SDK_INT < 23 the alarm repeats automatically if (SDK_INT >= 23) scheduleIdleAlarm(); }