Skip to content

Commit 91bbca9

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

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
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);

0 commit comments

Comments
 (0)