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

Fix a crash

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-04 21:33:55 +02:00
parent 91f38323e9
commit e79d25dc3f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -839,9 +839,11 @@ public class ContactsController extends BaseController implements SearchView.OnQ
if (currentUser.hasSpreedCapabilityWithName("chat-v2")) { if (currentUser.hasSpreedCapabilityWithName("chat-v2")) {
bundle.putString(BundleKeys.KEY_CONVERSATION_NAME, bundle.putString(BundleKeys.KEY_CONVERSATION_NAME,
roomOverall.getOcs().getData().getDisplayName()); roomOverall.getOcs().getData().getDisplayName());
getParentController().getRouter().pushController((RouterTransaction.with(new ChatController(bundle)) if (getParentController() != null) {
.pushChangeHandler(new HorizontalChangeHandler()) getParentController().getRouter().pushController((RouterTransaction.with(new ChatController(bundle))
.popChangeHandler(new HorizontalChangeHandler()))); .pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new HorizontalChangeHandler())));
}
} else { } else {
startActivity(conversationIntent); startActivity(conversationIntent);
} }