refactor omemo fingerprint UI code

2 files changed, 43 insertions, 39 deletions

diff --git a/src/main/res/values/ids.xml b/src/main/res/values/ids.xml
index 0786006cf..84f9ac69e 100644
--- a/src/main/res/values/ids.xml
+++ b/src/main/res/values/ids.xml
@@ -4,4 +4,6 @@
     <item name="message_image_view" type="id" />
     <item name="message_video_view" type="id" />
     <item name="import_text" type="id" />
+    <item type="id" name="TAG_ACCOUNT"/>
+    <item type="id" name="TAG_FINGERPRINT"/>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6e2c31120..75df2af53 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -101,13 +101,13 @@
 	<string name="pref_xmpp_resource">XMPP resource</string>
 	<string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
 	<string name="pref_accept_files_wifi">Accept files in WiFi connections</string>
-    <string name="pref_accept_files_summary_wifi">When connected to wifi automatically accept files smaller than…</string>
-    <string name="pref_accept_files_mobile">Accept files in mobile connections</string>
-    <string name="pref_accept_files_summary_mobile">When connected with mobile data automatically accept files smaller than…</string>
-    <string name="pref_accept_files_mobileroaming">Accept files in mobile roaming connections</string>
-    <string name="pref_accept_files_summary_mobileroaming">When connected with mobile data in roaming automatically accept files smaller than…</string>
+	<string name="pref_accept_files_summary_wifi">When connected to wifi automatically accept files smaller than…</string>
+	<string name="pref_accept_files_mobile">Accept files in mobile connections</string>
+	<string name="pref_accept_files_summary_mobile">When connected with mobile data automatically accept files smaller than…</string>
+	<string name="pref_accept_files_mobileroaming">Accept files in mobile roaming connections</string>
+	<string name="pref_accept_files_summary_mobileroaming">When connected with mobile data in roaming automatically accept files smaller than…</string>
 	<string name="pref_attachments">Attachments</string>
-    <string name="pref_notification_settings">Notification</string>
+	<string name="pref_notification_settings">Notification</string>
 	<string name="pref_notifications">Notifications</string>
 	<string name="pref_notifications_summary">Notify when a new message arrives</string>
 	<string name="pref_vibrate">Vibrate</string>
@@ -116,13 +116,13 @@
 	<string name="pref_led_summary">Blink notification light when a new message arrives</string>
 	<string name="pref_sound">Ringtone</string>
 	<string name="pref_sound_summary">Play sound when a new message arrives</string>
-    <string name="pref_send_crash">Send crash reports</string>
+	<string name="pref_send_crash">Send crash reports</string>
 	<string name="pref_send_crash_summary">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger</string>
 	<string name="pref_confirm_messages">Confirm Messages</string>
 	<string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string>
 	<string name="pref_ui_options">UI</string>
 	<string name="openpgp_error">OpenKeychain reported an error</string>
-    <string name="accept">Accept</string>
+	<string name="accept">Accept</string>
 	<string name="error">An error has occurred</string>
 	<string name="pref_grant_presence_updates">Grant presence updates</string>
 	<string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string>
@@ -197,7 +197,7 @@
 	<string name="last_seen_hours">%d hours ago</string>
 	<string name="last_seen_day">1 day ago</string>
 	<string name="last_seen_days">%d days ago</string>
-    <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string>
+	<string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string>
 	<string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string>
 	<string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
 	<string name="your_fingerprint">Your fingerprint</string>
@@ -273,7 +273,7 @@
 	<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
 	<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
 	<string name="pref_expert_options">Expert settings</string>
-    <string name="title_activity_about">About Pix-Art Messenger</string>
+	<string name="title_activity_about">About Pix-Art Messenger</string>
 	<string name="pref_about_conversations_summary">Build and licensing information</string>
 	<string name="pref_about_message" translatable="false">Pix-Art Messenger
 			\n\nCopyright © 2014-2016 Christian Schneppe
@@ -330,7 +330,7 @@
 	<string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string>
 	<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
 	<string name="pref_expert_options_other">Other</string>
-    <string name="pref_autojoin">Automatically join conferences</string>
+	<string name="pref_autojoin">Automatically join conferences</string>
 	<string name="pref_autojoin_summary">Respect the autojoin flag in conference bookmarks</string>
 	<string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string>
 	<string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string>
@@ -338,7 +338,7 @@
 	<string name="conference_members_only">This conference is members only</string>
 	<string name="conference_kicked">You have been kicked from this conference</string>
 	<string name="conference_shutdown">The conference was shut down</string>
-    <string name="using_account">using account %s</string>
+	<string name="using_account">using account %s</string>
 	<string name="checking_x">Checking %s on HTTP host</string>
 	<string name="not_connected_try_again">You are not connected. Try again later</string>
 	<string name="check_x_filesize">Check %s size</string>
@@ -394,7 +394,7 @@
 	<string name="enable_notifications">Enable notifications</string>
 	<string name="no_conference_server_found">No conference server found</string>
 	<string name="conference_creation_failed">Conference creation failed!</string>s
-    <string name="account_image_description">Account avatar</string>
+	<string name="account_image_description">Account avatar</string>
 	<string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string>
 	<string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string>
 	<string name="regenerate_omemo_key">Regenerate OMEMO key</string>
@@ -471,7 +471,7 @@
 	<string name="sending_x_file">Sending %s</string>
 	<string name="offering_x_file">Offering %s</string>
 	<string name="hide_offline">Hide offline</string>
-    <string name="is_typing">is typing…</string>
+	<string name="is_typing">is typing…</string>
 	<string name="pref_chat_states">Typing notifications</string>
 	<string name="pref_chat_states_summary">Let your contact know when you are writing a new message</string>
 	<string name="send_location">Send location</string>
@@ -552,7 +552,7 @@
 	<string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string>
 	<string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string>
 	<string name="changelog">Changes</string>
-    <string name="account_settings_hostname">Hostname</string>
+	<string name="account_settings_hostname">Hostname</string>
 	<string name="account_settings_port">Port</string>
 	<string name="hostname_or_onion">Server- or .onion-Address</string>
 	<string name="not_a_valid_port">This is not a valid port number</string>
@@ -644,13 +644,13 @@
 	<string name="creating_conference">Creating conference…</string>
 	<string name="import_text">There is a backup on your device which can be imported.\nPossibly you will be asked to uninstall the old version or Conversations and your Messenger will be restarted during backup process. Shall the backup be imported? </string>
 	<string name="import_database">Import backup</string>
-    <string name="invite_again">Invite again</string>
+	<string name="invite_again">Invite again</string>
 	<string name="inviteUser_Subject">has invited you via</string>
 	<string name="InviteText">Hello,\n\nthe user %s has invited you to Pix-Art Messenger. If you are using Android, give it a try and click the following link to start over...</string>
-    <string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string>
+	<string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string>
 	<string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Pix-Art Messenger</string>
-    <string name="invite_user">Invite to Pix-Art Messenger</string>
-    <string name="request_permissions_message">Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string>
+	<string name="invite_user">Invite to Pix-Art Messenger</string>
+	<string name="request_permissions_message">Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string>
 	<string name="request_permissions_message_again">You have denied some or all permissions needed for Pix-Art Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself.</string>
 	<string name="unable_to_connect_to_keychain">Unable to connect to OpenKeychain</string>
 	<string name="no_permission">Pix-Art Messenger has no permissions</string>
@@ -678,7 +678,7 @@
 	<string name="preparing_video">Prepare video for transmission. Please wait…</string>
 	<string name="compressing_video">Compressing video, please wait…</string>
 	<string name="shared_video_with_x">Shared video with %s</string>
-    <string name="no_permission_to_access_x">No permission to access %s</string>
+	<string name="no_permission_to_access_x">No permission to access %s</string>
 	<string name="remote_server_not_found">Remote server not found</string>
 	<string name="error_file_corrupt">This file seems to be corrupt.</string>
 	<string name="unable_to_update_account">Unable to update account</string>
@@ -687,23 +687,25 @@
 	<string name="wrong_conference_configuration">This is not a private, non-anonymous conference.</string>
 	<string name="this_conference_has_no_members">There are no members in this conference.</string>
 	<string name="report_jid_as_spammer">Report this JID as sending unwanted messages.</string>
-    <string name="create_issue">Report an issue</string>
-    <string name="pref_delete_omemo_identities">Delete OMEMO identities</string>
-    <string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string>
-    <string name="delete_selected_keys">Delete selected keys</string>
-    <string name="missing_presence_subscription">Missing presence subscription</string>
-    <string name="missing_omemo_keys">Missing OMEMO keys</string>
-    <string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</string>
-    <string name="select_text">Select text</string>
-    <string name="show_error_message">Show error message</string>
-    <string name="error_message">Error Message</string>
-    <string name="data_saver_enabled">Data saver enabled</string>
-    <string name="data_saver_enabled_explained">Your operating system is restricting Pix-Art Messenger from accessing the Internet when in background. To receive notifications of new messages you should allow Pix-Art Messenger unrestricted access when Data saver is on.\\nPix-Art Messenger will still make an effort to save data when possible.</string>
-    <string name="device_does_not_support_data_saver">Your device does not supporting disabling Data saver for Pix-Art Messenger.</string>
-    <string name="navigate">Navigate to location</string>
-    <string name="add_to_contact_list">Add to contact list</string>
-    <string name="received_contact">Received contact</string>
-    <string name="contact">Contact</string>
-    <string name="unable_to_start_recording">Unable to start recording</string>
-	<string name="error_unable_to_create_temporary_file">Error: unable to create temporary file</string>
+	<string name="create_issue">Report an issue</string>
+	<string name="pref_delete_omemo_identities">Delete OMEMO identities</string>
+	<string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string>
+	<string name="delete_selected_keys">Delete selected keys</string>
+	<string name="missing_presence_subscription">Missing presence subscription</string>
+	<string name="missing_omemo_keys">Missing OMEMO keys</string>
+	<string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</string>
+	<string name="select_text">Select text</string>
+	<string name="show_error_message">Show error message</string>
+	<string name="error_message">Error Message</string>
+	<string name="data_saver_enabled">Data saver enabled</string>
+	<string name="data_saver_enabled_explained">Your operating system is restricting Pix-Art Messenger from accessing the Internet when in background. To receive notifications of new messages you should allow Pix-Art Messenger unrestricted access when Data saver is on.\\nPix-Art Messenger will still make an effort to save data when possible.</string>
+	<string name="device_does_not_support_data_saver">Your device does not supporting disabling Data saver for Pix-Art Messenger.</string>
+	<string name="navigate">Navigate to location</string>
+	<string name="add_to_contact_list">Add to contact list</string>
+	<string name="received_contact">Received contact</string>
+	<string name="contact">Contact</string>
+	<string name="unable_to_start_recording">Unable to start recording</string>
+	<string name="error_unable_to_create_temporary_file">Unable to create temporary file</string>
+	<string name="this_device_has_been_verified">This device has been verified</string>
+	<string name="copy_fingerprint">Copy fingerprint</string>
 </resources>