From daa2b9c968414fb9fcb080bdb0c8f18257fee176 Mon Sep 17 00:00:00 2001 From: goapunk <goapunk@riseup.net> Date: Mon, 9 Jul 2018 10:07:50 +0200 Subject: [PATCH] briar fixup --- .../briarproject/briar/android/AndroidComponent.java | 3 --- .../android/keyagreement/MailboxExchangeActivity.java | 10 +++++----- .../briar/android/repeater/RepeaterActivity.java | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java index 9c140a021..778a6f2b9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.BrambleCoreEagerSingletons; import org.briarproject.bramble.BrambleCoreModule; import org.briarproject.bramble.api.contact.ContactExchangeTask; import org.briarproject.bramble.api.contact.ContactManager; -import org.briarproject.bramble.api.contact.MailboxExchangeTask; import org.briarproject.bramble.api.crypto.CryptoComponent; import org.briarproject.bramble.api.crypto.CryptoExecutor; import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator; @@ -130,8 +129,6 @@ public interface AndroidComponent ContactExchangeTask contactExchangeTask(); - MailboxExchangeTask mailboxExchangeTask(); - KeyAgreementTask keyAgreementTask(); PayloadEncoder payloadEncoder(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/MailboxExchangeActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/MailboxExchangeActivity.java index f2764266a..c22bf3383 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/MailboxExchangeActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/MailboxExchangeActivity.java @@ -5,7 +5,7 @@ import android.support.annotation.UiThread; import android.widget.Toast; import org.briarproject.bramble.api.contact.ContactExchangeListener; -import org.briarproject.bramble.api.contact.MailboxExchangeTask; +import org.briarproject.bramble.api.contact.ContactExchangeTask; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.IdentityManager; @@ -21,8 +21,8 @@ import javax.inject.Inject; import static android.widget.Toast.LENGTH_LONG; import static java.util.logging.Level.WARNING; -import static org.briarproject.bramble.api.contact.ContactTypes.MAILBOX_OWNER; -import static org.briarproject.bramble.api.contact.ContactTypes.PRIVATE_MAILBOX; +import static org.briarproject.bramble.api.contact.ContactType.MAILBOX_OWNER; +import static org.briarproject.bramble.api.contact.ContactType.PRIVATE_MAILBOX; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.briar.R.string; @@ -33,7 +33,7 @@ public class MailboxExchangeActivity extends KeyAgreementActivity implements Logger.getLogger(MailboxExchangeActivity.class.getName()); @Inject - volatile MailboxExchangeTask mailboxExchangeTask; + volatile ContactExchangeTask contactExchangeTask; @Inject volatile IdentityManager identityManager; @@ -61,7 +61,7 @@ public class MailboxExchangeActivity extends KeyAgreementActivity implements } // Exchange contact details - mailboxExchangeTask.startExchange(MailboxExchangeActivity.this, + contactExchangeTask.startExchange(MailboxExchangeActivity.this, localAuthor, result.getMasterKey(), result.getConnection(), result.getTransportId(), result.wasAlice(), MAILBOX_OWNER, PRIVATE_MAILBOX); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java index 1f878c880..3bae52a35 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/repeater/RepeaterActivity.java @@ -24,7 +24,7 @@ import de.hdodenhof.circleimageview.CircleImageView; import static android.support.v4.view.ViewCompat.setTransitionName; import static java.util.logging.Level.WARNING; -import static org.briarproject.bramble.api.contact.ContactTypes.PRIVATE_MAILBOX; +import static org.briarproject.bramble.api.contact.ContactType.PRIVATE_MAILBOX; import static org.briarproject.bramble.util.LogUtils.logException; public class RepeaterActivity extends BriarActivity { -- GitLab