From f5ba9d4223ca8e5dc9ce00024f69a8374d170a31 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 2 Jul 2015 23:13:00 +0200
Subject: refactored message context menu

---
 src/main/res/menu/message_context.xml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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

diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 21659266..4e1316d3 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -3,21 +3,27 @@
 
     <item
         android:id="@+id/copy_text"
-        android:title="@string/copy_text"/>
+        android:title="@string/copy_text"
+        android:visible="false"/>
     <item
         android:id="@+id/share_with"
-        android:title="@string/share_with"/>
+        android:title="@string/share_with"
+        android:visible="false"/>
     <item
         android:id="@+id/copy_url"
-        android:title="@string/copy_original_url"/>
+        android:title="@string/copy_original_url"
+        android:visible="false"/>
     <item
         android:id="@+id/send_again"
-        android:title="@string/send_again"/>
+        android:title="@string/send_again"
+        android:visible="false"/>
     <item
-        android:id="@+id/download_image"
-        android:title="@string/download_image"/>
+        android:id="@+id/download_file"
+        android:title="@string/download_x_file"
+        android:visible="false"/>
     <item
         android:id="@+id/cancel_transmission"
-        android:title="@string/cancel_transmission" />
+        android:title="@string/cancel_transmission"
+        android:visible="false"/>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 077932eb558853e4c3c3046c54db18c530495d8c Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Fri, 29 May 2015 11:18:25 +0200
Subject: CryptoNext Menu entries added

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

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

diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index adf0ad8d..1b3fe76e 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -11,6 +11,9 @@
         <item
             android:id="@+id/encryption_choice_pgp"
             android:title="@string/encryption_choice_pgp"/>
+        <item
+            android:id="@+id/encryption_choice_axolotl"
+            android:title="@string/encryption_choice_axolotl"/>
     </group>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 37b214a8a853dfdc1760bc69d9213484e519832f Mon Sep 17 00:00:00 2001
From: Christian S <kriztan@users.noreply.github.com>
Date: Sun, 19 Jul 2015 14:03:46 +0200
Subject: show contact details in conference details ...

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

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

diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index dc0f5d3e..592e44af 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+	android:id="@+id/action_contact_details"
+	android:title="@string/action_contact_details"
+	android:visible="false" />
     <item
         android:id="@+id/start_conversation"
         android:title="@string/start_conversation"
@@ -29,4 +33,4 @@
 		android:id="@+id/remove_from_room"
         android:title="@string/remove_from_room"
 		android:visible="false"/>
-</menu>
\ No newline at end of file
+</menu>
-- 
cgit v1.2.3


From 480b1cde810e0ed2afc6ea424fb36fd973ae24b9 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sun, 19 Jul 2015 23:35:03 +0200
Subject: Add clear devices to overflow menu in EditAccount

---
 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 4ce9e1f3..2076805e 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -20,4 +20,8 @@
 	<item android:id="@+id/action_change_password_on_server"
           android:title="@string/change_password"
           android:showAsAction="never" />
+
+    <item android:id="@+id/action_clear_devices"
+          android:title="@string/clear_other_devices"
+          android:showAsAction="never"/>
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 9c91b9036aa57c610c26b4cdf52ee295eaa0dc95 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 20 Jul 2015 14:24:59 +0200
Subject: don't show 'show contact details' context menu item when contact isn
 not in roster

---
 src/main/res/menu/muc_details_context.xml | 50 +++++++++++++++----------------
 1 file changed, 25 insertions(+), 25 deletions(-)

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

diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index 592e44af..6fddb23e 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-	android:id="@+id/action_contact_details"
-	android:title="@string/action_contact_details"
-	android:visible="false" />
     <item
         android:id="@+id/start_conversation"
         android:title="@string/start_conversation"
-        android:visible="false" />
-	<item
-		android:id="@+id/give_membership"
+        android:visible="false"/>
+    <item
+        android:id="@+id/action_contact_details"
+        android:title="@string/action_contact_details"
+        android:visible="false"/>
+    <item
+        android:id="@+id/give_membership"
         android:title="@string/grant_membership"
-		android:visible="false" />
-	<item
-		android:id="@+id/give_admin_privileges"
+        android:visible="false"/>
+    <item
+        android:id="@+id/give_admin_privileges"
         android:title="@string/grant_admin_privileges"
-		android:visible="false"/>
-	<item
-		android:id="@+id/remove_admin_privileges"
+        android:visible="false"/>
+    <item
+        android:id="@+id/remove_admin_privileges"
         android:title="@string/remove_admin_privileges"
-		android:visible="false"/>
+        android:visible="false"/>
 
-	<item
-		android:id="@+id/remove_membership"
-		android:title="@string/remove_membership"
-		android:visible="false"/>
-	<item
-		android:id="@+id/ban_from_conference"
-	    android:title="@string/ban_from_conference"
-	    android:visible="false" />
-	<item
-		android:id="@+id/remove_from_room"
+    <item
+        android:id="@+id/remove_membership"
+        android:title="@string/remove_membership"
+        android:visible="false"/>
+    <item
+        android:id="@+id/ban_from_conference"
+        android:title="@string/ban_from_conference"
+        android:visible="false"/>
+    <item
+        android:id="@+id/remove_from_room"
         android:title="@string/remove_from_room"
-		android:visible="false"/>
+        android:visible="false"/>
 </menu>
-- 
cgit v1.2.3


From 1aeb5874b042b7461e82dddbb34f70c5149a789f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 21 Jul 2015 13:15:59 +0200
Subject: allow for private messages being started from muc details in
 anonymous mucs

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

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

diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index 6fddb23e..af5e691b 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -8,6 +8,10 @@
         android:id="@+id/action_contact_details"
         android:title="@string/action_contact_details"
         android:visible="false"/>
+    <item
+        android:id="@+id/send_private_message"
+        android:title="@string/send_private_message"
+        android:visible="false"/>
     <item
         android:id="@+id/give_membership"
         android:title="@string/grant_membership"
-- 
cgit v1.2.3


From 8b9b74ff7ee863160e0cf2827e2a5a431d4fb90f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 8 Aug 2015 13:29:21 +0200
Subject: renamed multi-end / axolotl to OMEMO

---
 src/main/res/menu/encryption_choices.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index 1b3fe76e..9af2cd34 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -5,15 +5,15 @@
         <item
             android:id="@+id/encryption_choice_none"
             android:title="@string/encryption_choice_none"/>
+        <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"/>
-        <item
-            android:id="@+id/encryption_choice_axolotl"
-            android:title="@string/encryption_choice_axolotl"/>
     </group>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 730a5c644bbacea3189479ef067b3ebbd7dcffd6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 24 Aug 2015 21:15:47 +0200
Subject: renamed plain text to unencrypted. fixes #1331

---
 src/main/res/menu/encryption_choices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index 9af2cd34..ab42a206 100644
--- a/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
@@ -4,7 +4,7 @@
     <group android:checkableBehavior="single" >
         <item
             android:id="@+id/encryption_choice_none"
-            android:title="@string/encryption_choice_none"/>
+            android:title="@string/encryption_choice_unencrypted"/>
         <item
             android:id="@+id/encryption_choice_axolotl"
             android:title="@string/encryption_choice_omemo"/>
-- 
cgit v1.2.3


From b23cb5a9e43d804551dc18f399ffbec991479ee6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 9 Oct 2015 13:37:08 +0200
Subject: initial UI work to allow setting up accounts from certifcates

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

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

diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index f8a30ff7..6dd57ae5 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -6,6 +6,12 @@
 		android:icon="?attr/icon_add_person"
 		android:showAsAction="always"
 		android:title="@string/action_add_account"/>
+	<item
+		android:id="@+id/action_add_account_from_key"
+		android:showAsAction="never"
+		android:icon="?attr/icon_add_person"
+		android:title="@string/action_add_account_from_key"
+		android:visible="false"/>
 	<item
 		android:id="@+id/action_enable_all"
 		android:title="@string/enable_all_accounts"/>
-- 
cgit v1.2.3


From 09816b61df2fa72e7a80588982f78144fd43f173 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 9 Oct 2015 13:46:54 +0200
Subject: make add account from key visible

---
 src/main/res/menu/manageaccounts.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 6dd57ae5..2eeb30db 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -11,7 +11,7 @@
 		android:showAsAction="never"
 		android:icon="?attr/icon_add_person"
 		android:title="@string/action_add_account_from_key"
-		android:visible="false"/>
+		android:visible="true"/>
 	<item
 		android:id="@+id/action_enable_all"
 		android:title="@string/enable_all_accounts"/>
-- 
cgit v1.2.3


From 7be331bbb2ae2abde55eb031f4fdf4616846360e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 11 Oct 2015 15:48:58 +0200
Subject: add menu item in account details to renew certificate

---
 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 2076805e..62981a45 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -10,6 +10,13 @@
         android:title="@string/show_block_list"
         android:showAsAction="never" />
 
+    <item
+        android:id="@+id/action_renew_certificate"
+        android:title="@string/action_renew_certificate"
+        android:visible="false"
+        android:showAsAction="never" />
+        />
+
     <item
         android:id="@+id/action_server_info_show_more"
         android:title="@string/server_info_show_more"
-- 
cgit v1.2.3


From 212d1a8c91d5b83d1132d3a02664607ce37f8ecf Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 12 Oct 2015 13:18:20 +0200
Subject: add config variable to enable x509 verification

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

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

diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 2eeb30db..ffa692a0 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -7,10 +7,10 @@
 		android:showAsAction="always"
 		android:title="@string/action_add_account"/>
 	<item
-		android:id="@+id/action_add_account_from_key"
+		android:id="@+id/action_add_account_with_cert"
 		android:showAsAction="never"
 		android:icon="?attr/icon_add_person"
-		android:title="@string/action_add_account_from_key"
+		android:title="@string/action_add_account_with_certificate"
 		android:visible="true"/>
 	<item
 		android:id="@+id/action_enable_all"
-- 
cgit v1.2.3


From f0b1761ec3826b72fe3b20032b532dc5b1adfc1c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 28 Nov 2015 20:11:38 +0100
Subject: initial tor support

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

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

diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 62981a45..b7a40418 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -31,4 +31,9 @@
     <item android:id="@+id/action_clear_devices"
           android:title="@string/clear_other_devices"
           android:showAsAction="never"/>
+    <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 501034fe0eb267f5100f4dd799fb1454fe7ba1a4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 4 Jan 2016 17:27:51 +0100
Subject: Allow entering a JID from 'choose contact'. thanks @singpolyma fixes
 #1611 fixes #1602

---
 src/main/res/menu/choose_contact.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index c025d00f..94b6479b 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -1,5 +1,5 @@
 <?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_search"
@@ -8,4 +8,10 @@
         android:showAsAction="collapseActionView|always"
         android:title="@string/search"/>
 
-</menu>
\ No newline at end of file
+    <item
+        android:id="@+id/action_create_contact"
+        android:icon="?attr/icon_add_person"
+        android:showAsAction="always"
+        android:title="@string/create_contact"
+        android:visible="false"/>
+</menu>
-- 
cgit v1.2.3