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

Solve bug KeepassDX #18

Browse Source
This commit is contained in:
J-Jamet
2018-01-24 21:11:43 +01:00
parent 6c5936d15d
commit fb72f37ebb
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,14 +147,14 @@ public class PasswordActivity extends LockingActivity implements FingerPrintHelp
super.onActivityResult(requestCode, resultCode, data);
keyFileHelper.onActivityResultCallback(requestCode, resultCode, data,
new KeyFileHelper.KeyFileCallback() {
@Override
public void onKeyFileResultCallback(Uri uri) {
if(uri != null) {
keyFileView.setText(uri.toString());
}
new KeyFileHelper.KeyFileCallback() {
@Override
public void onKeyFileResultCallback(Uri uri) {
if(uri != null) {
keyFileView.setText(uri.toString());
}
});
}
});
switch (requestCode) {
case KeePass.EXIT_NORMAL:
@@ -169,7 +169,6 @@ public class PasswordActivity extends LockingActivity implements FingerPrintHelp
App.getDB().clear();
break;
}
}
@Override
@@ -259,9 +258,12 @@ public class PasswordActivity extends LockingActivity implements FingerPrintHelp
private void setEmptyViews() {
passwordView.setText("");
keyFileView.setText("");
checkboxPasswordView.setChecked(false);
checkboxKeyfileView.setChecked(false);
// Bug KeepassDX #18
if (!mRememberKeyfile) {
keyFileView.setText("");
checkboxKeyfileView.setChecked(false);
}
}
private void retrieveSettings() {
@@ -290,8 +292,9 @@ public class PasswordActivity extends LockingActivity implements FingerPrintHelp
}
String key = (mKeyUri == null) ? "" : mKeyUri.toString();
if (!key.isEmpty())
if (!key.isEmpty() && mRememberKeyfile) { // Bug KeepassDX #18
keyFileView.setText(key);
}
}
// fingerprint related code here

2
app/src/main/java/com/keepassdroid/fileselect/FileInformationDialogFragment.java
View File

@@ -23,6 +23,7 @@ import android.app.Dialog;
import android.content.DialogInterface;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
@@ -46,6 +47,7 @@ public class FileInformationDialogFragment extends DialogFragment {
return fileInformationDialogFragment;
}
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());