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

Fix fingerprint keyfile recognition

Browse Source
This commit is contained in:
J-Jamet
2018-03-09 16:26:51 +01:00
parent 3be9c9161c
commit 384966641a
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,7 +200,6 @@ public class PasswordActivity extends StylishActivity
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
AutofillHelper.onActivityResultSetResultAndFinish(this, requestCode, resultCode, data);
}
// TODO Tests
boolean keyFileResult = false;
if (keyFileHelper != null) {
@@ -651,16 +650,14 @@ public class PasswordActivity extends StylishActivity
.putString(getPreferenceKeyValue(), value)
.putString(getPreferenceKeyIvSpec(), ivSpec)
.apply();
// and remove visual input to reset UI
confirmButtonView.performClick(); // TODO remove click
verifyAllViewsAndLoadDatabase();
setFingerPrintTextView(R.string.encrypted_value_stored);
}
@Override
public void handleDecryptedResult(final String passwordValue) {
// Load database directly
String key = keyFileView.getText().toString();
loadDatabase(passwordValue, key);
verifyKeyFileViewsAndLoadDatabase(passwordValue);
}
@RequiresApi(api = Build.VERSION_CODES.M)
@@ -720,21 +717,17 @@ public class PasswordActivity extends StylishActivity
private class ValidateButtonViewClickListener implements View.OnClickListener {
public void onClick(View view) {
String pass = passwordView.getText().toString();
String key = keyFileView.getText().toString();
verifyCheckboxesAndLoadDatabase(pass, key);
verifyAllViewsAndLoadDatabase();
}
}
private void verifyCheckboxesAndLoadDatabase(
String pass,
String keyfile) {
private void verifyAllViewsAndLoadDatabase() {
String pass = passwordView.getText().toString();
String keyfile = keyFileView.getText().toString();
verifyCheckboxesAndLoadDatabase(pass, UriUtil.parseDefaultFile(keyfile));
}
private void verifyCheckboxesAndLoadDatabase(
String pass,
Uri keyfile) {
private void verifyCheckboxesAndLoadDatabase(String pass, Uri keyfile) {
if (!checkboxPasswordView.isChecked()) {
pass = "";
}
@@ -744,16 +737,16 @@ public class PasswordActivity extends StylishActivity
loadDatabase(pass, keyfile);
}
private void loadDatabase(
String pass,
String keyfile) {
loadDatabase(pass, UriUtil.parseDefaultFile(keyfile));
private void verifyKeyFileViewsAndLoadDatabase(String password) {
String key = keyFileView.getText().toString();
Uri keyUri = UriUtil.parseDefaultFile(key);
if (!checkboxKeyfileView.isChecked()) {
keyUri = null;
}
loadDatabase(password, keyUri);
}
private void loadDatabase(
String pass,
Uri keyfile) {
private void loadDatabase(String pass, Uri keyfile) {
// Clear before we load
Database db = App.getDB();
db.clear();