From a9546bab57ee46a7dacc4f1646514728ce5f6234 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 30 Mar 2018 22:17:33 +0200
Subject: skip unnecessary loading of conversation overview fragment

---
 .../java/de/pixart/messenger/ui/ConversationActivity.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index fe38445ea..033cd0efd 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -106,17 +106,21 @@ public class ConversationActivity extends XmppActivity implements OnConversation
         if (performRedirectIfNecessary(true)) {
             return;
         }
-        for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
-            notifyFragmentOfBackendConnected(id);
-        }
-        invalidateActionBarTitle();
         xmppConnectionService.getNotificationService().setIsInForeground(true);
         Intent intent = pendingViewIntent.pop();
         if (intent != null) {
             if (processViewIntent(intent)) {
+                if (binding.secondaryFragment != null) {
+                    notifyFragmentOfBackendConnected(R.id.main_fragment);
+                }
+                invalidateActionBarTitle();
                 return;
             }
         }
+        for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
+            notifyFragmentOfBackendConnected(id);
+        }
+        invalidateActionBarTitle();
         if (binding.secondaryFragment != null && ConversationFragment.getConversation(this) == null) {
             Conversation conversation = ConversationsOverviewFragment.getSuggestion(this);
             if (conversation != null) {
-- 
cgit v1.2.3