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/muc_details_context.xml')

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 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/muc_details_context.xml')

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/muc_details_context.xml')

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