Skip to content

Commit a251356

Browse files
Merge pull request #15428 from nextcloud/fix/extended-file-list-fragment-back-press-npe
fix: extended list fragment current npe
2 parents e21ed79 + e5b9849 commit a251356

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -748,12 +748,14 @@ open class ExtendedListFragment :
748748
}
749749

750750
protected fun setupBackButtonRedirectToAllFiles() {
751+
val fda = getTypedActivity(FileActivity::class.java)
752+
val currentDir = fda?.currentDir ?: return
753+
751754
view?.isFocusableInTouchMode = true
752755
view?.requestFocus()
753756
view?.setOnKeyListener { _: View, keyCode: Int, event: KeyEvent ->
754-
val fda = getTypedActivity(FileActivity::class.java)
755-
if (fda != null && (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK)) {
756-
return@setOnKeyListener fda.handleBackButtonEvent(fda.currentDir)
757+
if (event.action == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
758+
return@setOnKeyListener fda.handleBackButtonEvent(currentDir)
757759
}
758760
false
759761
}

0 commit comments

Comments
 (0)