From da707773ede9ff7caa03301c09d70c98947f4b4d Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 1 Apr 2018 23:45:21 +0200
Subject: refactor disable notifications dialog to make use of timeframeutils

---
 src/main/res/values/arrays.xml  | 15 ---------------
 src/main/res/values/strings.xml | 30 ------------------------------
 2 files changed, 45 deletions(-)

(limited to 'src/main/res/values')

diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 68666ddcc..062f29b48 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -16,13 +16,6 @@
         <item>5242880</item>
         <item>10485760</item>
     </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>@string/thirty_minutes</item>
-        <item>@string/one_hour</item>
-        <item>@string/two_hours</item>
-        <item>@string/eight_hours</item>
-        <item>@string/until_further_notice</item>
-    </string-array>
 
     <integer-array name="mute_options_durations">
         <item>1800</item>
@@ -80,14 +73,6 @@
         <item>@string/always</item>
     </string-array>
 
-    <string-array name="presence_show_options">
-        <item>@string/presence_chat</item>
-        <item>@string/presence_online</item>
-        <item>@string/presence_away</item>
-        <item>@string/presence_xa</item>
-        <item>@string/presence_dnd</item>
-    </string-array>
-
     <integer-array name="automatic_message_deletion_values">
         <item>0</item>
         <item>86400</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e63bea6ae..4ccdd2b78 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -166,7 +166,6 @@
     <string name="account_settings_jabber_id">Jabber-ID</string>
     <string name="account_settings_password">Password</string>
     <string name="account_settings_example_jabber_id">username@pix-art.de</string>
-    <string name="account_settings_confirm_password">Confirm password</string>
     <string name="password">Password</string>
     <string name="confirm_password">Confirm password</string>
     <string name="passwords_do_not_match">Passwords do not match</string>
@@ -393,10 +392,6 @@
     <string name="modified_conference_options">Modified group chat options!</string>
     <string name="could_not_modify_conference_options">Could not modify group chat options</string>
     <string name="never">Never</string>
-    <string name="thirty_minutes">30 minutes</string>
-    <string name="one_hour">1 hour</string>
-    <string name="two_hours">2 hours</string>
-    <string name="eight_hours">8 hours</string>
     <string name="until_further_notice">Until further notice</string>
     <string name="pref_input_options">Input</string>
     <string name="pref_enter_is_send">Enter is send</string>
@@ -510,14 +505,6 @@
     <string name="shared_text_with_x">Shared text with %s</string>
     <string name="sync_with_contacts">Synchronize with contacts</string>
     <string name="sync_with_contacts_long">Pix-Art Messenger wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nPix-Art Messenger will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string>
-    <string name="certificate_information">Certificate Information</string>
-    <string name="certificate_subject">Subject</string>
-    <string name="certificate_issuer">Issuer</string>
-    <string name="certificate_cn">Common Name</string>
-    <string name="certificate_o">Organization</string>
-    <string name="certificate_sha1">SHA-1</string>
-    <string name="certicate_info_not_available">(Not available)</string>
-    <string name="certificate_not_found">No certificate found</string>
     <string name="notify_on_all_messages">Notify on all messages</string>
     <string name="notify_only_when_highlighted">Notify only when mentioned</string>
     <string name="notify_never">Notifications disabled</string>
@@ -534,7 +521,6 @@
     <string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string>
     <string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
     <string name="install_from_unknown_sources_disabled">Install from unknown sources disabled</string>
-    <string name="install_from_unknown_sources_disabled_explained">Your device is configured to not allow app installs from unknown sources, which causes problems with the in app updater.\nIt is recommended to allow installs from unknown sources.</string>
     <string name="install_from_unknown_sources_disabled_dialog">Your device is configured to not allow app installs from unknown sources except from Google PlayStore. This will cause problems with the in app updater.\n\nYou will now be asked to allow app installs from unknown sources.</string>
     <string name="disable">Disable</string>
     <string name="selection_too_large">The selected area is too large</string>
@@ -562,9 +548,7 @@
     <string name="pick_your_username">Choose your username</string>
     <string name="pref_manually_change_presence">Manage availability manually</string>
     <string name="pref_manually_change_presence_summary">Set your availability when editing your status message.</string>
-    <string name="change_presence">Change Presence</string>
     <string name="status_message">Status message</string>
-    <string name="all_accounts_on_this_device">Set for all accounts on this device</string>
     <string name="presence_chat">Free for Chat</string>
     <string name="presence_online">Online</string>
     <string name="presence_away">Away</string>
@@ -572,7 +556,6 @@
     <string name="presence_dnd">Busy</string>
     <string name="secure_password_generated">A secure password has been generated</string>
     <string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string>
-    <string name="device_does_not_support_unknown_source_op">Your device does not support allowing app installs from unknown source</string>
     <string name="share">Share</string>
     <string name="share_location">Share location</string>
     <string name="location_sharing_disabled">Location sharing is disabled in settings</string>
@@ -583,7 +566,6 @@
     <string name="registration_please_wait">Registration failed: Try again later</string>
     <string name="registration_password_too_weak">Registration failed: Password too weak</string>
     <string name="create_conference">Create group chat</string>
-    <string name="join_or_create_conference">Join or create group chat</string>
     <string name="conference_subject">Subject</string>
     <string name="choose_participants">Choose participants</string>
     <string name="creating_conference">Creating group chat…</string>
@@ -598,7 +580,6 @@
     <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>
     <string name="send_image">Send image?</string>
     <string name="this_device_is_no_longer_in_use">This device is no longer in use</string>
     <string name="import_canceled">Import canceled</string>
@@ -614,22 +595,15 @@
     <string name="me">Me</string>
     <string name="contact_asks_for_presence_subscription">Contact asks for presence subscription</string>
     <string name="allow">Allow</string>
-    <string name="attach_choose_video">Choose video</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>
-    <string name="missing_presence_subscription_with_x">Missing presence subscription with %s.</string>
-    <string name="missing_keys_from_x">Missing OMEMO keys from %s.</string>
-    <string name="wrong_conference_configuration">This is not a private, non-anonymous group chat.</string>
-    <string name="this_conference_has_no_members">There are no members in this group chat.</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="copy_to_clipboard">Copy to clipboard</string>
     <string name="message_copied_to_clipboard">Message copied to clipboard</string>
@@ -670,8 +644,6 @@
     <string name="reply">Reply</string>
     <string name="encrypting_message">Encrypting message</string>
     <string name="transcoding_video">Compressing video</string>
-    <string name="pref_automatically_delete_messages_description">Automatically delete messages from this device that are older than the configured time frame.</string>
-    <string name="pref_automatically_delete_messages">Automatic message deletion</string>
     <string name="not_fetching_history_retention_period">Not fetching messages due to local retention period.</string>
     <plurals name="seconds">
         <item quantity="one">%d second</item>
@@ -776,12 +748,10 @@
     <string name="pref_enable_multi_accounts_summary">You want to use multiple accounts, so you have to set a password for daily backups.</string>
     <string name="mtm_accept_cert">Accept Unknown Certificate?</string>
     <string name="mtm_trust_anchor">The server certificate is not signed by a known Certificate Authority.</string>
-    <string name="mtm_cert_expired">The server certificate is expired.</string>
     <string name="mtm_accept_servername">Accept Mismatching Server Name?</string>
     <string name="mtm_hostname_mismatch">Server could not authenticate as \"%s\". The certificate is only valid for:</string>
     <string name="mtm_connect_anyway">Do you want to connect anyway?</string>
     <string name="mtm_cert_details">Certificate details:</string>
-    <string name="mtm_notification">Certificate Verification</string>
     <string name="once">Once</string>
     <string name="theme">Theme</string>
     <string name="qr_code_scanner_needs_access_to_camera">The QR code scanner needs access to the camera</string>
-- 
cgit v1.2.3