From bd19272099ecbbdd8613cf51afc2c8b5118fa882 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 11 May 2018 10:08:43 +0100
Subject: [PATCH] Throw exception if account exists when beginning setup.
---
.../org/briarproject/briar/android/login/SetupActivity.java | 2 ++
.../org/briarproject/briar/android/login/SetupController.java | 4 +---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
index 5e74be6b29..d2dff6a28e 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java
@@ -38,6 +38,8 @@ public class SetupActivity extends BaseActivity
setContentView(R.layout.activity_fragment_container);
if (state == null) {
+ if (setupController.accountExists())
+ throw new AssertionError();
showInitialFragment(AuthorNameFragment.newInstance());
} else {
authorName = state.getString(STATE_KEY_AUTHOR_NAME);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
index 7d130b26a2..3921518978 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
@@ -3,7 +3,7 @@ package org.briarproject.briar.android.login;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@NotNullByDefault
-public interface SetupController {
+public interface SetupController extends PasswordController {
void setSetupActivity(SetupActivity setupActivity);
@@ -13,8 +13,6 @@ public interface SetupController {
void setPassword(String password);
- float estimatePasswordStrength(String password);
-
/**
* This should be called after the author name has been set.
*/
--
GitLab