gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-23 13:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix up bugs

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-03-03 21:16:06 +01:00
parent f8bb67f3fe
commit 0d94501d29
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -159,12 +159,10 @@ public class ContactsController extends BaseController implements SearchView.OnQ
public ContactsController() { public ContactsController() {
super(); super();
setHasOptionsMenu(true);
} }
public ContactsController(Bundle args) { public ContactsController(Bundle args) {
super(args); super(args);
setHasOptionsMenu(true);
if (args.containsKey(BundleKeys.KEY_NEW_CONVERSATION)) { if (args.containsKey(BundleKeys.KEY_NEW_CONVERSATION)) {
isNewConversationView = true; isNewConversationView = true;
} }
@ -178,6 +176,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
@Override @Override
protected void onAttach(@NonNull View view) { protected void onAttach(@NonNull View view) {
super.onAttach(view); super.onAttach(view);
setHasOptionsMenu(true);
eventBus.register(this); eventBus.register(this);
if (isNewConversationView) { if (isNewConversationView) {
@ -738,7 +737,8 @@ public class ContactsController extends BaseController implements SearchView.OnQ
} else { } else {
bottomSheet.setCancelable(bottomSheetLockEvent.isCancelable()); bottomSheet.setCancelable(bottomSheetLockEvent.isCancelable());
if (bottomSheet.isShowing() && bottomSheetLockEvent.isCancel()) { if (bottomSheet.isShowing() && bottomSheetLockEvent.isCancel()) {
bottomSheet.cancel(); new Handler().postDelayed(() -> bottomSheet.cancel(), bottomSheetLockEvent.getDelay());
getRouter().popCurrentController();
} }
} }
} }