From b50b9f8088dfc94c8cf2efb45efef3124e49febb Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 17 Jan 2020 10:22:12 +0000 Subject: [PATCH] Small code cleanups in key agreement UI. --- .../keyagreement/ContactExchangeActivity.java | 13 +++++++-- .../keyagreement/KeyAgreementActivity.java | 29 +++++++++---------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java index 062f12059..f18c41f75 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ContactExchangeActivity.java @@ -9,6 +9,7 @@ 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 org.briarproject.briar.android.fragment.BaseFragment; import javax.annotation.Nullable; import javax.inject.Inject; @@ -79,13 +80,13 @@ public class ContactExchangeActivity extends KeyAgreementActivity { @UiThread private void contactExchangeFailed() { - showErrorFragment(R.string.connection_error_explanation); + showErrorFragment(); } @UiThread @Override public void keyAgreementFailed() { - showErrorFragment(R.string.connection_error_explanation); + showErrorFragment(); } @UiThread @@ -103,7 +104,7 @@ public class ContactExchangeActivity extends KeyAgreementActivity { @UiThread @Override public void keyAgreementAborted(boolean remoteAborted) { - showErrorFragment(R.string.connection_error_explanation); + showErrorFragment(); } @UiThread @@ -112,4 +113,10 @@ public class ContactExchangeActivity extends KeyAgreementActivity { startContactExchange(result); return getString(R.string.exchanging_contact_details); } + + protected void showErrorFragment() { + String errorMsg = getString(R.string.connection_error_explanation); + BaseFragment f = ContactExchangeErrorFragment.newInstance(errorMsg); + showNextFragment(f); + } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java index 16d8e2a03..67e125020 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java @@ -44,6 +44,8 @@ import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE; import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE; import static android.bluetooth.BluetoothAdapter.STATE_ON; import static android.content.pm.PackageManager.PERMISSION_GRANTED; +import static java.util.logging.Logger.getLogger; +import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_BLUETOOTH_DISCOVERABLE; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PERMISSION_CAMERA_LOCATION; @@ -62,7 +64,7 @@ public abstract class KeyAgreementActivity extends BriarActivity implements } private static final Logger LOG = - Logger.getLogger(KeyAgreementActivity.class.getName()); + getLogger(KeyAgreementActivity.class.getName()); @Inject EventBus eventBus; @@ -74,18 +76,21 @@ public abstract class KeyAgreementActivity extends BriarActivity implements * https://issuetracker.google.com/issues/37067655. */ private boolean isResumed = false; + /** * Set to true when the continue button is clicked, and false when the QR * code fragment is shown. This prevents the QR code fragment from being * shown automatically before the continue button has been clicked. */ private boolean continueClicked = false; + /** * Records whether the Bluetooth adapter was already enabled before we * asked for Bluetooth discoverability, so we know whether to broadcast a * {@link BluetoothEnabledEvent}. */ private boolean wasAdapterEnabled = false; + private Permission cameraPermission = Permission.UNKNOWN; private Permission locationPermission = Permission.UNKNOWN; private BluetoothState bluetoothState = BluetoothState.UNKNOWN; @@ -96,14 +101,13 @@ public abstract class KeyAgreementActivity extends BriarActivity implements component.inject(this); } - @SuppressWarnings("ConstantConditions") @Override public void onCreate(@Nullable Bundle state) { super.onCreate(state); setContentView(R.layout.activity_fragment_container_toolbar); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true); if (state == null) { showInitialFragment(IntroFragment.newInstance()); } @@ -122,13 +126,11 @@ public abstract class KeyAgreementActivity extends BriarActivity implements @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - onBackPressed(); - return true; - default: - return super.onOptionsItemSelected(item); + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; } + return super.onOptionsItemSelected(item); } @Override @@ -206,7 +208,8 @@ public abstract class KeyAgreementActivity extends BriarActivity implements } @Override - public void onActivityResult(int request, int result, Intent data) { + public void onActivityResult(int request, int result, + @Nullable Intent data) { if (request == REQUEST_BLUETOOTH_DISCOVERABLE) { if (result == RESULT_CANCELED) { setBluetoothState(BluetoothState.REFUSED); @@ -239,12 +242,6 @@ public abstract class KeyAgreementActivity extends BriarActivity implements } } - protected void showErrorFragment(@StringRes int errorResId) { - String errorMsg = getString(errorResId); - BaseFragment f = ContactExchangeErrorFragment.newInstance(errorMsg); - showNextFragment(f); - } - private boolean checkPermissions() { if (areEssentialPermissionsGranted()) return true; // If the camera permission has been permanently denied, ask the