diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-01 13:50:05 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-01 13:50:05 +0200 |
commit | 186bf6e9ffbe1ae14cd68a46cdba15f4bb8337d0 (patch) | |
tree | 83b1f60950be352f10b22fb86b1bab84b77b5718 /src/main/java/de/pixart/messenger/ui/ConversationActivity.java | |
parent | 84ecfa39810d8d802f95643cb62280e5801ea0ea (diff) |
made conference invite work again
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index fef8300be..f97d5fb06 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -818,6 +818,12 @@ public class ConversationActivity extends XmppActivity implements OnConversation } @Override + public void switchToConversation(Conversation conversation) { + Log.d(Config.LOGTAG, "override"); + openConversation(conversation, null); + } + + @Override public void onConversationRead(Conversation conversation) { if (!mActivityPaused && pendingViewIntent.peek() == null) { xmppConnectionService.sendReadMarker(conversation); |