From 2cd77d47eb681feb735d15bcbb4108df930e3fe2 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sun, 23 Feb 2020 13:43:09 +0100
Subject: [PATCH] Move up remember keyfile locations setting

---
 app/src/main/res/values/strings.xml              |  4 ++--
 app/src/main/res/xml/preferences_application.xml | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe7815e98..ef14f2cce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -205,12 +205,12 @@
     <string name="selection_mode">Selection mode</string>
     <string name="remember_database_locations_title">Save location of databases</string>
     <string name="remember_database_locations_summary">Remember the location of databases</string>
+    <string name="remember_keyfile_locations_title">Save location of keyfiles</string>
+    <string name="remember_keyfile_locations_summary">Remember the location of databases keyfiles</string>
     <string name="show_recent_files_title">Show recent files</string>
     <string name="show_recent_files_summary">Show locations of recent databases</string>
     <string name="hide_broken_locations_title">Hide broken database links</string>
     <string name="hide_broken_locations_summary">Hide broken links in the list of recent databases</string>
-    <string name="remember_keyfile_locations_title">Save location of keyfiles</string>
-    <string name="remember_keyfile_locations_summary">Remember the location of databases keyfiles</string>
     <string name="root">Root</string>
     <string name="encryption_explanation">Database encryption algorithm used for all data.</string>
     <string name="kdf_explanation">To generate the key for the encryption algorithm, the master key is transformed using a randomly salted key derivation function.</string>
diff --git a/app/src/main/res/xml/preferences_application.xml b/app/src/main/res/xml/preferences_application.xml
index 1c779f2df..e317aaf43 100644
--- a/app/src/main/res/xml/preferences_application.xml
+++ b/app/src/main/res/xml/preferences_application.xml
@@ -125,6 +125,12 @@
             android:title="@string/remember_database_locations_title"
             android:summary="@string/remember_database_locations_summary"
             android:defaultValue="@bool/remember_database_locations_default"/>
+        <SwitchPreference
+            android:key="@string/remember_keyfile_locations_key"
+            android:title="@string/remember_keyfile_locations_title"
+            android:summary="@string/remember_keyfile_locations_summary"
+            android:dependency="@string/remember_database_locations_key"
+            android:defaultValue="@bool/remember_keyfile_locations_default"/>
         <SwitchPreference
             android:key="@string/show_recent_files_key"
             android:title="@string/show_recent_files_title"
@@ -137,12 +143,6 @@
             android:summary="@string/hide_broken_locations_summary"
             android:dependency="@string/show_recent_files_key"
             android:defaultValue="@bool/hide_broken_locations_default"/>
-        <SwitchPreference
-            android:key="@string/remember_keyfile_locations_key"
-            android:title="@string/remember_keyfile_locations_title"
-            android:summary="@string/remember_keyfile_locations_summary"
-            android:dependency="@string/remember_database_locations_key"
-            android:defaultValue="@bool/remember_keyfile_locations_default"/>
 
     </PreferenceCategory>