Auto open select file #32

app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java

@@ -22,7 +22,6 @@ package com.keepassdroid.fileselect;
 import android.Manifest;
 import android.app.Activity;
 import android.app.assist.AssistStructure;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -51,13 +50,14 @@ import com.keepassdroid.database.edit.FileOnFinish;
 import com.keepassdroid.database.exception.ContentFileNotFoundException;
 import com.keepassdroid.dialogs.AssignMasterKeyDialogFragment;
 import com.keepassdroid.dialogs.CreateFileDialogFragment;
+import com.keepassdroid.password.AssignPasswordHelper;
 import com.keepassdroid.password.PasswordActivity;
+import com.keepassdroid.settings.PreferencesUtil;
 import com.keepassdroid.stylish.StylishActivity;
 import com.keepassdroid.tasks.ProgressTask;
 import com.keepassdroid.utils.EmptyUtils;
 import com.keepassdroid.utils.MenuUtil;
 import com.keepassdroid.utils.UriUtil;
-import com.keepassdroid.password.AssignPasswordHelper;
 import com.keepassdroid.view.FileNameView;
 import com.kunzisoft.keepass.R;
 
@@ -102,6 +102,8 @@ public class FileSelectActivity extends StylishActivity implements
 
 	private KeyFileHelper keyFileHelper;
 
+    private String defaultPath;
+
 	public static void launch(Activity activity) {
 		Intent intent = new Intent(activity, FileSelectActivity.class);
 		// only to avoid visible flickering when redirecting
@@ -141,7 +143,7 @@ public class FileSelectActivity extends StylishActivity implements
         fileNameView = (FileNameView) findViewById(R.id.file_select);
 
         // Set the initial value of the filename
-        final String defaultPath = Environment.getExternalStorageDirectory().getAbsolutePath()
+        defaultPath = Environment.getExternalStorageDirectory().getAbsolutePath()
                 + getString(R.string.database_file_path_default)
                 + getString(R.string.database_file_name_default)
                 + getString(R.string.database_file_extension_default);
@@ -158,55 +160,24 @@ public class FileSelectActivity extends StylishActivity implements
 
 		// Open button
 		View openButton = findViewById(R.id.open_database);
-		openButton.setOnClickListener(new View.OnClickListener() {
-
-			public void onClick(View v) {
-				String fileName = openFileNameView.getText().toString();
-				if (fileName.isEmpty())
-					fileName = defaultPath;
-				try {
-				    AssistStructure assistStructure = null;
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        assistStructure = autofillHelper.retrieveAssistStructure(getIntent());
-                        if (assistStructure != null) {
-							PasswordActivity.launch(FileSelectActivity.this,
-                                    fileName,
-                                    assistStructure);
-						}
-					}
-					if (assistStructure == null) {
-                        PasswordActivity.launch(FileSelectActivity.this, fileName);
-                    }
-				}
-				catch (ContentFileNotFoundException e) {
-					Toast.makeText(FileSelectActivity.this,
-							R.string.file_not_found_content, Toast.LENGTH_LONG).show();
-				}
-				catch (FileNotFoundException e) {
-					Toast.makeText(FileSelectActivity.this,
-							R.string.file_not_found, Toast.LENGTH_LONG).show();
-				}
-			}
-		});
+		openButton.setOnClickListener(v -> {
+		    String fileName = openFileNameView.getText().toString();
+            if (fileName.isEmpty())
+                fileName = defaultPath;
+            launchPasswordActivityWithPath(fileName);
+        });
 
 		// Create button
 		View createButton = findViewById(R.id.create_database);
-		createButton.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
+		createButton.setOnClickListener(v ->
                 FileSelectActivityPermissionsDispatcher
-                        .openCreateFileDialogFragmentWithPermissionCheck(FileSelectActivity.this);
-			}
-		});
+                        .openCreateFileDialogFragmentWithPermissionCheck(FileSelectActivity.this)
+		);
 
         keyFileHelper = new KeyFileHelper(this);
 		View browseButton = findViewById(R.id.browse_button);
 		browseButton.setOnClickListener(keyFileHelper.getOpenFileOnClickViewListener(
-		        new KeyFileHelper.ClickDataUriCallback() {
-            @Override
-            public Uri onRequestIntentFilePicker() {
-                return Uri.parse("file://" + openFileNameView.getText().toString());
-            }
-        }));
+                () -> Uri.parse("file://" + openFileNameView.getText().toString())));
 
 		// Construct adapter with listeners
 		mAdapter = new FileSelectAdapter(FileSelectActivity.this, fileHistory.getDbList());
@@ -260,8 +231,18 @@ public class FileSelectActivity extends StylishActivity implements
             // Delete flickering for kitkat <=
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
                 overridePendingTransition(0, 0);
+        } catch (ContentFileNotFoundException e) {
+            String error = getString(R.string.file_not_found_content);
+            Toast.makeText(FileSelectActivity.this,
+                    error, Toast.LENGTH_LONG).show();
+            Log.e(TAG, error, e);
+        } catch (FileNotFoundException e) {
+            String error = getString(R.string.file_not_found);
+            Toast.makeText(FileSelectActivity.this,
+                    error, Toast.LENGTH_LONG).show();
+            Log.e(TAG, error, e);
         } catch (Exception e) {
-            // Ignore exception
+            Log.e(TAG, "Can't launch PasswordActivity", e);
         }
     }
 
@@ -453,33 +434,31 @@ public class FileSelectActivity extends StylishActivity implements
 
 	@Override
 	public void onFileItemOpenListener(int itemPosition) {
-		new OpenFileHistoryAsyncTask(new OpenFileHistoryAsyncTask.AfterOpenFileHistoryListener() {
-			@Override
-			public void afterOpenFile(String fileName, String keyFile) {
-				try {
-				    AssistStructure assistStructure = null;
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        assistStructure = autofillHelper.getAssistStructure();
-				        if (assistStructure != null) {
-							PasswordActivity.launch(FileSelectActivity.this,
-                                    fileName, keyFile, assistStructure);
-						}
-					}
-					if (assistStructure == null) {
-                        PasswordActivity.launch(FileSelectActivity.this, fileName, keyFile);
+		new OpenFileHistoryAsyncTask((fileName, keyFile) -> {
+            // TODO ENCAPSULATE
+            try {
+                AssistStructure assistStructure = null;
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    assistStructure = autofillHelper.getAssistStructure();
+                    if (assistStructure != null) {
+                        PasswordActivity.launch(FileSelectActivity.this,
+                            fileName, keyFile, assistStructure);
                     }
-				} catch (ContentFileNotFoundException e) {
-					Toast.makeText(FileSelectActivity.this,
-							R.string.file_not_found_content, Toast.LENGTH_LONG)
-							.show();
-				} catch (FileNotFoundException e) {
-					Toast.makeText(FileSelectActivity.this,
-							R.string.file_not_found, Toast.LENGTH_LONG)
-							.show();
-				}
-				updateTitleFileListView();
-			}
-		}, fileHistory).execute(itemPosition);
+                }
+                if (assistStructure == null) {
+                    PasswordActivity.launch(FileSelectActivity.this, fileName, keyFile);
+                }
+            } catch (ContentFileNotFoundException e) {
+                Toast.makeText(FileSelectActivity.this,
+                        R.string.file_not_found_content, Toast.LENGTH_LONG)
+                        .show();
+            } catch (FileNotFoundException e) {
+                Toast.makeText(FileSelectActivity.this,
+                        R.string.file_not_found, Toast.LENGTH_LONG)
+                        .show();
+            }
+            updateTitleFileListView();
+        }, fileHistory).execute(itemPosition);
 	}
 
     @Override
@@ -493,13 +472,10 @@ public class FileSelectActivity extends StylishActivity implements
 
     @Override
     public boolean onFileSelectClearListener(final FileSelectBean fileSelectBean) {
-        new DeleteFileHistoryAsyncTask(new DeleteFileHistoryAsyncTask.AfterDeleteFileHistoryListener() {
-            @Override
-            public void afterDeleteFile() {
-                fileHistory.deleteFile(fileSelectBean.getFileUri());
-                mAdapter.notifyDataSetChanged();
-                updateTitleFileListView();
-            }
+        new DeleteFileHistoryAsyncTask(() -> {
+            fileHistory.deleteFile(fileSelectBean.getFileUri());
+            mAdapter.notifyDataSetChanged();
+            updateTitleFileListView();
         }, fileHistory, mAdapter).execute(fileSelectBean);
         return true;
     }
@@ -513,33 +489,23 @@ public class FileSelectActivity extends StylishActivity implements
 		}
 
 		keyFileHelper.onActivityResultCallback(requestCode, resultCode, data,
-                new KeyFileHelper.KeyFileCallback() {
-            @Override
-            public void onKeyFileResultCallback(Uri uri) {
-                if (uri != null) {
-                    String filename = uri.toString();
-                    openFileNameView.setText(filename);
-                }
-            }
-        });
+                uri -> {
+                    if (uri != null) {
+                        if (PreferencesUtil.autoOpenSelectedFile(FileSelectActivity.this)) {
+                            launchPasswordActivityWithPath(uri.toString());
+                        } else {
+                            openFileNameView.setText(uri.toString());
+                        }
+                    }
+                });
 	}
 
     @OnShowRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)
     void showRationaleForExternalStorage(final PermissionRequest request) {
         new AlertDialog.Builder(this)
                 .setMessage(R.string.permission_external_storage_rationale_write_database)
-                .setPositiveButton(R.string.allow, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        request.proceed();
-                    }
-                })
-                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        request.cancel();
-                    }
-                })
+                .setPositiveButton(R.string.allow, (dialog, which) -> request.proceed())
+                .setNegativeButton(R.string.cancel, (dialog, which) -> request.cancel())
                 .show();
     }
 

app/src/main/java/com/keepassdroid/settings/PreferencesUtil.java

@@ -125,4 +125,10 @@ public class PreferencesUtil {
         return prefs.getBoolean(ctx.getString(R.string.monospace_font_fields_enable_key),
                 ctx.getResources().getBoolean(R.bool.monospace_font_fields_enable_default));
     }
+
+    public static boolean autoOpenSelectedFile(Context ctx) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
+        return prefs.getBoolean(ctx.getString(R.string.auto_open_file_uri_key),
+                ctx.getResources().getBoolean(R.bool.auto_open_file_uri_default));
+    }
 }

app/src/main/res/values-ca/strings.xml

@@ -158,7 +158,7 @@
     <string name="sort_name">Ordena per nom</string>
     <string name="sort_db">Ordenació de base de dades</string>
     <string name="special">Especial</string>
-    <string name="search_hint">Títol/descripció d\'entrada</string>
+    <string name="search">Títol/descripció d\'entrada</string>
     <string name="search_results">Resultats de cerca</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Subratllat</string>

app/src/main/res/values-cs/strings.xml

@@ -175,7 +175,7 @@
     <string name="sort_name">Seřadit podle jména</string>
     <string name="sort_db">Seřadit podle DB</string>
     <string name="special">Speciální</string>
-    <string name="search_hint">Zadejte název/popis</string>
+    <string name="search">Zadejte název/popis</string>
     <string name="search_results">Výsledky hledání</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Podtrženo</string>

app/src/main/res/values-da/strings.xml

@@ -174,7 +174,7 @@
     <string name="sort_name">Sorter efter navn</string>
     <string name="sort_db">DB sorteringsrækkefølge</string>
     <string name="special">Speciel</string>
-    <string name="search_hint">Post titel/beskrivelse</string>
+    <string name="search">Post titel/beskrivelse</string>
     <string name="search_results">Søgeresultater</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Understreget</string>

app/src/main/res/values-de/strings.xml

@@ -183,7 +183,7 @@
     <string name="sort_name">Sortieren nach Name</string>
     <string name="sort_db">Sortieren nach Erstellung</string>
     <string name="special">Spezialsymbole</string>
-    <string name="search_hint">Titel/Beschreibung des Eintrags</string>
+    <string name="search">Titel/Beschreibung des Eintrags</string>
     <string name="search_results">Suchergebnisse</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Unterstrichen</string>

app/src/main/res/values-el/strings.xml

@@ -172,7 +172,7 @@
     <string name="sort_name">Ταξινόμηση κατά όνομα</string>
     <string name="sort_db">Σειρά ταξινόμησης βάσης</string>
     <string name="special">Ειδικοί</string>
-    <string name="search_hint">Τίτλος/περιγραφή εγγραφής</string>
+    <string name="search">Τίτλος/περιγραφή εγγραφής</string>
     <string name="search_results">Αποτελέσματα αναζήτησης</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Υπογράμμιση</string>

app/src/main/res/values-es/strings.xml

@@ -159,7 +159,7 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="sort_name">Ordenar por nombre</string>
     <string name="sort_db">Orden de BD</string>
     <string name="special">Especial</string>
-    <string name="search_hint">Título/descripción de entrada</string>
+    <string name="search">Título/descripción de entrada</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Subrayado</string>
     <string name="unsupported_db_version">Versión de base de datos no soportada.</string>

app/src/main/res/values-eu/strings.xml

@@ -172,7 +172,7 @@
     <string name="sort_name">Izenaren arabera ordenatu</string>
     <string name="sort_db">DB-a antolatzeko ordena</string>
     <string name="special">Berezia</string>
-    <string name="search_hint">Sarreraren Izena / Deskribapena</string>
+    <string name="search">Sarreraren Izena / Deskribapena</string>
     <string name="search_results">Bilaketaren emaitzak</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Azpimarratu</string>

app/src/main/res/values-fi/strings.xml

@@ -170,7 +170,7 @@
     <string name="sort_name">Lajittele nimen mukaan</string>
     <string name="sort_db">Tietokannan lajittelujärjestys</string>
     <string name="special">Erityistä</string>
-    <string name="search_hint">Tietueen otsikko/kuvaus</string>
+    <string name="search">Tietueen otsikko/kuvaus</string>
     <string name="search_results">Hakutulokset</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Alleviivattu</string>

app/src/main/res/values-fr/strings.xml

@@ -195,7 +195,7 @@
     <string name="sort_last_modify_time">Tri par Date de Dernière Modification</string>
     <string name="sort_last_access_time">Tri par Date de Dernier Accès</string>
     <string name="special">Spécial</string>
-    <string name="search_hint">Nom/description</string>
+    <string name="search">Nom/description</string>
     <string name="search_results">Résultats</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Souligné</string>
@@ -266,6 +266,8 @@
     <string name="permission_external_storage_never_ask">Impossible d\'effectuer l\'action sans autorisation de stockage externe</string>
     <string name="monospace_font_fields_enable_title">Police des champs</string>
     <string name="monospace_font_fields_enable_summary">Change la police de caractères des champs pour une meilleure visibilité</string>
+    <string name="auto_open_file_uri_title">Ouvrir le fichier sélectionné automatiquement</string>
+    <string name="auto_open_file_uri_summary">Ouvrir automatiquement un fichier à partir de l\'écran de sélection après une sélection dans le navigateur de fichiers</string>
 
     <string-array name="clipboard_timeout_options">
     	<item>5 secondes</item>

app/src/main/res/values-hu/strings.xml

@@ -170,7 +170,7 @@
     <string name="sort_name">Rendezés név alapján</string>
     <string name="sort_db">Rendezés dátum alapján</string>
     <string name="special">Speciális</string>
-    <string name="search_hint">Bejegyzés név/leírás</string>
+    <string name="search">Bejegyzés név/leírás</string>
     <string name="search_results">Keresés eredménye</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Aláhúzás</string>

app/src/main/res/values-it/strings.xml

@@ -158,7 +158,7 @@
     <string name="sort_name">Ordina per nome</string>
     <string name="sort_db">Ordinamento DB</string>
     <string name="special">Speciale</string>
-    <string name="search_hint">Titolo/descrizione voce</string>
+    <string name="search">Titolo/descrizione voce</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Sottolinea</string>
     <string name="unsupported_db_version">Versione database non supportata.</string>

app/src/main/res/values-iw/strings.xml

@@ -166,7 +166,7 @@
   <string name="sort_name">מיין לפי שם</string>
   <string name="sort_db">סדר מיון מסד נתונים</string>
   <string name="special">מיוחד</string>
-  <string name="search_hint">כותרת/תיאור ערך</string>
+  <string name="search">כותרת/תיאור ערך</string>
   <string name="search_results">תוצאות חיפוש</string>
   <string name="underline">קו תחתון</string>
   <string name="unsupported_db_version">גרסת מסד נתונים לא נתמכת.</string>

app/src/main/res/values-ja/strings.xml

@@ -155,7 +155,7 @@
     <string name="sort_name">A-Z順に並び替え</string>
     <string name="sort_db">並べ替え</string>
     <string name="special">記号</string>
-    <string name="search_hint">キーワードを入力</string>
+    <string name="search">キーワードを入力</string>
     <string name="twofish">Twofish</string>
     <string name="underline">アンダーライン (_)</string>
     <string name="unsupported_db_version">このバージョンのデータベースはサポートされていません。</string>

app/src/main/res/values-lt/strings.xml

@@ -101,7 +101,7 @@
     <string name="keyfile_is_empty">Rakto failas yra tuščias.</string>
     <string name="keyfile_does_not_exist">Rakto failas neegzistuoja.</string>
     <string name="entry_keyfile">Rakto failas</string>
-    <string name="search_hint">Įrašo pavadinimas/aprašymas</string>
+    <string name="search">Įrašo pavadinimas/aprašymas</string>
     <string name="menu_change_key">Pakeisti master raktą</string>
     <string name="entry_accessed">Naudota:</string>
     <string name="maskpass_title">Maskuoti slaptažodį</string>

app/src/main/res/values-lv/strings.xml

@@ -150,7 +150,7 @@
     <string name="sort_name">Kārtot pēc nosaukuma</string>
     <string name="sort_db">Izejas</string>
     <string name="special">Speciālie</string>
-    <string name="search_hint">Ieraksta nosaukums/apraksts</string>
+    <string name="search">Ieraksta nosaukums/apraksts</string>
     <string name="search_results">Meklēšanas rezultāti</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Pasvītrojums</string>

app/src/main/res/values-nl/strings.xml

@@ -157,7 +157,7 @@
     <string name="sort_name">Sorteren op naam</string>
     <string name="sort_db">Sorteringsvolgorde DB</string>
     <string name="special">Speciaal</string>
-    <string name="search_hint">Record titel/beschrijving</string>
+    <string name="search">Record titel/beschrijving</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Onderlijnen</string>
     <string name="unsupported_db_version">Niet-ondersteunde databaseversie.</string>

app/src/main/res/values-nn/strings.xml

@@ -155,7 +155,7 @@
     <string name="sort_name">Sorter etter namn</string>
     <string name="sort_db">DB-sortering</string>
     <string name="special">Spesial</string>
-    <string name="search_hint">Oppføringa sin tittel/skildring</string>
+    <string name="search">Oppføringa sin tittel/skildring</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Understreking</string>
     <string name="unsupported_db_version">Kan ikkje bruka databaseutgåva.</string>

app/src/main/res/values-pl/strings.xml

@@ -157,7 +157,7 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="sort_name">Sortuj wg nazwy</string>
     <string name="sort_db">Sortuj wg daty</string>
     <string name="special">Znaki specjalne</string>
-    <string name="search_hint">Tytuł/opis wpisu</string>
+    <string name="search">Tytuł/opis wpisu</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Podkreślenie</string>
     <string name="unsupported_db_version">Nieobsługiwana wersja bazy danych.</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -158,7 +158,7 @@
     <string name="sort_name">Ordenar por nome</string>
     <string name="sort_db">Ordenação do banco de dados</string>
     <string name="special">Caracteres Especiais</string>
-    <string name="search_hint">Título/Descrição da entrada</string>
+    <string name="search">Título/Descrição da entrada</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Underline</string>
     <string name="unsupported_db_version">Versão de banco de dados não suportada.</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -177,7 +177,7 @@
     <string name="sort_name">Ordenar por nome</string>
     <string name="sort_db">Ordenação da BD</string>
     <string name="special">Especiais</string>
-    <string name="search_hint">Título/descrição da entrada</string>
+    <string name="search">Título/descrição da entrada</string>
     <string name="search_results">Resultados da pesquisa</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Sublinhado</string>

app/src/main/res/values-ru/strings.xml

@@ -174,7 +174,7 @@
     <string name="sort_name">А–Я</string>
     <string name="sort_db">Исходный</string>
     <string name="special">$пеци@льные</string>
-    <string name="search_hint">название, комментарий</string>
+    <string name="search">название, комментарий</string>
     <string name="search_results">Результаты поиска</string>
     <string name="twofish">Twofish</string>
     <string name="underline">_Подчёркивание_</string>

app/src/main/res/values-sk/strings.xml

@@ -155,7 +155,7 @@
     <string name="sort_name">Zoradiť podľa mena</string>
     <string name="sort_db">DB zoradenie poradia</string>
     <string name="special">Špeciálne</string>
-    <string name="search_hint">Záznam názov/popis</string>
+    <string name="search">Záznam názov/popis</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Podčiarknuté</string>
     <string name="unsupported_db_version">Nepodporovaná verzia databázy.</string>

app/src/main/res/values-sv/strings.xml

@@ -169,7 +169,7 @@
     <string name="sort_name">Sortera efter namn</string>
     <string name="sort_db">Sortera efter databasordning</string>
     <string name="special">Specialtecken</string>
-    <string name="search_hint">Postens titel/beskrivning</string>
+    <string name="search">Postens titel/beskrivning</string>
     <string name="search_results">Sökresultat</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Understreck</string>

app/src/main/res/values-uk/strings.xml

@@ -155,7 +155,7 @@
     <string name="sort_name">Упорядкувати за ім’ям</string>
     <string name="sort_db">Упорядкування БД</string>
     <string name="special">Спеціальний</string>
-    <string name="search_hint">Введіть заголовок/опис</string>
+    <string name="search">Введіть заголовок/опис</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Підкреслення</string>
     <string name="unsupported_db_version">Непідтримувана версія бази даних.</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -152,7 +152,7 @@
     <string name="sort_name">通过名称排序</string>
     <string name="sort_db">数据库的排序顺序</string>
     <string name="special">特别</string>
-    <string name="search_hint">条目名称/说明</string>
+    <string name="search">条目名称/说明</string>
     <string name="twofish">Twofish算法</string>
     <string name="underline">强调</string>
     <string name="unsupported_db_version">不支持的数据库版本。</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -152,7 +152,7 @@
     <string name="sort_name">通過名稱排序</string>
     <string name="sort_db">資料庫的排序順序</string>
     <string name="special">特別</string>
-    <string name="search_hint">條目名稱/說明</string>
+    <string name="search">條目名稱/說明</string>
     <string name="twofish">Twofish演算法</string>
     <string name="underline">強調</string>
     <string name="unsupported_db_version">不支援的資料庫版本。</string>

app/src/main/res/values/donottranslate.xml

@@ -65,6 +65,7 @@
     <string name="fingerprint_delete_all_key" translatable="true">fingerprint_delete_all_key</string>
     <string name="recycle_bin_key" translatable="true">recycle_bin_key</string>
     <string name="monospace_font_fields_enable_key" translatable="true">monospace_font_extra_fields_enable_key</string>
+    <string name="auto_open_file_uri_key" translatable="true">auto_open_file_uri_key</string>
 
     <bool name="maskpass_default" translatable="false">true</bool>
     <bool name="keyfile_default" translatable="false">true</bool>
@@ -80,6 +81,7 @@
     <bool name="sort_ascending_default" translatable="true">true</bool>
     <bool name="sort_recycle_bin_bottom_default" translatable="true">true</bool>
     <bool name="monospace_font_fields_enable_default" translatable="true">false</bool>
+    <bool name="auto_open_file_uri_default" translatable="true">true</bool>
 
     <string name="clipboard_timeout_default" translatable="false">300000</string>
     <string-array name="clipboard_timeout_values">

app/src/main/res/values/strings.xml

@@ -195,7 +195,7 @@
     <string name="sort_last_modify_time">Sort by Last Modify Time</string>
     <string name="sort_last_access_time">Sort by Last Access Time</string>
     <string name="special">Special</string>
-    <string name="search_hint">Search</string>
+    <string name="search">Search</string>
     <string name="search_results">Search results</string>
     <string name="twofish">Twofish</string>
     <string name="underline">Underline</string>
@@ -268,6 +268,8 @@
     <string name="permission_external_storage_never_ask">Can\'t perform the action without external storage permission</string>
     <string name="monospace_font_fields_enable_title">Fields Font</string>
     <string name="monospace_font_fields_enable_summary">Change the font of the fields for better character visibility</string>
+    <string name="auto_open_file_uri_title">Auto open selected file</string>
+    <string name="auto_open_file_uri_summary">Automatically open a file from the selection screen after a selection in the file browser</string>
 
     <string-array name="clipboard_timeout_options">
     	<item>5 seconds</item>

app/src/main/res/xml/app_preferences.xml

@@ -20,24 +20,36 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-	<PreferenceCategory
-		android:title="@string/general">
+    <PreferenceCategory
+        android:title="@string/file_browser">
+
+        <SwitchPreference
+            android:key="@string/saf_key"
+            android:summary="@string/use_saf_summary"
+            android:defaultValue="@bool/saf_default"
+            android:title="@string/use_saf_title"/>
+        <SwitchPreference
+            android:key="@string/auto_open_file_uri_key"
+            android:summary="@string/auto_open_file_uri_summary"
+            android:defaultValue="@bool/auto_open_file_uri_default"
+            android:title="@string/auto_open_file_uri_title"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/search">
 
         <SwitchPreference
             android:summary="@string/omitbackup_summary"
             android:defaultValue="@bool/omitbackup_default"
             android:title="@string/omitbackup_title"
             android:key="@string/omitbackup_key"/>
-        <SwitchPreference
-            android:summary="@string/use_saf_summary"
-            android:defaultValue="@bool/saf_default"
-            android:title="@string/use_saf_title"
-            android:key="@string/saf_key"/>
 
     </PreferenceCategory>
 
     <PreferenceCategory
         android:title="@string/lock">
+
         <ListPreference
             android:key="@string/clipboard_timeout_key"
             android:title="@string/clipboard_timeout"
@@ -59,6 +71,7 @@
             android:title="@string/lock_database_screen_off_title"
             android:summary="@string/lock_database_screen_off_summary"
             android:defaultValue="@bool/lock_database_screen_off_default"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -71,7 +84,6 @@
             android:defaultValue="@string/default_password_length"
             app:min="@string/min_password_length"
             android:max="@string/max_password_length" />
-
         <MultiSelectListPreference
             android:key="@string/list_password_generator_options_key"
             android:title="@string/list_password_generator_options_title"
@@ -79,7 +91,6 @@
             android:entries="@array/list_password_generator_options_entries"
             android:entryValues="@array/list_password_generator_options_values"
             android:defaultValue="@array/list_password_generator_options_default_values"/>
-
         <SwitchPreference
             android:key="@string/maskpass_key"
             android:title="@string/maskpass_title"

app/src/main/res/xml/searchable.xml

@@ -19,6 +19,6 @@
 -->
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
     android:label="@string/search_label"
-    android:hint="@string/search_hint" 
+    android:hint="@string/search"
     android:searchMode="showSearchLabelAsBadge"
  />