From 59f82cbd341d105fc7ed90bc7bf4f5e59789958f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 20 Jan 2017 13:44:29 +0100
Subject: fixed regression introduced in previous commit.

---
 .../java/eu/siacs/conversations/ui/ConversationActivity.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 9b6f1dbd..189879a6 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -304,18 +304,19 @@ public class ConversationActivity extends XmppActivity
 
 				@Override
 				public void onPanelOpened(View arg0) {
+					mShouldPanelBeOpen.set(true);
 					updateActionBarTitle();
 					invalidateOptionsMenu();
 					hideKeyboard();
 					if (xmppConnectionServiceBound) {
-						xmppConnectionService.getNotificationService()
-								.setOpenConversation(null);
+						xmppConnectionService.getNotificationService().setOpenConversation(null);
 					}
 					closeContextMenu();
 				}
 
 				@Override
 				public void onPanelClosed(View arg0) {
+					mShouldPanelBeOpen.set(false);
 					listView.discardUndo();
 					openConversation();
 				}
@@ -1131,7 +1132,6 @@ public class ConversationActivity extends XmppActivity
 
 
 		if (!isConversationsOverviewVisable() || !isConversationsOverviewHideable()) {
-			Conversation c = getSelectedConversation();
 			sendReadMarkerIfNecessary(getSelectedConversation());
 		}
 
@@ -1269,6 +1269,9 @@ public class ConversationActivity extends XmppActivity
 		if (!ExceptionHelper.checkForCrash(this, this.xmppConnectionService)) {
 			openBatteryOptimizationDialogIfNeeded();
 		}
+		if (isConversationsOverviewVisable() && isConversationsOverviewHideable()) {
+			xmppConnectionService.getNotificationService().setOpenConversation(null);
+		}
 	}
 
 	private void handleViewConversationIntent(final Intent intent) {
-- 
cgit v1.2.3