From 0d94501d29ed512215371b01d225c1acb67c7bc1 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Sat, 3 Mar 2018 21:16:06 +0100
Subject: [PATCH] Fix up bugs

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../com/nextcloud/talk/controllers/ContactsController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
index 719ad5177..d2b1f998e 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -159,12 +159,10 @@ public class ContactsController extends BaseController implements SearchView.OnQ
 
     public ContactsController() {
         super();
-        setHasOptionsMenu(true);
     }
 
     public ContactsController(Bundle args) {
         super(args);
-        setHasOptionsMenu(true);
         if (args.containsKey(BundleKeys.KEY_NEW_CONVERSATION)) {
             isNewConversationView = true;
         }
@@ -178,6 +176,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
     @Override
     protected void onAttach(@NonNull View view) {
         super.onAttach(view);
+        setHasOptionsMenu(true);
         eventBus.register(this);
 
         if (isNewConversationView) {
@@ -738,7 +737,8 @@ public class ContactsController extends BaseController implements SearchView.OnQ
             } else {
                 bottomSheet.setCancelable(bottomSheetLockEvent.isCancelable());
                 if (bottomSheet.isShowing() && bottomSheetLockEvent.isCancel()) {
-                    bottomSheet.cancel();
+                    new Handler().postDelayed(() -> bottomSheet.cancel(), bottomSheetLockEvent.getDelay());
+                    getRouter().popCurrentController();
                 }
             }
         }