Skip to content
Snippets Groups Projects
Commit b83fe859 authored by Ernir Erlingsson's avatar Ernir Erlingsson
Browse files

code re-structure, mostly nitpicks :)

parent 7e9cff31
No related branches found
No related tags found
1 merge request!1040 forgotten password
Pipeline #
Hide whitespace changes
Inline Side-by-side
briar-android/src/org/briarproject/android/BaseActivity.java
+ 43
− 45
View file @ b83fe859
......@@ -13,49 +13,47 @@ import roboguice.activity.RoboActivity;
public abstract class BaseActivity extends RoboActivity {
private final static String PREFS_DB = "db";
private final static String KEY_DB_KEY = "key";
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
}
private SharedPreferences getBriarPrefs(String prefsName) {
return getSharedPreferences(prefsName, MODE_PRIVATE);
}
protected String getDbKeyInHex() {
return getBriarPrefs(PREFS_DB).getString(KEY_DB_KEY, null);
}
private void clearPrefs(String prefsName) {
SharedPreferences.Editor editor = getBriarPrefs(prefsName).edit();
editor.clear();
editor.apply();
}
protected void clearDbPrefs() {
this.clearPrefs(PREFS_DB);
}
protected void gotoAndFinish(Class classInstance, int resultCode) {
if (resultCode != Integer.MIN_VALUE)
this.setResult(resultCode);
this.startActivity(new Intent(this, classInstance));
this.finish();
}
protected void gotoAndFinish(Class classInstance)
{
this.gotoAndFinish(classInstance, Integer.MIN_VALUE);
}
protected void hideSoftKeyboard()
{
Object o = getSystemService(INPUT_METHOD_SERVICE);
((InputMethodManager) o).toggleSoftInput(HIDE_IMPLICIT_ONLY, 0);
}
private final static String PREFS_DB = "db";
private final static String KEY_DB_KEY = "key";
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
}
private SharedPreferences getBriarPrefs(String prefsName) {
return getSharedPreferences(prefsName, MODE_PRIVATE);
}
protected String getDbKeyInHex() {
return getBriarPrefs(PREFS_DB).getString(KEY_DB_KEY, null);
}
private void clearPrefs(String prefsName) {
SharedPreferences.Editor editor = getBriarPrefs(prefsName).edit();
editor.clear();
editor.apply();
}
protected void clearDbPrefs() {
this.clearPrefs(PREFS_DB);
}
protected void gotoAndFinish(Class classInstance, int resultCode) {
if (resultCode != Integer.MIN_VALUE)
setResult(resultCode);
startActivity(new Intent(this, classInstance));
finish();
}
protected void gotoAndFinish(Class classInstance) {
gotoAndFinish(classInstance, Integer.MIN_VALUE);
}
protected void hideSoftKeyboard() {
Object o = getSystemService(INPUT_METHOD_SERVICE);
((InputMethodManager) o).toggleSoftInput(HIDE_IMPLICIT_ONLY, 0);
}
}
briar-android/src/org/briarproject/android/PasswordActivity.java
+ 27
− 28
View file @ b83fe859
......@@ -3,17 +3,16 @@ package org.briarproject.android;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import java.io.File;
import java.util.concurrent.Executor;
import javax.inject.Inject;
import org.briarproject.R;
import org.briarproject.android.util.BriarIOUtils;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.crypto.SecretKey;
import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.system.AndroidFileUtils;
import org.briarproject.util.StringUtils;
import android.app.AlertDialog;
......@@ -32,10 +31,10 @@ import android.widget.TextView.OnEditorActionListener;
public class PasswordActivity extends BaseActivity {
@Inject @CryptoExecutor private Executor cryptoExecutor;
private Button mSignInButton;
private ProgressBar mProgress;
private TextView mTitle;
private EditText mPassword;
private Button signInButton;
private ProgressBar progress;
private TextView title;
private EditText password;
private byte[] encrypted;
......@@ -47,23 +46,23 @@ public class PasswordActivity extends BaseActivity {
public void onCreate(Bundle state) {
super.onCreate(state);
String hex = this.getDbKeyInHex();
String hex = getDbKeyInHex();
if (hex == null || !databaseConfig.databaseExists()) {
this.clearDbPrefs();
clearDbPrefs();
return;
}
this.encrypted = StringUtils.fromHexString(hex);
this.setContentView(R.layout.activity_password);
this.mSignInButton = (Button)findViewById(R.id.btn_sign_in);
this.mProgress = (ProgressBar)findViewById(R.id.progress_wheel);
this.mTitle = (TextView)findViewById(R.id.title_password);
this.mPassword = (EditText)findViewById(R.id.edit_password);
this.mPassword.setOnEditorActionListener(new OnEditorActionListener() {
encrypted = StringUtils.fromHexString(hex);
setContentView(R.layout.activity_password);
signInButton = (Button)findViewById(R.id.btn_sign_in);
progress = (ProgressBar)findViewById(R.id.progress_wheel);
title = (TextView)findViewById(R.id.title_password);
password = (EditText)findViewById(R.id.edit_password);
password.setOnEditorActionListener(new OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if (actionId == EditorInfo.IME_ACTION_DONE) {
validatePassword(encrypted, PasswordActivity.this.mPassword.getText());
validatePassword(encrypted, password.getText());
}
return false;
}
......@@ -73,12 +72,12 @@ public class PasswordActivity extends BaseActivity {
@Override
protected void clearDbPrefs() {
super.clearDbPrefs();
BriarIOUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
this.gotoAndFinish(SetupActivity.class, RESULT_CANCELED);
AndroidFileUtils.deleteFileOrDir(databaseConfig.getDatabaseDirectory());
gotoAndFinish(SetupActivity.class, RESULT_CANCELED);
}
public void onSignInClick(View v) {
this.validatePassword(this.encrypted, this.mPassword.getText());
validatePassword(encrypted, password.getText());
}
public void onForgottenPasswordClick(View v) {
......@@ -90,7 +89,7 @@ public class PasswordActivity extends BaseActivity {
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
PasswordActivity.this.clearDbPrefs();
clearDbPrefs();
}
});
AlertDialog dialog = builder.create();
......@@ -98,10 +97,10 @@ public class PasswordActivity extends BaseActivity {
}
private void validatePassword(final byte[] encrypted, Editable e) {
this.hideSoftKeyboard();
hideSoftKeyboard();
// Replace the button with a progress bar
this.mSignInButton.setVisibility(View.INVISIBLE);
this.mProgress.setVisibility(VISIBLE);
signInButton.setVisibility(View.INVISIBLE);
progress.setVisibility(VISIBLE);
// Decrypt the database key in a background thread
final String password = e.toString();
cryptoExecutor.execute(new Runnable() {
......@@ -120,10 +119,10 @@ public class PasswordActivity extends BaseActivity {
private void tryAgain() {
runOnUiThread(new Runnable() {
public void run() {
PasswordActivity.this.mTitle.setText(R.string.try_again);
PasswordActivity.this.mSignInButton.setVisibility(VISIBLE);
PasswordActivity.this.mProgress.setVisibility(GONE);
PasswordActivity.this.mPassword.setText("");
title.setText(R.string.try_again);
signInButton.setVisibility(VISIBLE);
progress.setVisibility(GONE);
password.setText("");
}
});
}
......
briar-android/src/org/briarproject/android/util/BriarIOUtils.java deleted 100644 → 0
+ 0
− 18
View file @ 7e9cff31
package org.briarproject.android.util;
import java.io.File;
/**
* Created by Ernir Erlingsson (ernir@ymirmobile.com) on 9.12.2015.
*/
public class BriarIOUtils {
public static void deleteFileOrDir(File f)
{
if (f.isFile())
f.delete();
else if (f.isDirectory())
for (File child : f.listFiles())
deleteFileOrDir(child);
}
}
briar-android/src/org/briarproject/system/AndroidFileUtils.java
+ 8
− 0
View file @ b83fe859
......@@ -14,4 +14,12 @@ public class AndroidFileUtils implements FileUtils {
public long getFreeSpace(File f) throws IOException {
return f.getUsableSpace();
}
public static void deleteFileOrDir(File f) {
if (f.isFile())
f.delete();
else if (f.isDirectory())
for (File child : f.listFiles())
deleteFileOrDir(child);
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment