gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lock & unlock bottom sheet

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-26 00:19:59 +01:00
parent f6b14d1ec8
commit 00938d8358
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
View File

@ -117,7 +117,6 @@ public class EntryMenuController extends BaseController {
public void onProceedButtonClick() { public void onProceedButtonClick() {
Bundle bundle; Bundle bundle;
if (operationCode == 99) { if (operationCode == 99) {
eventBus.post(new BottomSheetLockEvent(false, 0, false, false));
UserEntity userEntity = userUtils.getCurrentUser(); UserEntity userEntity = userUtils.getCurrentUser();
if (userEntity != null) { if (userEntity != null) {
@ -131,7 +130,6 @@ public class EntryMenuController extends BaseController {
} else if (operationCode != 7) { } else if (operationCode != 7) {
eventBus.post(new BottomSheetLockEvent(false, 0, false, false)); eventBus.post(new BottomSheetLockEvent(false, 0, false, false));
bundle = new Bundle(); bundle = new Bundle();
if (operationCode == 4 || operationCode == 6) { if (operationCode == 4 || operationCode == 6) {
room.setPassword(editText.getText().toString()); room.setPassword(editText.getText().toString());
@ -149,7 +147,7 @@ public class EntryMenuController extends BaseController {
intent.setComponent(new ComponentName(packageName, name)); intent.setComponent(new ComponentName(packageName, name));
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
getActivity().startActivity(intent); getActivity().startActivity(intent);
eventBus.post(new BottomSheetLockEvent(true, 0, false, false)); eventBus.post(new BottomSheetLockEvent(true, 0, false, true));
} }
} }
} }

3
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
View File

@ -274,7 +274,8 @@ public class OperationsMenuController extends BaseController {
showResultImage(false); showResultImage(false);
} else { } else {
if (((HttpException) e).response().code() == 403) { 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); ErrorMessageHolder.getInstance().setMessageType(ErrorMessageHolder.ErrorMessageType.CALL_PASSWORD_WRONG);
getRouter().popCurrentController(); getRouter().popCurrentController();
} else { } else {