From af7a64491fa5c514866d0f1952c034a7672bb508 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 21 Dec 2014 15:43:58 -0500
Subject: Add support for XEP-0191 (Blocking command)

Fixes #791

Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
---
 src/main/res/menu/contact_context.xml |  3 +++
 src/main/res/menu/conversations.xml   | 12 ++++++++++++
 src/main/res/menu/editaccount.xml     |  4 ++++
 3 files changed, 19 insertions(+)

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

diff --git a/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml
index 11ac7d7c..223c7ece 100644
--- a/src/main/res/menu/contact_context.xml
+++ b/src/main/res/menu/contact_context.xml
@@ -7,6 +7,9 @@
     <item
         android:id="@+id/context_contact_details"
         android:title="@string/view_contact_details"/>
+    <item
+        android:id="@+id/context_contact_block_unblock"
+        android:title="@string/block_contact"/>
     <item
         android:id="@+id/context_delete_contact"
         android:title="@string/delete_contact"/>
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index d68c1436..6c22ed18 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -56,6 +56,18 @@
         android:showAsAction="never"
         android:title="@string/enable_notifications"/>
 
+    <item
+        android:id="@+id/action_block"
+        android:orderInCategory="72"
+        android:showAsAction="never"
+        android:title="@string/action_block_contact"/>
+
+    <item
+        android:id="@+id/action_unblock"
+        android:orderInCategory="73"
+        android:showAsAction="never"
+        android:title="@string/action_unblock_contact"/>
+
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 2301caf0..5d10901e 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -4,5 +4,9 @@
         android:id="@+id/action_show_qr_code"
         android:title="@string/show_qr_code"
         android:showAsAction="never" />
+    <item
+        android:id="@+id/action_show_block_list"
+        android:title="@string/show_block_list"
+        android:showAsAction="never" />
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 01107e31ae22d84922742717ad5b7d87581e4096 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Tue, 21 Oct 2014 16:22:01 -0400
Subject: Add more server compatibility info.

Hide server info behind a checkbox.

Add XEP-0352 support to the server info list

Add XEP-0237 to server info list

Add XEP-0352 support to the server info list

Add MaM and Blocking to the account XEPs list

Also add a toggle button to hide some of the list
Rebase on current codebase

Make MAM string more descriptive

Change show more button to checkbox menu item

Shorten `MAM (History)' to `MAM'

Order XEP list and hide all by default

Supress warning (which is wrong anyways)

Change `Show more' to `Show more info'
---
 src/main/res/menu/editaccount.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 5d10901e..fc362836 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -4,9 +4,16 @@
         android:id="@+id/action_show_qr_code"
         android:title="@string/show_qr_code"
         android:showAsAction="never" />
+
     <item
         android:id="@+id/action_show_block_list"
         android:title="@string/show_block_list"
         android:showAsAction="never" />
 
+    <item
+        android:id="@+id/action_server_info_show_more"
+        android:title="@string/server_info_show_more"
+        android:checkable="true"
+        android:checked="false"
+        android:showAsAction="never" />
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 1988e244ef035da5ddc309c3ad587f967518509e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Fri, 2 Jan 2015 15:14:06 +0100
Subject: some further otr improvements

---
 src/main/res/menu/verification_choices.xml | 15 +++++++++++++++
 src/main/res/menu/verify_otr.xml           |  9 ++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 src/main/res/menu/verification_choices.xml

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

diff --git a/src/main/res/menu/verification_choices.xml b/src/main/res/menu/verification_choices.xml
new file mode 100644
index 00000000..e833ba79
--- /dev/null
+++ b/src/main/res/menu/verification_choices.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/scan_fingerprint"
+        android:title="@string/scan_qr_code"/>
+    <item
+        android:id="@+id/ask_question"
+        android:title="@string/ask_question"/>
+
+    <item
+        android:id="@+id/manual_verification"
+        android:title="@string/manually_verify" />
+
+</menu>
\ No newline at end of file
diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml
index 1d4a11b6..42b66ad5 100644
--- a/src/main/res/menu/verify_otr.xml
+++ b/src/main/res/menu/verify_otr.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:id="@+id/manually_verify"
-        android:orderInCategory="10"
-        android:showAsAction="never"
-        android:title="@string/manually_verify" />
+	<item
+		android:id="@+id/action_show_qr_code"
+		android:title="@string/show_qr_code"
+		android:showAsAction="never" />
 
     <item
         android:id="@+id/action_accounts"
-- 
cgit v1.2.3


From 969044b1133fa2fd82d209953a1970a2a5b2eb97 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sat, 3 Jan 2015 00:11:02 +0100
Subject: migrated change password into separate activity

---
 src/main/res/menu/editaccount.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index fc362836..4ce9e1f3 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -16,4 +16,8 @@
         android:checkable="true"
         android:checked="false"
         android:showAsAction="never" />
+
+	<item android:id="@+id/action_change_password_on_server"
+          android:title="@string/change_password"
+          android:showAsAction="never" />
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 960b7343d3bf2511be4a6da838b9cf4a0f0a3c43 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sat, 3 Jan 2015 13:36:48 +0100
Subject: disable / enable all accounts

---
 src/main/res/menu/manageaccounts.xml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

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

diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index b5cd9b50..5b04484f 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:id="@+id/action_add_account"
-        android:icon="@drawable/ic_action_add_person"
-        android:showAsAction="always"
-        android:title="@string/action_add_account"/>
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
+	<item
+		android:id="@+id/action_add_account"
+		android:icon="@drawable/ic_action_add_person"
+		android:showAsAction="always"
+		android:title="@string/action_add_account"/>
+	<item
+		android:id="@+id/action_enable_all"
+		android:title="@string/enable_all_accounts"/>
+	<item
+		android:id="@+id/action_disable_all"
+		android:title="@string/disable_all_accounts"/>
+	<item
+		android:id="@+id/action_settings"
+		android:orderInCategory="100"
+		android:showAsAction="never"
+		android:title="@string/action_settings"/>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From be7de054be6b31b82947b9c641c8b1d5bbefb284 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sat, 3 Jan 2015 16:06:59 +0100
Subject: record voice and attachment refactor

---
 src/main/res/menu/attachment_choices.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml
index 12b37c08..5139272c 100644
--- a/src/main/res/menu/attachment_choices.xml
+++ b/src/main/res/menu/attachment_choices.xml
@@ -7,8 +7,11 @@
     <item
         android:id="@+id/attach_take_picture"
         android:title="@string/attach_take_picture"/>
+	<item
+		android:id="@+id/attach_record_voice"
+		android:title="@string/attach_record_voice"/>
     <item
-        android:id="@+id/attach_record_voice"
+        android:id="@+id/attach_choose_file"
         android:title="@string/choose_file"/>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3