close
Skip to content

fix(search-operation): add missing fields #2012

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
alperozturk96 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix(search-operation): add missing fields #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a57de5b
Rename .java to .kt
alperozturk96 May 8, 2026
ea78f3c
fix(search-operation): add missing fields
alperozturk96 May 8, 2026
bb67a5a
wip
alperozturk96 May 8, 2026
6e92b93
wip
alperozturk96 May 21, 2026
6e993ac
wip
alperozturk96 May 21, 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 library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,8 @@ class WebdavEntry constructor(
const val SHAREES_SHARE_TYPE = "type"
const val PROPERTY_QUOTA_USED_BYTES = "quota-used-bytes"
const val PROPERTY_QUOTA_AVAILABLE_BYTES = "quota-available-bytes"
const val EXTENDED_PROPERTY_SHARE_TYPES = "share-types"
const val EXTENDED_PROPERTY_SHARE_ATTRIBUTES = "share-attributes"
private const val IS_ENCRYPTED = "1"
private const val CODE_PROP_NOT_FOUND = 404
}
Expand Down
91 changes: 91 additions & 0 deletions library/src/main/java/com/owncloud/android/lib/resources/files/NcSearchMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,34 @@
import javax.xml.parsers.ParserConfigurationException;

import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_IS_ENCRYPTED;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_NAME_LOCAL_ID;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_MOUNT_TYPE;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_OWNER_ID;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_OWNER_DISPLAY_NAME;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_UNREAD_COMMENTS;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_NOTE;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_SHAREES;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_SHARE_TYPES;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_SHARE_ATTRIBUTES;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_HIDDEN;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_RICH_WORKSPACE;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_SYSTEM_TAGS;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_CREATION_TIME;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_UPLOAD_TIME;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_METADATA_LIVE_PHOTO;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_FILE_DOWNLOAD_LIMITS;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_METADATA_PHOTOS_SIZE;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_METADATA_PHOTOS_GPS;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_METADATA_SIZE;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_METADATA_GPS;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_LOCK;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_LOCK_OWNER_TYPE;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_LOCK_OWNER;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_LOCK_OWNER_DISPLAY_NAME;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_LOCK_OWNER_EDITOR;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_LOCK_TIME;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_LOCK_TIMEOUT;
import static com.owncloud.android.lib.common.network.WebdavEntry.EXTENDED_PROPERTY_LOCK_TOKEN;
import static com.owncloud.android.lib.common.network.WebdavEntry.NAMESPACE_NC;
import static com.owncloud.android.lib.common.network.WebdavEntry.NAMESPACE_OC;

Expand Down Expand Up @@ -100,11 +128,41 @@ private Document createQuery(String searchQuery) {
Element quotaAvailableElement = query.createElementNS(DAV_NAMESPACE, "d:quota-available-bytes");
Element permissionsElement = query.createElementNS(NAMESPACE_OC, "oc:permissions");
Element remoteIdElement = query.createElementNS(NAMESPACE_OC, "oc:id");
Element localIdElement = query.createElementNS(NAMESPACE_OC, "oc:" + EXTENDED_PROPERTY_NAME_LOCAL_ID);
Element sizeElement = query.createElementNS(NAMESPACE_OC, "oc:size");
Element favoriteElement = query.createElementNS(NAMESPACE_OC, "oc:favorite");
Element previewElement = query.createElementNS(NAMESPACE_OC, "nc:has-preview");
Element encryptedElement = query.createElementNS(NAMESPACE_NC, EXTENDED_PROPERTY_IS_ENCRYPTED);

// Additional properties parsed by WebdavEntry
Element ownerIdElement = query.createElementNS(NAMESPACE_OC, "oc:" + EXTENDED_PROPERTY_OWNER_ID);
Comment thread
alperozturk96 marked this conversation as resolved.
Element ownerDisplayNameElement = query.createElementNS(NAMESPACE_OC, "oc:" + EXTENDED_PROPERTY_OWNER_DISPLAY_NAME);
Element unreadCommentsElement = query.createElementNS(NAMESPACE_OC, "oc:" + EXTENDED_PROPERTY_UNREAD_COMMENTS);
Element shareTypesElement = query.createElementNS(NAMESPACE_OC, "oc:" + EXTENDED_PROPERTY_SHARE_TYPES);
Element mountTypeElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_MOUNT_TYPE);
Element noteElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_NOTE);
Element shareesElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_SHAREES);
Element shareAttributesElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_SHARE_ATTRIBUTES);
Element hiddenElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_HIDDEN);
Element richWorkspaceElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_RICH_WORKSPACE);
Element systemTagsElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_SYSTEM_TAGS);
Element creationTimeElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_CREATION_TIME);
Element uploadTimeElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_UPLOAD_TIME);
Element livePhotoElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_METADATA_LIVE_PHOTO);
Element downloadLimitsElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_FILE_DOWNLOAD_LIMITS);
Element metaPhotosSizeElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_METADATA_PHOTOS_SIZE);
Element metaPhotosGpsElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_METADATA_PHOTOS_GPS);
Element metaSizeElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_METADATA_SIZE);
Element metaGpsElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_METADATA_GPS);
Element lockElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_LOCK);
Element lockOwnerTypeElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_LOCK_OWNER_TYPE);
Element lockOwnerElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_LOCK_OWNER);
Element lockOwnerDisplayNameElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_LOCK_OWNER_DISPLAY_NAME);
Element lockOwnerEditorElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_LOCK_OWNER_EDITOR);
Element lockTimeElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_LOCK_TIME);
Element lockTimeoutElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_LOCK_TIMEOUT);
Element lockTokenElement = query.createElementNS(NAMESPACE_NC, "nc:" + EXTENDED_PROPERTY_LOCK_TOKEN);

if (searchType != SearchRemoteOperation.SearchType.GALLERY_SEARCH) {
selectPropsElement.appendChild(displayNameElement);
selectPropsElement.appendChild(creationDate);
Expand All @@ -122,9 +180,42 @@ private Document createQuery(String searchQuery) {
selectPropsElement.appendChild(lastModifiedElement);
selectPropsElement.appendChild(etagElement);
selectPropsElement.appendChild(remoteIdElement);
selectPropsElement.appendChild(localIdElement);
selectPropsElement.appendChild(favoriteElement);
selectPropsElement.appendChild(permissionsElement);

// Common additional properties for all search types
selectPropsElement.appendChild(ownerIdElement);
selectPropsElement.appendChild(ownerDisplayNameElement);
selectPropsElement.appendChild(unreadCommentsElement);
selectPropsElement.appendChild(shareTypesElement);
selectPropsElement.appendChild(mountTypeElement);
selectPropsElement.appendChild(noteElement);
selectPropsElement.appendChild(shareesElement);
selectPropsElement.appendChild(shareAttributesElement);
selectPropsElement.appendChild(hiddenElement);
selectPropsElement.appendChild(richWorkspaceElement);
selectPropsElement.appendChild(systemTagsElement);
selectPropsElement.appendChild(creationTimeElement);
selectPropsElement.appendChild(uploadTimeElement);
selectPropsElement.appendChild(livePhotoElement);
selectPropsElement.appendChild(downloadLimitsElement);
selectPropsElement.appendChild(metaPhotosSizeElement);
selectPropsElement.appendChild(metaPhotosGpsElement);
selectPropsElement.appendChild(metaSizeElement);
selectPropsElement.appendChild(metaGpsElement);
selectPropsElement.appendChild(lockElement);
selectPropsElement.appendChild(lockOwnerTypeElement);
selectPropsElement.appendChild(lockOwnerElement);
selectPropsElement.appendChild(lockOwnerDisplayNameElement);
selectPropsElement.appendChild(lockOwnerEditorElement);
selectPropsElement.appendChild(lockTimeElement);
selectPropsElement.appendChild(lockTimeoutElement);
selectPropsElement.appendChild(lockTokenElement);
if (searchType != SearchRemoteOperation.SearchType.GALLERY_SEARCH) {
selectPropsElement.appendChild(previewElement);
}

Element fromElement = query.createElementNS(DAV_NAMESPACE, "d:from");
Element scopeElement = query.createElementNS(DAV_NAMESPACE, "d:scope");
Element hrefElement = query.createElementNS(DAV_NAMESPACE, "d:href");
Expand Down
153 changes: 0 additions & 153 deletions library/src/main/java/com/owncloud/android/lib/resources/files/SearchRemoteOperation.java
View file
Open in desktop

This file was deleted.

Loading
Loading