From 0a9b8fc585a9a06d50ccdb8aef21a2794f700751 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Mon, 21 Sep 2020 23:44:52 +0530
Subject: Remove Autofill onboarding prompt and cleanup strings (#1116)

---
 .../main/java/com/zeapo/pwdstore/PasswordStore.kt  | 48 +---------------------
 app/src/main/res/layout/fragment_clone.xml         |  1 -
 app/src/main/res/layout/fragment_repo_location.xml |  1 -
 app/src/main/res/layout/fragment_welcome.xml       |  1 -
 app/src/main/res/values-ar/strings.xml             |  7 ----
 app/src/main/res/values-cs/strings.xml             |  8 ----
 app/src/main/res/values-de/strings.xml             |  7 ----
 app/src/main/res/values-es/strings.xml             |  9 ----
 app/src/main/res/values-fr/strings.xml             |  9 ----
 app/src/main/res/values-ja/strings.xml             |  7 ----
 app/src/main/res/values-pt-rBR/strings.xml         | 23 -----------
 app/src/main/res/values-ru/strings.xml             | 13 ------
 app/src/main/res/values-zh-rCN/strings.xml         |  7 ----
 app/src/main/res/values-zh-rTW/strings.xml         |  7 ----
 app/src/main/res/values/strings.xml                | 35 ----------------
 15 files changed, 1 insertion(+), 182 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt
index eb339ac3..fc14d805 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt
@@ -11,10 +11,8 @@ import android.content.Intent
 import android.content.pm.ShortcutInfo.Builder
 import android.content.pm.ShortcutManager
 import android.graphics.drawable.Icon
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
@@ -22,7 +20,6 @@ import android.view.MenuItem.OnActionExpandListener
 import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.activity.viewModels
-import androidx.appcompat.widget.AppCompatTextView
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.SearchView.OnQueryTextListener
 import androidx.core.content.edit
@@ -35,8 +32,6 @@ import com.github.ajalt.timberkt.d
 import com.github.ajalt.timberkt.e
 import com.github.ajalt.timberkt.i
 import com.github.ajalt.timberkt.w
-import com.github.androidpasswordstore.autofillparser.BrowserAutofillSupportLevel
-import com.github.androidpasswordstore.autofillparser.getInstalledBrowsersWithAutofillSupportLevel
 import com.github.michaelbull.result.fold
 import com.github.michaelbull.result.getOr
 import com.github.michaelbull.result.onFailure
@@ -61,11 +56,11 @@ import com.zeapo.pwdstore.utils.PasswordRepository.Companion.initialize
 import com.zeapo.pwdstore.utils.PasswordRepository.Companion.isInitialized
 import com.zeapo.pwdstore.utils.PreferenceKeys
 import com.zeapo.pwdstore.utils.base64
-import com.zeapo.pwdstore.utils.isPermissionGranted
 import com.zeapo.pwdstore.utils.commitChange
 import com.zeapo.pwdstore.utils.contains
 import com.zeapo.pwdstore.utils.getString
 import com.zeapo.pwdstore.utils.isInsideRepository
+import com.zeapo.pwdstore.utils.isPermissionGranted
 import com.zeapo.pwdstore.utils.listFilesRecursively
 import com.zeapo.pwdstore.utils.requestInputFocusOnView
 import com.zeapo.pwdstore.utils.sharedPrefs
@@ -125,45 +120,6 @@ class PasswordStore : BaseGitActivity() {
             shortcutManager = getSystemService()
         }
 
-        // If user is eligible for Oreo autofill, prompt them to switch.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
-            !settings.getBoolean(PREFERENCE_SEEN_AUTOFILL_ONBOARDING, false)) {
-            MaterialAlertDialogBuilder(this).run {
-                @SuppressLint("InflateParams")
-                val layout =
-                    layoutInflater.inflate(R.layout.oreo_autofill_instructions, null)
-                layout.findViewById<AppCompatTextView>(R.id.intro_text).setText(R.string.autofill_onboarding_dialog_message)
-                val supportedBrowsersTextView =
-                    layout.findViewById<AppCompatTextView>(R.id.supportedBrowsers)
-                supportedBrowsersTextView.text =
-                    getInstalledBrowsersWithAutofillSupportLevel(context).joinToString(
-                        separator = "\n"
-                    ) {
-                        val appLabel = it.first
-                        val supportDescription = when (it.second) {
-                            BrowserAutofillSupportLevel.None -> getString(R.string.oreo_autofill_no_support)
-                            BrowserAutofillSupportLevel.FlakyFill -> getString(R.string.oreo_autofill_flaky_fill_support)
-                            BrowserAutofillSupportLevel.PasswordFill -> getString(R.string.oreo_autofill_password_fill_support)
-                            BrowserAutofillSupportLevel.GeneralFill -> getString(R.string.oreo_autofill_general_fill_support)
-                            BrowserAutofillSupportLevel.GeneralFillAndSave -> getString(R.string.oreo_autofill_general_fill_and_save_support)
-                        }
-                        "$appLabel: $supportDescription"
-                    }
-                setView(layout)
-                setTitle(R.string.autofill_onboarding_dialog_title)
-                setPositiveButton(R.string.dialog_ok) { _, _ ->
-                    startActivity(Intent(Settings.ACTION_REQUEST_SET_AUTOFILL_SERVICE).apply {
-                        data = Uri.parse("package:${BuildConfig.APPLICATION_ID}")
-                    })
-                }
-                setNegativeButton(R.string.dialog_cancel) { _, _ -> }
-                setOnDismissListener {
-                    settings.edit { putBoolean(PREFERENCE_SEEN_AUTOFILL_ONBOARDING, true) }
-                }
-                show()
-            }
-        }
-
         model.currentDir.observe(this) { dir ->
             val basePath = getRepositoryDirectory().absoluteFile
             supportActionBar!!.apply {
@@ -737,7 +693,5 @@ class PasswordStore : BaseGitActivity() {
             return (!Character.isISOControl(c) &&
                 block != null && block !== UnicodeBlock.SPECIALS)
         }
-
-        private const val PREFERENCE_SEEN_AUTOFILL_ONBOARDING = "seen_autofill_onboarding"
     }
 }
diff --git a/app/src/main/res/layout/fragment_clone.xml b/app/src/main/res/layout/fragment_clone.xml
index 0e173428..a4c0c841 100644
--- a/app/src/main/res/layout/fragment_clone.xml
+++ b/app/src/main/res/layout/fragment_clone.xml
@@ -1,6 +1,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorPrimary"
diff --git a/app/src/main/res/layout/fragment_repo_location.xml b/app/src/main/res/layout/fragment_repo_location.xml
index cc987d8c..9581774e 100644
--- a/app/src/main/res/layout/fragment_repo_location.xml
+++ b/app/src/main/res/layout/fragment_repo_location.xml
@@ -1,6 +1,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorPrimary"
diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index 98a0475d..cdf9f0a1 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -1,6 +1,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorPrimary"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1fd90cb2..a11cd122 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -16,8 +16,6 @@
     <!-- PGPHandler -->
     <string name="file_toast_text">الرجاء إدخال إسم ملف</string>
     <!-- Git Async Task -->
-    <string name="running_dialog_text">جاري تنفيذ الأمر ...</string>
-    <string name="jgit_error_dialog_text">رسالة مِن jgit: \n</string>
 
     <!-- Git Handler -->
     <string name="ssh_preferences_dialog_title">خال من مفاتيح الـ SSH</string>
@@ -25,10 +23,7 @@
     <string name="ssh_preferences_dialog_generate">توليد</string>
     <string name="passphrase_dialog_title">المصادقة</string>
     <!-- Clone fragment -->
-    <string name="clone">أنسخ مِن الخادوم</string>
-    <string name="initialize">إستخدام مجلد محلي</string>
     <string name="server_name">الخادوم</string>
-    <string name="server_protocol">البروتوكول</string>
 
     <string name="connection_mode">نوع المصادقة</string>
 
@@ -83,9 +78,7 @@
     <string name="pwgen_ambiguous">مبهمة</string>
     <string name="pwgen_pronounceable">منطوقة</string>
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">الطول</string>
     <string name="ssh_keygen_passphrase">العبارة السرية</string>
-    <string name="ssh_keygen_comment">تعليق</string>
     <string name="ssh_keygen_generate">توليد</string>
 
     <!-- Misc -->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 8252cffd..053eaf65 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -34,9 +34,7 @@
     <string name="empty_toast_text">Nelze zadat prázdné heslo nebo další obsah</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Příkaz běží…</string>
     <string name="jgit_error_dialog_title">Došlo k vnitřní výjimce</string>
-    <string name="jgit_error_dialog_text">Zpráva od jgit: \n</string>
 
     <!-- Git Handler -->
     <string name="ssh_preferences_dialog_text">Importujte nebo si prosím vygenerujte svůj SSH klíč v nastavení aplikace</string>
@@ -48,14 +46,10 @@
     <string name="password_dialog_text">Zadejte prosím heslo k tomuto repozitáři</string>
 
     <!-- Clone fragment -->
-    <string name="clone">Klonovat ze serveru</string>
-    <string name="initialize">Použít místní adresář</string>
-    <string name="location_dialog_title">Umístění úložiště</string>
     <string name="location_sdcard">SD-Karta</string>
     <string name="location_hidden">Skryté (Preferováno)</string>
     <string name="external_repository_dialog_title">Vyberte kam ukládat hesla</string>
     <string name="server_name">Server</string>
-    <string name="server_protocol">Protokol</string>
 
     <string name="connection_mode">Mód ověření</string>
 
@@ -125,9 +119,7 @@
     <string name="pwgen_uppercase">Velká písmena</string>
     <string name="pwgen_ambiguous">Dvouznačné</string>
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">Délka</string>
     <string name="ssh_keygen_passphrase">Bezpečnostní fráze</string>
-    <string name="ssh_keygen_comment">Komentář</string>
     <string name="ssh_keygen_generate">Generovat</string>
 
     <!-- Misc -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1c89081a..fc619e31 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -23,9 +23,7 @@
     <string name="empty_toast_text">Du kannst kein leeres Passwort setzen oder leere Extra-Angaben</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Befehl läuft…</string>
     <string name="jgit_error_dialog_title">Internal Exception occurred</string>
-    <string name="jgit_error_dialog_text">Message from jgit: \n</string>
 
     <!-- Git Handler -->
     <string name="ssh_preferences_dialog_text">Please import or generate your SSH key file in the preferences</string>
@@ -37,10 +35,7 @@
     <string name="password_dialog_text">Bitte setze ein Passwort für dieses Repository</string>
 
     <!-- Clone fragment -->
-    <string name="clone">Klone von Server</string>
-    <string name="initialize">Nutze lokalen Ordner</string>
     <string name="server_name">Server</string>
-    <string name="server_protocol">Protokoll</string>
 
     <string name="connection_mode">Authentifizierungsmethode</string>
 
@@ -107,9 +102,7 @@
     <string name="pwgen_ambiguous">Zweideutig</string>
     <string name="pwgen_pronounceable">Aussprechbar</string>
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">Länge</string>
     <string name="ssh_keygen_passphrase">Passwort</string>
-    <string name="ssh_keygen_comment">Kommentar</string>
     <string name="ssh_keygen_generate">Generieren</string>
 
     <!-- Misc -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 39e9ebc3..d4c41c14 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -29,9 +29,7 @@
     <string name="empty_toast_text">No puedes dejar la contraseña y el contenido extra ambos vacíos</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Ejecutando comando…</string>
     <string name="jgit_error_dialog_title">Ocurrió un error durante la operación de Git</string>
-    <string name="jgit_error_dialog_text">Mensaje de jgit: \n</string>
 
     <!-- Git Handler -->
     <string name="ssh_preferences_dialog_text">Por favor importa o genera tu llave SSH en los ajustes</string>
@@ -43,16 +41,12 @@
     <string name="password_dialog_text">Por favor ingresa una contraseña para este repositorio</string>
 
     <!-- Clone fragment -->
-    <string name="clone">Clonar desde servidor</string>
-    <string name="initialize">Usar directorio local</string>
-    <string name="location_dialog_title">Ubicación del repositorio</string>
     <string name="location_sdcard">Tarjeta SD</string>
     <string name="location_hidden">Oculto (Recomendado)</string>
     <string name="external_repository_dialog_title">Selecciona dónde almacenar tus contraseñas</string>
     <string name="external_repository_dialog_text">Debes seleccionar un directorio para almacenar tus contraseñas. Si quieres guardarlas dentro del almacenamiento oculto de la aplicación, cancela este diálogo y deshabilita la opción \"Repositorio externo\".</string>
 
     <string name="server_name">Servidor</string>
-    <string name="server_protocol">Protocolo</string>
 
     <string name="connection_mode">Modo de autenticación</string>
 
@@ -130,9 +124,7 @@
     <string name="pwgen_length_too_short_error">Longitud demasiado corta para el criterio seleccionado</string>
 
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">Longitud</string>
     <string name="ssh_keygen_passphrase">Contraseña</string>
-    <string name="ssh_keygen_comment">Comentario</string>
     <string name="ssh_keygen_generate">Generar</string>
 
     <!-- Misc -->
@@ -173,7 +165,6 @@
     <string name="autofill_ins_3_hint">Pantalla de servicio de autollenado en acción</string>
     <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="git_operation_remember_passphrase">Recordar contraseñagit  (inseguro)</string>
     <string name="abort_rebase">Abortar rebase</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 43801b81..a4e383fd 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -35,9 +35,7 @@
     <string name="empty_toast_text">Vous ne pouvez pas utiliser un mot de passe vide ou des données supplémentaires vide</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Commande en cours…</string>
     <string name="jgit_error_dialog_title">Une erreur c\'est produite lors d\'une opération Git</string>
-    <string name="jgit_error_dialog_text">Message de jgit: \n</string>
 
     <!-- Git Handler -->
     <string name="ssh_preferences_dialog_text">Vous devez importer ou générer votre fichier de clef SSH dans les préférences</string>
@@ -49,16 +47,12 @@
     <string name="password_dialog_text">Renseignez le mot de passe pour ce dépôt</string>
 
     <!-- Clone fragment -->
-    <string name="clone">Cloner depuis le serveur</string>
-    <string name="initialize">Utiliser un répertoire local</string>
-    <string name="location_dialog_title">Location du répertoire</string>
     <string name="location_sdcard">Carte SD</string>
     <string name="location_hidden">Caché (Préféré)</string>
     <string name="external_repository_dialog_title">Choisissez où sauvegarder les mots de passe</string>
     <string name="external_repository_dialog_text">Vous devez sélectionner un répertoire où sauvegarder vos mots de passe. Si vous souhaitez sauvegarder vos mots de passe dans la mémoire cachée de l\'application, annulez cette boîte de dialogue et désactivez l\'option \"Répertoire externe\".</string>
 
     <string name="server_name">Serveur</string>
-    <string name="server_protocol">Protocole</string>
 
     <string name="connection_mode">Méthode d\'authentification</string>
 
@@ -130,9 +124,7 @@
     <string name="pwgen_ambiguous">Ambigus</string>
     <string name="pwgen_pronounceable">Prononçable</string>
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">Taille</string>
     <string name="ssh_keygen_passphrase">Mot de passe</string>
-    <string name="ssh_keygen_comment">Commentaire</string>
     <string name="ssh_keygen_generate">Générer</string>
 
     <!-- Misc -->
@@ -173,6 +165,5 @@
     <string name="git_push_nff_error">La poussée a été rejetée par le dépôt distant, exécutez une tirée avant de pousser à nouveau. Vous pouvez utiliser Synchroniser plutôt que de tirer/pousser car il implémente les deux.</string>
     <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="git_operation_remember_passphrase">Se rappeler de la phrase secrète dans la configuration de l\'application (peu sûr)</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 65f378a9..463a8354 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -23,9 +23,7 @@
     <string name="empty_toast_text">空のパスワードを使用したり、追加のコンテンツを空にすることはできません</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">コマンドの実行中…</string>
     <string name="jgit_error_dialog_title">Git 操作中にエラーが発生しました</string>
-    <string name="jgit_error_dialog_text">jgit からのメッセージ: \n</string>
 
     <!-- Git Handler -->
     <string name="ssh_preferences_dialog_text">プリファレンスで SSH 鍵ファイルをインポートまたは生成してください</string>
@@ -37,10 +35,7 @@
     <string name="password_dialog_text">このリポジトリのパスワードを入力してください</string>
 
     <!-- Clone fragment -->
-    <string name="clone">サーバーからクローン</string>
-    <string name="initialize">ローカルディレクトリーを使用する</string>
     <string name="server_name">サーバー</string>
-    <string name="server_protocol">プロトコル</string>
 
     <string name="connection_mode">認証モード</string>
 
@@ -90,9 +85,7 @@
     <string name="pwgen_ambiguous">あいまい</string>
     <string name="pwgen_pronounceable">発音可能</string>
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">長さ</string>
     <string name="ssh_keygen_passphrase">パスフレーズ</string>
-    <string name="ssh_keygen_comment">コメント</string>
     <string name="ssh_keygen_generate">生成</string>
 
     <!-- Misc -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9b7150e5..39efdecd 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -45,11 +45,8 @@
     <string name="path_toast_text">Por favor, forneça o caminho do arquivo</string>
     <string name="empty_toast_text">Você não pode usar uma senha vazia ou conteúdo extra vazio</string>
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Executando comando…</string>
     <string name="jgit_error_dialog_title">Ocorreu um erro durante uma operação do Git</string>
-    <string name="jgit_error_dialog_text">Mensagem do jgit: \n</string>
     <!-- Git Handler -->
-    <string name="set_information_dialog_text">Por favor, corrija a configuração do servidor remoto nas configurações antes de prosseguir</string>
     <string name="ssh_preferences_dialog_text">Por favor, importe ou gere seu arquivo de chave SSH nas preferências</string>
     <string name="ssh_preferences_dialog_title">Nenhuma chave SSH</string>
     <string name="ssh_preferences_dialog_import">Importar</string>
@@ -58,15 +55,11 @@
     <string name="passphrase_dialog_text">Por favor, forneça a senha para a sua chave SSH</string>
     <string name="password_dialog_text">Por favor, forneça a senha para este repositório</string>
     <!-- Clone fragment -->
-    <string name="clone">Clonar do servidor</string>
-    <string name="initialize">Usar diretório local</string>
-    <string name="location_dialog_title">Local do repositório</string>
     <string name="location_sdcard">Cartão SD</string>
     <string name="location_hidden">Oculto (preferencial)</string>
     <string name="external_repository_dialog_title">Escolha onde armazenar as senhas</string>
     <string name="external_repository_dialog_text">Você deve selecionar um diretório onde armazenar suas senhas. Se você deseja armazenar suas senhas dentro do armazenamento oculto do aplicativo, cancele esta caixa de diálogo e desative a opção \"Repositório Externo\".</string>
     <string name="server_name">Servidor</string>
-    <string name="server_protocol">Protocolo</string>
     <string name="connection_mode">Modo de autenticação</string>
     <!-- Git Config fragment -->
     <string name="git_user_name_hint">Usuário</string>
@@ -164,18 +157,13 @@
     <string name="xkpwgen_pref_custom_dict_picker_title">Lista de palavras personalizadas</string>
     <string name="xkpwgen_pref_custom_dict_picker_summary">Toque para escolher um arquivo personalizado de lista de palavras contendo uma palavra por linha</string>
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">Tamanho</string>
     <string name="ssh_keygen_passphrase">Frase Secreta</string>
-    <string name="ssh_keygen_comment">Comentário</string>
     <string name="ssh_keygen_generate">Gerar</string>
     <string name="ssh_key_gen_generating_progress">Gerando chaves…</string>
-    <string name="ssh_keygen_generating_done">Concluído!</string>
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Sim</string>
     <string name="dialog_no">Não</string>
-    <string name="dialog_positive">Ir para configurações</string>
-    <string name="dialog_negative">Voltar</string>
     <string name="dialog_cancel">Cancelar</string>
     <string name="dialog_skip">Pular</string>
     <string name="git_sync">Sincronizar repositório</string>
@@ -241,16 +229,11 @@
     <string name="git_push_nff_error">Push rejeitado pelo remoto, execute o pull antes de fazer push novamente. Você pode usar Sincronização em vez de pull/push conforme implementa ambos</string>
     <string name="git_push_generic_error">Push rejeitado pelo remoto, razão:</string>
     <string name="git_push_other_error">O remoto rejeito o push non-fast-foward. Cheque a variável receive.denyNonFastForwards no arquivo de configuração do repositório de destino.</string>
-    <string name="jgit_error_push_dialog_text">Ocorreu um erro durante a operação de push:</string>
     <string name="clear_saved_passphrase_ssh">Limpar a frase secreta salva para chave SSH local</string>
     <string name="clear_saved_passphrase_https">Limpar senha HTTPS salva</string>
     <string name="git_operation_remember_passphrase">Lembrar senha da chave</string>
     <string name="abort_rebase">Abortar rebase e realizar push do novo branch</string>
     <string name="reset_to_remote">Hard reset no branch remoto</string>
-    <string name="openkeychain_ssh_api_connect_fail">Falha ao conectar ao serviço de API SSH do OpenKeychain.</string>
-    <string name="no_ssh_api_provider">Nenhum provedor de API SSH encontrado. O OpenKeychain está instalado?</string>
-    <string name="ssh_api_pending_intent_failed">SSH API pendente falhou</string>
-    <string name="ssh_api_unknown_error">Erro desconhecido de API SSH</string>
     <string name="sdcard_root_warning_title">Raiz do cartão SD selecionada</string>
     <string name="sdcard_root_warning_message">Você selecionou a raiz do seu cartão SD para armazenar. Isto é extremamente perigoso e você perderá seus dados, pois seu conteúdo será eventualmente apagado</string>
     <string name="git_abort_and_push_title">Abortar e executar Push</string>
@@ -284,16 +267,10 @@
     <string name="connection_mode_ssh_key">Chave SSH</string>
     <string name="connection_mode_basic_authentication">Senha</string>
     <string name="git_server_config_save_success">Configuração salva com sucesso</string>
-    <string name="git_config_error_hostname_empty">hostname vazio</string>
-    <string name="git_config_error_generic">por favor, verifique suas configurações e tente novamente</string>
-    <string name="git_config_error_nonnumeric_port">porta deve ser numérica</string>
-    <string name="git_config_error_custom_port_absolute">caminho deve ser absoluto (começar com \'/\') ao usar uma porta personalizada</string>
     <string name="git_operation_wrong_passphrase">Frase segura incorreta</string>
     <string name="git_operation_wrong_password">Senha incorreta</string>
     <string name="bottom_sheet_create_new_folder">Criar nova pasta</string>
     <string name="bottom_sheet_create_new_password">Criar nova senha</string>
-    <string name="autofill_onboarding_dialog_title">Novo, autopreenchimento renovado!</string>
-    <string name="autofill_onboarding_dialog_message">Nesta versão, o suporte ao preenchimento automático foi aprimorado enormemente com recursos avançados, como proteção antiphishing e confiabilidade aprimorada. Se você não conseguiu usá-lo devido às deficiências da versão anterior, provavelmente adorará a nova iteração. Experimente!</string>
     <string name="snackbar_action_grant">Conceder</string>
     <string name="pref_debug_logging_summary">Ativar log de depuração (requer reinicialização da aplicação)</string>
     <string name="pref_debug_logging_title">Debug log</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 134f834a..5a34c54f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -37,9 +37,7 @@
     <string name="empty_toast_text">Вы не можете использовать пустой пароль или пустое поле информации</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Выполняется команда…</string>
     <string name="jgit_error_dialog_title">Произошла ошибка выполнения операции Git</string>
-    <string name="jgit_error_dialog_text">Сообщение от jgit: \n</string>
 
     <!-- Git Handler -->
     <string name="ssh_preferences_dialog_text">Пожалуйста, импортируйте или сгенерируйте новый SSH ключ в настройках</string>
@@ -51,16 +49,12 @@
     <string name="password_dialog_text">Пожалуйста, введите пароль для репозитория</string>
 
     <!-- Clone fragment -->
-    <string name="clone">Клонировать с сервера</string>
-    <string name="initialize">Использовать локальную директорию</string>
-    <string name="location_dialog_title">Расположение репозитория</string>
     <string name="location_sdcard">SD-Карта</string>
     <string name="location_hidden">Скрытый (Предпочтительно)</string>
     <string name="external_repository_dialog_title">Выберете где хранить пароли</string>
     <string name="external_repository_dialog_text">Вы должны выбрать директорию где хранить пароли. Если вы хотите хранить пароли в скрытом хранилище приложения, тогда отмените этот диалог и отключите настройку \"Внешний репозиторий\".</string>
 
     <string name="server_name">Сервер</string>
-    <string name="server_protocol">Протокол</string>
 
     <string name="connection_mode">Тип авторизации</string>
 
@@ -159,9 +153,7 @@
     <string name="xkpwgen_pref_custom_dict_picker_summary">Нажмите чтобы выбрать файл пользовательского списка слов содержащий одно слово на строку</string>
 
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">Длина</string>
     <string name="ssh_keygen_passphrase">Пароль</string>
-    <string name="ssh_keygen_comment">Комментарий</string>
     <string name="ssh_keygen_generate">Сгенерировать</string>
 
     <!-- Misc -->
@@ -228,14 +220,9 @@
     <string name="git_push_nff_error">Запись изменений была отклонена удаленным репозиторием, сначала пполучите изменения перед повторной записью. Вы можете использовать Синхронизацию вместо получения/записи изменений, т.к. она реализует оба подхда.</string>
     <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="git_operation_remember_passphrase">Заполнить парольную фразу в конфигурации приложнеия (небезопасно)</string>
     <string name="abort_rebase">Прервать перебазирование и записать изменения в новую ветку</string>
     <string name="reset_to_remote">Полный сброс до состояния удаленной ветки</string>
-    <string name="openkeychain_ssh_api_connect_fail">Ошибка при подключении к сервису OpenKeychain SSH API</string>
-    <string name="no_ssh_api_provider">Не найдено SSH API провайдеров. OpenKeychain установлен?</string>
-    <string name="ssh_api_pending_intent_failed">Ожидаемое намерение SSH API не удалось</string>
-    <string name="ssh_api_unknown_error">Незвестная ошибка SSH API</string>
     <string name="sdcard_root_warning_title">Выбран корень SD-Карты</string>
     <string name="sdcard_root_warning_message">Вы выбрали корень вашей sd-карты для хранения. Это очень опасно и вы потеряете ваши данные, поскольку они будут в конечном итоге удалены</string>
     <string name="git_abort_and_push_title">Прервать и записать изменения</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ebc710d4..c60a814b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -23,9 +23,7 @@
     <string name="empty_toast_text">无法使用空白密码或者空白的额外内容</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">执行命令中…</string>
     <string name="jgit_error_dialog_title">内部错误</string>
-    <string name="jgit_error_dialog_text">Message from jgit:</string>
 
     <!-- Git Handler -->
     <string name="ssh_preferences_dialog_text">请在设置中导入或生成你的SSH密钥文件</string>
@@ -37,10 +35,7 @@
     <string name="password_dialog_text">请提供当前 Repo 的密码</string>
 
     <!-- Clone fragment -->
-    <string name="clone">从服务器Clone</string>
-    <string name="initialize">使用本地目录</string>
     <string name="server_name">服务器</string>
-    <string name="server_protocol">接口</string>
 
     <string name="connection_mode">认证模式</string>
 
@@ -87,9 +82,7 @@
     <string name="pwgen_uppercase">大写</string>
     <string name="pwgen_ambiguous">混淆</string>
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">长度</string>
     <string name="ssh_keygen_passphrase">口令</string>
-    <string name="ssh_keygen_comment">备注</string>
     <string name="ssh_keygen_generate">生成</string>
 
     <!-- Misc -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b380c560..64df9a7c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -20,9 +20,7 @@
     <string name="empty_toast_text">不能使用空白密碼或者空白的備註</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">執行中…</string>
     <string name="jgit_error_dialog_title">内部錯誤</string>
-    <string name="jgit_error_dialog_text">Message from jgit:</string>
 
     <!-- Git Handler -->
     <string name="ssh_preferences_dialog_text">請在設定中匯入或產生你的 SSH 金鑰</string>
@@ -34,10 +32,7 @@
     <string name="password_dialog_text">請提供目前 Repo 的密碼</string>
 
     <!-- Clone fragment -->
-    <string name="clone">從伺服器 Clone</string>
-    <string name="initialize">使用本機目錄</string>
     <string name="server_name">伺服器</string>
-    <string name="server_protocol">port</string>
 
     <string name="connection_mode">認證模式</string>
 
@@ -84,9 +79,7 @@
     <string name="pwgen_uppercase">大寫</string>
     <string name="pwgen_ambiguous">混淆</string>
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">長度</string>
     <string name="ssh_keygen_passphrase">密碼</string>
-    <string name="ssh_keygen_comment">備註</string>
     <string name="ssh_keygen_generate">產生</string>
 
     <!-- Misc -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c2e88b2..57c32126 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,12 +59,9 @@
     <string name="empty_toast_text">You cannot use an empty password or empty extra content</string>
 
     <!-- Git Async Task -->
-    <string name="running_dialog_text">Running command…</string>
     <string name="jgit_error_dialog_title">An error occurred during a Git operation</string>
-    <string name="jgit_error_dialog_text">Message from jgit: \n</string>
 
     <!-- Git Handler -->
-    <string name="set_information_dialog_text">Please fix the remote server configuration in settings before proceeding</string>
     <string name="ssh_preferences_dialog_text">Please import or generate your SSH key file in the preferences</string>
     <string name="ssh_preferences_dialog_title">No SSH key</string>
     <string name="ssh_preferences_dialog_import">Import</string>
@@ -74,9 +71,6 @@
     <string name="password_dialog_text">Please provide the password for this repository</string>
 
     <!-- Clone fragment -->
-    <string name="clone">Clone from server</string>
-    <string name="initialize">Use local directory</string>
-    <string name="location_dialog_title">Repository location</string>
     <string name="location_dialog_create_text">Select where do you want to create your password repository</string>
     <string name="location_sdcard">SD-Card</string>
     <string name="location_hidden">Hidden (Preferred)</string>
@@ -84,7 +78,6 @@
     <string name="external_repository_dialog_text">You must select a directory where to store your passwords. If you want to store your passwords within the hidden storage of the application, cancel this dialog and disable the \"External Repository\" option.</string>
 
     <string name="server_name">Server</string>
-    <string name="server_protocol">Protocol</string>
     <string name="server_url">Repository URL</string>
     <string name="server_branch">Branch</string>
 
@@ -195,17 +188,13 @@
     <string name="xkpwgen_pref_custom_dict_picker_summary">Tap to pick a custom wordlist file containing one word per line</string>
 
     <!-- ssh keygen fragment -->
-    <string name="ssh_keygen_length">Length</string>
     <string name="ssh_keygen_passphrase">Passphrase</string>
-    <string name="ssh_keygen_comment">Comment</string>
     <string name="ssh_keygen_generate">Generate</string>
     <string name="ssh_keygen_share">Share</string>
     <string name="ssh_keygen_later">Later</string>
     <string name="ssh_keygen_message">%1$s\n\nProvide this public key to your Git server.</string>
     <string name="ssh_key_gen_generating_progress">Generating keys…</string>
-    <string name="ssh_keygen_generating_done">Done!</string>
     <string name="ssh_keygen_require_authentication">Protect with screen lock credential</string>
-    <string name="ssh_keygen_copied_key">Public key copied to clipboard</string>
     <string name="ssh_keygen_label_rsa">RSA</string>
     <string name="ssh_keygen_label_ecdsa">ECDSA</string>
     <string name="ssh_keygen_label_ed25519">Ed25519</string>
@@ -227,8 +216,6 @@
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Yes</string>
     <string name="dialog_no">No</string>
-    <string name="dialog_positive">Go to Settings</string>
-    <string name="dialog_negative">Go back</string>
     <string name="dialog_cancel">Cancel</string>
     <string name="dialog_skip">Skip</string>
     <string name="git_sync">Synchronize repository</string>
@@ -296,7 +283,6 @@
     <string name="autofill_ins_1_hint">Screenshot of accessibility services</string>
     <string name="autofill_ins_2_hint">Screenshot of toggle in accessibility services</string>
     <string name="autofill_ins_3_hint">Screenshot of autofill service in action</string>
-    <string name="jgit_error_push_dialog_text">Error occurred during the push operation:</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="git_operation_remember_passphrase">Remember key passphrase</string>
@@ -306,10 +292,6 @@
     <string name="git_head_on_branch">On branch %1$s</string>
     <string name="git_head_detached">HEAD detached at %1$s</string>
     <string name="git_head_missing">Unable to locate HEAD</string>
-    <string name="openkeychain_ssh_api_connect_fail">Failed to connect to OpenKeychain SSH API service.</string>
-    <string name="no_ssh_api_provider">No SSH API provider found. Is OpenKeychain installed?</string>
-    <string name="ssh_api_pending_intent_failed">SSH API pending intent failed</string>
-    <string name="ssh_api_unknown_error">Unknown SSH API Error</string>
     <string name="sdcard_root_warning_title">SD-Card root selected</string>
     <string name="sdcard_root_warning_message">You have selected the root of your sdcard for the store. This is extremely dangerous and you will lose your data as its content will, eventually, be deleted</string>
     <string name="git_abort_and_push_title">Abort and Push</string>
@@ -342,8 +324,6 @@
     <string name="theme_dark">Dark</string>
     <string name="theme_battery_saver">Set by Battery Saver</string>
     <string name="theme_follow_system">System default</string>
-    <string name="clone_protocol_ssh" translatable="false">SSH</string>
-    <string name="clone_protocol_https" translatable="false">HTTPS</string>
     <string name="connection_mode_ssh_key">SSH key</string>
     <string name="connection_mode_basic_authentication">Password</string>
     <string name="connection_mode_openkeychain" translatable="false">OpenKeychain</string>
@@ -352,16 +332,10 @@
     <string name="git_server_config_save_missing_username_https">Please specify the HTTPS username in the form https://username@example.com/…</string>
     <string name="git_server_config_save_missing_username_ssh">Please specify the SSH username in the form username@example.com:…</string>
     <string name="git_server_config_save_auth_mode_mismatch">Valid authentication modes for %1$s: %2$s</string>
-    <string name="git_config_error_hostname_empty">empty hostname</string>
-    <string name="git_config_error_generic">please verify your settings and try again</string>
-    <string name="git_config_error_nonnumeric_port">port must be numeric</string>
-    <string name="git_config_error_custom_port_absolute">path must be absolute (start with \'/\') when using a custom port</string>
     <string name="git_operation_wrong_passphrase">Wrong passphrase</string>
     <string name="git_operation_wrong_password">Wrong password</string>
     <string name="bottom_sheet_create_new_folder">Create new folder</string>
     <string name="bottom_sheet_create_new_password">Create new password</string>
-    <string name="autofill_onboarding_dialog_title">New, revamped Autofill!</string>
-    <string name="autofill_onboarding_dialog_message">In this release, Autofill support has been massively improved with advanced features like anti-phishing protection and enhanced reliability. If you have been holding out on using it because of the shortcomings on the previous version, you\'ll likely love the new iteration. Give it a shot!</string>
     <string name="snackbar_action_grant">Grant</string>
     <string name="pref_debug_logging_summary">Enable debug logging (requires app restart)</string>
     <string name="pref_debug_logging_title">Debug logging</string>
@@ -421,20 +395,11 @@
 
     <!-- Onboarding flow -->
     <string name="repository_n_location">Repository \nLocation</string>
-    <string name="select_n_openpgp_provider">Select \nOpenPGP Provider</string>
     <string name="let_s_go">Let\'s Go</string>
     <string name="select_n_repository_type">Select \nRepository Type</string>
     <string name="select_repo_type_text">Select if you want to create a local repo or clone a remote repo.</string>
     <string name="clone_remote_repo">Clone Remote Repo</string>
     <string name="create_local_repo">Create Local Repo</string>
-    <string name="error_directory_uri">Error getting directory uri</string>
-    <string name="select_directory_passwords">Select a directory to store passwords</string>
-    <string name="select_n_store_name">Select \nStore Name</string>
-    <string name="select_n_store_text">Select a name for your password store.</string>
-    <string name="store_name">Store Name</string>
-    <string name="select_empty_directory">Select an empty directory for password store</string>
-    <string name="err_enter_store_name">Enter a store name to continue</string>
-    <string name="exception_cannot_create_directory">Cannot create new directory.</string>
 
     <!-- SSH port validation -->
     <string name="ssh_scheme_needed_title">Potentially incorrect URL</string>
-- 
cgit v1.2.3