Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

merge and update

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-04-26 10:59:58 +02:00
parent ef3b41dc1d
commit e809aaa932
27 changed files with 187 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
briar-android/src/org/briarproject/android/PasswordActivity.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.android;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.TextInputLayout;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
@@ -16,9 +17,8 @@ import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import org.briarproject.R;
import org.briarproject.android.controller.EncryptedKeyNullException;
import org.briarproject.android.controller.PasswordController;
import org.briarproject.android.controller.ResultHandler;
import org.briarproject.android.controller.handler.UiResultHandler;
import org.briarproject.android.util.AndroidUtils;
import javax.inject.Inject;
@@ -36,13 +36,13 @@ public class PasswordActivity extends BaseActivity {
private EditText password;
@Inject
PasswordController passwordHelper;
PasswordController passwordController;
@Override
public void onCreate(Bundle state) {
super.onCreate(state);
if (!passwordHelper.initialized()) {
if (!passwordController.initialized()) {
clearSharedPrefsAndDeleteEverything();
return;
}
@@ -92,7 +92,7 @@ public class PasswordActivity extends BaseActivity {
}
private void clearSharedPrefsAndDeleteEverything() {
passwordHelper.clearPrefs();
passwordController.clearPrefs();
AndroidUtils.deleteAppData(this);
setResult(RESULT_CANCELED);
startActivity(new Intent(this, SetupActivity.class));
@@ -125,22 +125,17 @@ public class PasswordActivity extends BaseActivity {
hideSoftKeyboard(password);
signInButton.setVisibility(INVISIBLE);
progress.setVisibility(VISIBLE);
passwordHelper.validatePassword(password.getText().toString(),
new ResultHandler<Boolean, EncryptedKeyNullException>() {
passwordController.validatePassword(password.getText().toString(),
new UiResultHandler<Boolean>(this) {
@Override
public void onResult(Boolean result) {
if (result != null && result) {
public void onResultUi(@NonNull Boolean result) {
if (result) {
setResult(RESULT_OK);
finish();
} else {
tryAgain();
}
}
@Override
public void onException(EncryptedKeyNullException e) {
// TODO ?
}
});
}