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

Run contact exchange task on IO executor.

Browse Source
This commit is contained in:
akwizgran
2019-03-15 17:31:56 +00:00
parent cc49648e37
commit f459115b19
3 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java
View File

@@ -14,11 +14,13 @@ import org.briarproject.bramble.api.identity.Author;
import org.briarproject.bramble.api.identity.IdentityManager;
import org.briarproject.bramble.api.identity.LocalAuthor;
import org.briarproject.bramble.api.keyagreement.KeyAgreementResult;
import org.briarproject.bramble.api.lifecycle.IoExecutor;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
import javax.annotation.Nullable;
@@ -36,6 +38,10 @@ public class ContactExchangeActivity extends KeyAgreementActivity implements
private static final Logger LOG =
Logger.getLogger(ContactExchangeActivity.class.getName());
@Inject
@IoExecutor
Executor ioExecutor;
// Fields that are accessed from background threads must be volatile
@Inject
volatile ContactExchangeTask contactExchangeTask;
@@ -63,12 +69,12 @@ public class ContactExchangeActivity extends KeyAgreementActivity implements
@Override
protected void onStop() {
super.onStop();
// Stop listen to updates from contactExchangeTask
// Stop listening to updates from contactExchangeTask
eventBus.addListener(this);
}
private void startContactExchange(KeyAgreementResult result) {
runOnDbThread(() -> {
ioExecutor.execute(() -> {
LocalAuthor localAuthor;
// Load the local pseudonym
try {
@@ -78,9 +84,8 @@ public class ContactExchangeActivity extends KeyAgreementActivity implements
contactExchangeFailed();
return;
}
// Exchange contact details
contactExchangeTask.startExchange(localAuthor,
contactExchangeTask.exchangeContacts(localAuthor,
result.getMasterKey(), result.getConnection(),
result.getTransportId(), result.wasAlice());
});