From 1ce3ef4ea3c55d4a6c4a79f8a6cca58387b240df Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Thu, 27 Aug 2020 14:27:55 +0530
Subject: Expand show hidden folders to also cover files (#1059)

* PasswordItem: only strip .gpg suffixes

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Add preference key and migration for showing all hidden contents

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Allow showing both hidden files and directories

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Add tests for hidden folder setting migration

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Add changelog entry

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Slightly improve migration logic

Skip migration if old key is not found and always delete the previous key even if its set to false.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Tweak wording

Suggested-by: Fabian Henneke <fabian@henneke.me>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

* Assert previous key's removal in tests

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 app/src/main/res/values-pt-rBR/strings.xml | 2 --
 app/src/main/res/values-ru/strings.xml     | 2 --
 app/src/main/res/values/strings.xml        | 4 ++--
 app/src/main/res/xml/preference.xml        | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

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

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 79edf2d9..a7f3e046 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -269,8 +269,6 @@
     <string name="access_sdcard_text">O local do armazenamento está em seu cartão SD ou armazenamento interno, mas o aplicativo não tem permissão para acessá-lo.</string>
     <string name="your_public_key">Sua chave pública</string>
     <string name="error_generate_ssh_key">Erro ao tentar gerar a chave SSH</string>
-    <string name="pref_show_hidden_title">Mostrar pastas ocultas</string>
-    <string name="pref_show_hidden_summary">Incluir diretórios ocultos na lista de senhas</string>
     <string name="title_create_folder">Criar pasta</string>
     <string name="title_rename_folder">Renomear pasta</string>
     <string name="message_category_error_empty_field">O nome da categoria não pode ser vazio</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 596e1c14..3fab8cf9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -251,8 +251,6 @@
     <string name="ssh_openkeystore_clear_keyid">Очистить сохраненный SSH Key идентификатор OpenKystortore</string>
     <string name="your_public_key">Ваш публичный ключ</string>
     <string name="error_generate_ssh_key">Возникла ошибка при попытке генерации ssh ключа</string>
-    <string name="pref_show_hidden_title">Показать скрытые папки</string>
-    <string name="pref_show_hidden_summary">Включить скрытые директории в список паролей</string>
     <string name="title_create_folder">Создать папку</string>
     <string name="button_create">Создать</string>
     <string name="pref_search_on_start">Открыть поиск на старте</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f27224ff..a6e33047 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -302,8 +302,8 @@
     <string name="access_sdcard_text">The store location is in your SD Card or Internal storage, but the app does not have permission to access it.</string>
     <string name="your_public_key">Your public key</string>
     <string name="error_generate_ssh_key">Error while trying to generate the ssh-key</string>
-    <string name="pref_show_hidden_title">Show hidden folders</string>
-    <string name="pref_show_hidden_summary">Include hidden directories in the password list</string>
+    <string name="pref_show_hidden_title">Show all files and folders</string>
+    <string name="pref_show_hidden_summary">Include non-password files and directories in the password list</string>
     <string name="title_create_folder">Create folder</string>
     <string name="title_rename_folder">Rename folder</string>
     <string name="message_category_error_empty_field">Category name can\'t be empty</string>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 50300b5b..1d82df18 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -127,7 +127,7 @@
             app:title="@string/pref_search_on_start" />
         <CheckBoxPreference
             app:defaultValue="false"
-            app:key="show_hidden_folders"
+            app:key="show_hidden_contents"
             app:persistent="true"
             app:summary="@string/pref_show_hidden_summary"
             app:title="@string/pref_show_hidden_title" />
-- 
cgit v1.2.3