From 00938d8358a6601cf23214de3de778ece4faa9e1 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 26 Jan 2018 00:19:59 +0100
Subject: [PATCH] Lock & unlock bottom sheet

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../talk/controllers/bottomsheet/EntryMenuController.java     | 4 +---
 .../controllers/bottomsheet/OperationsMenuController.java     | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
index 26c03982c..0550abaa7 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
@@ -117,7 +117,6 @@ public class EntryMenuController extends BaseController {
     public void onProceedButtonClick() {
         Bundle bundle;
         if (operationCode == 99) {
-            eventBus.post(new BottomSheetLockEvent(false, 0, false, false));
             UserEntity userEntity = userUtils.getCurrentUser();
 
             if (userEntity != null) {
@@ -131,7 +130,6 @@ public class EntryMenuController extends BaseController {
 
         } else if (operationCode != 7) {
             eventBus.post(new BottomSheetLockEvent(false, 0, false, false));
-
             bundle = new Bundle();
             if (operationCode == 4 || operationCode == 6) {
                 room.setPassword(editText.getText().toString());
@@ -149,7 +147,7 @@ public class EntryMenuController extends BaseController {
                 intent.setComponent(new ComponentName(packageName, name));
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 getActivity().startActivity(intent);
-                eventBus.post(new BottomSheetLockEvent(true, 0, false, false));
+                eventBus.post(new BottomSheetLockEvent(true, 0, false, true));
             }
         }
     }
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
index e20101ee6..e1b8aba80 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
@@ -274,7 +274,8 @@ public class OperationsMenuController extends BaseController {
                     showResultImage(false);
                 } else {
                     if (((HttpException) e).response().code() == 403) {
-                        // just make it cancelable again
+                        eventBus.post(new BottomSheetLockEvent(true, 0, false,
+                                false));
                         ErrorMessageHolder.getInstance().setMessageType(ErrorMessageHolder.ErrorMessageType.CALL_PASSWORD_WRONG);
                         getRouter().popCurrentController();
                     } else {