Skip to content

Fixed back navigation in upload screen #17921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 1 commit into from
Nov 2, 2026
+14 −4
Merged

Fixed back navigation in upload screen #17921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ class UploadFilesActivity :

private val onBackPressedCallback = object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
if (isSearchOpen) closeSearch() else navigateToParentDirectory()
when {
isSearchOpen -> closeSearch()
navigateToParentDirectory() -> Log_OC.i(TAG, "Moved to parent directory")
else -> finish()
}
}
}

Expand Down Expand Up @@ -288,14 +292,19 @@ class UploadFilesActivity :
setDrawerIndicatorEnabled(isDrawerIndicatorAvailable)
}

private fun navigateToParentDirectory() {
/**
* Navigates to parent directory
*
* @return true if navigation is possible, false otherwise
*/
private fun navigateToParentDirectory(): Boolean {
if (directories.count <= SINGLE_DIR) {
finish()
return
return false
}

val isParentUnreadable = currentDir?.parentFile?.canRead() == false
if (currentDir == null || isParentUnreadable) return
if (currentDir == null || isParentUnreadable) return false

directories.remove(directories.getItem(0))
fileListFragment.onNavigateUp()
Expand All @@ -309,6 +318,7 @@ class UploadFilesActivity :
if (!isFolderPickerMode) {
setSelectAllMenuItem(selectAllMenuItem, false)
}
return true
}

override fun onSaveInstanceState(outState: Bundle) {
Expand Down
Loading