From 16d2154c733cadf833a99be6c1d0b2de898e145d Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 5 Apr 2019 16:49:46 +0100 Subject: [PATCH] Add a couple of code cleanups. --- .../android/keyagreement/KeyAgreementFragment.java | 2 ++ .../android/navdrawer/NavDrawerControllerImpl.java | 12 ++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java index b0c9cabbc..168708367 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java @@ -303,11 +303,13 @@ public class KeyAgreementFragment extends BaseEventFragment status.setText(listener.keyAgreementStarted()); } + @UiThread private void keyAgreementAborted(boolean remoteAborted) { reset(); listener.keyAgreementAborted(remoteAborted); } + @UiThread private void keyAgreementFinished(KeyAgreementResult result) { statusView.setVisibility(VISIBLE); status.setText(listener.keyAgreementFinished(result)); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java index 607d1bc28..489be9db3 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.navdrawer; import android.app.Activity; import android.content.Context; -import android.support.annotation.UiThread; import org.briarproject.bramble.api.db.DatabaseExecutor; import org.briarproject.bramble.api.db.DbException; @@ -84,7 +83,6 @@ public class NavDrawerControllerImpl extends DbControllerImpl @Override public void onActivityDestroy() { - } @Override @@ -94,21 +92,16 @@ public class NavDrawerControllerImpl extends DbControllerImpl if (LOG.isLoggable(INFO)) { LOG.info("TransportEnabledEvent: " + id.getString()); } - transportStateUpdate(id, true); + listener.stateUpdate(id, true); } else if (e instanceof TransportDisabledEvent) { TransportId id = ((TransportDisabledEvent) e).getTransportId(); if (LOG.isLoggable(INFO)) { LOG.info("TransportDisabledEvent: " + id.getString()); } - transportStateUpdate(id, false); + listener.stateUpdate(id, false); } } - @UiThread - private void transportStateUpdate(TransportId id, boolean enabled) { - listener.stateUpdate(id, enabled); - } - @Override public void showExpiryWarning(ResultHandler handler) { if (!IS_DEBUG_BUILD && !IS_BETA_BUILD) { @@ -190,7 +183,6 @@ public class NavDrawerControllerImpl extends DbControllerImpl @Override public boolean isTransportRunning(TransportId transportId) { Plugin plugin = pluginManager.getPlugin(transportId); - return plugin != null && plugin.isRunning(); }