Break down PGP Activity into focused sections (#776)

18 files changed, 29 insertions, 174 deletions

diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 590661b3..664cb482 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -19,7 +19,7 @@
         android:padding="16dp">
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/crypto_password_category_decrypt"
+            android:id="@+id/password_category"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -32,7 +32,7 @@
             tools:text="CATEGORY HERE" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/crypto_password_file"
+            android:id="@+id/password_file"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -41,11 +41,11 @@
             android:textSize="24sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/crypto_password_category_decrypt"
+            app:layout_constraintTop_toBottomOf="@id/password_category"
             tools:text="PASSWORD FILE NAME HERE" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/crypto_password_last_changed"
+            android:id="@+id/password_last_changed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -54,7 +54,7 @@
             android:textIsSelectable="false"
             android:textSize="18sp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/crypto_password_file"
+            app:layout_constraintTop_toBottomOf="@id/password_file"
             tools:text="LAST CHANGED HERE" />
 
 
@@ -65,7 +65,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
             android:src="@drawable/divider"
-            app:layout_constraintTop_toBottomOf="@id/crypto_password_last_changed"
+            app:layout_constraintTop_toBottomOf="@id/password_last_changed"
             tools:ignore="ContentDescription" />
 
         <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/password_creation_activity.xml
index 02864135..13af597c 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/password_creation_activity.xml
@@ -11,10 +11,10 @@
     android:background="?android:attr/windowBackground"
     android:orientation="vertical"
     android:padding="@dimen/activity_horizontal_margin"
-    tools:context="com.zeapo.pwdstore.crypto.PgpActivity">
+    tools:context="com.zeapo.pwdstore.crypto.PasswordCreationActivity">
 
     <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/crypto_password_category"
+        android:id="@+id/category"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -33,10 +33,10 @@
         android:layout_margin="8dp"
         android:hint="@string/crypto_name_hint"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/crypto_password_category">
+        app:layout_constraintTop_toBottomOf="@id/category">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/crypto_password_file_edit"
+            android:id="@+id/filename"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
     </com.google.android.material.textfield.TextInputLayout>
@@ -52,7 +52,7 @@
         app:layout_constraintTop_toBottomOf="@id/name_input_layout">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/crypto_password_edit"
+            android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="textVisiblePassword" />
@@ -77,14 +77,14 @@
         app:layout_constraintTop_toBottomOf="@id/generate_password">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/crypto_extra_edit"
+            android:id="@+id/extra_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="textMultiLine|textVisiblePassword" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <Switch
+    <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/encrypt_username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/menu/context_pass.xml b/app/src/main/res/menu/context_pass.xml
index 3d262e14..41a1f705 100644
--- a/app/src/main/res/menu/context_pass.xml
+++ b/app/src/main/res/menu/context_pass.xml
@@ -15,12 +15,6 @@
         app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/menu_edit_password"
-        android:icon="@drawable/ic_edit_white_24dp"
-        android:title="@string/edit"
-        app:showAsAction="ifRoom" />
-
-    <item
         android:id="@+id/menu_delete_password"
         android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/delete"
diff --git a/app/src/main/res/menu/pgp_handler_new_password.xml b/app/src/main/res/menu/pgp_handler_new_password.xml
index c3e73199..78ea8ced 100644
--- a/app/src/main/res/menu/pgp_handler_new_password.xml
+++ b/app/src/main/res/menu/pgp_handler_new_password.xml
@@ -8,17 +8,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.zeapo.pwdstore.crypto.PgpActivity">
     <item
-        android:id="@+id/crypto_cancel_add"
+        android:id="@+id/cancel_password_add"
         android:icon="@drawable/ic_clear_white_24dp"
         android:title="@string/crypto_cancel"
         pwstore:showAsAction="ifRoom" />
     <item
-        android:id="@+id/crypto_confirm_add"
+        android:id="@+id/save_password"
         android:icon="@drawable/ic_save_white_24dp"
         android:title="@string/crypto_save"
         pwstore:showAsAction="ifRoom" />
     <item
-        android:id="@+id/crypto_confirm_add_and_copy"
+        android:id="@+id/save_and_copy_password"
         android:icon="@drawable/ic_save_copy_white_24dp"
         android:title="@string/crypto_save_and_copy"
         pwstore:showAsAction="ifRoom" />
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 0ab9c7f1..c76b435c 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -22,7 +22,6 @@
     <string name="jgit_error_dialog_text">رسالة مِن jgit: \n</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">هل نسيت إدخال إسم المستخدم ؟</string>
     <string name="ssh_preferences_dialog_title">خال من مفاتيح الـ SSH</string>
     <string name="ssh_preferences_dialog_import">إستيراد</string>
     <string name="ssh_preferences_dialog_generate">توليد</string>
@@ -34,14 +33,9 @@
     <string name="server_protocol">البروتوكول</string>
     <string name="server_url">عنوان الخادوم</string>
     <string name="server_port_hint">22</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">مسار المستودع</string>
-    <string name="server_path_hint">path/to/pass</string>
     <string name="server_user">إسم المستخدم</string>
-    <string name="server_user_hint">git_username</string>
 
-    <string name="server_resulting_url">عنوان الرابط الناتج</string>
     <string name="connection_mode">نوع المصادقة</string>
 
     <string name="git_user_name_hint">إسم المستخدم</string>
@@ -87,7 +81,6 @@
     <string name="pref_external_repository">مستودع تخزين خارجي</string>
     <string name="pref_external_repository_summary">إستخدم كلمة مرور المستودع الخارجي</string>
     <string name="pref_select_external_repository">إختيار مستودع التخزين الخارجي</string>
-    <string name="prefs_use_default_file_picker">إستخدم أداة إختيار الملفات الإفتراضي</string>
     <string name="prefs_export_passwords_title">تصدير كلمات السر</string>
     <string name="prefs_version">النسخة</string>
 
@@ -105,7 +98,6 @@
     <string name="ssh_keygen_comment">تعليق</string>
     <string name="ssh_keygen_generate">توليد</string>
     <string name="ssh_keygen_copy">نسخ</string>
-    <string name="ssh_keygen_show_passphrase">إظهار العبارة السرية</string>
 
     <!-- Misc -->
     <string name="dialog_ok">حسناً</string>
@@ -119,7 +111,6 @@
     <string name="refresh_list">تحديث القائمة</string>
     <string name="show_password">إظهار كلمة السر</string>
     <string name="show_extra">إظهار المزيد من المحتوى</string>
-    <string name="repository_uri">عنوان المستودع</string>
     <string name="app_icon_hint">أيقونة التطبيق</string>
     <string name="folder_icon_hint">أيقونة المجلد</string>
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a6cde10c..24a1913d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -26,8 +26,8 @@
     <string name="password_exists_message">Toto přepíše%1$s %2$s .</string>
 
     <!-- git commits -->
-    <string name="git_commit_add_text">Přídat generované heslo pro %1$s s použítím android password store.</string>
-    <string name="git_commit_edit_text">Upravit heslo %1$s s použítím android password store.</string>
+    <string name="git_commit_add_text">Přídat generované heslo pro %1$s s použítím Android Password Store.</string>
+    <string name="git_commit_edit_text">Upravit heslo %1$s s použítím Android Password Store.</string>
     <string name="git_commit_remove_text">Odstranit %1$s ze store. </string>
     <!-- PGPHandler -->
     <string name="provider_toast_text">Nebyl vybrán poskytovatel OpenPGP!</string>
@@ -43,7 +43,6 @@
     <string name="jgit_error_dialog_text">Zpráva od jgit: \n</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">Zapomněli jste uvést přihlašovací jméno?</string>
     <string name="ssh_preferences_dialog_text">Importujte nebo si prosím vygenerujte svůj SSH klíč v nastavení aplikace</string>
     <string name="ssh_preferences_dialog_title">Žádný SSH klíč</string>
     <string name="ssh_preferences_dialog_import">Import</string>
@@ -64,21 +63,13 @@
     <string name="server_protocol">Protokol</string>
     <string name="server_url">URL serveru</string>
     <string name="server_port_hint">22</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">Cesta k repozitáři</string>
-    <string name="server_path_hint">cesta/k/heslům</string>
     <string name="server_user">Jméno</string>
-    <string name="server_user_hint">git_username</string>
 
-    <string name="server_resulting_url">Výsledná URL</string>
     <string name="connection_mode">Mód ověření</string>
 
-    <string name="warn_malformed_url_port">Při použití vlastního portu, zadejte absolutní cestu (začíná "/")</string>
-
     <string name="git_user_name_hint">Jméno</string>
     <string name="git_user_email">Email</string>
-    <string name="git_user_email_hint">email</string>
     <string name="invalid_email_dialog_text">Zadejte prosím platnou emailovou adresu</string>
     <string name="clone_button">Klonovat!</string>
 
@@ -154,13 +145,11 @@
     <string name="ssh_keygen_generate">Generovat</string>
     <string name="ssh_keygen_copy">Kopírovat</string>
     <string name="ssh_keygen_tip">Přidat tento veřejný klíč na Git server.</string>
-    <string name="ssh_keygen_show_passphrase">Zobrazit bezpečnostní frázi</string>
 
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Ano</string>
     <string name="dialog_no">Ne</string>
-    <string name="dialog_oops">Ajaj…</string>
     <string name="dialog_cancel">Zrušit</string>
     <string name="git_sync">Synchronizovat repozitář</string>
     <string name="git_pull">Stáhnout ze serveru</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 77d3fb4f..aae2e888 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -29,7 +29,6 @@
     <string name="jgit_error_dialog_text">Message from jgit: \n</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">Hast du vergessen einen Nutzernamen zu vergeben?</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">Kein SSH-Key angegeben</string>
     <string name="ssh_preferences_dialog_import">Import</string>
@@ -45,18 +44,11 @@
     <string name="server_protocol">Protokoll</string>
     <string name="server_url">Server URL</string>
     <string name="server_port_hint">22</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">Repo-Pfad</string>
-    <string name="server_path_hint">path/to/pass</string>
     <string name="server_user">Nutzername</string>
-    <string name="server_user_hint">Git-Nutzername</string>
 
-    <string name="server_resulting_url">Erzeugte URL</string>
     <string name="connection_mode">Authentifizierungsmethode</string>
 
-    <string name="warn_malformed_url_port">Wenn du einen anderen Port nutzt, setze den absoluten Pfad (startet mit "/")</string>
-
     <string name="git_user_name_hint">Nutzername</string>
     <string name="invalid_email_dialog_text">Bitte valide Email eingeben</string>
     <string name="clone_button">Klone!</string>
@@ -112,7 +104,6 @@
     <string name="pref_external_repository">Externes Repository</string>
     <string name="pref_external_repository_summary">Nutze ein externes Repository</string>
     <string name="pref_select_external_repository">Wähle ein externes Repository</string>
-    <string name="prefs_use_default_file_picker">Benutze Standardauswahl für Dateien</string>
     <string name="prefs_export_passwords_title">Passwörter exportieren</string>
     <string name="prefs_export_passwords_summary">Exportiert die verschlüsselten Passwörter in ein externes Verzeichnis</string>
     <string name="prefs_version">Version</string>
@@ -132,13 +123,11 @@
     <string name="ssh_keygen_generate">Generieren</string>
     <string name="ssh_keygen_copy">Kopieren</string>
     <string name="ssh_keygen_tip">Füge den Public-Key zu deinem Git-Server hinzu.</string>
-    <string name="ssh_keygen_show_passphrase">Zeige Passwort</string>
 
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Ja</string>
     <string name="dialog_no">Nein</string>
-    <string name="dialog_oops">Oops…</string>
     <string name="dialog_cancel">Abbruch</string>
     <string name="git_sync">Synchronisiere Repository</string>
     <string name="git_pull">Git Pull</string>
@@ -153,7 +142,6 @@
     <string name="send_plaintext_password_to">Passwort senden als Nur-Text mit behilfe von…</string>
     <string name="show_password">Password wiedergeben</string>
     <string name="show_extra">Zeige weiteren Inhalt</string>
-    <string name="repository_uri">Repository URI</string>
     <string name="app_icon_hint">App Icon</string>
     <string name="folder_icon_hint">Verzeichnis Icon</string>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7ef91026..7a8309bb 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -38,7 +38,6 @@
     <string name="jgit_error_dialog_text">Mensaje de jgit: \n</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">Olvidaste especificar un nombre de usuario?</string>
     <string name="ssh_preferences_dialog_text">Por favor importa o genera tu llave SSH en los ajustes</string>
     <string name="ssh_preferences_dialog_title">No hay llave SSH</string>
     <string name="ssh_preferences_dialog_import">Importar</string>
@@ -61,18 +60,11 @@
     <string name="server_protocol">Protocolo</string>
     <string name="server_url">URL de servidor</string>
     <string name="server_port_hint">22</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">Ruta del repositorio</string>
-    <string name="server_path_hint">ruta/a/claves</string>
     <string name="server_user">Nombre de usuario</string>
-    <string name="server_user_hint">nombre_usuario</string>
 
-    <string name="server_resulting_url">URL resultante</string>
     <string name="connection_mode">Modo de autenticación</string>
 
-    <string name="warn_malformed_url_port">Al usar puertos personalizados, ingresa una ruta absoluta (empieza con "/")</string>
-
     <string name="git_user_name_hint">Nombre de usuario</string>
     <string name="invalid_email_dialog_text">Por favor ingresa una dirección de correo</string>
     <string name="clone_button">¡Clonar!</string>
@@ -134,7 +126,6 @@
     <string name="pref_external_repository">Repositorio externo</string>
     <string name="pref_external_repository_summary">Usar un repositorio externo para contraseñas</string>
     <string name="pref_select_external_repository">Seleccionar repositorio externo</string>
-    <string name="prefs_use_default_file_picker">Usar seleccionador de archivos por defecto</string>
     <string name="prefs_export_passwords_title">Exportar contraseñas</string>
     <string name="prefs_export_passwords_summary">Exporta las contraseñas cifradas a un directorio externo.</string>
     <string name="prefs_version">Versión</string>
@@ -160,13 +151,11 @@
     <string name="ssh_keygen_generate">Generar</string>
     <string name="ssh_keygen_copy">Copiar</string>
     <string name="ssh_keygen_tip">Registra esta llave pública en tu servidor Git.</string>
-    <string name="ssh_keygen_show_passphrase">Mostrar contraseña</string>
 
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Sí</string>
     <string name="dialog_no">No</string>
-    <string name="dialog_oops">Ups…</string>
     <string name="dialog_cancel">Cancelar</string>
     <string name="git_sync">Sincronizar con servidor</string>
     <string name="git_pull">Descargar del servidor</string>
@@ -181,7 +170,6 @@
     <string name="send_plaintext_password_to">Enviar contraseña en texto plano usando…</string>
     <string name="show_password">Mostrar contraseña</string>
     <string name="show_extra">Mostrar contenido extra</string>
-    <string name="repository_uri">URI del repositorio</string>
     <string name="app_icon_hint">Ícono de app</string>
     <string name="folder_icon_hint">Ícono de directorio</string>
 
@@ -212,6 +200,5 @@
     <string name="hackish_tools">Hackish tools</string>
     <string name="abort_rebase">Abortar rebase</string>
     <string name="commit_hash">Hash del commit</string>
-    <string name="crypto_extra_edit_hint">Username: Nombre de usuario\n… o algún contenido extra</string>
     <string name="get_last_changed_failed">Error al obtener la fecha de último cambio</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 32ee4bec..945e3559 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -44,7 +44,6 @@
     <string name="jgit_error_dialog_text">Message de jgit: \n</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">Avez-vous oublié de renseigner votre nom d\'utilisateur ?</string>
     <string name="ssh_preferences_dialog_text">Vous devez importer ou générer votre fichier de clef SSH dans les préférences</string>
     <string name="ssh_preferences_dialog_title">Absence de clef SSH</string>
     <string name="ssh_preferences_dialog_import">Importer</string>
@@ -67,21 +66,13 @@
     <string name="server_protocol">Protocole</string>
     <string name="server_url">URL du serveur</string>
     <string name="server_port_hint">22</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">Chemin du dépôt</string>
-    <string name="server_path_hint">path/to/pass</string>
     <string name="server_user">Nom d\'utilisateur</string>
-    <string name="server_user_hint">git_username</string>
 
-    <string name="server_resulting_url">URL finale</string>
     <string name="connection_mode">Méthode d\'authentification</string>
 
-    <string name="warn_malformed_url_port">Lors de l\'utilisation d\'un numéro de port personnalisé, fournissez un chemin absolu  (commençant par "/")</string>
-
     <string name="git_user_name_hint">Nom d\'utilisateur</string>
     <string name="git_user_email">Email</string>
-    <string name="git_user_email_hint">email</string>
     <string name="invalid_email_dialog_text">Merci de saisir une adresse mail valide</string>
     <string name="clone_button">Cloner !</string>
 
@@ -139,7 +130,6 @@
     <string name="pref_external_repository">Dépôt externe</string>
     <string name="pref_external_repository_summary">Utilise un dépôt externe pour les mots de passe</string>
     <string name="pref_select_external_repository">Choisissez un dépôt externe</string>
-    <string name="prefs_use_default_file_picker">Utiliser le selecteur de fichier par défaut</string>
     <string name="prefs_export_passwords_title">Exporter les mots de passe</string>
     <string name="prefs_export_passwords_summary">Exporter les mots de passe (chiffrés) vers un répertoire externe</string>
     <string name="prefs_version">Version</string>
@@ -161,13 +151,11 @@
     <string name="ssh_keygen_generate">Générer</string>
     <string name="ssh_keygen_copy">Copier</string>
     <string name="ssh_keygen_tip">Enregistrez cette clef publique sur votre serveur Git.</string>
-    <string name="ssh_keygen_show_passphrase">Afficher le mot de passe</string>
 
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Oui</string>
     <string name="dialog_no">Non</string>
-    <string name="dialog_oops">Oups…</string>
     <string name="dialog_cancel">Annuler</string>
     <string name="git_sync">Synchronisation du dépôt</string>
     <string name="git_pull">Importer du serveur</string>
@@ -182,7 +170,6 @@
     <string name="send_plaintext_password_to">Envoyer le mot de passe en clair via…</string>
     <string name="show_password">Montrer le mot de passe</string>
     <string name="show_extra">Afficher le contenu supplémentaire</string>
-    <string name="repository_uri">Adresse du dépot</string>
     <string name="app_icon_hint">Icône de l\'application</string>
     <string name="folder_icon_hint">Icône du dossier</string>
 
@@ -212,6 +199,5 @@
     <string name="git_operation_remember_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>
     <string name="commit_hash">Commettre la clé</string>
-    <string name="crypto_extra_edit_hint">nom d\'utilisateur: quelque chose d\'autre contenu supplémentaire</string>
     <string name="get_last_changed_failed">Failed to get last changed date</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 82d99da6..8bdec1e7 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -30,7 +30,6 @@
     <string name="jgit_error_dialog_text">jgit からのメッセージ: \n</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">ユーザー名の指定を忘れましたか?</string>
     <string name="ssh_preferences_dialog_text">プリファレンスで SSH 鍵ファイルをインポートまたは生成してください</string>
     <string name="ssh_preferences_dialog_title">SSH 鍵がありませんkey</string>
     <string name="ssh_preferences_dialog_import">インポート</string>
@@ -46,18 +45,11 @@
     <string name="server_protocol">プロトコル</string>
     <string name="server_url">サーバー URL</string>
     <string name="server_port_hint">22</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">リポジトリのパス</string>
-    <string name="server_path_hint">path/to/pass</string>
     <string name="server_user">ユーザー名</string>
-    <string name="server_user_hint">git_username</string>
 
-    <string name="server_resulting_url">結果 URL</string>
     <string name="connection_mode">認証モード</string>
 
-    <string name="warn_malformed_url_port">カスタムポートを使用する場合は、絶対パスを入力 ("/" で始まる)</string>
-
     <string name="git_user_name_hint">ユーザー名</string>
     <!-- PGP Handler -->
     <string name="crypto_name_hint">名前</string>
@@ -114,13 +106,11 @@
     <string name="ssh_keygen_generate">生成</string>
     <string name="ssh_keygen_copy">コピー</string>
     <string name="ssh_keygen_tip">この公開鍵を Git サーバーに提供してください。</string>
-    <string name="ssh_keygen_show_passphrase">パスフレーズを表示</string>
 
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">はい</string>
     <string name="dialog_no">いいえ</string>
-    <string name="dialog_oops">おっと…</string>
     <string name="dialog_cancel">キャンセル</string>
     <string name="git_sync">リポジトリを同期</string>
     <string name="git_pull">リモートからプル</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 53de0bed..7fcc054a 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -9,14 +9,10 @@
     <color name="primary_light_color">#FF373737</color>
     <color name="primary_dark_color">#FF000000</color>
     <color name="secondary_color">#FFFF7539</color>
-    <color name="secondary_light_color">#FFFFa667</color>
-    <color name="secondary_dark_color">#FFC54506</color>
     <color name="primary_text_color">#FFFFFFFF</color>
-    <color name="secondary_text_color">#FFFFFFFF</color>
 
     <!-- Theme variables -->
     <color name="window_background">@color/primary_color</color>
-    <color name="color_surface">#FF111111</color>
     <color name="navigation_bar_color">@color/primary_color</color>
     <color name="list_multiselect_background">#66EEEEEE</color>
     <color name="status_bar_color">@color/window_background</color>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 39d22662..836b5672 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -46,7 +46,6 @@
     <string name="jgit_error_dialog_text">Сообщение от jgit: \n</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">Вы забыли указать имя пользователя?</string>
     <string name="ssh_preferences_dialog_text">Пожалуйста, импортируйте или сгенерируйте новый SSH ключ в настройках</string>
     <string name="ssh_preferences_dialog_title">Нет SSH ключа</string>
     <string name="ssh_preferences_dialog_import">Импортировать</string>
@@ -69,21 +68,13 @@
     <string name="server_protocol">Протокол</string>
     <string name="server_url">URL сервера</string>
     <string name="server_port_hint">22</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">Путь к репозиторию</string>
-    <string name="server_path_hint">путь/до/пароля</string>
     <string name="server_user">Имя пользователя</string>
-    <string name="server_user_hint">git_username</string>
 
-    <string name="server_resulting_url">Получившийся URL</string>
     <string name="connection_mode">Тип авторизации</string>
 
-    <string name="warn_malformed_url_port">При использовании нестандартных портов, укажите полный путь (начинается с "/")</string>
-
     <string name="git_user_name_hint">Имя пользователя</string>
     <string name="git_user_email">Электронная почта</string>
-    <string name="git_user_email_hint">электронная почта</string>
     <string name="invalid_email_dialog_text">Введите корректный email</string>
     <string name="clone_button">Клонировать</string>
 
@@ -149,7 +140,6 @@
     <string name="pref_external_repository">Внешний репозиторий</string>
     <string name="pref_external_repository_summary">Использовать внешний репозиторий</string>
     <string name="pref_select_external_repository">Выбрать внешний репозиторий</string>
-    <string name="prefs_use_default_file_picker">Использовать стандартное окно выбора файлов</string>
     <string name="prefs_export_passwords_title">Экспортировать пароли</string>
     <string name="prefs_export_passwords_summary">Экспортировать пароли в открытом виде во внешнее хранилище</string>
     <string name="prefs_version">Версия</string>
@@ -193,13 +183,11 @@
     <string name="ssh_keygen_generate">Сгенерировать</string>
     <string name="ssh_keygen_copy">Скоприровать</string>
     <string name="ssh_keygen_tip">Поместите публичный ключ на сервер Git</string>
-    <string name="ssh_keygen_show_passphrase">Показать пароль</string>
 
     <!-- Misc -->
     <string name="dialog_ok">OK</string>
     <string name="dialog_yes">Да</string>
     <string name="dialog_no">Нет</string>
-    <string name="dialog_oops">Упс…</string>
     <string name="dialog_cancel">Отмена</string>
     <string name="git_sync">Синхронизировать репозиторий</string>
     <string name="git_pull">Пулл с удаленного сервера</string>
@@ -215,7 +203,6 @@
     <string name="show_password">Показать пароль</string>
     <string name="show_extra">Показать дополнительную информацию</string>
     <string name="hide_extra">Скрыть расширенный контекст</string>
-    <string name="repository_uri">URI репозитория</string>
     <string name="app_icon_hint">Иконка приложения</string>
     <string name="folder_icon_hint">Иконка папки</string>
 
@@ -226,9 +213,7 @@
     <string name="oreo_autofill_save_internal_error">Сохранение не удалось из-за внутренней ошибки</string>
     <string name="oreo_autofill_save_app_not_supported">Это приложение в настоящее время не поддерживается</string>
     <string name="oreo_autofill_save_passwords_dont_match">Пароли не совпадают</string>
-    <string name="oreo_autofill_save_invalid_password">Невозможно извлечь пароль, пожалуйста, используйте другой браузер</string>
     <string name="oreo_autofill_generate_password">Сгенерировать пароль...</string>
-    <string name="oreo_autofill_publisher_changed">Издатель приложения изменился; это может быть попытка фишинга.</string>
     <string name="oreo_autofill_max_matches_reached">Достигнуто максимальное количество совпадений (%1$d); очистите совпадения перед тем как добавите новые.</string>
     <string name="oreo_autofill_warning_publisher_header">Издатель приложения изменился с тех пор как вы первый раз связали с ним запись хранилища паролей:</string>
     <string name="oreo_autofill_warning_publisher_footer"><b>Установленное приложение может попытаться украсть ваши учетные данные, выдавая себя за доверенное приложение</b>\n\nПопробуйте удалить или переустановить  приложение из доверенного источника, такого как Play Store, Amazon Appstore, F-Droid или магазин приложений производителя вашего смартфона.</string>
@@ -275,7 +260,6 @@
     <string name="abort_rebase">Прервать перебазирование и записать изменения в новую ветку</string>
     <string name="reset_to_remote">Полный сброс до состояния удаленной ветки</string>
     <string name="commit_hash">Хэш-сумма изменений</string>
-    <string name="crypto_extra_edit_hint">имя пользователя: какой-то другой дополнительный контент</string>
     <string name="get_last_changed_failed">Failed to get last changed date</string>
     <string name="openkeychain_ssh_api_connect_fail">Ошибка при подключении к сервису OpenKeychain SSH API</string>
     <string name="no_ssh_api_provider">Не найдено SSH API провайдеров. OpenKeychain установлен?</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5c5ba140..ff3ad60a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -30,7 +30,6 @@
     <string name="jgit_error_dialog_text">Message from jgit:</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">你忘了提供用户名了吗？</string>
     <string name="ssh_preferences_dialog_text">请在设置中导入或生成你的SSH密钥文件</string>
     <string name="ssh_preferences_dialog_title">无SSH密钥</string>
     <string name="ssh_preferences_dialog_import">导入</string>
@@ -46,18 +45,11 @@
     <string name="server_protocol">接口</string>
     <string name="server_url">服务器 URL</string>
     <string name="server_port_hint">22</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">Repo 路径</string>
-    <string name="server_path_hint">path/to/pass</string>
     <string name="server_user">用户名</string>
-    <string name="server_user_hint">git_username</string>
 
-    <string name="server_resulting_url">生成的 URL</string>
     <string name="connection_mode">认证模式</string>
 
-    <string name="warn_malformed_url_port">如果使用自定义端口, 请提供绝对路径 (从根目录开始)</string>
-
     <string name="git_user_name_hint">用户名</string>
     <!-- PGP Handler -->
     <string name="crypto_name_hint">名称</string>
@@ -111,13 +103,11 @@
     <string name="ssh_keygen_generate">生成</string>
     <string name="ssh_keygen_copy">复制</string>
     <string name="ssh_keygen_tip">在你的Git服务器上提供此公钥</string>
-    <string name="ssh_keygen_show_passphrase">显示口令</string>
 
     <!-- Misc -->
     <string name="dialog_ok">确定</string>
     <string name="dialog_yes">确定</string>
     <string name="dialog_no">否</string>
-    <string name="dialog_oops">糟糕…</string>
     <string name="dialog_cancel">取消</string>
     <string name="git_sync">同步 Repo</string>
     <string name="git_pull">Git Pull</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c9ce813d..cb35d387 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -27,7 +27,6 @@
     <string name="jgit_error_dialog_text">Message from jgit:</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">你忘記輸入使用者名稱了嗎？</string>
     <string name="ssh_preferences_dialog_text">請在設定中匯入或產生你的 SSH 金鑰</string>
     <string name="ssh_preferences_dialog_title">無 SSH 金鑰</string>
     <string name="ssh_preferences_dialog_import">匯入</string>
@@ -43,18 +42,11 @@
     <string name="server_protocol">port</string>
     <string name="server_url">伺服器 URL</string>
     <string name="server_port_hint">22</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">Repo 路徑</string>
-    <string name="server_path_hint">path/to/pass</string>
     <string name="server_user">使用者名稱</string>
-    <string name="server_user_hint">git_username</string>
 
-    <string name="server_resulting_url">生成的 URL</string>
     <string name="connection_mode">認證模式</string>
 
-    <string name="warn_malformed_url_port">如果使用自定 port, 請使用绝對路徑 (從根目錄開始)</string>
-
     <string name="git_user_name_hint">使用者名稱</string>
     <!-- PGP Handler -->
     <string name="crypto_name_hint">名稱</string>
@@ -108,13 +100,11 @@
     <string name="ssh_keygen_generate">產生</string>
     <string name="ssh_keygen_copy">複製</string>
     <string name="ssh_keygen_tip">在你的 Git 伺服器上提供此公鑰</string>
-    <string name="ssh_keygen_show_passphrase">顯示密碼</string>
 
     <!-- Misc -->
     <string name="dialog_ok">確定</string>
     <string name="dialog_yes">確定</string>
     <string name="dialog_no">否</string>
-    <string name="dialog_oops">糟糕…</string>
     <string name="dialog_cancel">取消</string>
     <string name="git_sync">同步 Repo</string>
     <string name="git_pull">Git Pull</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 2849dd4f..5ede6b6f 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -4,15 +4,6 @@
   -->
 
 <resources>
-    <string-array name="connection_modes" translatable="false">
-        <item>ssh-key</item>
-        <item>username/password</item>
-        <item>OpenKeychain</item>
-    </string-array>
-    <string-array name="clone_protocols" translatable="false">
-        <item>ssh://</item>
-        <item>https://</item>
-    </string-array>
     <string-array name="sort_order_entries">
         <item>@string/pref_folder_first_sort_order</item>
         <item>@string/pref_file_first_sort_order</item>
@@ -23,12 +14,6 @@
         <item>FILE_FIRST</item>
         <item>INDEPENDENT</item>
     </string-array>
-    <string-array name="capitalization_type_entries">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
     <string-array name="capitalization_type_values">
         <item>lowercase</item>
         <item>UPPERCASE</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 04f1e99b..55136a37 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,17 +9,13 @@
     <color name="primary_light_color">#8eacbb</color>
     <color name="primary_dark_color">#34515e</color>
     <color name="secondary_color">#ff7043</color>
-    <color name="secondary_light_color">#ffa270</color>
-    <color name="secondary_dark_color">#c63f17</color>
     <color name="primary_text_color">#212121</color>
-    <color name="secondary_text_color">#ffffff</color>
     <color name="white">#ffffffff</color>
 
     <!-- Theme variables -->
     <color name="window_background">#eceff1</color>
     <color name="ic_launcher_background">#D4F1EA</color>
     <color name="color_control_normal">@color/primary_text_color</color>
-    <color name="color_surface">#FFFFFF</color>
     <color name="list_multiselect_background">#668eacbb</color>
     <color name="navigation_bar_color">#000000</color>
     <color name="status_bar_color">@color/primary_dark_color</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 26d94ff7..a76d0bab 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,7 +8,6 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="fab_compat_margin">16dp</dimen>
-    <dimen name="fab_margin">8dp</dimen>
     <dimen name="normal_margin">8dp</dimen>
     <dimen name="bottom_sheet_item_height">56dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e37b0eb..4574c44a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,8 +38,8 @@
     <string name="password_exists_message">This will overwrite %1$s with %2$s.</string>
 
     <!-- git commits -->
-    <string name="git_commit_add_text">Add generated password for %1$s using android password store.</string>
-    <string name="git_commit_edit_text">Edit password for %1$s using android password store.</string>
+    <string name="git_commit_add_text">Add generated password for %1$s using Android Password Store.</string>
+    <string name="git_commit_edit_text">Edit password for %1$s using Android Password Store.</string>
     <string name="git_commit_remove_text">Remove %1$s from store.</string>
     <string name="git_commit_move_text">Rename %1$s to %2$s.</string>
 
@@ -58,7 +58,6 @@
     <string name="jgit_error_dialog_text">Message from jgit: \n</string>
 
     <!-- Git Handler -->
-    <string name="forget_username_dialog_text">Did you forget to specify a username?</string>
     <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>
@@ -81,26 +80,15 @@
     <string name="server_name">Server</string>
     <string name="server_protocol">Protocol</string>
     <string name="server_url">Server URL</string>
-    <string name="server_url_hint" translatable="false">server.com</string>
     <string name="server_port_hint">Port</string>
-    <string name="default_ssh_port">22</string>
-    <string name="default_https_port">443</string>
     <string name="server_path">Repo path</string>
-    <string name="server_path_hint">path/to/pass</string>
     <string name="server_user">Username</string>
-    <string name="server_user_hint">git_username</string>
 
-    <string name="server_resulting_url">Resulting URL</string>
     <string name="connection_mode">Authentication Mode</string>
 
-    <string name="warn_malformed_url_port">When using custom ports, provide an absolute path (starts with "/")</string>
-
     <!-- Git Config fragment -->
-    <string name="git_config" translatable="false">Git config</string>
-    <string name="git_user_name" translatable="false">Username</string>
     <string name="git_user_name_hint">Username</string>
     <string name="git_user_email">Email</string>
-    <string name="git_user_email_hint">email</string>
     <string name="invalid_email_dialog_text">Please enter a valid email address</string>
     <string name="clone_button">Clone</string>
 
@@ -172,7 +160,6 @@
     <string name="pref_external_repository">External repository</string>
     <string name="pref_external_repository_summary">Use an external password repository</string>
     <string name="pref_select_external_repository">Select external repository</string>
-    <string name="prefs_use_default_file_picker">Use default file picker</string>
     <string name="prefs_export_passwords_title">Export passwords</string>
     <string name="prefs_export_passwords_summary">Exports the encrypted passwords to an external directory</string>
     <string name="prefs_version">Version</string>
@@ -216,7 +203,6 @@
     <string name="ssh_keygen_generate">Generate</string>
     <string name="ssh_keygen_copy">Copy</string>
     <string name="ssh_keygen_tip">Provide this public key to your Git server.</string>
-    <string name="ssh_keygen_show_passphrase">Show passphrase</string>
     <string name="ssh_key_gen_generating_progress">Generating keys…</string>
     <string name="ssh_keygen_generating_done">Done!</string>
     <string name="key_length_2048" translatable="false">2048</string>
@@ -228,7 +214,6 @@
     <string name="dialog_no">No</string>
     <string name="dialog_positive">Go to Settings</string>
     <string name="dialog_negative">Go back</string>
-    <string name="dialog_oops">Oops…</string>
     <string name="dialog_cancel">Cancel</string>
     <string name="git_sync">Synchronize repository</string>
     <string name="git_pull">Pull from remote</string>
@@ -244,7 +229,6 @@
     <string name="show_password">Show password</string>
     <string name="show_extra">Show extra content</string>
     <string name="hide_extra">Hide extra content</string>
-    <string name="repository_uri">Repository URI</string>
     <string name="app_icon_hint">App icon</string>
     <string name="folder_icon_hint">Folder icon</string>
 
@@ -257,9 +241,7 @@
     <string name="oreo_autofill_save_internal_error">Save failed due to an internal error</string>
     <string name="oreo_autofill_save_app_not_supported">This app is currently not supported</string>
     <string name="oreo_autofill_save_passwords_dont_match">Passwords don\'t match</string>
-    <string name="oreo_autofill_save_invalid_password">Couldn\'t extract password, please use a different browser for now</string>
     <string name="oreo_autofill_generate_password">Generate password…</string>
-    <string name="oreo_autofill_publisher_changed">The app\'s publisher has changed; this may be a phishing attempt.</string>
     <string name="oreo_autofill_max_matches_reached">Maximum number of matches (%1$d) reached; clear matches before adding new ones.</string>
     <string name="oreo_autofill_warning_publisher_header">This app\'s publisher has changed since you first associated a Password Store entry with it:</string>
     <string name="oreo_autofill_warning_publisher_footer"><b>The currently installed app may be trying to steal your credentials by pretending to be a trusted app.</b>\n\nTry to uninstall and reinstall the app from a trusted source, such as the Play Store, Amazon Appstore, F-Droid, or your phone manufacturer\'s store.</string>
@@ -313,7 +295,6 @@
     <string name="abort_rebase">Abort rebase and push new branch</string>
     <string name="reset_to_remote">Hard reset to remote branch</string>
     <string name="commit_hash">Commit hash</string>
-    <string name="crypto_extra_edit_hint">username: something other extra content</string>
     <string name="get_last_changed_failed">Failed to get last changed date</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>
@@ -376,4 +357,13 @@
     <string name="preference_custom_public_suffixes_title">Custom domains</string>
     <string name="preference_custom_public_suffixes_summary">Autofill will distinguish subdomains of these domains</string>
     <string name="preference_custom_public_suffixes_hint">company.com\npersonal.com</string>
+
+    <!-- OpenKeychain errors -->
+    <string name="openpgp_error_wrong_passphrase">Incorrect passphrase</string>
+    <string name="openpgp_error_no_user_ids">No matching PGP keys found</string>
+    <string name="openpgp_error_unknown">Error from OpenKeyChain : %s</string>
+
+    <!-- Password creation failure -->
+    <string name="password_creation_file_write_fail_title">Error</string>
+    <string name="password_creation_file_write_fail_message">Failed to write password file to the store, please try again.</string>
 </resources>