diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-03-29 22:36:59 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-03-29 22:36:59 +0200 |
commit | 2868db3c0f611b0d154206cf7c425effad9e4f50 (patch) | |
tree | 1afa8e6f90bab02f1fc24dd203ea5ca6ba2d414c /src/main/java/de/pixart/messenger/ui/ConversationActivity.java | |
parent | e9263bf79976ac50626ee5f196a1602d8dd4d953 (diff) |
change font size in conversation overview
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationActivity.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index faa8bdc37..c3fdfefa2 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -104,7 +104,15 @@ public class ConversationActivity extends XmppActivity implements OnConversation invalidateActionBarTitle(); Intent intent = pendingViewIntent.pop(); if (intent != null) { - processViewIntent(intent); + if (processViewIntent(intent)) { + return; + } + } + if (binding.secondaryFragment != null && ConversationFragment.getConversation(this) == null) { + Conversation conversation = ConversationsOverviewFragment.getSuggestion(this); + if (conversation != null) { + openConversation(conversation, null); + } } } @@ -122,14 +130,15 @@ public class ConversationActivity extends XmppActivity implements OnConversation } } - private void processViewIntent(Intent intent) { + private boolean processViewIntent(Intent intent) { String uuid = intent.getStringExtra(EXTRA_CONVERSATION); Conversation conversation = uuid != null ? xmppConnectionService.findConversationByUuid(uuid) : null; if (conversation == null) { Log.d(Config.LOGTAG, "unable to view conversation with uuid:" + uuid); - return; + return false; } openConversation(conversation, intent.getExtras()); + return true; } @Override |