Add a UI for changing the password

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

@@ -62,6 +62,8 @@ public interface ActivityComponent {
 
 	void inject(SettingsActivity activity);
 
+	void inject(ChangePasswordActivity activity);
+
 	void inject(IntroductionActivity activity);
 
 	@Named("ContactListFragment")

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

@@ -0,0 +1,162 @@
+package org.briarproject.android;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.design.widget.TextInputLayout;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+import android.widget.Toast;
+
+import org.briarproject.R;
+import org.briarproject.android.controller.PasswordController;
+import org.briarproject.android.controller.SetupController;
+import org.briarproject.android.controller.handler.UiResultHandler;
+import org.briarproject.android.util.AndroidUtils;
+import org.briarproject.android.util.StrengthMeter;
+
+import javax.inject.Inject;
+
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+import static org.briarproject.api.crypto.PasswordStrengthEstimator.WEAK;
+
+public class ChangePasswordActivity extends BaseActivity
+		implements OnClickListener,
+		OnEditorActionListener {
+
+	@Inject
+	protected PasswordController passwordController;
+	@Inject
+	protected SetupController setupController;
+
+	private TextInputLayout currentPasswordEntryWrapper;
+	private TextInputLayout newPasswordEntryWrapper;
+	private TextInputLayout newPasswordConfirmationWrapper;
+	private EditText currentPassword;
+	private EditText newPassword;
+	private EditText newPasswordConfirmation;
+	private StrengthMeter strengthMeter;
+	private Button changePasswordButton;
+	private ProgressBar progress;
+
+	@Override
+	public void onCreate(Bundle state) {
+		super.onCreate(state);
+		setContentView(R.layout.activity_change_password);
+
+		currentPasswordEntryWrapper =
+				(TextInputLayout) findViewById(
+						R.id.current_password_entry_wrapper);
+		newPasswordEntryWrapper =
+				(TextInputLayout) findViewById(R.id.new_password_entry_wrapper);
+		newPasswordConfirmationWrapper =
+				(TextInputLayout) findViewById(
+						R.id.new_password_confirm_wrapper);
+		currentPassword = (EditText) findViewById(R.id.current_password_entry);
+		newPassword = (EditText) findViewById(R.id.new_password_entry);
+		newPasswordConfirmation =
+				(EditText) findViewById(R.id.new_password_confirm);
+		strengthMeter = (StrengthMeter) findViewById(R.id.strength_meter);
+		changePasswordButton = (Button) findViewById(R.id.change_password);
+		progress = (ProgressBar) findViewById(R.id.progress_wheel);
+
+		TextWatcher tw = new TextWatcher() {
+
+			@Override
+			public void beforeTextChanged(CharSequence s, int start, int count,
+					int after) {
+			}
+
+			@Override
+			public void onTextChanged(CharSequence s, int start, int before,
+					int count) {
+				enableOrDisableContinueButton();
+			}
+
+			@Override
+			public void afterTextChanged(Editable s) {
+			}
+		};
+
+		currentPassword.addTextChangedListener(tw);
+		newPassword.addTextChangedListener(tw);
+		newPasswordConfirmation.addTextChangedListener(tw);
+		newPasswordConfirmation.setOnEditorActionListener(this);
+		changePasswordButton.setOnClickListener(this);
+	}
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	private void enableOrDisableContinueButton() {
+		if (progress == null) return; // Not created yet
+		if (newPassword.getText().length() > 0 && newPassword.hasFocus())
+			strengthMeter.setVisibility(VISIBLE);
+		else strengthMeter.setVisibility(INVISIBLE);
+		String firstPassword = newPassword.getText().toString();
+		String secondPassword = newPasswordConfirmation.getText().toString();
+		boolean passwordsMatch = firstPassword.equals(secondPassword);
+		float strength =
+				setupController.estimatePasswordStrength(firstPassword);
+		strengthMeter.setStrength(strength);
+		AndroidUtils.setError(newPasswordEntryWrapper,
+				getString(R.string.password_too_weak),
+				firstPassword.length() > 0 && strength < WEAK);
+		AndroidUtils.setError(newPasswordConfirmationWrapper,
+				getString(R.string.passwords_do_not_match),
+				secondPassword.length() > 0 && !passwordsMatch);
+		changePasswordButton.setEnabled(
+				!currentPassword.getText().toString().isEmpty() &&
+						passwordsMatch && strength >= WEAK);
+	}
+
+	@Override
+	public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+		hideSoftKeyboard(v);
+		return true;
+	}
+
+	@Override
+	public void onClick(View view) {
+		// Replace the button with a progress bar
+		changePasswordButton.setVisibility(INVISIBLE);
+		progress.setVisibility(VISIBLE);
+		passwordController.changePassword(currentPassword.getText().toString(),
+				newPassword.getText().toString(),
+				new UiResultHandler<Boolean>(this) {
+					@Override
+					public void onResultUi(@NonNull Boolean result) {
+						if (result) {
+							Toast.makeText(ChangePasswordActivity.this,
+									R.string.password_changed,
+									Toast.LENGTH_LONG).show();
+							setResult(RESULT_OK);
+							finish();
+						} else {
+							tryAgain();
+						}
+					}
+				});
+	}
+
+	private void tryAgain() {
+		AndroidUtils.setError(currentPasswordEntryWrapper,
+				getString(R.string.try_again), true);
+		changePasswordButton.setVisibility(VISIBLE);
+		progress.setVisibility(INVISIBLE);
+		currentPassword.setText("");
+
+		// show the keyboard again
+		showSoftKeyboard(currentPassword);
+	}
+}

briar-android/src/org/briarproject/android/controller/PasswordController.java

@@ -6,4 +6,7 @@ public interface PasswordController extends ConfigController {
 
 	void validatePassword(String password,
 			ResultHandler<Boolean> resultHandler);
+
+	void changePassword(String password, String newPassword,
+			ResultHandler<Boolean> resultHandler);
 }

briar-android/src/org/briarproject/android/controller/PasswordControllerImpl.java

@@ -1,28 +1,40 @@
 package org.briarproject.android.controller;
 
 import android.app.Activity;
+import android.content.SharedPreferences;
 
 import org.briarproject.android.controller.handler.ResultHandler;
 import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.crypto.CryptoExecutor;
 import org.briarproject.api.crypto.SecretKey;
+import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.util.StringUtils;
 
 import java.util.concurrent.Executor;
+import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
+import static java.util.logging.Level.INFO;
+
 public class PasswordControllerImpl extends ConfigControllerImpl
 		implements PasswordController {
 
+	private static final Logger LOG =
+			Logger.getLogger(PasswordControllerImpl.class.getName());
+
+	private final static String PREF_DB_KEY = "key";
+
 	@Inject
 	@CryptoExecutor
 	protected Executor cryptoExecutor;
 	@Inject
-	protected CryptoComponent crypto;
-	@Inject
 	protected Activity activity;
 
+	// Fields that are accessed from background threads must be volatile
+	@Inject
+	protected CryptoComponent crypto;
+
 	@Inject
 	public PasswordControllerImpl() {
 
@@ -46,10 +58,46 @@ public class PasswordControllerImpl extends ConfigControllerImpl
 		});
 	}
 
+	@Override
+	public void changePassword(final String password, final String newPassword,
+			final ResultHandler<Boolean> resultHandler) {
+		final byte[] encrypted = getEncryptedKey();
+		cryptoExecutor.execute(new Runnable() {
+			@Override
+			public void run() {
+				byte[] key = crypto.decryptWithPassword(encrypted, password);
+				if (key == null) {
+					resultHandler.onResult(false);
+				} else {
+					String hex =
+							encryptDatabaseKey(new SecretKey(key), newPassword);
+					storeEncryptedDatabaseKey(hex);
+					resultHandler.onResult(true);
+				}
+			}
+		});
+	}
+
 	private byte[] getEncryptedKey() {
 		String hex = getEncryptedDatabaseKey();
 		if (hex == null)
 			throw new IllegalStateException("Encrypted database key is null");
 		return StringUtils.fromHexString(hex);
 	}
+
+	// Call inside cryptoExecutor
+	String encryptDatabaseKey(SecretKey key, String password) {
+		long now = System.currentTimeMillis();
+		byte[] encrypted = crypto.encryptWithPassword(key.getBytes(), password);
+		long duration = System.currentTimeMillis() - now;
+		if (LOG.isLoggable(INFO))
+			LOG.info("Key derivation took " + duration + " ms");
+		return StringUtils.toHexString(encrypted);
+	}
+
+	void storeEncryptedDatabaseKey(String hex) {
+		SharedPreferences.Editor editor = briarPrefs.edit();
+		editor.putString(PREF_DB_KEY, hex);
+		editor.apply();
+	}
 }

briar-android/src/org/briarproject/android/controller/SetupControllerImpl.java

@@ -22,29 +22,17 @@ import javax.inject.Inject;
 
 import static java.util.logging.Level.INFO;
 
-public class SetupControllerImpl implements SetupController {
+public class SetupControllerImpl extends PasswordControllerImpl
+		implements SetupController {
 
 	private static final Logger LOG =
 			Logger.getLogger(SetupControllerImpl.class.getName());
 
-	private final static String PREF_DB_KEY = "key";
-
-	@Inject
-	@CryptoExecutor
-	protected Executor cryptoExecutor;
 	@Inject
 	protected PasswordStrengthEstimator strengthEstimator;
-	@Inject
-	protected Activity activity;
-	@Inject
-	protected SharedPreferences briarPrefs;
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject
-	protected volatile CryptoComponent crypto;
-	@Inject
-	protected volatile DatabaseConfig databaseConfig;
-	@Inject
 	protected volatile AuthorFactory authorFactory;
 	@Inject
 	protected volatile ReferenceManager referenceManager;
@@ -54,15 +42,6 @@ public class SetupControllerImpl implements SetupController {
 
 	}
 
-	private String encryptDatabaseKey(SecretKey key, String password) {
-		long now = System.currentTimeMillis();
-		byte[] encrypted = crypto.encryptWithPassword(key.getBytes(), password);
-		long duration = System.currentTimeMillis() - now;
-		if (LOG.isLoggable(INFO))
-			LOG.info("Key derivation took " + duration + " ms");
-		return StringUtils.toHexString(encrypted);
-	}
-
 	private LocalAuthor createLocalAuthor(String nickname) {
 		long now = System.currentTimeMillis();
 		KeyPair keyPair = crypto.generateSignatureKeyPair();
@@ -98,10 +77,4 @@ public class SetupControllerImpl implements SetupController {
 			}
 		});
 	}
-
-	private void storeEncryptedDatabaseKey(String hex) {
-		SharedPreferences.Editor editor = briarPrefs.edit();
-		editor.putString(PREF_DB_KEY, hex);
-		editor.apply();
-	}
 }