Skip to content

Use capability in SearchRemoteOperation #9651

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

Merged
AlvaroBrey merged 2 commits into from
Jan 20, 2022
Merged

Use capability in SearchRemoteOperation #9651

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
a9cec44
Use capability in SearchRemoteOperation
tobiasKaminsky Jan 5, 2022
7d58967
Restore library version
AlvaroBrey Jan 20, 2022
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 ...st/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,7 @@ public void before() {
.getContentResolver()
.acquireContentProviderClient(ProviderMeta.ProviderTableMeta.CONTENT_URI)
);

super.before();
}
}
12 changes: 10 additions & 2 deletions src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;
import com.owncloud.android.lib.resources.files.model.RemoteFile;
import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation;
import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.operations.RefreshFolderOperation;
import com.owncloud.android.utils.FileStorageUtils;
Expand All @@ -57,6 +58,7 @@
abstract public class FileDataStorageManagerIT extends AbstractOnServerIT {

protected FileDataStorageManager sut;
private OCCapability capability;

@Before
public void before() {
Expand All @@ -65,6 +67,10 @@ public void before() {
sut.deleteVirtuals(VirtualFolderType.GALLERY);

assertEquals(0, sut.getAllFiles().size());

capability = (OCCapability) new GetCapabilitiesRemoteOperation(null)
.execute(client)
.getSingleData();
}

@After
Expand Down Expand Up @@ -168,7 +174,8 @@ public void testPhotoSearch() throws IOException {
// search
SearchRemoteOperation searchRemoteOperation = new SearchRemoteOperation("image/%",
PHOTO_SEARCH,
false);
false,
capability);

RemoteOperationResult<List<RemoteFile>> searchResult = searchRemoteOperation.execute(client);
TestCase.assertTrue(searchResult.isSuccess());
Expand Down Expand Up @@ -253,7 +260,8 @@ public void testGallerySearch() throws IOException {
// search
SearchRemoteOperation searchRemoteOperation = new SearchRemoteOperation("",
GALLERY_SEARCH,
false);
false,
capability);

RemoteOperationResult<List<RemoteFile>> searchResult = searchRemoteOperation.execute(client);
TestCase.assertTrue(searchResult.isSuccess());
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,10 @@ public FetchRemoteFileTask(User user,

@Override
protected String doInBackground(Void... voids) {


SearchRemoteOperation searchRemoteOperation = new SearchRemoteOperation(fileId,
FILE_ID_SEARCH,
false);
false,
fileDisplayActivity.getCapabilities());
RemoteOperationResult remoteOperationResult = searchRemoteOperation.execute(user.toPlatformAccount(),
fileDisplayActivity);

Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.owncloud.android.datamodel.VirtualFolderType;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.files.SearchRemoteOperation;
import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.ui.asynctasks.GallerySearchTask;
import com.owncloud.android.ui.events.ChangeMenuEvent;
import com.owncloud.android.ui.events.SearchEvent;
Expand Down Expand Up @@ -67,9 +68,13 @@ public void onCreate(Bundle savedInstanceState) {

searchEvent = new SearchEvent("", SearchRemoteOperation.SearchType.GALLERY_SEARCH);

OCCapability ocCapability = mContainerActivity.getStorageManager()
.getCapability(accountManager.getUser().getAccountName());

searchRemoteOperation = new SearchRemoteOperation(searchEvent.getSearchQuery(),
searchEvent.getSearchType(),
false);
false,
ocCapability);
}

@Override
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,8 +1515,13 @@ private void handleSearchEvent(SearchEvent event) {
searchOnlyFolders = true;
}

remoteOperation = new SearchRemoteOperation(event.getSearchQuery(), event.getSearchType(),
searchOnlyFolders);
OCCapability ocCapability = mContainerActivity.getStorageManager()
.getCapability(currentUser.getAccountName());

remoteOperation = new SearchRemoteOperation(event.getSearchQuery(),
event.getSearchType(),
searchOnlyFolders,
ocCapability);
} else {
remoteOperation = new GetSharesRemoteOperation();
}
Expand Down