From e6937b4210513d74901f0cd4923bbf5d93b93e9b Mon Sep 17 00:00:00 2001 From: Juan Carlos Garrote Date: Mon, 15 May 2023 14:01:16 +0200 Subject: [PATCH] Removed publicUpload parameter from public shares creation and update requests --- .../resources/shares/CreateRemoteShareOperation.kt | 9 ++------- .../resources/shares/UpdateRemoteShareOperation.kt | 14 +------------- .../lib/resources/shares/services/ShareService.kt | 2 -- .../services/implementation/OCShareService.kt | 4 ---- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt index ed2b7417..fed12f83 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt @@ -89,8 +89,6 @@ class CreateRemoteShareOperation( var expirationDateInMillis: Long = INIT_EXPIRATION_DATE_IN_MILLIS // Expiration date to set for the public link - var publicUpload: Boolean = false // Upload permissions for the public link (only folders) - var retrieveShareDetails = false // To retrieve more info about the just created share private fun buildRequestUri(baseUri: Uri) = @@ -99,7 +97,7 @@ class CreateRemoteShareOperation( .appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT) .build() - private fun parseResponse(response: String): ShareResponse? { + private fun parseResponse(response: String): ShareResponse { val moshi = Moshi.Builder().build() val commonOcsType: Type = Types.newParameterizedType(CommonOcsResponse::class.java, ShareItem::class.java) val adapter: JsonAdapter> = moshi.adapter(commonOcsType) @@ -155,12 +153,10 @@ class CreateRemoteShareOperation( formBodyBuilder.add(PARAM_EXPIRATION_DATE, formattedExpirationDate) } - if (publicUpload) { - formBodyBuilder.add(PARAM_PUBLIC_UPLOAD, publicUpload.toString()) - } if (password.isNotEmpty()) { formBodyBuilder.add(PARAM_PASSWORD, password) } + if (RemoteShare.DEFAULT_PERMISSION != permissions) { formBodyBuilder.add(PARAM_PERMISSIONS, permissions.toString()) } @@ -207,7 +203,6 @@ class CreateRemoteShareOperation( private const val PARAM_SHARE_TYPE = "shareType" private const val PARAM_SHARE_WITH = "shareWith" private const val PARAM_PASSWORD = "password" - private const val PARAM_PUBLIC_UPLOAD = "publicUpload" private const val PARAM_PERMISSIONS = "permissions" //Arguments - constant values diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt index a6cc71e3..b9f814a2 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt @@ -103,13 +103,6 @@ class UpdateRemoteShareOperation */ var permissions: Int = DEFAULT_PERMISSION - /** - * Enable upload permissions to update in Share resource. - * - * Null results in no update applied to the upload permission. - */ - var publicUpload: Boolean? = null - var retrieveShareDetails = false // To retrieve more info about the just updated share private fun buildRequestUri(baseUri: Uri) = @@ -119,7 +112,7 @@ class UpdateRemoteShareOperation .appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT) .build() - private fun parseResponse(response: String): ShareResponse? { + private fun parseResponse(response: String): ShareResponse { val moshi = Moshi.Builder().build() val commonOcsType: Type = Types.newParameterizedType(CommonOcsResponse::class.java, ShareItem::class.java) val adapter: JsonAdapter> = moshi.adapter(commonOcsType) @@ -181,10 +174,6 @@ class UpdateRemoteShareOperation formBodyBuilder.add(PARAM_EXPIRATION_DATE, formattedExpirationDate) } // else, ignore - no update - if (publicUpload != null) { - formBodyBuilder.add(PARAM_PUBLIC_UPLOAD, publicUpload.toString()) - } - // IMPORTANT: permissions parameter needs to be updated after mPublicUpload parameter, // otherwise they would be set always as 1 (READ) in the server when mPublicUpload was updated if (permissions > DEFAULT_PERMISSION) { @@ -233,7 +222,6 @@ class UpdateRemoteShareOperation private const val PARAM_PASSWORD = "password" private const val PARAM_EXPIRATION_DATE = "expireDate" private const val PARAM_PERMISSIONS = "permissions" - private const val PARAM_PUBLIC_UPLOAD = "publicUpload" //Arguments - constant values private const val FORMAT_EXPIRATION_DATE = "yyyy-MM-dd" diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareService.kt index 7e77c62b..53458c59 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/ShareService.kt @@ -46,7 +46,6 @@ interface ShareService : Service { name: String, password: String, expirationDate: Long, - publicUpload: Boolean ): RemoteOperationResult fun updateShare( @@ -55,7 +54,6 @@ interface ShareService : Service { password: String?, expirationDate: Long, permissions: Int, - publicUpload: Boolean ): RemoteOperationResult fun deleteShare(remoteId: String): RemoteOperationResult diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareService.kt index 68a22654..96381b6a 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareService.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/services/implementation/OCShareService.kt @@ -55,7 +55,6 @@ class OCShareService(override val client: OwnCloudClient) : ShareService { name: String, password: String, expirationDate: Long, - publicUpload: Boolean ): RemoteOperationResult = CreateRemoteShareOperation( remoteFilePath, @@ -66,7 +65,6 @@ class OCShareService(override val client: OwnCloudClient) : ShareService { this.name = name this.password = password this.expirationDateInMillis = expirationDate - this.publicUpload = publicUpload this.retrieveShareDetails = true }.execute(client) @@ -76,7 +74,6 @@ class OCShareService(override val client: OwnCloudClient) : ShareService { password: String?, expirationDate: Long, permissions: Int, - publicUpload: Boolean ): RemoteOperationResult = UpdateRemoteShareOperation( remoteId @@ -85,7 +82,6 @@ class OCShareService(override val client: OwnCloudClient) : ShareService { this.password = password this.expirationDateInMillis = expirationDate this.permissions = permissions - this.publicUpload = publicUpload this.retrieveShareDetails = true }.execute(client)