From fde16c60f4ce5d57a0c7d5a0186dcd532a23f0f0 Mon Sep 17 00:00:00 2001
From: Fabian Henneke <FabianHenneke@users.noreply.github.com>
Date: Wed, 25 Mar 2020 18:13:04 +0100
Subject: Make preferred directory structure for Autofill configurable (#660)

Some users keep their password files in a directory structure such as:
/example.org/john@doe.org.gpg
while others prefer the style:
/example.org/john@doe.org/password.gpg

This commit adds a setting that allows to switch between the two. All Autofill
operations, such as search, match, generate and save, respect this setting.

Note: The first style seems to be the most widely used and is therefore kept as
the default. The second style is mentioned on the official Pass website at:
https://www.passwordstore.org/#organization
---
 app/src/main/res/values/arrays.xml  | 8 ++++++++
 app/src/main/res/values/strings.xml | 2 ++
 2 files changed, 10 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 522fe6cc..37b55432 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -51,5 +51,13 @@
         <item>classic</item>
         <item>xkpasswd</item>
     </string-array>
+    <string-array name="oreo_autofill_directory_structure_entries">
+        <item>/example.org/john@doe.org(.gpg)</item>
+        <item>/example.org/john@doe.org/password(.gpg)</item>
+    </string-array>
+    <string-array name="oreo_autofill_directory_structure_values">
+        <item>file</item>
+        <item>directory</item>
+    </string-array>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5df51af5..ba491c87 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="clipboard_username_toast_text">Username copied to clipboard</string>
     <string name="clipboard_otp_toast_text">OTP code copied to clipboard</string>
     <string name="file_toast_text">Please provide a file name</string>
+    <string name="path_toast_text">Please provide a file path</string>
     <string name="empty_toast_text">You cannot use an empty password or empty extra content</string>
 
     <!-- Git Async Task -->
@@ -268,6 +269,7 @@
     <string name="oreo_autofill_fill_support">Fill credentials</string>
     <string name="oreo_autofill_flaky_fill_support">Fill credentials (may require restarting the browser from time to time)</string>
     <string name="oreo_autofill_no_support">No support</string>
+    <string name="oreo_autofill_preference_directory_structure">Password file organization</string>
 
     <!-- Autofill -->
     <string name="autofill_description">Autofills password fields in apps. Only works for Android versions 4.3 and up. Does not rely on the clipboard for Android versions 5.0 and up.</string>
-- 
cgit v1.2.3