From 74cfd313ab8194089e9ae8c425536d2fadc4b3dc Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Wed, 11 Oct 2017 15:45:02 +0100
Subject: [PATCH] Code cleanup.
---
.../briarproject/bramble/plugin/tor/TorPlugin.java | 5 +++--
.../bramble/util/RenewableWakeLock.java | 13 ++++---------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
index 3458c97e38..5ad1360f8e 100644
--- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
@@ -105,6 +105,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
private static final String OWNER = "__OwningControllerProcess";
private static final int COOKIE_TIMEOUT = 3000; // Milliseconds
private static final Pattern ONION = Pattern.compile("[a-z2-7]{16}");
+ // This tag will prevent Huawei's power manager from killing us
+ private static final String WAKE_LOCK_TAG = "LocationManagerService";
private static final Logger LOG =
Logger.getLogger(TorPlugin.class.getName());
@@ -161,9 +163,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
ioExecutor, 1);
PowerManager pm = (PowerManager)
appContext.getSystemService(POWER_SERVICE);
- // This tag will prevent Huawei's power manager from killing us
wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
- "LocationManagerService", 30, MINUTES);
+ WAKE_LOCK_TAG, 30, MINUTES);
}
@Override
diff --git a/bramble-android/src/main/java/org/briarproject/bramble/util/RenewableWakeLock.java b/bramble-android/src/main/java/org/briarproject/bramble/util/RenewableWakeLock.java
index 4b2dfb1ffa..5e26f4cfb2 100644
--- a/bramble-android/src/main/java/org/briarproject/bramble/util/RenewableWakeLock.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/util/RenewableWakeLock.java
@@ -35,16 +35,11 @@ public class RenewableWakeLock {
this.tag = tag;
this.duration = duration;
this.timeUnit = timeUnit;
- renewTask = new Runnable() {
- @Override
- public void run() {
- renew();
- }
- };
+ renewTask = this::renew;
}
public void acquire() {
- if (LOG.isLoggable(INFO)) LOG.info("Acquiring wake lock " + tag );
+ if (LOG.isLoggable(INFO)) LOG.info("Acquiring wake lock " + tag);
synchronized (lock) {
if (wakeLock != null) {
LOG.info("Already acquired");
@@ -58,7 +53,7 @@ public class RenewableWakeLock {
}
private void renew() {
- if (LOG.isLoggable(INFO)) LOG.info("Renewing wake lock " + tag );
+ if (LOG.isLoggable(INFO)) LOG.info("Renewing wake lock " + tag);
synchronized (lock) {
if (wakeLock == null) {
LOG.info("Already released");
@@ -74,7 +69,7 @@ public class RenewableWakeLock {
}
public void release() {
- if (LOG.isLoggable(INFO)) LOG.info("Releasing wake lock " + tag );
+ if (LOG.isLoggable(INFO)) LOG.info("Releasing wake lock " + tag);
synchronized (lock) {
if (wakeLock == null) {
LOG.info("Already released");
--
GitLab