Browse Source

Fix some operation bugs

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 years ago
parent
commit
6c35dc5123

+ 13 - 3
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java

@@ -549,9 +549,19 @@ public class OperationsMenuController extends BaseController {
 
             conversationIntent.putExtras(bundle);
 
-            getParentController().getRouter().pushController(RouterTransaction.with(new ChatController(bundle))
-                    .pushChangeHandler(new HorizontalChangeHandler())
-                    .popChangeHandler(new HorizontalChangeHandler()));
+            if (getParentController() != null) {
+                if (getParentController().getParentController() != null) {
+                    getParentController().getParentController().getRouter().pushController(RouterTransaction.with(new
+                            ChatController(bundle))
+                            .pushChangeHandler(new HorizontalChangeHandler())
+                            .popChangeHandler(new HorizontalChangeHandler()));
+                } else {
+                    getParentController().getRouter().pushController(RouterTransaction.with(new
+                            ChatController(bundle))
+                            .pushChangeHandler(new HorizontalChangeHandler())
+                            .popChangeHandler(new HorizontalChangeHandler()));
+                }
+            }
 
         } else {
             initiateCall();