Break down PGP Activity into focused sections (#776)

4 files changed, 11 insertions, 41 deletions

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>