From beaec159e8ee76c9cb598ec3a1a6cff8c46c355b Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Fri, 17 Apr 2020 23:42:48 +0530
Subject: Update SSH clear passphrase preference to handle HTTPS (#716)

* Update SSH clear passphrase preference to handle HTTPS

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

* Address review comments

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

* Address review comments

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

* Explicitly set preference to visible if it can do anything

* Address review comments

Co-authored-by: Fabian Henneke <FabianHenneke@users.noreply.github.com>
Co-authored-by: Fabian Henneke <fabian@henneke.me>
---
 app/src/main/res/values-es/strings.xml | 1 -
 app/src/main/res/values-fr/strings.xml | 1 -
 app/src/main/res/values-ru/strings.xml | 1 -
 app/src/main/res/values/strings.xml    | 3 ++-
 app/src/main/res/xml/preference.xml    | 4 +---
 5 files changed, 3 insertions(+), 7 deletions(-)

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

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index aeb0a133..55cc3cda 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -216,7 +216,6 @@
     <string name="git_push_nff_error">La subida fue rechazada por el servidor, Ejecuta \'Descargar desde servidor\' antes de subir o pulsa \'Sincronizar con servidor\' para realizar ambas acciones.</string>
     <string name="git_push_generic_error">El envío fue rechazado por el servidor, la razón:</string>
     <string name="jgit_error_push_dialog_text">Ocurrió un error durante el envío:</string>
-    <string name="ssh_key_clear_passphrase">Limpiar contraseña guardada de llave SSH</string>
     <string name="hotp_remember_clear_choice">Limpiar preferencia para incremento HOTP</string>
     <string name="remember_the_passphrase">Recordar contraseñagit  (inseguro)</string>
     <string name="hackish_tools">Hackish tools</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8461d96d..7a28dd82 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -217,7 +217,6 @@
     <string name="git_push_generic_error">Poussée rejetée par le dépôt distant, raison:</string>
     <string name="git_push_other_error">Pousser au dépôt distant sans avance rapide rejetée. Vérifiez la variable receive.denyNonFastForwards dans le fichier de configuration du répertoire de destination.</string>
     <string name="jgit_error_push_dialog_text">Une erreur s\'est produite lors de l\'opération de poussée:</string>
-    <string name="ssh_key_clear_passphrase">Effacer la phrase secrète enregistrée par ssh-key</string>
     <string name="hotp_remember_clear_choice">Effacer les préférences enregistrées pour l’incrémentation HOTP</string>
     <string name="remember_the_passphrase">Se rappeler de la phrase secrète dans la configuration de l\'application (peu sûr)</string>
     <string name="hackish_tools">Outils de hack</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 04d7b837..051ab024 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -279,7 +279,6 @@
     <string name="git_push_generic_error">Запись изменений была отклонена удаленным репозиторием, причина:</string>
     <string name="git_push_other_error">Удаленный репозиторий отклонил запись изменений без быстрой перемотки вперед. Проверьте переменную receive.denyNonFastForwards в файле конфигурации репозитория назначения.</string>
     <string name="jgit_error_push_dialog_text">В хоте операции записи изменений возникла ошибка:</string>
-    <string name="ssh_key_clear_passphrase">Очистить сохраненную парольную фразу ключа ssh</string>
     <string name="hotp_remember_clear_choice">Очистить сохраненные настройки для увеличения HOTP</string>
     <string name="remember_the_passphrase">Заполнить парольную фразу в конфигурации приложнеия (небезопасно)</string>
     <string name="hackish_tools">Костыльные инструменты</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dafad85a..acedf8e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -307,7 +307,8 @@
     <string name="git_push_generic_error">Push was rejected by remote, reason:</string>
     <string name="git_push_other_error">Remote rejected non-fast-forward push. Check receive.denyNonFastForwards variable in config file of destination repository.</string>
     <string name="jgit_error_push_dialog_text">Error occurred during the push operation:</string>
-    <string name="ssh_key_clear_passphrase">Clear ssh-key saved passphrase</string>
+    <string name="clear_saved_passphrase_ssh">Clear saved passphrase for local SSH key</string>
+    <string name="clear_saved_passphrase_https">Clear saved HTTPS password</string>
     <string name="hotp_remember_clear_choice">Clear saved preference for HOTP incrementing</string>
     <string name="remember_the_passphrase">Remember key passphrase</string>
     <string name="hackish_tools">Hackish tools</string>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index fc041ee1..abc40a8e 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -45,9 +45,7 @@
         <androidx.preference.Preference
             app:key="ssh_keygen"
             app:title="@string/pref_ssh_keygen_title" />
-        <androidx.preference.Preference
-            app:key="ssh_key_clear_passphrase"
-            app:title="@string/ssh_key_clear_passphrase" />
+        <androidx.preference.Preference app:key="clear_saved_pass" />
         <androidx.preference.Preference
             app:key="hotp_remember_clear_choice"
             app:title="@string/hotp_remember_clear_choice" />
-- 
cgit v1.2.3