Skip to content

Commit 96e63ef

Browse files
Merge pull request #17032 from nextcloud/fix/trashbin-back-button-behaviour
fix(trashbin): back button behaviour
2 parents aec50ec + ac7ec77 commit 96e63ef

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
@@ -143,8 +143,13 @@ class NavigatorActivity : DrawerActivity() {
143143
this,
144144
object : OnBackPressedCallback(true) {
145145
override fun handleOnBackPressed() {
146+
val onBackPressListener = supportFragmentManager.fragments
147+
.filterIsInstance<NavigatorOnBackPressListener>()
148+
.firstOrNull()
149+
146150
when {
147151
isDrawerOpen -> closeDrawer()
152+
onBackPressListener?.canInterceptBackPress() == true -> onBackPressListener.interceptBackPress()
148153
supportFragmentManager.backStackEntryCount == 1 -> finish()
149154
else -> pop()
150155
}

0 commit comments

Comments
 (0)