Visitar URL original
fix: refresh share badges when folder etag is unchanged by mvanhorn · Pull Request #5013 · owncloud/android · GitHub
Skip to content

fix: refresh share badges when folder etag is unchanged #5013

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

Open
mvanhorn wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix: refresh share badges when folder etag is unchanged #5013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
074df83
fix: refresh share badges when folder etag is unchanged
mvanhorn Oct 22, 2026
c360166
test: add test for refreshFolder when only share metadata changes
mvanhorn Oct 22, 2026
72c0a3c
chore: add calens file
mvanhorn Oct 22, 2026
2cd2b3b
fix: remove redundant comment above shareMetadataChanged check
mvanhorn Oct 30, 2026
946f942
test: rename share metadata refreshFolder test to match naming conven…
mvanhorn Oct 30, 2026
7112e1c
test: cover sharedWithSharee and permissions changes in refreshFolder
mvanhorn Oct 30, 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
7 changes: 7 additions & 0 deletions changelog/unreleased/5013
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Bugfix: Refresh share badges when the folder etag is unchanged

Share badges have been refreshed on pull-to-refresh when a file or folder is shared or unshared
but the server keeps the same etag for it.

https://github.com/owncloud/android/issues/4938
https://github.com/owncloud/android/pull/5013
8 changes: 7 additions & 1 deletion owncloudData/src/main/java/com/owncloud/android/data/files/repository/OCFileRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,8 @@ class OCFileRepository(
})
} else if (localChildToSync.etag != remoteChild.etag ||
localChildToSync.localModificationTimestamp > remoteChild.lastSyncDateForData!! ||
isActionSetFolderAvailableOfflineOrSynchronize
isActionSetFolderAvailableOfflineOrSynchronize ||
shareMetadataChanged(localChildToSync, remoteChild)
) {
// File exists in the database, we need to check several stuff.
folderContentUpdated.add(
Expand Down Expand Up @@ -609,6 +610,11 @@ class OCFileRepository(
deleteOrResetFileFromDatabase(ocFile, onlyFromLocalStorage)
}

private fun shareMetadataChanged(localChild: OCFile, remoteChild: OCFile): Boolean =
localChild.sharedByLink != remoteChild.sharedByLink ||
(localChild.sharedWithSharee == true) != (remoteChild.sharedWithSharee == true) ||
localChild.permissions != remoteChild.permissions

private fun deleteOrResetFileFromDatabase(ocFile: OCFile, onlyFromLocalStorage: Boolean) {
if (onlyFromLocalStorage) {
localFileDataSource.saveFile(ocFile.copy(storagePath = null, etagInConflict = null, lastUsage = null, etag = null))
Expand Down
195 changes: 195 additions & 0 deletions ...loudData/src/test/java/com/owncloud/android/data/files/repository/OCFileRepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,6 +1685,201 @@ class OCFileRepositoryTest {
}
}

@Suppress("MaxLineLength")
@Test
fun `refreshFolder returns a list with the OCFile that changed when the etag matches but sharedByLink changed`() {
val ocParentFolderWithoutSpaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.copy(spaceId = null)
val remoteFolderChild = OC_FOLDER_WITH_SPACE_ID.copy(spaceId = null, sharedByLink = true)
val expectedFolderChild = OC_FOLDER_WITH_SPACE_ID.copy(sharedByLink = true)
every {
remoteFileDataSource.refreshFolder(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
accountName = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceWebDavUrl = OC_SPACE_PERSONAL.root.webDavUrl
)
} returns listOf(ocParentFolderWithoutSpaceId, remoteFolderChild)
every {
localFileDataSource.getFileByRemotePath(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
owner = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId
)
} returns OC_PARENT_FOLDER_WITH_SPACE_ID
every {
localFileDataSource.getFolderContent(
folderId = OC_PARENT_FOLDER_WITH_SPACE_ID.id!!
)
} returns listOf(OC_FOLDER_WITH_SPACE_ID)
every {
localFileDataSource.saveFilesInFolderAndReturnTheFilesThatChanged(
listOfFiles = listOf(expectedFolderChild),
folder = OC_PARENT_FOLDER_WITH_SPACE_ID,
)
} returns listOf(expectedFolderChild)

val listOfFiles = ocFileRepository.refreshFolder(
OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId,
false
)
assertEquals(listOf(expectedFolderChild), listOfFiles)

verify(exactly = 1) {
localSpacesDataSource.getWebDavUrlForSpace(
spaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId,
accountName = OC_PARENT_FOLDER_WITH_SPACE_ID.owner
)
remoteFileDataSource.refreshFolder(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
accountName = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceWebDavUrl = OC_SPACE_PERSONAL.root.webDavUrl
)
localFileDataSource.getFileByRemotePath(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
owner = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId
)
localFileDataSource.getFolderContent(
folderId = OC_PARENT_FOLDER_WITH_SPACE_ID.id!!
)
localFileDataSource.saveFilesInFolderAndReturnTheFilesThatChanged(
listOfFiles = listOf(expectedFolderChild),
folder = OC_PARENT_FOLDER_WITH_SPACE_ID,
)
}
}

@Suppress("MaxLineLength")
@Test
fun `refreshFolder returns a list with the OCFile that changed when the etag matches but sharedWithSharee changed`() {
val ocParentFolderWithoutSpaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.copy(spaceId = null)
val remoteFolderChild = OC_FOLDER_WITH_SPACE_ID.copy(spaceId = null, sharedWithSharee = true)
val expectedFolderChild = OC_FOLDER_WITH_SPACE_ID.copy(sharedWithSharee = true)
every {
remoteFileDataSource.refreshFolder(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
accountName = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceWebDavUrl = OC_SPACE_PERSONAL.root.webDavUrl
)
} returns listOf(ocParentFolderWithoutSpaceId, remoteFolderChild)
every {
localFileDataSource.getFileByRemotePath(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
owner = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId
)
} returns OC_PARENT_FOLDER_WITH_SPACE_ID
every {
localFileDataSource.getFolderContent(
folderId = OC_PARENT_FOLDER_WITH_SPACE_ID.id!!
)
} returns listOf(OC_FOLDER_WITH_SPACE_ID)
every {
localFileDataSource.saveFilesInFolderAndReturnTheFilesThatChanged(
listOfFiles = listOf(expectedFolderChild),
folder = OC_PARENT_FOLDER_WITH_SPACE_ID,
)
} returns listOf(expectedFolderChild)

val listOfFiles = ocFileRepository.refreshFolder(
OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId,
false
)
assertEquals(listOf(expectedFolderChild), listOfFiles)

verify(exactly = 1) {
localSpacesDataSource.getWebDavUrlForSpace(
spaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId,
accountName = OC_PARENT_FOLDER_WITH_SPACE_ID.owner
)
remoteFileDataSource.refreshFolder(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
accountName = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceWebDavUrl = OC_SPACE_PERSONAL.root.webDavUrl
)
localFileDataSource.getFileByRemotePath(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
owner = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId
)
localFileDataSource.getFolderContent(
folderId = OC_PARENT_FOLDER_WITH_SPACE_ID.id!!
)
localFileDataSource.saveFilesInFolderAndReturnTheFilesThatChanged(
listOfFiles = listOf(expectedFolderChild),
folder = OC_PARENT_FOLDER_WITH_SPACE_ID,
)
}
}

@Suppress("MaxLineLength")
@Test
fun `refreshFolder returns a list with the OCFile that changed when the etag matches but permissions changed`() {
val ocParentFolderWithoutSpaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.copy(spaceId = null)
val remoteFolderChild = OC_FOLDER_WITH_SPACE_ID.copy(spaceId = null, permissions = "RDNVCKW")
val expectedFolderChild = OC_FOLDER_WITH_SPACE_ID.copy(permissions = "RDNVCKW")
every {
remoteFileDataSource.refreshFolder(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
accountName = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceWebDavUrl = OC_SPACE_PERSONAL.root.webDavUrl
)
} returns listOf(ocParentFolderWithoutSpaceId, remoteFolderChild)
every {
localFileDataSource.getFileByRemotePath(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
owner = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId
)
} returns OC_PARENT_FOLDER_WITH_SPACE_ID
every {
localFileDataSource.getFolderContent(
folderId = OC_PARENT_FOLDER_WITH_SPACE_ID.id!!
)
} returns listOf(OC_FOLDER_WITH_SPACE_ID)
every {
localFileDataSource.saveFilesInFolderAndReturnTheFilesThatChanged(
listOfFiles = listOf(expectedFolderChild),
folder = OC_PARENT_FOLDER_WITH_SPACE_ID,
)
} returns listOf(expectedFolderChild)

val listOfFiles = ocFileRepository.refreshFolder(
OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId,
false
)
assertEquals(listOf(expectedFolderChild), listOfFiles)

verify(exactly = 1) {
localSpacesDataSource.getWebDavUrlForSpace(
spaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId,
accountName = OC_PARENT_FOLDER_WITH_SPACE_ID.owner
)
remoteFileDataSource.refreshFolder(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
accountName = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceWebDavUrl = OC_SPACE_PERSONAL.root.webDavUrl
)
localFileDataSource.getFileByRemotePath(
remotePath = OC_PARENT_FOLDER_WITH_SPACE_ID.remotePath,
owner = OC_PARENT_FOLDER_WITH_SPACE_ID.owner,
spaceId = OC_PARENT_FOLDER_WITH_SPACE_ID.spaceId
)
localFileDataSource.getFolderContent(
folderId = OC_PARENT_FOLDER_WITH_SPACE_ID.id!!
)
localFileDataSource.saveFilesInFolderAndReturnTheFilesThatChanged(
listOfFiles = listOf(expectedFolderChild),
folder = OC_PARENT_FOLDER_WITH_SPACE_ID,
)
}
}

@Suppress("MaxLineLength")
@Test
fun `refreshFolder returns an empty list of OCFiles when folder and its content already exists in database but there are additional files in conflict in local to be removed`() {
Expand Down