diff --git a/app/src/main/java/com/owncloud/android/ui/navigation/NavigatorActivity.kt b/app/src/main/java/com/owncloud/android/ui/navigation/NavigatorActivity.kt index 103eb38c36be..263bb63c7f6d 100644 --- a/app/src/main/java/com/owncloud/android/ui/navigation/NavigatorActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/navigation/NavigatorActivity.kt @@ -143,8 +143,13 @@ class NavigatorActivity : DrawerActivity() { this, object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { + val onBackPressListener = supportFragmentManager.fragments + .filterIsInstance() + .firstOrNull() + when { isDrawerOpen -> closeDrawer() + onBackPressListener?.canInterceptBackPress() == true -> onBackPressListener.interceptBackPress() supportFragmentManager.backStackEntryCount == 1 -> finish() else -> pop() }