diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-11-17 01:54:01 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-11-17 01:54:01 +0100 |
commit | 967cd922e15fe919f8c8d42763eb8960198a33d4 (patch) | |
tree | cfe1fe908d56c45de1dc9034f0c642ec4daac062 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
parent | 2036c58cd7793c25ce227bdc44f0377b07be45e1 (diff) |
highlight muc members by touching their name in muc details. fixed #503
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 5dccde18..56a6bead 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -47,6 +47,7 @@ public class ConversationActivity extends XmppActivity implements public static final String VIEW_CONVERSATION = "viewConversation"; public static final String CONVERSATION = "conversationUuid"; public static final String TEXT = "text"; + public static final String NICK = "nick"; public static final String PRESENCE = "eu.siacs.conversations.presence"; public static final int REQUEST_SEND_MESSAGE = 0x0201; @@ -701,9 +702,14 @@ public class ConversationActivity extends XmppActivity implements private void handleViewConversationIntent(Intent intent) { String uuid = (String) intent.getExtras().get(CONVERSATION); String text = intent.getExtras().getString(TEXT, ""); + String nick = intent.getExtras().getString(NICK,null); selectConversationByUuid(uuid); this.mConversationFragment.reInit(getSelectedConversation()); - this.mConversationFragment.appendText(text); + if (nick!=null) { + this.mConversationFragment.highlightInConference(nick); + } else { + this.mConversationFragment.appendText(text); + } hideConversationsOverview(); if (mContentView instanceof SlidingPaneLayout) { openConversation(); |