[android] Combine Password and OpenDatabase Activity into StartupActivity

briar-android/src/main/AndroidManifest.xml

@@ -73,13 +73,13 @@
 		</activity>
 
 		<activity
-			android:name="org.briarproject.briar.android.login.PasswordActivity"
+			android:name="org.briarproject.briar.android.login.StartupActivity"
 			android:label="@string/app_name"
-			android:windowSoftInputMode="stateVisible">
+			android:windowSoftInputMode="stateUnchanged">
 		</activity>
 
 		<activity
-			android:name="org.briarproject.briar.android.login.SetupActivity"
+			android:name="org.briarproject.briar.android.account.SetupActivity"
 			android:label="@string/setup_title"
 			android:windowSoftInputMode="adjustResize">
 		</activity>
@@ -94,11 +94,6 @@
 			</intent-filter>
 		</activity>
 
-		<activity
-			android:name=".android.login.OpenDatabaseActivity"
-			android:label="@string/app_name"
-			android:launchMode="singleTop"/>
-
 		<activity
 			android:name="org.briarproject.briar.android.navdrawer.NavDrawerActivity"
 			android:theme="@style/BriarTheme.NoActionBar"
@@ -420,7 +415,7 @@
 		</activity>
 
 		<activity
-			android:name=".android.login.UnlockActivity"
+			android:name=".android.account.UnlockActivity"
 			android:label="@string/lock_unlock"
 			android:launchMode="singleTask"
 			android:theme="@style/BriarTheme.NoActionBar"/>

briar-android/src/main/java/org/briarproject/briar/android/BriarService.java

@@ -22,7 +22,6 @@ import org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResult;
 import org.briarproject.bramble.api.system.AndroidExecutor;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.logout.HideUiActivity;
-import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.android.LockManager;
 
@@ -48,6 +47,7 @@ import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResult.ALREADY_RUNNING;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResult.SUCCESS;
+import static org.briarproject.briar.android.activity.ActivityComponent.ENTRY_ACTIVITY;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_CHANNEL_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_NOTIFICATION_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_ID;
@@ -182,7 +182,7 @@ public class BriarService extends Service {
 			NotificationManager nm = (NotificationManager) o;
 			nm.notify(FAILURE_NOTIFICATION_ID, b.build());
 			// Bring the dashboard to the front to clear the back stack
-			i = new Intent(BriarService.this, NavDrawerActivity.class);
+			i = new Intent(BriarService.this, ENTRY_ACTIVITY);
 			i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
 			i.putExtra(EXTRA_STARTUP_FAILED, true);
 			startActivity(i);

briar-android/src/main/java/org/briarproject/briar/android/login/AuthorNameFragment.java → briar-android/src/main/java/org/briarproject/briar/android/account/AuthorNameFragment.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 import android.os.Bundle;
 import android.support.design.widget.TextInputEditText;

briar-android/src/main/java/org/briarproject/briar/android/login/DozeFragment.java → briar-android/src/main/java/org/briarproject/briar/android/account/DozeFragment.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -14,7 +14,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.login.PowerView.OnCheckedChangedListener;
+import org.briarproject.briar.android.account.PowerView.OnCheckedChangedListener;
 import org.briarproject.briar.android.util.UiUtils;
 
 import static android.view.View.INVISIBLE;

briar-android/src/main/java/org/briarproject/briar/android/login/DozeView.java → briar-android/src/main/java/org/briarproject/briar/android/account/DozeView.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 
 import android.content.Context;

briar-android/src/main/java/org/briarproject/briar/android/login/HuaweiView.java → briar-android/src/main/java/org/briarproject/briar/android/account/HuaweiView.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 
 import android.content.Context;

briar-android/src/main/java/org/briarproject/briar/android/login/PowerView.java → briar-android/src/main/java/org/briarproject/briar/android/account/PowerView.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 import android.content.Context;
 import android.os.Parcel;

briar-android/src/main/java/org/briarproject/briar/android/account/SetPasswordFragment.java

+package org.briarproject.briar.android.account;
+
+import android.os.Bundle;
+import android.os.IBinder;
+import android.support.design.widget.TextInputEditText;
+import android.support.design.widget.TextInputLayout;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.ProgressBar;
+
+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.login.StrengthMeter;
+
+import javax.annotation.Nullable;
+
+import static android.content.Context.INPUT_METHOD_SERVICE;
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
+import static java.util.Objects.requireNonNull;
+import static org.briarproject.bramble.api.crypto.PasswordStrengthEstimator.QUITE_WEAK;
+import static org.briarproject.briar.android.util.UiUtils.setError;
+
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class SetPasswordFragment extends SetupFragment {
+
+	private final static String TAG = SetPasswordFragment.class.getName();
+
+	private TextInputLayout passwordEntryWrapper;
+	private TextInputLayout passwordConfirmationWrapper;
+	private TextInputEditText passwordEntry;
+	private TextInputEditText passwordConfirmation;
+	private StrengthMeter strengthMeter;
+	private Button nextButton;
+	private ProgressBar progressBar;
+
+	public static SetPasswordFragment newInstance() {
+		return new SetPasswordFragment();
+	}
+
+	@Override
+	public void injectFragment(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater,
+			@Nullable ViewGroup container,
+			@Nullable Bundle savedInstanceState) {
+		requireNonNull(getActivity()).setTitle(getString(R.string.setup_password_intro));
+		View v = inflater.inflate(R.layout.fragment_setup_password, container,
+						false);
+
+		strengthMeter = v.findViewById(R.id.strength_meter);
+		passwordEntryWrapper = v.findViewById(R.id.password_entry_wrapper);
+		passwordEntry = v.findViewById(R.id.password_entry);
+		passwordConfirmationWrapper =
+				v.findViewById(R.id.password_confirm_wrapper);
+		passwordConfirmation = v.findViewById(R.id.password_confirm);
+		nextButton = v.findViewById(R.id.next);
+		progressBar = v.findViewById(R.id.progress);
+
+		passwordEntry.addTextChangedListener(this);
+		passwordConfirmation.addTextChangedListener(this);
+		nextButton.setOnClickListener(this);
+
+		if (!setupController.needToShowDozeFragment()) {
+			nextButton.setText(R.string.create_account_button);
+			passwordConfirmation.setImeOptions(IME_ACTION_DONE);
+		}
+
+		return v;
+	}
+
+	@Override
+	public String getUniqueTag() {
+		return TAG;
+	}
+
+	@Override
+	protected String getHelpText() {
+		return getString(R.string.setup_password_explanation);
+	}
+
+	@Override
+	public void onTextChanged(CharSequence authorName, int i, int i1, int i2) {
+		String password1 = passwordEntry.getText().toString();
+		String password2 = passwordConfirmation.getText().toString();
+		boolean passwordsMatch = password1.equals(password2);
+
+		strengthMeter
+				.setVisibility(password1.length() > 0 ? VISIBLE : INVISIBLE);
+		float strength = setupController.estimatePasswordStrength(password1);
+		strengthMeter.setStrength(strength);
+		boolean strongEnough = strength >= QUITE_WEAK;
+
+		setError(passwordEntryWrapper, getString(R.string.password_too_weak),
+				password1.length() > 0 && !strongEnough);
+		setError(passwordConfirmationWrapper,
+				getString(R.string.passwords_do_not_match),
+				password2.length() > 0 && !passwordsMatch);
+
+		boolean enabled = passwordsMatch && strongEnough;
+		nextButton.setEnabled(enabled);
+		passwordConfirmation.setOnEditorActionListener(enabled ? this : null);
+	}
+
+	@Override
+	public void onClick(View view) {
+		IBinder token = passwordEntry.getWindowToken();
+		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
+		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
+		setupController.setPassword(passwordEntry.getText().toString());
+		if (setupController.needToShowDozeFragment()) {
+			setupController.showDozeFragment();
+		} else {
+			nextButton.setVisibility(INVISIBLE);
+			progressBar.setVisibility(VISIBLE);
+			setupController.createAccount();
+		}
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/login/SetupActivity.java → briar-android/src/main/java/org/briarproject/briar/android/account/SetupActivity.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -15,8 +15,11 @@ import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME;
+import static org.briarproject.briar.android.activity.ActivityComponent.ENTRY_ACTIVITY;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -86,7 +89,7 @@ public class SetupActivity extends BaseActivity
 
 	void showPasswordFragment() {
 		if (authorName == null) throw new IllegalStateException();
-		showNextFragment(PasswordFragment.newInstance());
+		showNextFragment(SetPasswordFragment.newInstance());
 	}
 
 	@TargetApi(23)
@@ -97,8 +100,9 @@ public class SetupActivity extends BaseActivity
 	}
 
 	void showApp() {
-		Intent i = new Intent(this, OpenDatabaseActivity.class);
-		i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME);
+		Intent i = new Intent(this, ENTRY_ACTIVITY);
+		i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_TASK_ON_HOME |
+				FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_CLEAR_TOP);
 		startActivity(i);
 		supportFinishAfterTransition();
 		overridePendingTransition(R.anim.screen_new_in, R.anim.screen_old_out);

briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java → briar-android/src/main/java/org/briarproject/briar/android/account/SetupController.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
 @NotNullByDefault
-public interface SetupController extends PasswordController {
+public interface SetupController {
 
 	void setSetupActivity(SetupActivity setupActivity);
 
@@ -11,6 +11,8 @@ public interface SetupController extends PasswordController {
 
 	void setAuthorName(String authorName);
 
+	float estimatePasswordStrength(String password);
+
 	void setPassword(String password);
 
 	/**

briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java → briar-android/src/main/java/org/briarproject/briar/android/account/SetupControllerImpl.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 import android.support.annotation.Nullable;
 
@@ -15,12 +15,15 @@ import java.util.logging.Logger;
 import javax.inject.Inject;
 
 @NotNullByDefault
-public class SetupControllerImpl extends PasswordControllerImpl
-		implements SetupController {
+public class SetupControllerImpl implements SetupController {
 
 	private static final Logger LOG =
 			Logger.getLogger(SetupControllerImpl.class.getName());
 
+	private final AccountManager accountManager;
+	private final PasswordStrengthEstimator strengthEstimator;
+	@IoExecutor
+	private final Executor ioExecutor;
 	@Nullable
 	private volatile SetupActivity setupActivity;
 
@@ -28,7 +31,9 @@ public class SetupControllerImpl extends PasswordControllerImpl
 	SetupControllerImpl(AccountManager accountManager,
 			@IoExecutor Executor ioExecutor,
 			PasswordStrengthEstimator strengthEstimator) {
-		super(accountManager, ioExecutor, strengthEstimator);
+		this.accountManager = accountManager;
+		this.strengthEstimator = strengthEstimator;
+		this.ioExecutor = ioExecutor;
 	}
 
 	@Override
@@ -51,6 +56,11 @@ public class SetupControllerImpl extends PasswordControllerImpl
 		setupActivity.setAuthorName(authorName);
 	}
 
+	@Override
+	public float estimatePasswordStrength(String password) {
+		return strengthEstimator.estimateStrength(password);
+	}
+
 	@Override
 	public void setPassword(String password) {
 		SetupActivity setupActivity = this.setupActivity;

briar-android/src/main/java/org/briarproject/briar/android/login/SetupFragment.java → briar-android/src/main/java/org/briarproject/briar/android/account/SetupFragment.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 import android.support.annotation.Nullable;
 import android.text.Editable;

briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java → briar-android/src/main/java/org/briarproject/briar/android/account/UnlockActivity.java

-package org.briarproject.briar.android.login;
+package org.briarproject.briar.android.account;
 
 import android.app.KeyguardManager;
 import android.content.Intent;

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java

@@ -4,6 +4,11 @@ import android.app.Activity;
 
 import org.briarproject.briar.android.AndroidComponent;
 import org.briarproject.briar.android.StartupFailureActivity;
+import org.briarproject.briar.android.account.AuthorNameFragment;
+import org.briarproject.briar.android.account.DozeFragment;
+import org.briarproject.briar.android.account.SetPasswordFragment;
+import org.briarproject.briar.android.account.SetupActivity;
+import org.briarproject.briar.android.account.UnlockActivity;
 import org.briarproject.briar.android.blog.BlogActivity;
 import org.briarproject.briar.android.blog.BlogFragment;
 import org.briarproject.briar.android.blog.BlogModule;
@@ -37,14 +42,10 @@ import org.briarproject.briar.android.keyagreement.ContactExchangeActivity;
 import org.briarproject.briar.android.keyagreement.ContactExchangeErrorFragment;
 import org.briarproject.briar.android.keyagreement.KeyAgreementActivity;
 import org.briarproject.briar.android.keyagreement.KeyAgreementFragment;
-import org.briarproject.briar.android.login.AuthorNameFragment;
 import org.briarproject.briar.android.login.ChangePasswordActivity;
-import org.briarproject.briar.android.login.DozeFragment;
-import org.briarproject.briar.android.login.OpenDatabaseActivity;
-import org.briarproject.briar.android.login.PasswordActivity;
+import org.briarproject.briar.android.login.OpenDatabaseFragment;
 import org.briarproject.briar.android.login.PasswordFragment;
-import org.briarproject.briar.android.login.SetupActivity;
-import org.briarproject.briar.android.login.UnlockActivity;
+import org.briarproject.briar.android.login.StartupActivity;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 import org.briarproject.briar.android.panic.PanicPreferencesActivity;
 import org.briarproject.briar.android.panic.PanicResponderActivity;
@@ -90,18 +91,18 @@ import dagger.Component;
 		dependencies = AndroidComponent.class)
 public interface ActivityComponent {
 
+	Class<? extends Activity> ENTRY_ACTIVITY = NavDrawerActivity.class;
+
 	Activity activity();
 
 	void inject(SplashScreenActivity activity);
 
-	void inject(SetupActivity activity);
+	void inject(StartupActivity activity);
 
-	void inject(OpenDatabaseActivity activity);
+	void inject(SetupActivity activity);
 
 	void inject(NavDrawerActivity activity);
 
-	void inject(PasswordActivity activity);
-
 	void inject(PanicResponderActivity activity);
 
 	void inject(PanicPreferencesActivity activity);
@@ -177,12 +178,17 @@ public interface ActivityComponent {
 	void inject(PendingContactListActivity activity);
 
 	// Fragments
+
 	void inject(AuthorNameFragment fragment);
 
-	void inject(PasswordFragment fragment);
+	void inject(SetPasswordFragment fragment);
 
 	void inject(DozeFragment fragment);
 
+	void inject(PasswordFragment imageFragment);
+
+	void inject(OpenDatabaseFragment activity);
+
 	void inject(ContactListFragment fragment);
 
 	void inject(CreateGroupFragment fragment);

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityModule.java

@@ -6,10 +6,10 @@ import org.briarproject.briar.android.controller.BriarController;
 import org.briarproject.briar.android.controller.BriarControllerImpl;
 import org.briarproject.briar.android.controller.DbController;
 import org.briarproject.briar.android.controller.DbControllerImpl;
-import org.briarproject.briar.android.login.PasswordController;
-import org.briarproject.briar.android.login.PasswordControllerImpl;
-import org.briarproject.briar.android.login.SetupController;
-import org.briarproject.briar.android.login.SetupControllerImpl;
+import org.briarproject.briar.android.login.ChangePasswordController;
+import org.briarproject.briar.android.login.ChangePasswordControllerImpl;
+import org.briarproject.briar.android.account.SetupController;
+import org.briarproject.briar.android.account.SetupControllerImpl;
 import org.briarproject.briar.android.navdrawer.NavDrawerController;
 import org.briarproject.briar.android.navdrawer.NavDrawerControllerImpl;
 
@@ -48,8 +48,8 @@ public class ActivityModule {
 
 	@ActivityScope
 	@Provides
-	PasswordController providePasswordController(
-			PasswordControllerImpl passwordController) {
+	ChangePasswordController providePasswordController(
+			ChangePasswordControllerImpl passwordController) {
 		return passwordController;
 	}
 

briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java

@@ -15,8 +15,8 @@ import org.briarproject.briar.R;
 import org.briarproject.briar.android.controller.BriarController;
 import org.briarproject.briar.android.controller.DbController;
 import org.briarproject.briar.android.controller.handler.UiResultHandler;
-import org.briarproject.briar.android.login.PasswordActivity;
-import org.briarproject.briar.android.login.UnlockActivity;
+import org.briarproject.briar.android.login.StartupActivity;
+import org.briarproject.briar.android.account.UnlockActivity;
 import org.briarproject.briar.android.logout.ExitActivity;
 import org.briarproject.briar.api.android.LockManager;
 
@@ -86,8 +86,8 @@ public abstract class BriarActivity extends BaseActivity {
 		if (!briarController.accountSignedIn() && !isFinishing()) {
 			// Also check that the activity isn't finishing already.
 			// This is possible if we finished in onActivityResult().
-			// Launching another PasswordActivity would cause a loop.
-			Intent i = new Intent(this, PasswordActivity.class);
+			// Launching another StartupActivity would cause a loop.
+			Intent i = new Intent(this, StartupActivity.class);
 			startActivityForResult(i, REQUEST_PASSWORD);
 		} else if (lockManager.isLocked() && !isFinishing()) {
 			// Also check that the activity isn't finishing already.

briar-android/src/main/java/org/briarproject/briar/android/controller/BriarControllerImpl.java

@@ -8,6 +8,7 @@ import android.support.annotation.CallSuper;
 import org.briarproject.bramble.api.account.AccountManager;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.settings.Settings;
 import org.briarproject.bramble.api.settings.SettingsManager;
 import org.briarproject.briar.android.BriarService;
@@ -21,6 +22,7 @@ import java.util.logging.Logger;
 import javax.inject.Inject;
 
 import static java.util.logging.Level.WARNING;
+import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STARTING_SERVICES;
 import static org.briarproject.bramble.util.LogUtils.logException;
 import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
 import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting;
@@ -34,6 +36,7 @@ public class BriarControllerImpl implements BriarController {
 
 	private final BriarServiceConnection serviceConnection;
 	private final AccountManager accountManager;
+	private final LifecycleManager lifecycleManager;
 	private final Executor databaseExecutor;
 	private final SettingsManager settingsManager;
 	private final DozeWatchdog dozeWatchdog;
@@ -44,11 +47,13 @@ public class BriarControllerImpl implements BriarController {
 	@Inject
 	BriarControllerImpl(BriarServiceConnection serviceConnection,
 			AccountManager accountManager,
+			LifecycleManager lifecycleManager,
 			@DatabaseExecutor Executor databaseExecutor,
 			SettingsManager settingsManager, DozeWatchdog dozeWatchdog,
 			Activity activity) {
 		this.serviceConnection = serviceConnection;
 		this.accountManager = accountManager;
+		this.lifecycleManager = lifecycleManager;
 		this.databaseExecutor = databaseExecutor;
 		this.settingsManager = settingsManager;
 		this.dozeWatchdog = dozeWatchdog;
@@ -84,7 +89,8 @@ public class BriarControllerImpl implements BriarController {
 
 	@Override
 	public boolean accountSignedIn() {
-		return accountManager.hasDatabaseKey();
+		return accountManager.hasDatabaseKey() &&
+				lifecycleManager.getLifecycleState().isAfter(STARTING_SERVICES);
 	}
 
 	@Override

briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordActivity.java

@@ -31,7 +31,7 @@ public class ChangePasswordActivity extends BriarActivity
 		implements OnClickListener, OnEditorActionListener {
 
 	@Inject
-	protected PasswordController passwordController;
+	protected ChangePasswordController passwordController;
 
 	private TextInputLayout currentPasswordEntryWrapper;
 	private TextInputLayout newPasswordEntryWrapper;

briar-android/src/main/java/org/briarproject/briar/android/login/PasswordController.java → briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordController.java

@@ -4,13 +4,10 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.android.controller.handler.ResultHandler;
 
 @NotNullByDefault
-public interface PasswordController {
+public interface ChangePasswordController {
 
 	float estimatePasswordStrength(String password);
 
-	void validatePassword(String password,
-			ResultHandler<Boolean> resultHandler);
-
 	void changePassword(String oldPassword, String newPassword,
 			ResultHandler<Boolean> resultHandler);
 

briar-android/src/main/java/org/briarproject/briar/android/login/PasswordControllerImpl.java → briar-android/src/main/java/org/briarproject/briar/android/login/ChangePasswordControllerImpl.java

@@ -11,14 +11,14 @@ import java.util.concurrent.Executor;
 import javax.inject.Inject;
 
 @NotNullByDefault
-public class PasswordControllerImpl implements PasswordController {
+public class ChangePasswordControllerImpl implements ChangePasswordController {
 
 	protected final AccountManager accountManager;
 	protected final Executor ioExecutor;
 	private final PasswordStrengthEstimator strengthEstimator;
 
 	@Inject
-	PasswordControllerImpl(AccountManager accountManager,
+	ChangePasswordControllerImpl(AccountManager accountManager,
 			@IoExecutor Executor ioExecutor,
 			PasswordStrengthEstimator strengthEstimator) {
 		this.accountManager = accountManager;
@@ -31,13 +31,6 @@ public class PasswordControllerImpl implements PasswordController {
 		return strengthEstimator.estimateStrength(password);
 	}
 
-	@Override
-	public void validatePassword(String password,
-			ResultHandler<Boolean> resultHandler) {
-		ioExecutor.execute(() ->
-				resultHandler.onResult(accountManager.signIn(password)));
-	}
-
 	@Override
 	public void changePassword(String oldPassword, String newPassword,
 			ResultHandler<Boolean> resultHandler) {

briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseActivity.java

-package org.briarproject.briar.android.login;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager;
-import org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState;
-import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent;
-import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.activity.BriarActivity;
-import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
-
-import javax.inject.Inject;
-
-import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.COMPACTING_DATABASE;
-import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.MIGRATING_DATABASE;
-import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STARTING_SERVICES;
-
-@ParametersNotNullByDefault
-public class OpenDatabaseActivity extends BriarActivity
-		implements EventListener {
-
-	@Inject
-	LifecycleManager lifecycleManager;
-	@Inject
-	EventBus eventBus;
-
-	private TextView textView;
-	private ImageView imageView;
-	private boolean showingMigration = false, showingCompaction = false;
-
-	@Override
-	public void onCreate(@Nullable Bundle state) {
-		super.onCreate(state);
-		setContentView(R.layout.activity_open_database);
-		textView = findViewById(R.id.textView);
-		imageView = findViewById(R.id.imageView);
-	}
-
-	@Override
-	public void injectActivity(ActivityComponent component) {
-		component.inject(this);
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		LifecycleState state = lifecycleManager.getLifecycleState();
-		if (state.isAfter(STARTING_SERVICES)) {
-			finishAndStartApp();
-		} else {
-			if (state == MIGRATING_DATABASE) showMigration();
-			else if (state == COMPACTING_DATABASE) showCompaction();
-			eventBus.addListener(this);
-		}
-	}
-
-	@Override
-	protected void onStop() {
-		super.onStop();
-		eventBus.removeListener(this);
-	}
-
-	@Override
-	public void eventOccurred(Event e) {
-		if (e instanceof LifecycleEvent) {
-			LifecycleState state = ((LifecycleEvent) e).getLifecycleState();
-			if (state.isAfter(STARTING_SERVICES)) finishAndStartApp();
-			else if (state == MIGRATING_DATABASE) showMigration();
-			else if (state == COMPACTING_DATABASE) showCompaction();
-		}
-	}
-
-	private void showMigration() {