Remove Autofill onboarding prompt and cleanup strings (#1116)

Author: msfjarvis

app/src/main/java/com/zeapo/pwdstore/PasswordStore.kt

@@ -11,18 +11,15 @@ 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
 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"
     }
 }

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"

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"

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"

app/src/main/res/values-ar/strings.xml

@@ -16,19 +16,14 @@
     <!-- 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>
     <string name="ssh_preferences_dialog_import">إستيراد</string>
     <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 -->

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 -->

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 -->

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>

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>

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 -->