From 8d021aab50158341872a0c7498537eb1e7f35d5a Mon Sep 17 00:00:00 2001
From: Ernir Erlingsson <ernir@ymirmobile.com>
Date: Fri, 1 Apr 2016 16:38:16 +0200
Subject: [PATCH] cleaning up
---
.../briarproject/android/SetupActivity.java | 61 +++++++++----------
.../android/fragment/BaseFragment.java | 5 --
.../android/helper/PasswordHelperImp.java | 2 -
3 files changed, 29 insertions(+), 39 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/SetupActivity.java b/briar-android/src/org/briarproject/android/SetupActivity.java
index 8305e09d70..e3aaf510c9 100644
--- a/briar-android/src/org/briarproject/android/SetupActivity.java
+++ b/briar-android/src/org/briarproject/android/SetupActivity.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import org.briarproject.R;
+import org.briarproject.android.event.LocalAuthorCreatedEvent;
import org.briarproject.android.helper.SetupHelper;
import org.briarproject.android.util.AndroidUtils;
import org.briarproject.android.util.StrengthMeter;
@@ -25,6 +26,7 @@ import org.briarproject.api.crypto.KeyPair;
import org.briarproject.api.crypto.PasswordStrengthEstimator;
import org.briarproject.api.crypto.SecretKey;
import org.briarproject.api.db.DatabaseConfig;
+import org.briarproject.api.event.Event;
import org.briarproject.api.identity.AuthorFactory;
import org.briarproject.api.identity.LocalAuthor;
import org.briarproject.util.StringUtils;
@@ -64,15 +66,18 @@ public class SetupActivity extends BaseActivity implements OnClickListener,
super.onCreate(state);
setContentView(R.layout.activity_setup);
- nicknameEntryWrapper = (TextInputLayout)findViewById(R.id.nickname_entry_wrapper);
- passwordEntryWrapper = (TextInputLayout)findViewById(R.id.password_entry_wrapper);
- passwordConfirmationWrapper = (TextInputLayout)findViewById(R.id.password_confirm_wrapper);
- nicknameEntry = (EditText)findViewById(R.id.nickname_entry);
- passwordEntry = (EditText)findViewById(R.id.password_entry);
- passwordConfirmation = (EditText)findViewById(R.id.password_confirm);
- strengthMeter = (StrengthMeter)findViewById(R.id.strength_meter);
- createAccountButton = (Button)findViewById(R.id.create_account);
- progress = (ProgressBar)findViewById(R.id.progress_wheel);
+ nicknameEntryWrapper =
+ (TextInputLayout) findViewById(R.id.nickname_entry_wrapper);
+ passwordEntryWrapper =
+ (TextInputLayout) findViewById(R.id.password_entry_wrapper);
+ passwordConfirmationWrapper =
+ (TextInputLayout) findViewById(R.id.password_confirm_wrapper);
+ nicknameEntry = (EditText) findViewById(R.id.nickname_entry);
+ passwordEntry = (EditText) findViewById(R.id.password_entry);
+ passwordConfirmation = (EditText) findViewById(R.id.password_confirm);
+ strengthMeter = (StrengthMeter) findViewById(R.id.strength_meter);
+ createAccountButton = (Button) findViewById(R.id.create_account);
+ progress = (ProgressBar) findViewById(R.id.progress_wheel);
if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
@@ -144,32 +149,24 @@ public class SetupActivity extends BaseActivity implements OnClickListener,
final String nickname = nicknameEntry.getText().toString();
final String password = passwordEntry.getText().toString();
setupHelper.createIdentity(nickname, password);
-// // Store the DB key and create the identity in a background thread
-// cryptoExecutor.execute(new Runnable() {
-// public void run() {
-// SecretKey key = crypto.generateSecretKey();
-// databaseConfig.setEncryptionKey(key);
-// String hex = encryptDatabaseKey(key, password);
-// storeEncryptedDatabaseKey(hex);
-// LocalAuthor localAuthor = createLocalAuthor(nickname);
-// showDashboard(referenceManager.putReference(localAuthor,
-// LocalAuthor.class));
-// }
-// });
}
-
+ @Override
+ public void eventOccurred(Event e) {
+ super.eventOccurred(e);
+ if (e instanceof LocalAuthorCreatedEvent) {
+ long handle = ((LocalAuthorCreatedEvent)e).getAuthorHandle();
+ showDashboard(handle);
+ }
+ }
private void showDashboard(final long handle) {
- runOnUiThread(new Runnable() {
- public void run() {
- Intent i = new Intent(SetupActivity.this,
- NavDrawerActivity.class);
- i.putExtra(BriarActivity.KEY_LOCAL_AUTHOR_HANDLE, handle);
- i.setFlags(FLAG_ACTIVITY_NEW_TASK);
- startActivity(i);
- finish();
- }
- });
+ Intent i = new Intent(SetupActivity.this,
+ NavDrawerActivity.class);
+ i.putExtra(BriarActivity.KEY_LOCAL_AUTHOR_HANDLE, handle);
+ i.setFlags(FLAG_ACTIVITY_NEW_TASK);
+ startActivity(i);
+ finish();
}
}
+}
diff --git a/briar-android/src/org/briarproject/android/fragment/BaseFragment.java b/briar-android/src/org/briarproject/android/fragment/BaseFragment.java
index 47f98f3660..34e00e0c3f 100644
--- a/briar-android/src/org/briarproject/android/fragment/BaseFragment.java
+++ b/briar-android/src/org/briarproject/android/fragment/BaseFragment.java
@@ -27,11 +27,6 @@ public abstract class BaseFragment extends Fragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
-// AndroidComponent component =
-// ((BriarApplication) getActivity().getApplication())
-// .getApplicationComponent();
-// injectActivity(component);
}
public interface BaseFragmentListener {
diff --git a/briar-android/src/org/briarproject/android/helper/PasswordHelperImp.java b/briar-android/src/org/briarproject/android/helper/PasswordHelperImp.java
index 95481bd4a0..f999337aef 100644
--- a/briar-android/src/org/briarproject/android/helper/PasswordHelperImp.java
+++ b/briar-android/src/org/briarproject/android/helper/PasswordHelperImp.java
@@ -42,12 +42,10 @@ public class PasswordHelperImp extends ConfigHelperImp
public void run() {
byte[] key = crypto.decryptWithPassword(encrypted, password);
if (key == null) {
-// tryAgain();.
onPasswordValidated(false);
} else {
databaseConfig.setEncryptionKey(new SecretKey(key));
onPasswordValidated(true);
-// setResultAndFinish();
}
}
});
--
GitLab