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 #157

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-05-10 15:31:15 +02:00
parent 59b54d1f7b
commit a2c45a3736
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/controllers/base/bottomnavigation/BottomNavigationController.java
View File

@ -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;