Skip to content

GetCapabilitiesRemoteOperation now returns OCCapability #15512

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
tobiasKaminsky merged 1 commit into from
Jan 12, 2026
+28 −13
Merged

GetCapabilitiesRemoteOperation now returns OCCapability #15512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions app/src/androidTest/java/com/owncloud/android/AbstractIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,7 @@ protected void testOnlyOnServer(OwnCloudVersion version) throws AccountUtils.Acc
protected OCCapability getCapability() throws AccountUtils.AccountNotFoundException {
NextcloudClient client = OwnCloudClientFactory.createNextcloudClient(user, targetContext);

OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
.execute(client)
.getSingleData();

return ocCapability;
return new GetCapabilitiesRemoteOperation().execute(client).getResultData();
}

@Before
Expand Down
4 changes: 1 addition & 3 deletions app/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 @@ -53,9 +53,7 @@ public void before() {

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

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

@After
Expand Down
7 changes: 3 additions & 4 deletions app/src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@ protected RemoteOperationResult run(OwnCloudClient client) {
currentCapability = storageManager.getCapability(storageManager.getUser().getAccountName());
}

RemoteOperationResult result = new GetCapabilitiesRemoteOperation(currentCapability).execute(client);
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation(currentCapability).execute(client);

if (result.isSuccess()
&& result.getData() != null && result.getData().size() > 0) {
if (result.isSuccess() && result.getResultData() != null) {
// Read data from the result
OCCapability capability = (OCCapability) result.getData().get(0);
OCCapability capability = result.getResultData();

// Save the capabilities into database
storageManager.saveCapabilities(capability);
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
androidCommonLibraryVersion = "0.31.0"
androidGifDrawableVersion = "1.2.30"
androidImageCropperVersion = "4.7.0"
androidLibraryVersion ="795e952c01d6cb37c8bf2efd86b2a716a2ea2985"
androidLibraryVersion = "498d2b9dc8fb1e626f6a7c5cbe548556633adf1d"
androidPluginVersion = '8.13.2'
androidsvgVersion = "1.4"
androidxMediaVersion = "1.5.1"
Expand Down
22 changes: 22 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19643,6 +19643,17 @@
<sha256 value="4202f3716e02182d759b714b31d5c5af86a60a508477fd1e0e77b446f7fc23e1" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library"
version="2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d">
<artifact name="android-library-2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d.aar">
<sha256 value="8a73f0d2541389aaa4e028b20df6ba25df7d047bcf17a5997f7708f3732fb71f"
origin="Generated by Gradle" reason="Artifact is not signed" />
</artifact>
<artifact name="android-library-2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d.module">
<sha256 value="64c0a81478419117abdd523e15f39458a1a046d2ed4e32ebc0fefe222336c7a0"
origin="Generated by Gradle" reason="Artifact is not signed" />
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="2d47aa4a368b49465320c16609ad4427dd64ca86">
<artifact name="android-library-2d47aa4a368b49465320c16609ad4427dd64ca86.aar">
<sha256 value="d772821c93ced5f256dfc150f90bac38358ea037fa90ac80614cfd089c3996e6" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -19762,6 +19773,17 @@
<artifact name="android-library-4534a8cb6d6f0b0aa3f3c0a1165d9887cd2d44da.module">
<sha256 value="032d70024dcf9acfa3695eaf085a8823da98953e49d0ca670c52002f53e454d3" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library"
version="498d2b9dc8fb1e626f6a7c5cbe548556633adf1d">
<artifact name="android-library-498d2b9dc8fb1e626f6a7c5cbe548556633adf1d.aar">
<sha256 value="e8daea0e3aa8f20e8dd03d54b4dc27dbbd068ba8c2ad59ba8ebfe740ba9a2df9"
origin="Generated by Gradle" reason="Artifact is not signed" />
</artifact>
<artifact name="android-library-498d2b9dc8fb1e626f6a7c5cbe548556633adf1d.module">
<sha256 value="7be737376e7d9075bc0841fae0efac938101574c377c1620dd2fb9c211b361d3"
origin="Generated by Gradle" reason="Artifact is not signed" />
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="4a8c04815faa818380e019a227e2d80df86ef187">
<artifact name="android-library-4a8c04815faa818380e019a227e2d80df86ef187.aar">
Expand Down
Loading