From defbfc8d0eb8dd0c1c8281caabda81e64625a13a Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Thu, 11 May 2017 09:57:47 +0200 Subject: [PATCH] Revert "Add support for capability to show optional warning about public shares" This reverts commit 6d0773cf34122a4a7fcf4f06da1a6fec7a64e32d. --- .../status/GetRemoteCapabilitiesOperation.java | 8 -------- .../android/lib/resources/status/OCCapability.java | 12 ------------ 2 files changed, 20 deletions(-) diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java index 5a9e9b26..43d76586 100644 --- a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java +++ b/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java @@ -98,7 +98,6 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation { private static final String PROPERTY_RESHARING = "resharing"; private static final String PROPERTY_OUTGOING = "outgoing"; private static final String PROPERTY_INCOMING = "incoming"; - private static final String PROPERTY_PRIVACY_WARNING = "privacy_warning"; private static final String PROPERTY_BIGFILECHUNKING = "bigfilechunking"; private static final String PROPERTY_UNDELETE = "undelete"; @@ -211,13 +210,6 @@ public class GetRemoteCapabilitiesOperation extends RemoteOperation { capability.setFilesSharingPublicMultiple(CapabilityBooleanType.fromBooleanValue( respPublic.getBoolean(PROPERTY_MULTIPLE))); } - if (respPublic.has(PROPERTY_PRIVACY_WARNING)) { - capability.setFilesSharingPublicDisplayPrivacyWarning( - CapabilityBooleanType.fromBooleanValue( - respPublic.getBoolean(PROPERTY_PRIVACY_WARNING) - ) - ); - } } if (respFilesSharing.has(NODE_USER)) { diff --git a/src/com/owncloud/android/lib/resources/status/OCCapability.java b/src/com/owncloud/android/lib/resources/status/OCCapability.java index 7437fbf6..be7827c1 100644 --- a/src/com/owncloud/android/lib/resources/status/OCCapability.java +++ b/src/com/owncloud/android/lib/resources/status/OCCapability.java @@ -67,7 +67,6 @@ public class OCCapability { private CapabilityBooleanType mFilesBigFileChuncking; private CapabilityBooleanType mFilesUndelete; private CapabilityBooleanType mFilesVersioning; - private CapabilityBooleanType mFilesSharingPublicDisplayPrivacyWarning; public OCCapability() { mId = 0; @@ -90,7 +89,6 @@ public class OCCapability { mFilesSharingPublicSendMail = CapabilityBooleanType.UNKNOWN; mFilesSharingPublicUpload = CapabilityBooleanType.UNKNOWN; mFilesSharingPublicMultiple = CapabilityBooleanType.UNKNOWN; - mFilesSharingPublicDisplayPrivacyWarning = CapabilityBooleanType.UNKNOWN; mFilesSharingUserSendMail = CapabilityBooleanType.UNKNOWN; mFilesSharingResharing = CapabilityBooleanType.UNKNOWN; mFilesSharingFederationOutgoing = CapabilityBooleanType.UNKNOWN; @@ -241,15 +239,6 @@ public class OCCapability { this.mFilesSharingPublicMultiple = filesSharingPublicMultiple; } - public CapabilityBooleanType getFilesSharingPublicDisplayPrivacyWarning() { - return mFilesSharingPublicDisplayPrivacyWarning; - } - - public void setFilesSharingPublicDisplayPrivacyWarning( - CapabilityBooleanType filesSharingPublicDisplayPrivacyWarning - ) { - mFilesSharingPublicDisplayPrivacyWarning = filesSharingPublicDisplayPrivacyWarning; - } public CapabilityBooleanType getFilesSharingUserSendMail() { return mFilesSharingUserSendMail; } @@ -305,5 +294,4 @@ public class OCCapability { public void setFilesVersioning(CapabilityBooleanType filesVersioning) { this.mFilesVersioning = filesVersioning; } - }