Browse Source

Fix #157

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

+ 8 - 1
app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java

@@ -287,7 +287,14 @@ public abstract class BottomNavigationController extends BaseController {
          */
          */
         Router childRouter = getChildRouter(currentlySelectedItemId);
         Router childRouter = getChildRouter(currentlySelectedItemId);
         if (childRouter != null) {
         if (childRouter != null) {
-            return childRouter.handleBack();
+            if (childRouter.getBackstackSize() > 1) {
+                return childRouter.handleBack();
+            } else if (currentlySelectedItemId != R.id.navigation_calls) {
+                navigateTo(R.id.navigation_calls);
+                return true;
+            } else {
+                return false;
+            }
         } else {
         } else {
             Log.d(TAG, "handleBack called with getChildRouter(currentlySelectedItemId) == null.");
             Log.d(TAG, "handleBack called with getChildRouter(currentlySelectedItemId) == null.");
             return false;
             return false;