Solve bug KeepassDX #18

app/src/main/java/com/keepassdroid/PasswordActivity.java

@@ -169,7 +169,6 @@ public class PasswordActivity extends LockingActivity implements FingerPrintHelp
                 App.getDB().clear();
                 break;
         }
-
     }
 
     @Override
@@ -259,10 +258,13 @@ public class PasswordActivity extends LockingActivity implements FingerPrintHelp
 
     private void setEmptyViews() {
         passwordView.setText("");
-        keyFileView.setText("");
         checkboxPasswordView.setChecked(false);
+        // Bug KeepassDX #18
+        if (!mRememberKeyfile) {
+            keyFileView.setText("");
             checkboxKeyfileView.setChecked(false);
         }
+    }
 
     private void retrieveSettings() {
         String defaultFilename = prefs.getString(KEY_DEFAULT_FILENAME, "");
@@ -290,9 +292,10 @@ 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
     @RequiresApi(api = Build.VERSION_CODES.M)

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());