Skip to content

Avoid picker navigation to affect main file list's one #17958

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 2 commits into from
Nov 5, 2026
Merged

Avoid picker navigation to affect main file list's one #17958

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f2b9ce
Avoid picker navigation to affect main file list's one
daniele-verducci Nov 4, 2026
3f4417d
Better fix for picker navigation affecting all file list fragments
daniele-verducci Nov 5, 2026
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
17 changes: 10 additions & 7 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import com.nextcloud.utils.e2ee.E2EEActionResolver
import com.nextcloud.utils.e2ee.E2EEDialogPresenter
import com.nextcloud.utils.extensions.getDepth
import com.nextcloud.utils.extensions.getParcelableArgument
import com.nextcloud.utils.extensions.getSerializableArgument
import com.nextcloud.utils.extensions.isDialogFragmentReady
import com.nextcloud.utils.extensions.isWebViewAvailable
import com.nextcloud.utils.extensions.listenEncryptionDialogResult
Expand Down Expand Up @@ -186,6 +187,9 @@ open class OCFileListFragment :
var currentFile: OCFile? = null
protected set

var fileDepth: OCFileDepth? = OCFileDepth.Root
private set

var adapter: OCFileListAdapter? = null
protected set

Expand Down Expand Up @@ -254,6 +258,7 @@ open class OCFileListFragment :
val state = savedInstanceState ?: arguments
loadSearchState(state)
currentFile = state.getParcelableArgument(KEY_FILE, OCFile::class.java)
savedInstanceState?.let { fileDepth = it.getSerializableArgument(KEY_FILE_DEPTH, OCFileDepth::class.java) }
isSearchFragment = activeSearchEvent != null
folderEncryption = FolderEncryption(this)
encryptedClickHandler = EncryptedFolderClickHandler(this)
Expand Down Expand Up @@ -331,6 +336,7 @@ open class OCFileListFragment :
super.onSaveInstanceState(outState)
currentFile.logFileSize(TAG)
outState.putParcelable(KEY_FILE, currentFile)
outState.putSerializable(KEY_FILE_DEPTH, fileDepth)
if (isSearchFragment) {
outState.putParcelable(KEY_CURRENT_SEARCH_TYPE, currentSearchType)
activeSearchEvent?.let { outState.putParcelable(SEARCH_EVENT, it) }
Expand Down Expand Up @@ -1071,15 +1077,12 @@ open class OCFileListFragment :
}

fun setFileDepth(file: OCFile?) {
currentFileDepth = file.getDepth()
fileDepth = file.getDepth()
}

fun resetFileDepth() {
currentFileDepth = OCFileDepth.Root
fileDepth = OCFileDepth.Root
}

val fileDepth: OCFileDepth?
get() = currentFileDepth
//endregion

//region Directory listing
Expand Down Expand Up @@ -1133,6 +1136,7 @@ open class OCFileListFragment :
}

currentFile = directoryToList
setFileDepth(directoryToList)
updateUiForCurrentFolder()
}

Expand Down Expand Up @@ -1518,6 +1522,7 @@ open class OCFileListFragment :
const val SEARCH_EVENT = "SEARCH_EVENT"
const val KEY_CURRENT_SEARCH_TYPE = "CURRENT_SEARCH_TYPE"
private val KEY_FILE = "$MY_PACKAGE.extra.FILE"
private val KEY_FILE_DEPTH = "$MY_PACKAGE.extra.FILE_DEPTH"

private const val DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER"
private const val DIALOG_CREATE_DOCUMENT = "DIALOG_CREATE_DOCUMENT"
Expand Down Expand Up @@ -1550,8 +1555,6 @@ open class OCFileListFragment :

private val scanIntentExternalApp = Intent(SCAN_TO_PDF_ACTION)

private var currentFileDepth: OCFileDepth? = OCFileDepth.Root

var isMultipleFileSelectedForCopyOrMove = false
}
}
Loading