Merge master-origin

Conflicts:
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/res/values-de/strings.xml

9 files changed, 69 insertions, 28 deletions

diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index e39091b3..c025d00f 100644
--- a/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="?attr/icon_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search"/>
 
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index ce9028aa..bd81b6d4 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -3,13 +3,13 @@
 
     <item
         android:id="@+id/action_edit_contact"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_edit_contact"/>
     <item
         android:id="@+id/action_delete_contact"
-        android:icon="@drawable/ic_action_discard"
+        android:icon="?attr/icon_discard"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_delete_contact"/>
@@ -17,6 +17,19 @@
         android:id="@+id/action_show_qr_code"
         android:title="@string/show_qr_code"
         android:showAsAction="never" />
+
+    <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/conversations.xml b/src/main/res/menu/conversations.xml
index 6c22ed18..4c724d27 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -2,19 +2,19 @@
 
     <item
         android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_new"
+        android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_add"/>
     <item
         android:id="@+id/action_security"
-        android:icon="@drawable/ic_action_not_secure"
+        android:icon="?attr/icon_not_secure"
         android:orderInCategory="20"
         android:showAsAction="always"
         android:title="@string/action_secure"/>
     <item
         android:id="@+id/action_attach_file"
-        android:icon="@drawable/ic_action_new_attachment"
+        android:icon="?attr/icon_new_attachment"
         android:orderInCategory="30"
         android:showAsAction="always"
         android:title="@string/attach_file"/>
@@ -25,7 +25,7 @@
         android:title="@string/action_contact_details"/>
     <item
         android:id="@+id/action_muc_details"
-        android:icon="@drawable/ic_action_group"
+        android:icon="?attr/icon_group"
         android:orderInCategory="40"
         android:showAsAction="ifRoom"
         android:title="@string/action_muc_details"/>
@@ -57,18 +57,6 @@
         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"
         android:showAsAction="never"
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index 5b04484f..f8a30ff7 100644
--- a/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
@@ -3,7 +3,7 @@
 
 	<item
 		android:id="@+id/action_add_account"
-		android:icon="@drawable/ic_action_add_person"
+		android:icon="?attr/icon_add_person"
 		android:showAsAction="always"
 		android:title="@string/action_add_account"/>
 	<item
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 3be52442..21659266 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -5,8 +5,8 @@
         android:id="@+id/copy_text"
         android:title="@string/copy_text"/>
     <item
-        android:id="@+id/share_image"
-        android:title="@string/share_image"/>
+        android:id="@+id/share_with"
+        android:title="@string/share_with"/>
     <item
         android:id="@+id/copy_url"
         android:title="@string/copy_original_url"/>
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 341d438a..51de4e75 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_edit_subject"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_edit_subject"/>
@@ -21,6 +21,13 @@
         android:title="@string/delete_bookmark"
         android:orderInCategory="80"
         android:showAsAction="never" />
+	<item
+		android:id="@+id/action_advanced_mode"
+		android:title="@string/advanced_mode"
+		android:checkable="true"
+		android:checked="false"
+		android:orderInCategory="85"
+		android:showAsAction="never" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index 113934f3..dc0f5d3e 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -3,5 +3,30 @@
     <item
         android:id="@+id/start_conversation"
         android:title="@string/start_conversation"
-        />
+        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:title="@string/grant_admin_privileges"
+		android:visible="false"/>
+	<item
+		android:id="@+id/remove_admin_privileges"
+        android:title="@string/remove_admin_privileges"
+		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"
+        android:title="@string/remove_from_room"
+		android:visible="false"/>
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index cbd15c11..bc51f462 100644
--- a/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_add"
-        android:icon="@drawable/ic_action_new"
+        android:icon="?attr/icon_new"
         android:orderInCategory="10"
         android:showAsAction="always"
         android:title="@string/action_add"/>
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index 2c23af59..a89d71ff 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -4,23 +4,31 @@
     <item
         android:id="@+id/action_search"
         android:actionLayout="@layout/actionview_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="?attr/icon_search"
         android:showAsAction="collapseActionView|always"
         android:title="@string/search" />
     <item
         android:id="@+id/action_create_contact"
-        android:icon="@drawable/ic_action_add_person"
+        android:icon="?attr/icon_add_person"
         android:showAsAction="always"
         android:title="@string/create_contact" />
     <item
         android:id="@+id/action_join_conference"
-        android:icon="@drawable/ic_action_add_group"
+        android:icon="?attr/icon_add_group"
         android:showAsAction="always"
         android:title="@string/join_conference" />
     <item
         android:id="@+id/action_scan_qr_code"
         android:showAsAction="never"
         android:title="@string/scan_qr_code" />
+
+    <item
+        android:id="@+id/action_hide_offline"
+        android:checkable="true"
+        android:checked="false"
+        android:orderInCategory="85"
+        android:showAsAction="never"
+        android:title="@string/hide_offline"/>
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"