From e79d25dc3f6c600073edb97b645f61e81b8452d9 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Mon, 4 Jun 2018 21:33:55 +0200 Subject: [PATCH] Fix a crash Signed-off-by: Mario Danic --- .../nextcloud/talk/controllers/ContactsController.java | 8 +++++--- 1 file changed, 5 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 3b09249c5..8e5263238 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -839,9 +839,11 @@ public class ContactsController extends BaseController implements SearchView.OnQ if (currentUser.hasSpreedCapabilityWithName("chat-v2")) { bundle.putString(BundleKeys.KEY_CONVERSATION_NAME, roomOverall.getOcs().getData().getDisplayName()); - getParentController().getRouter().pushController((RouterTransaction.with(new ChatController(bundle)) - .pushChangeHandler(new HorizontalChangeHandler()) - .popChangeHandler(new HorizontalChangeHandler()))); + if (getParentController() != null) { + getParentController().getRouter().pushController((RouterTransaction.with(new ChatController(bundle)) + .pushChangeHandler(new HorizontalChangeHandler()) + .popChangeHandler(new HorizontalChangeHandler()))); + } } else { startActivity(conversationIntent); }