Skip to content

Commit 29e9e98

Browse files
GetCapabilitiesRemoteOperation now returns OCCapability
Signed-off-by: tobiasKaminsky <[email protected]>
1 parent 55c5b59 commit 29e9e98

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

app/src/androidTest/java/com/owncloud/android/AbstractIT.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,7 @@ protected void testOnlyOnServer(OwnCloudVersion version) throws AccountUtils.Acc
208208
protected OCCapability getCapability() throws AccountUtils.AccountNotFoundException {
209209
NextcloudClient client = OwnCloudClientFactory.createNextcloudClient(user, targetContext);
210210

211-
OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
212-
.execute(client)
213-
.getSingleData();
214-
215-
return ocCapability;
211+
return new GetCapabilitiesRemoteOperation().execute(client).getResultData();
216212
}
217213

218214
@Before

app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ public void before() {
5353

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

56-
capability = (OCCapability) new GetCapabilitiesRemoteOperation(null)
57-
.execute(client)
58-
.getSingleData();
56+
capability = new GetCapabilitiesRemoteOperation(null).execute(client).getResultData();
5957
}
6058

6159
@After

app/src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,11 @@ protected RemoteOperationResult run(OwnCloudClient client) {
3636
currentCapability = storageManager.getCapability(storageManager.getUser().getAccountName());
3737
}
3838

39-
RemoteOperationResult result = new GetCapabilitiesRemoteOperation(currentCapability).execute(client);
39+
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation(currentCapability).execute(client);
4040

41-
if (result.isSuccess()
42-
&& result.getData() != null && result.getData().size() > 0) {
41+
if (result.isSuccess() && result.getResultData() != null) {
4342
// Read data from the result
44-
OCCapability capability = (OCCapability) result.getData().get(0);
43+
OCCapability capability = result.getResultData();
4544

4645
// Save the capabilities into database
4746
storageManager.saveCapabilities(capability);

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
androidCommonLibraryVersion = "0.31.0"
66
androidGifDrawableVersion = "1.2.30"
77
androidImageCropperVersion = "4.7.0"
8-
androidLibraryVersion = "b711becb0fe4fa3b09a0ea83a498579310cc8e69"
8+
androidLibraryVersion = "2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d"
99
androidPluginVersion = '8.13.2'
1010
androidsvgVersion = "1.4"
1111
androidxMediaVersion = "1.5.1"

gradle/verification-metadata.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19643,6 +19643,17 @@
1964319643
<sha256 value="4202f3716e02182d759b714b31d5c5af86a60a508477fd1e0e77b446f7fc23e1" origin="Generated by Gradle" reason="Artifact is not signed"/>
1964419644
</artifact>
1964519645
</component>
19646+
<component group="com.github.nextcloud" name="android-library"
19647+
version="2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d">
19648+
<artifact name="android-library-2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d.aar">
19649+
<sha256 value="8a73f0d2541389aaa4e028b20df6ba25df7d047bcf17a5997f7708f3732fb71f"
19650+
origin="Generated by Gradle" reason="Artifact is not signed" />
19651+
</artifact>
19652+
<artifact name="android-library-2ce13c93e8a5ca7bbe5a7e6f9d237fb3fd5a8f2d.module">
19653+
<sha256 value="64c0a81478419117abdd523e15f39458a1a046d2ed4e32ebc0fefe222336c7a0"
19654+
origin="Generated by Gradle" reason="Artifact is not signed" />
19655+
</artifact>
19656+
</component>
1964619657
<component group="com.github.nextcloud" name="android-library" version="2d47aa4a368b49465320c16609ad4427dd64ca86">
1964719658
<artifact name="android-library-2d47aa4a368b49465320c16609ad4427dd64ca86.aar">
1964819659
<sha256 value="d772821c93ced5f256dfc150f90bac38358ea037fa90ac80614cfd089c3996e6" origin="Generated by Gradle" reason="Artifact is not signed"/>

0 commit comments

Comments
 (0)