Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
akwizgran
2017-10-11 15:45:02 +01:00
parent c089a099f0
commit 74cfd313ab
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
View File

@@ -105,6 +105,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
private static final String OWNER = "__OwningControllerProcess"; private static final String OWNER = "__OwningControllerProcess";
private static final int COOKIE_TIMEOUT = 3000; // Milliseconds private static final int COOKIE_TIMEOUT = 3000; // Milliseconds
private static final Pattern ONION = Pattern.compile("[a-z2-7]{16}"); 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 = private static final Logger LOG =
Logger.getLogger(TorPlugin.class.getName()); Logger.getLogger(TorPlugin.class.getName());
@@ -161,9 +163,8 @@ class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
ioExecutor, 1); ioExecutor, 1);
PowerManager pm = (PowerManager) PowerManager pm = (PowerManager)
appContext.getSystemService(POWER_SERVICE); appContext.getSystemService(POWER_SERVICE);
// This tag will prevent Huawei's power manager from killing us
wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK, wakeLock = new RenewableWakeLock(pm, scheduler, PARTIAL_WAKE_LOCK,
"LocationManagerService", 30, MINUTES); WAKE_LOCK_TAG, 30, MINUTES);
} }
@Override @Override

13
bramble-android/src/main/java/org/briarproject/bramble/util/RenewableWakeLock.java
View File

@@ -35,16 +35,11 @@ public class RenewableWakeLock {
this.tag = tag; this.tag = tag;
this.duration = duration; this.duration = duration;
this.timeUnit = timeUnit; this.timeUnit = timeUnit;
renewTask = new Runnable() { renewTask = this::renew;
@Override
public void run() {
renew();
}
};
} }
public void acquire() { 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) { synchronized (lock) {
if (wakeLock != null) { if (wakeLock != null) {
LOG.info("Already acquired"); LOG.info("Already acquired");
@@ -58,7 +53,7 @@ public class RenewableWakeLock {
} }
private void renew() { 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) { synchronized (lock) {
if (wakeLock == null) { if (wakeLock == null) {
LOG.info("Already released"); LOG.info("Already released");
@@ -74,7 +69,7 @@ public class RenewableWakeLock {
} }
public void release() { 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) { synchronized (lock) {
if (wakeLock == null) { if (wakeLock == null) {
LOG.info("Already released"); LOG.info("Already released");