Skip to content

Commit 5fcb52e

Browse files
Merge pull request #17043 from nextcloud/backport/17032/stable-33.1.x
[stable-33.1.x] fix(trashbin): back button behaviour
2 parents 408c6bc + 3911770 commit 5fcb52e

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

app/src/main/java/com/owncloud/android/ui/navigation/NavigatorActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,13 @@ class NavigatorActivity : DrawerActivity() {
105105
this,
106106
object : OnBackPressedCallback(true) {
107107
override fun handleOnBackPressed() {
108+
val onBackPressListener = supportFragmentManager.fragments
109+
.filterIsInstance<NavigatorOnBackPressListener>()
110+
.firstOrNull()
111+
108112
when {
109113
isDrawerOpen -> closeDrawer()
114+
onBackPressListener?.canInterceptBackPress() == true -> onBackPressListener.interceptBackPress()
110115
supportFragmentManager.backStackEntryCount == 1 -> finish()
111116
else -> pop()
112117
}

0 commit comments

Comments
 (0)