From fb72f37ebb46ee75f5ece5f1777935a12e9632cd Mon Sep 17 00:00:00 2001
From: J-Jamet <jamet.jeremy@outlook.com>
Date: Wed, 24 Jan 2018 21:11:43 +0100
Subject: [PATCH] Solve bug KeepassDX #18

---
 .../com/keepassdroid/PasswordActivity.java    | 25 +++++++++++--------
 .../FileInformationDialogFragment.java        |  2 ++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/keepassdroid/PasswordActivity.java b/app/src/main/java/com/keepassdroid/PasswordActivity.java
index e0968bd4f..a5274fc8e 100644
--- a/app/src/main/java/com/keepassdroid/PasswordActivity.java
+++ b/app/src/main/java/com/keepassdroid/PasswordActivity.java
@@ -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
diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileInformationDialogFragment.java b/app/src/main/java/com/keepassdroid/fileselect/FileInformationDialogFragment.java
index 6e44ceba8..9f3ded5c2 100644
--- a/app/src/main/java/com/keepassdroid/fileselect/FileInformationDialogFragment.java
+++ b/app/src/main/java/com/keepassdroid/fileselect/FileInformationDialogFragment.java
@@ -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());