From 9350f362b793723db1dda52268f5df65c8dcd30d Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 22 Mar 2018 23:21:10 +0100
Subject: vastly untested refactor. pushing for backup purposes

---
 src/main/res/menu/activity_conversations.xml |  22 +++++
 src/main/res/menu/conversations.xml          | 116 ---------------------------
 src/main/res/menu/fragment_conversation.xml  | 116 +++++++++++++++++++++++++++
 src/main/res/values/strings.xml              |   2 +-
 4 files changed, 139 insertions(+), 117 deletions(-)
 create mode 100644 src/main/res/menu/activity_conversations.xml
 delete mode 100644 src/main/res/menu/conversations.xml
 create mode 100644 src/main/res/menu/fragment_conversation.xml

(limited to 'src/main/res')

diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml
new file mode 100644
index 000000000..80a4f2bd3
--- /dev/null
+++ b/src/main/res/menu/activity_conversations.xml
@@ -0,0 +1,22 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_add"
+        android:icon="?attr/icon_new"
+        android:orderInCategory="10"
+        app:showAsAction="always"
+        android:title="@string/action_add"/>
+
+    <item
+        android:id="@+id/action_accounts"
+        android:orderInCategory="90"
+        app:showAsAction="never"
+        android:title="@string/action_accounts"/>
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
deleted file mode 100644
index 9687e45ff..000000000
--- a/src/main/res/menu/conversations.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_add"
-        android:icon="?attr/icon_new"
-        android:orderInCategory="10"
-        app:showAsAction="always"
-        android:title="@string/action_add" />
-    <item
-        android:id="@+id/action_security"
-        android:icon="?attr/icon_not_secure"
-        android:orderInCategory="20"
-        app:showAsAction="always"
-        android:title="@string/action_secure" >
-        <menu>
-            <group android:checkableBehavior="single">
-                <item
-                    android:id="@+id/encryption_choice_none"
-                    android:title="@string/encryption_choice_unencrypted" />
-                <item
-                    android:id="@+id/encryption_choice_axolotl"
-                    android:title="@string/encryption_choice_omemo" />
-                <item
-                    android:id="@+id/encryption_choice_otr"
-                    android:title="@string/encryption_choice_otr" />
-                <item
-                    android:id="@+id/encryption_choice_pgp"
-                    android:title="@string/encryption_choice_pgp" />
-            </group>
-        </menu>
-    </item>
-    <item
-        android:id="@+id/action_attach_file"
-        android:icon="?attr/icon_new_attachment"
-        android:orderInCategory="30"
-        app:showAsAction="always"
-        android:title="@string/attach_file" >
-        <menu>
-
-            <item
-                android:id="@+id/attach_choose_file"
-                android:icon="?attr/ic_attach_document"
-                android:title="@string/choose_file" />
-
-            <item
-                android:id="@+id/attach_choose_picture"
-                android:icon="?attr/ic_attach_photo"
-                android:title="@string/attach_choose_picture" />
-
-            <item
-                android:id="@+id/attach_take_picture"
-                android:icon="?attr/ic_attach_camera"
-                android:title="@string/attach_take_from_camera" />
-            <item
-                android:id="@+id/attach_record_voice"
-                android:icon="?attr/ic_attach_record"
-                android:title="@string/attach_record_voice" />
-
-            <item
-                android:id="@+id/attach_location"
-                android:icon="?attr/ic_attach_location"
-                android:title="@string/send_location" />
-        </menu>
-    </item>
-    <item
-        android:id="@+id/action_invite"
-        android:orderInCategory="45"
-        app:showAsAction="never"
-        android:title="@string/invite_contact" />
-    <item
-        android:id="@+id/action_clear_history"
-        android:orderInCategory="50"
-        app:showAsAction="never"
-        android:title="@string/action_clear_history" />
-    <item
-        android:id="@+id/action_archive_chat"
-        android:orderInCategory="60"
-        app:showAsAction="never"
-        android:title="@string/action_end_conversation" />
-    <item
-        android:id="@+id/action_archive_muc"
-        android:orderInCategory="60"
-        app:showAsAction="never"
-        android:title="@string/action_end_conversation_muc" />
-    <item
-        android:id="@+id/action_accounts"
-        android:orderInCategory="90"
-        app:showAsAction="never"
-        android:title="@string/mgmt_account_edit" />
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        app:showAsAction="never"
-        android:title="@string/action_settings" />
-    <item
-        android:id="@+id/action_invite_user"
-        android:orderInCategory="100"
-        app:showAsAction="never"
-        android:title="@string/invite_user" />
-    <item
-        android:id="@+id/action_create_issue"
-        android:orderInCategory="100"
-        app:showAsAction="never"
-        android:title="@string/create_issue" />
-    <item
-        android:id="@+id/action_check_updates"
-        android:orderInCategory="100"
-        app:showAsAction="never"
-        android:title="@string/action_check_update" />
-    <item
-        android:id="@+id/action_search_history"
-        android:icon="?attr/icon_search"
-        app:showAsAction="ifRoom"
-        android:title="@string/search" />
-</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml
new file mode 100644
index 000000000..9687e45ff
--- /dev/null
+++ b/src/main/res/menu/fragment_conversation.xml
@@ -0,0 +1,116 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_add"
+        android:icon="?attr/icon_new"
+        android:orderInCategory="10"
+        app:showAsAction="always"
+        android:title="@string/action_add" />
+    <item
+        android:id="@+id/action_security"
+        android:icon="?attr/icon_not_secure"
+        android:orderInCategory="20"
+        app:showAsAction="always"
+        android:title="@string/action_secure" >
+        <menu>
+            <group android:checkableBehavior="single">
+                <item
+                    android:id="@+id/encryption_choice_none"
+                    android:title="@string/encryption_choice_unencrypted" />
+                <item
+                    android:id="@+id/encryption_choice_axolotl"
+                    android:title="@string/encryption_choice_omemo" />
+                <item
+                    android:id="@+id/encryption_choice_otr"
+                    android:title="@string/encryption_choice_otr" />
+                <item
+                    android:id="@+id/encryption_choice_pgp"
+                    android:title="@string/encryption_choice_pgp" />
+            </group>
+        </menu>
+    </item>
+    <item
+        android:id="@+id/action_attach_file"
+        android:icon="?attr/icon_new_attachment"
+        android:orderInCategory="30"
+        app:showAsAction="always"
+        android:title="@string/attach_file" >
+        <menu>
+
+            <item
+                android:id="@+id/attach_choose_file"
+                android:icon="?attr/ic_attach_document"
+                android:title="@string/choose_file" />
+
+            <item
+                android:id="@+id/attach_choose_picture"
+                android:icon="?attr/ic_attach_photo"
+                android:title="@string/attach_choose_picture" />
+
+            <item
+                android:id="@+id/attach_take_picture"
+                android:icon="?attr/ic_attach_camera"
+                android:title="@string/attach_take_from_camera" />
+            <item
+                android:id="@+id/attach_record_voice"
+                android:icon="?attr/ic_attach_record"
+                android:title="@string/attach_record_voice" />
+
+            <item
+                android:id="@+id/attach_location"
+                android:icon="?attr/ic_attach_location"
+                android:title="@string/send_location" />
+        </menu>
+    </item>
+    <item
+        android:id="@+id/action_invite"
+        android:orderInCategory="45"
+        app:showAsAction="never"
+        android:title="@string/invite_contact" />
+    <item
+        android:id="@+id/action_clear_history"
+        android:orderInCategory="50"
+        app:showAsAction="never"
+        android:title="@string/action_clear_history" />
+    <item
+        android:id="@+id/action_archive_chat"
+        android:orderInCategory="60"
+        app:showAsAction="never"
+        android:title="@string/action_end_conversation" />
+    <item
+        android:id="@+id/action_archive_muc"
+        android:orderInCategory="60"
+        app:showAsAction="never"
+        android:title="@string/action_end_conversation_muc" />
+    <item
+        android:id="@+id/action_accounts"
+        android:orderInCategory="90"
+        app:showAsAction="never"
+        android:title="@string/mgmt_account_edit" />
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never"
+        android:title="@string/action_settings" />
+    <item
+        android:id="@+id/action_invite_user"
+        android:orderInCategory="100"
+        app:showAsAction="never"
+        android:title="@string/invite_user" />
+    <item
+        android:id="@+id/action_create_issue"
+        android:orderInCategory="100"
+        app:showAsAction="never"
+        android:title="@string/create_issue" />
+    <item
+        android:id="@+id/action_check_updates"
+        android:orderInCategory="100"
+        app:showAsAction="never"
+        android:title="@string/action_check_update" />
+    <item
+        android:id="@+id/action_search_history"
+        android:icon="?attr/icon_search"
+        app:showAsAction="ifRoom"
+        android:title="@string/search" />
+</menu>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 2d5d6fa20..3ca30dfea 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -764,7 +764,7 @@
     <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 \&quot;%s\&quot;. The certificate is only valid for:</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>
-- 
cgit v1.2.3