Просмотр исходного кода

Lock & unlock bottom sheet

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 лет назад
Родитель
Сommit
00938d8358

+ 1 - 3
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));
             }
         }
     }

+ 2 - 1
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 {