Skip to content

fix(oc-search-task): data consistency #17004

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
alperozturk96 wants to merge 3 commits into
base: master
Choose a base branch
from
+6 −5
Draft

fix(oc-search-task): data consistency #17004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7760491
fix(oc-search-task): data consistency
alperozturk96 May 6, 2026
247e0e1
fix(oc-search-task): data consistency
alperozturk96 May 6, 2026
9f5ac7b
fetch result from search directly
alperozturk96 May 8, 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: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ class OCFileListDelegate(
if (showShareAvatar) null else R.drawable.shared_via_users to R.string.shared_icon_shared
}

file.isSharedViaLink -> R.drawable.shared_via_link to R.string.shared_icon_shared_via_link
file.isShared || file.isSharedViaLink -> R.drawable.shared_via_link to R.string.shared_icon_shared_via_link

else -> R.drawable.ic_unshared to R.string.shared_icon_share
}
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@ class GallerySearchTask(
ocCapability: com.owncloud.android.lib.resources.status.OCCapability
): SearchRemoteOperation =
SearchRemoteOperation("", SearchRemoteOperation.SearchType.GALLERY_SEARCH, false, ocCapability).apply {
setLimit(limit)
setEndDate(endDate)
limit = this@GallerySearchTask.limit
endDate = this@GallerySearchTask.endDate

// workaround to keep SearchRemoteOperation functioning correctly even if we don't actively use startDate
setStartDate(0L)
startDate = 0L
}

private fun logSearchStart() {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -208,7 +208,7 @@ class OCFileListSearchTask(

for (obj in data) {
try {
val remoteFile = obj as? RemoteFile ?: continue
val remoteFile = (obj as? RemoteFile) ?: continue
var ocFile = FileStorageUtils.fillOCFile(remoteFile)
FileStorageUtils.searchForLocalFileInDefaultPath(ocFile, currentUser.accountName)
ocFile = storageManager.saveFileWithParent(ocFile, activity)
Expand Down
Loading