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

Always remove observers in destroy().

Browse Source
This commit is contained in:
akwizgran
2022-06-08 13:53:27 +01:00
parent 6288577daa
commit 01e72eff40
2 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
bramble-core/src/main/java/org/briarproject/bramble/mailbox/ContactMailboxDownloadWorker.java
View File

@@ -69,14 +69,6 @@ class ContactMailboxDownloadWorker implements MailboxWorker,
@Nullable @Nullable
private Cancellable apiCall = null; private Cancellable apiCall = null;
@GuardedBy("lock")
@Nullable
private ConnectivityObserver connectivityObserver = null;
@GuardedBy("lock")
@Nullable
private TorReachabilityObserver reachabilityObserver = null;
ContactMailboxDownloadWorker( ContactMailboxDownloadWorker(
ConnectivityChecker connectivityChecker, ConnectivityChecker connectivityChecker,
TorReachabilityMonitor torReachabilityMonitor, TorReachabilityMonitor torReachabilityMonitor,
@@ -101,38 +93,28 @@ class ContactMailboxDownloadWorker implements MailboxWorker,
if (state != State.CREATED) throw new IllegalStateException(); if (state != State.CREATED) throw new IllegalStateException();
state = State.CONNECTIVITY_CHECK; state = State.CONNECTIVITY_CHECK;
} }
connectivityChecker.checkConnectivity(mailboxProperties, this);
// Avoid leaking observer in case destroy() is called concurrently // Avoid leaking observer in case destroy() is called concurrently
boolean remove = false; // before observer is added
connectivityChecker.checkConnectivity(mailboxProperties, this);
boolean destroyed;
synchronized (lock) { synchronized (lock) {
if (state == State.DESTROYED) remove = true; destroyed = state == State.DESTROYED;
else connectivityObserver = this;
} }
if (remove) connectivityChecker.removeObserver(this); if (destroyed) connectivityChecker.removeObserver(this);
} }
@Override @Override
public void destroy() { public void destroy() {
LOG.info("Destroyed"); LOG.info("Destroyed");
Cancellable apiCall; Cancellable apiCall;
ConnectivityObserver connectivityObserver;
TorReachabilityObserver reachabilityObserver;
synchronized (lock) { synchronized (lock) {
state = State.DESTROYED; state = State.DESTROYED;
apiCall = this.apiCall; apiCall = this.apiCall;
this.apiCall = null; this.apiCall = null;
connectivityObserver = this.connectivityObserver;
this.connectivityObserver = null;
reachabilityObserver = this.reachabilityObserver;
this.reachabilityObserver = null;
} }
if (apiCall != null) apiCall.cancel(); if (apiCall != null) apiCall.cancel();
if (connectivityObserver != null) { connectivityChecker.removeObserver(this);
connectivityChecker.removeObserver(connectivityObserver); torReachabilityMonitor.removeObserver(this);
}
if (reachabilityObserver != null) {
torReachabilityMonitor.removeObserver(reachabilityObserver);
}
} }
@Override @Override
@@ -141,8 +123,6 @@ class ContactMailboxDownloadWorker implements MailboxWorker,
synchronized (lock) { synchronized (lock) {
if (state != State.CONNECTIVITY_CHECK) return; if (state != State.CONNECTIVITY_CHECK) return;
state = State.DOWNLOAD_CYCLE_1; state = State.DOWNLOAD_CYCLE_1;
// No need to remove the observer in destroy()
connectivityObserver = null;
// Start first download cycle // Start first download cycle
apiCall = mailboxApiCaller.retryWithBackoff( apiCall = mailboxApiCaller.retryWithBackoff(
new SimpleApiCall(this::apiCallListInbox)); new SimpleApiCall(this::apiCallListInbox));
@@ -173,14 +153,14 @@ class ContactMailboxDownloadWorker implements MailboxWorker,
} }
} }
if (addObserver) { if (addObserver) {
torReachabilityMonitor.addOneShotObserver(this);
// Avoid leaking observer in case destroy() is called concurrently // Avoid leaking observer in case destroy() is called concurrently
boolean remove = false; // before observer is added
torReachabilityMonitor.addOneShotObserver(this);
boolean destroyed;
synchronized (lock) { synchronized (lock) {
if (state == State.DESTROYED) remove = true; destroyed = state == State.DESTROYED;
else reachabilityObserver = this;
} }
if (remove) torReachabilityMonitor.removeObserver(this); if (destroyed) torReachabilityMonitor.removeObserver(this);
} }
} }
@@ -253,8 +233,6 @@ class ContactMailboxDownloadWorker implements MailboxWorker,
synchronized (lock) { synchronized (lock) {
if (state != State.WAITING_FOR_TOR) return; if (state != State.WAITING_FOR_TOR) return;
state = State.DOWNLOAD_CYCLE_2; state = State.DOWNLOAD_CYCLE_2;
// No need to remove the observer in destroy()
reachabilityObserver = null;
// Start second download cycle // Start second download cycle
apiCall = mailboxApiCaller.retryWithBackoff( apiCall = mailboxApiCaller.retryWithBackoff(
new SimpleApiCall(this::apiCallListInbox)); new SimpleApiCall(this::apiCallListInbox));

12
bramble-core/src/test/java/org/briarproject/bramble/mailbox/ContactMailboxDownloadWorkerTest.java
View File

@@ -74,9 +74,10 @@ public class ContactMailboxDownloadWorkerTest extends BrambleMockTestCase {
worker.start(); worker.start();
// When the worker is destroyed it should remove the connectivity // When the worker is destroyed it should remove the connectivity
// observer // and reachability observers
context.checking(new Expectations() {{ context.checking(new Expectations() {{
oneOf(connectivityChecker).removeObserver(worker); oneOf(connectivityChecker).removeObserver(worker);
oneOf(torReachabilityMonitor).removeObserver(worker);
}}); }});
worker.destroy(); worker.destroy();
@@ -202,8 +203,13 @@ public class ContactMailboxDownloadWorkerTest extends BrambleMockTestCase {
assertFalse(listTask.get().callApi()); assertFalse(listTask.get().callApi());
// When the worker is destroyed it should not remove the connectivity // When the worker is destroyed it should remove the connectivity
// and reachability observers, which were removed when they were called // and reachability observers
context.checking(new Expectations() {{
oneOf(connectivityChecker).removeObserver(worker);
oneOf(torReachabilityMonitor).removeObserver(worker);
}});
worker.destroy(); worker.destroy();
} }
} }