Skip to content

GetCapabilitiesRemoteOperation now returns OCCapability #1818

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

GetCapabilitiesRemoteOperation now returns OCCapability #1818

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
3 changes: 1 addition & 2 deletions ...java/com/nextcloud/android/lib/resources/groupfolders/GetGroupfoldersRemoteOperationIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ package com.nextcloud.android.lib.resources.groupfolders

import com.owncloud.android.AbstractIT
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
import com.owncloud.android.lib.resources.status.OCCapability
import org.junit.Assert.assertEquals
import org.junit.Assume.assumeTrue
import org.junit.Test

class GetGroupfoldersRemoteOperationIT : AbstractIT() {
@Test
fun getGroupfolders() {
val capability = GetCapabilitiesRemoteOperation().execute(client).singleData as OCCapability
val capability = GetCapabilitiesRemoteOperation().execute(client).resultData

assumeTrue(capability.groupfolders.isTrue)

Expand Down
6 changes: 1 addition & 5 deletions ...dTest/java/com/nextcloud/android/lib/resources/search/SearchProvidersRemoteOperationIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ package com.nextcloud.android.lib.resources.search

import com.owncloud.android.AbstractIT
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
import com.owncloud.android.lib.resources.status.OCCapability
import com.owncloud.android.lib.resources.status.OwnCloudVersion
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
Expand Down Expand Up @@ -38,10 +37,7 @@ class SearchProvidersRemoteOperationIT : AbstractIT() {
@Test
fun getSearchProvidersOnOldServer() {
// only on < NC20
val ocCapability =
GetCapabilitiesRemoteOperation()
.execute(nextcloudClient)
.singleData as OCCapability
val ocCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData
assumeTrue(
ocCapability.version.isOlderThan(OwnCloudVersion.nextcloud_20)
)
Expand Down
4 changes: 1 addition & 3 deletions library/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 @@ -344,9 +344,7 @@ protected void longSleep() {
}

protected void testOnlyOnServer(OwnCloudVersion version) {
OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
.execute(nextcloudClient)
.getSingleData();
OCCapability ocCapability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData();
assumeTrue(ocCapability.getVersion().isNewerOrEqual(version));
}
}
3 changes: 1 addition & 2 deletions library/src/androidTest/java/com/owncloud/android/FileIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ public void testShareToGroupSharees() {
ShareeUser sharee = new ShareeUser("users", "", ShareType.GROUP);

// only on NC26+
OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
.execute(nextcloudClient).getSingleData();
OCCapability ocCapability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData();
if (ocCapability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_26)) {
sharee.setDisplayName("users");
}
Expand Down
38 changes: 18 additions & 20 deletions library/src/androidTest/java/com/owncloud/android/GetCapabilitiesRemoteOperationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,27 @@ public class GetCapabilitiesRemoteOperationIT extends AbstractIT {
@Test
public void testGetRemoteCapabilitiesOperation() {
// get capabilities
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(client);
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(client);
assertTrue(result.isSuccess());
assertTrue(result.getData() != null && result.getData().size() == 1);
assertNotNull(result.getResultData());

OCCapability capability = (OCCapability) result.getData().get(0);
checkCapability(capability, client.getUserId());
checkCapability(result.getResultData(), client.getUserId());
}

@Test
public void testGetRemoteCapabilitiesOperationEtag() {
// get capabilities
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(client);
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(client);
assertTrue(result.isSuccess());
assertTrue(result.getData() != null && result.getData().size() == 1);
assertNotNull(result.getResultData());

OCCapability capability = (OCCapability) result.getData().get(0);
OCCapability capability = result.getResultData();

RemoteOperationResult resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(client);
RemoteOperationResult<OCCapability> resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(client);
assertTrue(resultEtag.isSuccess());
assertTrue(resultEtag.getData() != null && resultEtag.getData().size() == 1);
assertNotNull(result.getResultData());

OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0);
OCCapability sameCapability = resultEtag.getResultData();

if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) {
assertEquals(capability, sameCapability);
Expand All @@ -74,28 +73,27 @@ public void testGetRemoteCapabilitiesOperationEtag() {
@Test
public void testGetRemoteCapabilitiesOperationWithNextcloudClient() {
// get capabilities
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
assertTrue(result.isSuccess());
assertTrue(result.getData() != null && result.getData().size() == 1);
assertNotNull(result.getResultData());

OCCapability capability = (OCCapability) result.getData().get(0);
checkCapability(capability, client.getUserId());
checkCapability(result.getResultData(), client.getUserId());
}

@Test
public void testGetRemoteCapabilitiesOperationEtagWithNextcloudClient() {
// get capabilities
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
assertTrue(result.isSuccess());
assertTrue(result.getData() != null && result.getData().size() == 1);
assertNotNull(result.getResultData());

OCCapability capability = (OCCapability) result.getData().get(0);
OCCapability capability = result.getResultData();

RemoteOperationResult resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(nextcloudClient);
RemoteOperationResult<OCCapability> resultEtag = new GetCapabilitiesRemoteOperation(capability).execute(nextcloudClient);
assertTrue(resultEtag.isSuccess());
assertTrue(resultEtag.getData() != null && resultEtag.getData().size() == 1);
assertNotNull(result.getResultData());

OCCapability sameCapability = (OCCapability) resultEtag.getData().get(0);
OCCapability sameCapability = resultEtag.getResultData();

if (capability.getVersion().isNewerOrEqual(OwnCloudVersion.nextcloud_19)) {
assertEquals(capability, sameCapability);
Expand Down
3 changes: 1 addition & 2 deletions library/src/androidTest/java/com/owncloud/android/lib/common/operations/GetUserQuotaIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ public void testGetUserQuota() {

assertNotNull(quota);

OCCapability capability = (OCCapability) new GetCapabilitiesRemoteOperation()
.execute(nextcloudClient).getSingleData();
OCCapability capability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData();

if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_31)) {
assertEquals(SPACE_UNLIMITED, quota.getFree());
Expand Down
3 changes: 1 addition & 2 deletions ...ary/src/androidTest/java/com/owncloud/android/lib/resources/files/FilesDownloadLimitIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ class FilesDownloadLimitIT : AbstractIT() {
}
}

private fun getCapability(): OCCapability =
GetCapabilitiesRemoteOperation().execute(nextcloudClient).singleData as OCCapability
private fun getCapability(): OCCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData

private fun createTestFile(): Boolean {
val localPath = createFile("test")
Expand Down
6 changes: 1 addition & 5 deletions ...rc/androidTest/java/com/owncloud/android/lib/resources/files/ReadFileRemoteOperationIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import com.owncloud.android.lib.resources.files.model.ImageDimension
import com.owncloud.android.lib.resources.files.model.RemoteFile
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
import com.owncloud.android.lib.resources.status.NextcloudVersion
import com.owncloud.android.lib.resources.status.OCCapability
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
Expand Down Expand Up @@ -119,10 +118,7 @@ class ReadFileRemoteOperationIT : AbstractIT() {

testOnlyOnServer(NextcloudVersion.nextcloud_27)

val ocCapability =
GetCapabilitiesRemoteOperation()
.execute(nextcloudClient)
.singleData as OCCapability
val ocCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData

if (ocCapability.version.majorVersionNumber == NextcloudVersion.nextcloud_27.majorVersionNumber) {
@Suppress("Detekt.MagicNumber")
Expand Down
6 changes: 1 addition & 5 deletions ...idTest/java/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperationIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import com.owncloud.android.AbstractIT
import com.owncloud.android.lib.resources.files.model.RemoteFile
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
import com.owncloud.android.lib.resources.status.NextcloudVersion
import com.owncloud.android.lib.resources.status.OCCapability
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
Expand Down Expand Up @@ -41,10 +40,7 @@ class ReadFileVersionsRemoteOperationIT : AbstractIT() {
assertTrue(sutResult.isSuccess)

var versionCount = 0
val ocCapability =
GetCapabilitiesRemoteOperation()
.execute(nextcloudClient)
.singleData as OCCapability
val ocCapability = GetCapabilitiesRemoteOperation().execute(nextcloudClient).resultData
if (ocCapability.version.isNewerOrEqual(NextcloudVersion.nextcloud_26)) {
// with NC26+ we always have a starting version
versionCount++
Expand Down
4 changes: 1 addition & 3 deletions ...rc/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ public class SearchRemoteOperationIT extends AbstractIT {

@BeforeClass
public static void beforeClass() {
capability = (OCCapability) new GetCapabilitiesRemoteOperation(null)
.execute(client)
.getSingleData();
capability = new GetCapabilitiesRemoteOperation(null).execute(client).getResultData();
}

@Test
Expand Down
3 changes: 1 addition & 2 deletions ...ndroidTest/java/com/owncloud/android/lib/resources/shares/GetSharesRemoteOperationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,7 @@ public void noFavorite() {
@Test
public void favorite() {
// only on NC25+
OCCapability ocCapability = (OCCapability) new GetCapabilitiesRemoteOperation()
.execute(nextcloudClient).getSingleData();
OCCapability ocCapability = new GetCapabilitiesRemoteOperation().execute(nextcloudClient).getResultData();
assumeTrue(ocCapability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_25));

String path = "/shareToAdminFavorite/";
Expand Down
3 changes: 1 addition & 2 deletions ...ndroidTest/java/com/owncloud/android/lib/resources/shares/UpdateShareRemoteOperationIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation
import com.owncloud.android.lib.resources.files.RemoveFileRemoteOperation
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation
import com.owncloud.android.lib.resources.status.NextcloudVersion
import com.owncloud.android.lib.resources.status.OCCapability
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
Expand Down Expand Up @@ -187,7 +186,7 @@ class UpdateShareRemoteOperationIT : AbstractIT() {

val capabilityResult = GetCapabilitiesRemoteOperation().execute(nextcloudClient)
assertTrue(capabilityResult.isSuccess)
val capability = capabilityResult.singleData as OCCapability
val capability = capabilityResult.resultData

when {
capability.version.isNewerOrEqual(NextcloudVersion.nextcloud_22) -> {
Expand Down
4 changes: 2 additions & 2 deletions ...droidTest/java/com/owncloud/android/lib/resources/users/SetUserInfoRemoteOperationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ public void testSetDisplayName() {

@Test
public void testSetPhone() {
RemoteOperationResult result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
RemoteOperationResult<OCCapability> result = new GetCapabilitiesRemoteOperation().execute(nextcloudClient);
assertTrue(result.isSuccess());
OCCapability ocCapability = (OCCapability) result.getSingleData();
OCCapability ocCapability = result.getResultData();

RemoteOperationResult<UserInfo> userInfo = new GetUserInfoRemoteOperation().execute(nextcloudClient);
assertTrue(userInfo.isSuccess());
Expand Down
5 changes: 2 additions & 3 deletions library/src/main/java/com/owncloud/android/lib/common/accounts/ExternalLinksOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ protected RemoteOperationResult run(OwnCloudClient client) {

try {
// check capabilities
RemoteOperation getCapabilities = new GetCapabilitiesRemoteOperation();
RemoteOperationResult capabilitiesResult = getCapabilities.execute(client);
OCCapability capability = (OCCapability) capabilitiesResult.getData().get(0);
RemoteOperationResult<OCCapability> getCapabilities = new GetCapabilitiesRemoteOperation().execute(client);
OCCapability capability = getCapabilities.getResultData();

if (capability.getExternalLinks().isTrue()) {

Expand Down
36 changes: 16 additions & 20 deletions ...c/main/java/com/owncloud/android/lib/resources/status/GetCapabilitiesRemoteOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*
* Save in Result.getData in a OCCapability object
*/
public class GetCapabilitiesRemoteOperation extends RemoteOperation {
public class GetCapabilitiesRemoteOperation extends RemoteOperation<OCCapability> {

private static final String TAG = GetCapabilitiesRemoteOperation.class.getSimpleName();

Expand Down Expand Up @@ -189,8 +189,8 @@ public GetCapabilitiesRemoteOperation(OCCapability currentCapability) {
}

@Override
public RemoteOperationResult run(NextcloudClient client) {
RemoteOperationResult result;
public RemoteOperationResult<OCCapability> run(NextcloudClient client) {
RemoteOperationResult<OCCapability> result;
int status;
GetMethod get = null;

Expand All @@ -212,7 +212,7 @@ public RemoteOperationResult run(NextcloudClient client) {
if (isNotModified(status)) {
Log_OC.d(TAG, "Capabilities not modified");

result = new RemoteOperationResult(true, get);
result = new RemoteOperationResult<>(true, get);
result.setSingleData(currentCapability);

Log_OC.d(TAG, "*** Get Capabilities completed ");
Expand All @@ -228,20 +228,16 @@ public RemoteOperationResult run(NextcloudClient client) {
}

// Result
result = new RemoteOperationResult(true, get);
result.setSingleData(capability);
result = new RemoteOperationResult<>(true, get);
result.setResultData(capability);
} else {
result = new RemoteOperationResult(false, get);
result = new RemoteOperationResult<>(false, get);
String response = get.getResponseBodyAsString();
Log_OC.e(TAG, "Failed response while getting capabilities from the server ");
if (response != null) {
Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
} else {
Log_OC.e(TAG, "*** status code: " + status);
}
Log_OC.e(TAG, "*** status code: " + status + "; response message: " + response);
}
} catch (JSONException | IOException e) {
result = new RemoteOperationResult(e);
result = new RemoteOperationResult<>(e);
Log_OC.e(TAG, "Exception while getting capabilities", e);

} finally {
Expand All @@ -253,8 +249,8 @@ public RemoteOperationResult run(NextcloudClient client) {
}

@Override
protected RemoteOperationResult run(OwnCloudClient client) {
RemoteOperationResult result;
protected RemoteOperationResult<OCCapability> run(OwnCloudClient client) {
RemoteOperationResult<OCCapability> result;
int status;
org.apache.commons.httpclient.methods.GetMethod get = null;

Expand All @@ -277,7 +273,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
if (isNotModified(status)) {
Log_OC.d(TAG, "Capabilities not modified");

result = new RemoteOperationResult(true, get);
result = new RemoteOperationResult<>(true, get);
result.setSingleData(currentCapability);

Log_OC.d(TAG, "*** Get Capabilities completed ");
Expand All @@ -293,10 +289,10 @@ protected RemoteOperationResult run(OwnCloudClient client) {
}

// Result
result = new RemoteOperationResult(true, get);
result.setSingleData(capability);
result = new RemoteOperationResult<>(true, get);
result.setResultData(capability);
} else {
result = new RemoteOperationResult(false, get);
result = new RemoteOperationResult<>(false, get);
String response = get.getResponseBodyAsString();
Log_OC.e(TAG, "Failed response while getting capabilities from the server ");
if (response != null) {
Expand All @@ -306,7 +302,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
}
}
} catch (JSONException | IOException e) {
result = new RemoteOperationResult(e);
result = new RemoteOperationResult<>(e);
Log_OC.e(TAG, "Exception while getting capabilities", e);

} finally {
Expand Down
Loading