diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-07-25 14:15:47 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-07-25 14:16:09 +0200 |
commit | 198a9f222663ea5e216459f89c8c1d5fe220cb40 (patch) | |
tree | 5b7f9057f6f22830693612b925b320fc90d7158e /src/main/java/eu/siacs/conversations/ui/XmppActivity.java | |
parent | 89a05265eaab5b52726268178beae0d5e9519e67 (diff) |
refactored how view intents are handled
processing view intents before saved instance caused troubles when the activity was destroyed
fixes #1969
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index b745afec..df16fd64 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -471,7 +471,7 @@ public abstract class XmppActivity extends Activity { private void switchToConversation(Conversation conversation, String text, String nick, boolean pm, boolean newTask) { Intent viewConversationIntent = new Intent(this, ConversationActivity.class); - viewConversationIntent.setAction(Intent.ACTION_VIEW); + viewConversationIntent.setAction(ConversationActivity.ACTION_VIEW_CONVERSATION); viewConversationIntent.putExtra(ConversationActivity.CONVERSATION, conversation.getUuid()); if (text != null) { @@ -481,7 +481,6 @@ public abstract class XmppActivity extends Activity { viewConversationIntent.putExtra(ConversationActivity.NICK, nick); viewConversationIntent.putExtra(ConversationActivity.PRIVATE_MESSAGE,pm); } - viewConversationIntent.setType(ConversationActivity.VIEW_CONVERSATION); if (newTask) { viewConversationIntent.setFlags(viewConversationIntent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK |