Skip to content

store subscription info #1858

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
+29 −7
Open

store subscription info #1858

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
17 changes: 10 additions & 7 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 @@ -9,6 +9,13 @@
*/
package com.owncloud.android;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.resources.status.CapabilityBooleanType;
import com.owncloud.android.lib.resources.status.E2EVersion;
Expand All @@ -19,13 +26,6 @@

import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

/**
* Class to test GetRemoteCapabilitiesOperation
*/
Expand Down Expand Up @@ -164,5 +164,8 @@ private void checkCapability(OCCapability capability, String userId) {
if (capability.getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_32)) {
assertTrue(capability.getUserStatusSupportsBusy().isTrue());
}

// support
assertTrue(capability.getHasValidSubscription().isFalse());
}
}
16 changes: 16 additions & 0 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 @@ -180,6 +180,10 @@ public class GetCapabilitiesRemoteOperation extends RemoteOperation {

private static final String PROPERTY_DEFAULT_PERMISSIONS = "default_permissions";

// support
private static final String NODE_SUPPORT = "support";
private static final String HAS_VALID_SUBSCRIPTION = "hasValidSubscription";

private OCCapability currentCapability = null;

public GetCapabilitiesRemoteOperation() {
Expand Down Expand Up @@ -805,6 +809,18 @@ private OCCapability parseResponse(String response) throws JSONException {
}
}

// support
if (respCapabilities.has(NODE_SUPPORT)) {
JSONObject supportCapability = respCapabilities.getJSONObject(NODE_SUPPORT);

if (supportCapability.getBoolean(HAS_VALID_SUBSCRIPTION)) {
capability.setHasValidSubscription(CapabilityBooleanType.TRUE);
} else {
capability.setHasValidSubscription(CapabilityBooleanType.FALSE);
}
} else {
capability.setHasValidSubscription(CapabilityBooleanType.FALSE);
}
}

Log_OC.d(TAG, "*** Get Capabilities completed ");
Expand Down
3 changes: 3 additions & 0 deletions library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ class OCCapability {

var defaultPermissions: Int? = null

// support
var hasValidSubscription = CapabilityBooleanType.UNKNOWN

val version: OwnCloudVersion
get() =
OwnCloudVersion(
Expand Down
Loading