rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fingerprint decrypt without fill password view

Browse Source
This commit is contained in:
Jeremy
2018-01-28 16:56:26 +01:00
parent 21c657c107
commit e9929ed848
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/java/com/keepassdroid/PasswordActivity.java
View File

@@ -267,7 +267,7 @@ public class PasswordActivity extends LockingActivity
} }
if (launch_immediately) { if (launch_immediately) {
loadDatabase(password, mKeyUri); verifyCheckboxesAndLoadDatabase(password, mKeyUri);
} }
} }
@@ -536,10 +536,10 @@ public class PasswordActivity extends LockingActivity
} }
@Override @Override
public void handleDecryptedResult(final String value) { public void handleDecryptedResult(final String passwordValue) {
// on decrypt enter it for the purchase/login action // Load database directly
passwordView.setText(value); String key = keyFileView.getText().toString();
confirmButtonView.performClick(); loadDatabase(passwordValue, key);
} }
@RequiresApi(api = Build.VERSION_CODES.M) @RequiresApi(api = Build.VERSION_CODES.M)
@@ -611,10 +611,28 @@ public class PasswordActivity extends LockingActivity
public void onClick(View view) { public void onClick(View view) {
String pass = passwordView.getText().toString(); String pass = passwordView.getText().toString();
String key = keyFileView.getText().toString(); String key = keyFileView.getText().toString();
loadDatabase(pass, key); verifyCheckboxesAndLoadDatabase(pass, key);
} }
} }
private void verifyCheckboxesAndLoadDatabase(
String pass,
String keyfile) {
verifyCheckboxesAndLoadDatabase(pass, UriUtil.parseDefaultFile(keyfile));
}
private void verifyCheckboxesAndLoadDatabase(
String pass,
Uri keyfile) {
if (!checkboxPasswordView.isChecked()) {
pass = "";
}
if (!checkboxKeyfileView.isChecked()) {
keyfile = null;
}
loadDatabase(pass, keyfile);
}
private void loadDatabase( private void loadDatabase(
String pass, String pass,
String keyfile) { String keyfile) {
@@ -632,13 +650,6 @@ public class PasswordActivity extends LockingActivity
// Clear the shutdown flag // Clear the shutdown flag
App.clearShutdown(); App.clearShutdown();
if (!checkboxPasswordView.isChecked()) {
pass = "";
}
if (!checkboxKeyfileView.isChecked()) {
keyfile = null;
}
Handler handler = new Handler(); Handler handler = new Handler();
LoadDB task = new LoadDB(db, PasswordActivity.this, mDbUri, pass, keyfile, new AfterLoad(handler, db)); LoadDB task = new LoadDB(db, PasswordActivity.this, mDbUri, pass, keyfile, new AfterLoad(handler, db));
ProgressTask pt = new ProgressTask(PasswordActivity.this, task, R.string.loading_database); ProgressTask pt = new ProgressTask(PasswordActivity.this, task, R.string.loading_database);