flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Added multiple share links to the capabilities

Browse Source
This commit is contained in:
davigonz 2017-05-03 13:56:05 +02:00 committed by David A. Velasco
parent e80b50d4de
commit 8ae4dd137d
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java
View File

@ -94,6 +94,7 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
private static final String PROPERTY_DAYS = "days"; private static final String PROPERTY_DAYS = "days";
private static final String PROPERTY_SEND_MAIL = "send_mail"; private static final String PROPERTY_SEND_MAIL = "send_mail";
private static final String PROPERTY_UPLOAD = "upload"; private static final String PROPERTY_UPLOAD = "upload";
private static final String PROPERTY_MULTIPLE = "multiple";
private static final String PROPERTY_RESHARING = "resharing"; private static final String PROPERTY_RESHARING = "resharing";
private static final String PROPERTY_OUTGOING = "outgoing"; private static final String PROPERTY_OUTGOING = "outgoing";
private static final String PROPERTY_INCOMING = "incoming"; private static final String PROPERTY_INCOMING = "incoming";
@ -205,6 +206,10 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation {
capability.setFilesSharingPublicUpload(CapabilityBooleanType.fromBooleanValue( capability.setFilesSharingPublicUpload(CapabilityBooleanType.fromBooleanValue(
respPublic.getBoolean(PROPERTY_UPLOAD))); respPublic.getBoolean(PROPERTY_UPLOAD)));
} }
if (respPublic.has(PROPERTY_MULTIPLE)) {
capability.setFilesSharingPublicMultiple(CapabilityBooleanType.fromBooleanValue(
respPublic.getBoolean(PROPERTY_MULTIPLE)));
}
} }
if (respFilesSharing.has(NODE_USER)) { if (respFilesSharing.has(NODE_USER)) {

18
src/com/owncloud/android/lib/resources/status/OCCapability.java
View File

@ -54,6 +54,7 @@ public class OCCapability {
private CapabilityBooleanType mFilesSharingPublicExpireDateEnforced; private CapabilityBooleanType mFilesSharingPublicExpireDateEnforced;
private CapabilityBooleanType mFilesSharingPublicSendMail; private CapabilityBooleanType mFilesSharingPublicSendMail;
private CapabilityBooleanType mFilesSharingPublicUpload; private CapabilityBooleanType mFilesSharingPublicUpload;
private CapabilityBooleanType mFilesSharingPublicMultiple;
private CapabilityBooleanType mFilesSharingUserSendMail; private CapabilityBooleanType mFilesSharingUserSendMail;
@ -67,7 +68,7 @@ public class OCCapability {
private CapabilityBooleanType mFilesUndelete; private CapabilityBooleanType mFilesUndelete;
private CapabilityBooleanType mFilesVersioning; private CapabilityBooleanType mFilesVersioning;
public OCCapability(){ public OCCapability() {
mId = 0; mId = 0;
mAccountName = ""; mAccountName = "";
@ -87,6 +88,7 @@ public class OCCapability {
mFilesSharingPublicExpireDateEnforced = CapabilityBooleanType.UNKNOWN; mFilesSharingPublicExpireDateEnforced = CapabilityBooleanType.UNKNOWN;
mFilesSharingPublicSendMail = CapabilityBooleanType.UNKNOWN; mFilesSharingPublicSendMail = CapabilityBooleanType.UNKNOWN;
mFilesSharingPublicUpload = CapabilityBooleanType.UNKNOWN; mFilesSharingPublicUpload = CapabilityBooleanType.UNKNOWN;
mFilesSharingPublicMultiple = CapabilityBooleanType.UNKNOWN;
mFilesSharingUserSendMail = CapabilityBooleanType.UNKNOWN; mFilesSharingUserSendMail = CapabilityBooleanType.UNKNOWN;
mFilesSharingResharing = CapabilityBooleanType.UNKNOWN; mFilesSharingResharing = CapabilityBooleanType.UNKNOWN;
mFilesSharingFederationOutgoing = CapabilityBooleanType.UNKNOWN; mFilesSharingFederationOutgoing = CapabilityBooleanType.UNKNOWN;
@ -229,6 +231,14 @@ public class OCCapability {
this.mFilesSharingPublicUpload = filesSharingPublicUpload; this.mFilesSharingPublicUpload = filesSharingPublicUpload;
} }
public CapabilityBooleanType getFilesSharingPublicMultiple() {
return mFilesSharingPublicMultiple;
}
public void setFilesSharingPublicMultiple(CapabilityBooleanType filesSharingPublicMultiple) {
this.mFilesSharingPublicMultiple = filesSharingPublicMultiple;
}
public CapabilityBooleanType getFilesSharingUserSendMail() { public CapabilityBooleanType getFilesSharingUserSendMail() {
return mFilesSharingUserSendMail; return mFilesSharingUserSendMail;
} }
@ -244,7 +254,7 @@ public class OCCapability {
public void setFilesSharingResharing(CapabilityBooleanType filesSharingResharing) { public void setFilesSharingResharing(CapabilityBooleanType filesSharingResharing) {
this.mFilesSharingResharing = filesSharingResharing; this.mFilesSharingResharing = filesSharingResharing;
} }
public CapabilityBooleanType getFilesSharingFederationOutgoing() { public CapabilityBooleanType getFilesSharingFederationOutgoing() {
return mFilesSharingFederationOutgoing; return mFilesSharingFederationOutgoing;
} }
@ -284,8 +294,4 @@ public class OCCapability {
public void setFilesVersioning(CapabilityBooleanType filesVersioning) { public void setFilesVersioning(CapabilityBooleanType filesVersioning) {
this.mFilesVersioning = filesVersioning; this.mFilesVersioning = filesVersioning;
} }
} }

6
src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java
View File

@ -48,6 +48,8 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
private static final int MINIMUM_VERSION_WITH_SESSION_MONITORING_WORKING_IN_PREEMPTIVE_MODE = 0x09010301; private static final int MINIMUM_VERSION_WITH_SESSION_MONITORING_WORKING_IN_PREEMPTIVE_MODE = 0x09010301;
// 9.1.3.1, final 9.1.3: https://github.com/owncloud/core/commit/f9a867b70c217463289a741d4d26079eb2a80dfd // 9.1.3.1, final 9.1.3: https://github.com/owncloud/core/commit/f9a867b70c217463289a741d4d26079eb2a80dfd
private static final int MINIMUM_VERSION_WITH_MULTIPLE_PUBLIC_SHARING = 0xA0000000;
private static final String INVALID_ZERO_VERSION = "0.0.0"; private static final String INVALID_ZERO_VERSION = "0.0.0";
private static final int MAX_DOTS = 3; private static final int MAX_DOTS = 3;
@ -193,4 +195,8 @@ public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
(mVersion >= MINIMUM_VERSION_WITH_SESSION_MONITORING_WORKING_IN_PREEMPTIVE_MODE) (mVersion >= MINIMUM_VERSION_WITH_SESSION_MONITORING_WORKING_IN_PREEMPTIVE_MODE)
); );
} }
public boolean isMultiplePublicSharingSupported() {
return (mVersion >= MINIMUM_VERSION_WITH_MULTIPLE_PUBLIC_SHARING);
}
} }