Skip to content

fix: Fix sharedWithMe files sometimes being wrongly queried int the DB #2055

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

Draft
FabianDevel wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix: Fix sharedWithMe files sometimes being wrongly queried int the DB #2055

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
138cc82
fix(SharedWithMe): Fix getFileById for sharedWithMe files
FabianDevel Jul 16, 2026
8de96c3
refactor(getFileByUidOrId): Clean code
FabianDevel Jul 16, 2026
7b78bb6
fix(getFileByUid): Use getFileByUidOrId everywhere instead of getFile…
FabianDevel Jul 17, 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
23 changes: 21 additions & 2 deletions app/src/main/java/com/infomaniak/drive/data/cache/FileController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,29 @@ object FileController {
return customRealm?.let(block) ?: getRealmInstance(userDrive).use(block)
}

fun getFileByUidOrId(fileId: Int, userDrive: UserDrive? = null): File? {
return userDrive?.let { getFileByUid(fileId, userDrive = it) } ?: getFileById(fileId, userDrive = null)
}
Comment on lines +160 to +162

fun getFileById(fileId: Int, userDrive: UserDrive? = null): File? {
return getRealmInstance(userDrive).use { realm ->
realm.where(File::class.java).equalTo(File::id.name, fileId).findFirst()?.let {
realm.copyFromRealm(it, 1)
realm.run {
where(File::class.java)
.equalTo(File::uid.name, "${fileId}_${userDrive?.driveId}")
.findFirst()
?.let { realm.copyFromRealm(it, 1) }
}
}
}

private fun getFileByUid(fileId: Int, userDrive: UserDrive): File? {
val uid = "${fileId}_${userDrive.driveId}"
return getRealmInstance(userDrive).use { realm ->
realm.run {
where(File::class.java)
.equalTo(File::uid.name, uid)
.findFirst()
?.let { realm.copyFromRealm(it, 1) }
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/infomaniak/drive/ui/menu/SharedWithMeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class SharedWithMeFragment : FileSubTypeListFragment() {
}

override fun previewFile(fileId: Int) {
FileController.getFileById(fileId, userDrive)?.let { file ->
FileController.getFileByUidOrId(fileId, userDrive)?.let { file ->
openFileOrFolder(file)
fileListViewModel.isPreviewManaged = true
}
Expand All @@ -146,7 +146,8 @@ class SharedWithMeFragment : FileSubTypeListFragment() {
}

private fun canShowButton(): Boolean {
val currentFolderRights = FileController.getFileById(folderId, userDrive)?.rights ?: Rights()
val currentFolderRights = FileController.getFileByUidOrId(folderId, userDrive)?.rights ?: Rights()

val isFromExternalOrCurrentDrive = navigationArgs.fromSaveExternal || userDrive?.driveId == AccountUtils.currentDriveId
return folderId != selectFolderViewModel.disableSelectedFolderId
&& (currentFolderRights.canMoveInto || currentFolderRights.canCreateFile)
Expand Down
Loading