Skip to content

Fix sync data overwritten by remote OCFile #18048

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
daniele-verducci wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fix sync data overwritten by remote OCFile #18048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c77ebc
Fix sync data overwritten by remote OCFile
daniele-verducci Nov 13, 2026
a4ce43a
Fix sync data overwritten by remote OCFile also in Shared section
daniele-verducci Nov 13, 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
2 changes: 2 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListSearchTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,8 @@ class OCFileListSearchTask(
if (ocFile.fileId != -1L) return
val localFile = storageManager.getFileByLocalId(ocFile.localId) ?: return
ocFile.fileId = localFile.fileId
ocFile.internalFolderSyncTimestamp = localFile.internalFolderSyncTimestamp
ocFile.internalFolderSyncResult = localFile.internalFolderSyncResult
}

// region public methods
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/fragment/SharedListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ class SharedListFragment :
val file = FileStorageUtils.fillOCFile(remoteFile).apply {
fileId = partialFile.fileId
parentId = partialFile.parentId
internalFolderSyncTimestamp = partialFile.internalFolderSyncTimestamp
internalFolderSyncResult = partialFile.internalFolderSyncResult
}
FileStorageUtils.searchForLocalFileInDefaultPath(file, user.accountName)
UnifiedShareSharees.fill(user, listOf(file))
Expand Down
Loading