From a5bfed5cc1c526fa12dd7e60731f106837918d86 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 18 Oct 2017 21:21:38 +0200
Subject: bring back option to highlight user in muc ...

... via context menu on selected user in ConferenceDetails
---
 .../java/de/pixart/messenger/ui/ConferenceDetailsActivity.java     | 7 ++++++-
 src/main/res/menu/muc_details_context.xml                          | 4 ++++
 src/main/res/values/strings.xml                                    | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 77f571433..134f82a5e 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -388,13 +388,14 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             final Contact contact = user.getContact();
             if (contact != null) {
                 name = contact.getDisplayName();
-            } else if (user.getRealJid() != null) {
+            } else if (user.getRealJid() != null){
                 name = user.getRealJid().toBareJid().toString();
             } else {
                 name = user.getName();
             }
             menu.setHeaderTitle(name);
             if (user.getRealJid() != null) {
+                MenuItem highlightInMuc = menu.findItem(R.id.highlight_in_muc);
                 MenuItem startConversation = menu.findItem(R.id.start_conversation);
                 MenuItem giveMembership = menu.findItem(R.id.give_membership);
                 MenuItem removeMembership = menu.findItem(R.id.remove_membership);
@@ -403,6 +404,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                 MenuItem removeFromRoom = menu.findItem(R.id.remove_from_room);
                 MenuItem banFromConference = menu.findItem(R.id.ban_from_conference);
                 MenuItem invite = menu.findItem(R.id.invite);
+                highlightInMuc.setVisible(true);
                 startConversation.setVisible(true);
                 if (user.getRole() == MucOptions.Role.NONE) {
                     invite.setVisible(true);
@@ -438,6 +440,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     public boolean onContextItemSelected(MenuItem item) {
         Jid jid = mSelectedUser.getRealJid();
         switch (item.getItemId()) {
+            case R.id.highlight_in_muc:
+                highlightInMuc(mConversation, mSelectedUser.getName());
+                return true;
             case R.id.start_conversation:
                 startConversation(mSelectedUser);
                 return true;
diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index 4760cec44..f337bf175 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/highlight_in_muc"
+        android:title="@string/highlight_in_muc"
+        android:visible="false" />
     <item
         android:id="@+id/start_conversation"
         android:title="@string/start_conversation"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3e448d1c0..e867a0c2a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -732,4 +732,5 @@
     <string name="pref_show_foreground_service">Use foreground service</string>
     <string name="update_service">Pix-Art Messenger update service</string>
     <string name="install_update">Install update?</string>
+    <string name="highlight_in_muc">highlight user</string>
 </resources>
-- 
cgit v1.2.3