From 48ee2639511ff506ab898417be31fb46a401bc54 Mon Sep 17 00:00:00 2001 From: abelgardep Date: Thu, 16 Jan 2020 17:08:54 +0100 Subject: [PATCH 1/5] First attempt to use Moshi to parse capabilities --- .../resources/response/CapabilityResponse.kt | 172 +++++++++++++ .../status/GetRemoteCapabilitiesOperation.kt | 237 ++++-------------- 2 files changed, 216 insertions(+), 193 deletions(-) create mode 100644 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt new file mode 100644 index 00000000..374cf96e --- /dev/null +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt @@ -0,0 +1,172 @@ +/* ownCloud Android Library is available under MIT license + * @author Abel García de Prada + * Copyright (C) 2020 ownCloud GmbH. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + */ +package com.owncloud.android.lib.resources.response + +import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = true) +data class CapabilityResponse( + @Json(name = NODE_SERVER_VERSION) + val serverVersion: ServerVersion, + @Json(name = NODE_CAPABILITIES) + val capabilities: Capabilities +) + +@JsonClass(generateAdapter = true) +data class Capabilities( + @Json(name = NODE_CORE) + val coreCapabilities: CoreCapabilities, + @Json(name = NODE_FILES_SHARING) + val fileSharingCapabilities: FileSharingCapabilities, + @Json(name = NODE_FILES) + val filesCapabilities: FilesCapabilities +) + +@JsonClass(generateAdapter = true) +data class CoreCapabilities( + @Json(name = PROPERTY_CORE_POLLINTERVAL) + val pollInterval: Int +) + +@JsonClass(generateAdapter = true) +data class FileSharingCapabilities( + @Json(name = PROPERTY_FILES_SHARING_API_ENABLED) + val fileSharingApiEnabled: Boolean, + @Json(name = PROPERTY_FILES_SHARING_SEARCH_MIN_LENGTH) + val fileSharingSearchMinLength: Int, + @Json(name = NODE_FILES_SHARING_PUBLIC) + val fileSharingPublic: FileSharingPublic, + @Json(name = PROPERTY_FILES_SHARING_RESHARING) + val fileSharingReSharing: Boolean, + @Json(name = NODE_FEDERATION) + val fileSharingFederation: FileSharingFederation +) + +@JsonClass(generateAdapter = true) +data class FileSharingPublic( + val enabled: Boolean, + @Json(name = PROPERTY_FILES_SHARING_PUBLIC_UPLOAD) + val fileSharingPublicUpload: Boolean, + @Json(name = PROPERTY_FILES_SHARING_PUBLIC_UPLOAD_ONLY) + val fileSharingPublicUploadOnly: Boolean, + @Json(name = PROPERTY_FILES_SHARING_PUBLIC_MULTIPLE) + val fileSharingPublicMultiple: Boolean, + @Json(name = NODE_PASSWORD) + val fileSharingPublicPassword: FileSharingPublicPassword, + @Json(name = NODE_EXPIRE_DATE) + val fileSharingPublicExpireDate: FileSharingPublicExpireDate +) + +@JsonClass(generateAdapter = true) +data class FileSharingPublicPassword( + val enforced: Boolean, + @Json(name = NODE_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED) + val enforcedFor: FileSharingPublicPasswordEnforced +) + +@JsonClass(generateAdapter = true) +data class FileSharingPublicPasswordEnforced( + @Json(name = PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_READ_ONLY) + val enforcedReadOnly: Boolean, + @Json(name = PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_READ_WRITE) + val enforcedReadWrite: Boolean, + @Json(name = PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_UPLOAD_ONLY) + val enforcedUploadOnly: Boolean +) + +@JsonClass(generateAdapter = true) +data class FileSharingPublicExpireDate( + val enabled: Boolean, + val days: Int?, + val enforced: Boolean? +) + +@JsonClass(generateAdapter = true) +data class FileSharingFederation( + val incoming: Boolean, + val outgoing: Boolean +) + +@JsonClass(generateAdapter = true) +data class FilesCapabilities( + @Json(name = PROPERTY_FILES_BIGFILECHUNKING) + val filesBigFileChunking: Boolean, + @Json(name = PROPERTY_FILES_UNDELETE) + val filesUnDelete: Boolean, + @Json(name = PROPERTY_FILES_VERSIONING) + val filesVersioning: Boolean +) + +@JsonClass(generateAdapter = true) +data class ServerVersion( + @Json(name = PROPERTY_VERSION_MAJOR) + var versionMayor: Int = 0, + @Json(name = PROPERTY_VERSION_MINOR) + var versionMinor: Int = 0, + @Json(name = PROPERTY_VERSION_MICRO) + var versionMicro: Int = 0, + @Json(name = PROPERTY_VERSION_STRING) + var versionString: String = "", + @Json(name = PROPERTY_VERSION_EDITION) + var versionEdition: String = "" +) + +private const val NODE_SERVER_VERSION = "version" +private const val PROPERTY_VERSION_MAJOR = "major" +private const val PROPERTY_VERSION_MINOR = "minor" +private const val PROPERTY_VERSION_MICRO = "micro" +private const val PROPERTY_VERSION_STRING = "string" +private const val PROPERTY_VERSION_EDITION = "edition" + +private const val NODE_CAPABILITIES = "capabilities" + +private const val NODE_CORE = "core" +private const val PROPERTY_CORE_POLLINTERVAL = "pollinterval" + +private const val NODE_FILES_SHARING = "files_sharing" +private const val PROPERTY_FILES_SHARING_API_ENABLED = "api_enabled" +private const val PROPERTY_FILES_SHARING_SEARCH_MIN_LENGTH = "search_min_length" +private const val PROPERTY_FILES_SHARING_RESHARING = "resharing" + +private const val NODE_FILES_SHARING_PUBLIC = "public" +private const val PROPERTY_FILES_SHARING_PUBLIC_UPLOAD = "upload" +private const val PROPERTY_FILES_SHARING_PUBLIC_UPLOAD_ONLY = "supports_upload_only" +private const val PROPERTY_FILES_SHARING_PUBLIC_MULTIPLE = "multiple" + +private const val NODE_FEDERATION = "federation" + +private const val NODE_PASSWORD = "password" +private const val NODE_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED = "enforced_for" +private const val PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_READ_ONLY = "read_only" +private const val PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_READ_WRITE = "read_write" +private const val PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_UPLOAD_ONLY = "upload_only" + +private const val NODE_EXPIRE_DATE = "expire_date" + +private const val NODE_FILES = "files" +private const val PROPERTY_FILES_BIGFILECHUNKING = "bigfilechunking" +private const val PROPERTY_FILES_UNDELETE = "undelete" +private const val PROPERTY_FILES_VERSIONING = "versioning" diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt index 0d53ce97..c7dfa452 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt @@ -2,6 +2,8 @@ * @author masensio * @author Semih Serhat Karakaya * @author David González Verdugo + * @author Abel García de Prada + * * Copyright (C) 2020 ownCloud GmbH. * * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -33,10 +35,13 @@ import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod import com.owncloud.android.lib.common.operations.RemoteOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK +import com.owncloud.android.lib.resources.response.CapabilityResponse +import com.owncloud.android.lib.resources.status.RemoteCapability.CapabilityBooleanType.Companion.fromBooleanValue +import com.squareup.moshi.JsonAdapter +import com.squareup.moshi.Moshi import org.json.JSONObject -import java.net.URL -import com.owncloud.android.lib.resources.status.RemoteCapability.CapabilityBooleanType import timber.log.Timber +import java.net.URL /** * Get the Capabilities from the server @@ -69,13 +74,7 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { if (!isSuccess(status)) { result = RemoteOperationResult(getMethod) - Timber.e("Failed response while getting capabilities from the server ") - if (response != null) { - Timber.e("*** status code: $status; response message: $response") - } else { - Timber.e("*** status code: $status") - } - + Timber.e("Failed response while getting capabilities from the server status code: $status; response message: $response") return result } @@ -93,154 +92,16 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { val message = respMeta.getString(PROPERTY_MESSAGE) if (statusProp) { - val capability = RemoteCapability() - // Add Version - if (respData.has(NODE_VERSION)) { - val respVersion = respData.getJSONObject(NODE_VERSION) - capability.versionMayor = respVersion.getInt(PROPERTY_MAJOR) - capability.versionMinor = respVersion.getInt(PROPERTY_MINOR) - capability.versionMicro = respVersion.getInt(PROPERTY_MICRO) - capability.versionString = respVersion.getString(PROPERTY_STRING) - capability.versionEdition = respVersion.getString(PROPERTY_EDITION) - Timber.d("*** Added $NODE_VERSION") - } + val moshi: Moshi = Moshi.Builder().build() + val adapter: JsonAdapter = moshi.adapter(CapabilityResponse::class.java) + val capabilityResponse: CapabilityResponse? = adapter.fromJson(respData.toString()) - // Capabilities Object - if (respData.has(NODE_CAPABILITIES)) { - val respCapabilities = respData.getJSONObject(NODE_CAPABILITIES) - - // Add Core: pollinterval - if (respCapabilities.has(NODE_CORE)) { - val respCore = respCapabilities.getJSONObject(NODE_CORE) - capability.corePollinterval = respCore.getInt(PROPERTY_POLLINTERVAL) - Timber.d("*** Added $NODE_CORE") - } - - // Add files_sharing: public, user, resharing - if (respCapabilities.has(NODE_FILES_SHARING)) { - val respFilesSharing = respCapabilities.getJSONObject(NODE_FILES_SHARING) - if (respFilesSharing.has(PROPERTY_API_ENABLED)) { - capability.filesSharingApiEnabled = CapabilityBooleanType.fromBooleanValue( - respFilesSharing.getBoolean(PROPERTY_API_ENABLED) - ) - } - - if (respFilesSharing.has(NODE_PUBLIC)) { - val respPublic = respFilesSharing.getJSONObject(NODE_PUBLIC) - capability.filesSharingPublicEnabled = CapabilityBooleanType.fromBooleanValue( - respPublic.getBoolean(PROPERTY_ENABLED) - ) - - if (respPublic.has(NODE_PASSWORD)) { - val respPassword = respPublic.getJSONObject(NODE_PASSWORD) - capability.filesSharingPublicPasswordEnforced = - CapabilityBooleanType.fromBooleanValue( - respPublic.getJSONObject(NODE_PASSWORD).getBoolean(PROPERTY_ENFORCED) - ) - - if (respPassword.has(NODE_ENFORCED_FOR)) { - capability.filesSharingPublicPasswordEnforcedReadOnly = - CapabilityBooleanType.fromBooleanValue( - respPassword.getJSONObject(NODE_ENFORCED_FOR).getBoolean( - PROPERTY_ENFORCED_READ_ONLY - ) - ) - - capability.filesSharingPublicPasswordEnforcedReadWrite = - CapabilityBooleanType.fromBooleanValue( - respPassword.getJSONObject(NODE_ENFORCED_FOR).getBoolean( - PROPERTY_ENFORCED_READ_WRITE - ) - ) - - capability.filesSharingPublicPasswordEnforcedUploadOnly = - CapabilityBooleanType.fromBooleanValue( - respPassword.getJSONObject(NODE_ENFORCED_FOR).getBoolean( - PROPERTY_ENFORCED_UPLOAD_ONLY - ) - ) - } - } - if (respPublic.has(NODE_EXPIRE_DATE)) { - val respExpireDate = respPublic.getJSONObject(NODE_EXPIRE_DATE) - capability.filesSharingPublicExpireDateEnabled = - CapabilityBooleanType.fromBooleanValue( - respExpireDate.getBoolean(PROPERTY_ENABLED) - ) - if (respExpireDate.has(PROPERTY_DAYS)) { - capability.filesSharingPublicExpireDateDays = - respExpireDate.getInt(PROPERTY_DAYS) - } - if (respExpireDate.has(PROPERTY_ENFORCED)) { - capability.filesSharingPublicExpireDateEnforced = - CapabilityBooleanType.fromBooleanValue( - respExpireDate.getBoolean(PROPERTY_ENFORCED) - ) - } - } - if (respPublic.has(PROPERTY_UPLOAD)) { - capability.filesSharingPublicUpload = CapabilityBooleanType.fromBooleanValue( - respPublic.getBoolean(PROPERTY_UPLOAD) - ) - } - if (respPublic.has(PROPERTY_UPLOAD_ONLY)) { - capability.filesSharingPublicSupportsUploadOnly = - CapabilityBooleanType.fromBooleanValue( - respPublic.getBoolean(PROPERTY_UPLOAD_ONLY) - ) - } - if (respPublic.has(PROPERTY_MULTIPLE)) { - capability.filesSharingPublicMultiple = CapabilityBooleanType.fromBooleanValue( - respPublic.getBoolean(PROPERTY_MULTIPLE) - ) - } - } - - if (respFilesSharing.has(NODE_USER)) { - val respUser = respFilesSharing.getJSONObject(NODE_USER) - capability.filesSharingUserSendMail = CapabilityBooleanType.fromBooleanValue( - respUser.getBoolean(PROPERTY_SEND_MAIL) - ) - } - - capability.filesSharingResharing = CapabilityBooleanType.fromBooleanValue( - respFilesSharing.getBoolean(PROPERTY_RESHARING) - ) - if (respFilesSharing.has(NODE_FEDERATION)) { - val respFederation = respFilesSharing.getJSONObject(NODE_FEDERATION) - capability.filesSharingFederationOutgoing = - CapabilityBooleanType.fromBooleanValue(respFederation.getBoolean(PROPERTY_OUTGOING)) - capability.filesSharingFederationIncoming = CapabilityBooleanType.fromBooleanValue( - respFederation.getBoolean(PROPERTY_INCOMING) - ) - } - Timber.d("*** Added $NODE_FILES_SHARING") - } - - if (respCapabilities.has(NODE_FILES)) { - val respFiles = respCapabilities.getJSONObject(NODE_FILES) - // Add files - capability.filesBigFileChunking = CapabilityBooleanType.fromBooleanValue( - respFiles.getBoolean(PROPERTY_BIGFILECHUNKING) - ) - if (respFiles.has(PROPERTY_UNDELETE)) { - capability.filesUndelete = CapabilityBooleanType.fromBooleanValue( - respFiles.getBoolean(PROPERTY_UNDELETE) - ) - } - if (respFiles.has(PROPERTY_VERSIONING)) { - capability.filesVersioning = CapabilityBooleanType.fromBooleanValue( - respFiles.getBoolean(PROPERTY_VERSIONING) - ) - } - Timber.d("*** Added $NODE_FILES") - } - } + val remoteCapability = capabilityResponse?.let { mapToModel(it) } ?: RemoteCapability() // Result result = RemoteOperationResult(OK) - result.data = capability + result.data = remoteCapability - Timber.d("*** Get Capabilities completed ") + Timber.d("*** Get Capabilities completed $remoteCapability") } else { result = RemoteOperationResult(statuscode, message, null) Timber.e("Failed response while getting capabilities from the server ") @@ -259,6 +120,36 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { return status == HttpConstants.HTTP_OK } + private fun mapToModel(capabilityResponse: CapabilityResponse): RemoteCapability = + with(capabilityResponse) { + RemoteCapability( + versionMayor = serverVersion.versionMayor, + versionMinor = serverVersion.versionMinor, + versionMicro = serverVersion.versionMicro, + versionString = serverVersion.versionString, + versionEdition = serverVersion.versionEdition, + corePollinterval = capabilities.coreCapabilities.pollInterval, + filesSharingApiEnabled = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingApiEnabled), + filesSharingResharing = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingReSharing), + filesSharingPublicEnabled = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.enabled), + filesSharingPublicUpload = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicUpload), + filesSharingPublicSupportsUploadOnly = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicUploadOnly), + filesSharingPublicMultiple = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicMultiple), + filesSharingPublicPasswordEnforced = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforced), + filesSharingPublicPasswordEnforcedReadOnly = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedReadOnly), + filesSharingPublicPasswordEnforcedReadWrite = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedReadWrite), + filesSharingPublicPasswordEnforcedUploadOnly = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedUploadOnly), + filesSharingPublicExpireDateEnabled = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enabled), + filesSharingPublicExpireDateDays = capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.days ?: 0, + filesSharingPublicExpireDateEnforced = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enforced?:false), + filesBigFileChunking = fromBooleanValue(capabilities.filesCapabilities.filesBigFileChunking), + filesUndelete = fromBooleanValue(capabilities.filesCapabilities.filesUnDelete), + filesVersioning = fromBooleanValue(capabilities.filesCapabilities.filesVersioning), + filesSharingFederationIncoming = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.incoming), + filesSharingFederationOutgoing = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.outgoing) + ) + } + companion object { // OCS Routes @@ -276,50 +167,10 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { private const val NODE_META = "meta" private const val NODE_DATA = "data" - private const val NODE_VERSION = "version" - - private const val NODE_CAPABILITIES = "capabilities" - private const val NODE_CORE = "core" - - private const val NODE_FILES_SHARING = "files_sharing" - private const val NODE_PUBLIC = "public" - private const val NODE_PASSWORD = "password" - private const val NODE_ENFORCED_FOR = "enforced_for" - private const val NODE_EXPIRE_DATE = "expire_date" - private const val NODE_USER = "user" - private const val NODE_FEDERATION = "federation" - private const val NODE_FILES = "files" private const val PROPERTY_STATUS = "status" private const val PROPERTY_STATUS_OK = "ok" private const val PROPERTY_STATUSCODE = "statuscode" private const val PROPERTY_MESSAGE = "message" - - private const val PROPERTY_POLLINTERVAL = "pollinterval" - - private const val PROPERTY_MAJOR = "major" - private const val PROPERTY_MINOR = "minor" - private const val PROPERTY_MICRO = "micro" - private const val PROPERTY_STRING = "string" - private const val PROPERTY_EDITION = "edition" - - private const val PROPERTY_API_ENABLED = "api_enabled" - private const val PROPERTY_ENABLED = "enabled" - private const val PROPERTY_ENFORCED = "enforced" - private const val PROPERTY_ENFORCED_READ_ONLY = "read_only" - private const val PROPERTY_ENFORCED_READ_WRITE = "read_write" - private const val PROPERTY_ENFORCED_UPLOAD_ONLY = "upload_only" - private const val PROPERTY_DAYS = "days" - private const val PROPERTY_SEND_MAIL = "send_mail" - private const val PROPERTY_UPLOAD = "upload" - private const val PROPERTY_UPLOAD_ONLY = "supports_upload_only" - private const val PROPERTY_MULTIPLE = "multiple" - private const val PROPERTY_RESHARING = "resharing" - private const val PROPERTY_OUTGOING = "outgoing" - private const val PROPERTY_INCOMING = "incoming" - - private const val PROPERTY_BIGFILECHUNKING = "bigfilechunking" - private const val PROPERTY_UNDELETE = "undelete" - private const val PROPERTY_VERSIONING = "versioning" } } From 7b29f8f09ea952965c0a2c0cf14d05630f5df609 Mon Sep 17 00:00:00 2001 From: abelgardep Date: Thu, 16 Jan 2020 19:02:00 +0100 Subject: [PATCH 2/5] Create a common response to parse json --- .../resources/response/CapabilityResponse.kt | 39 +++------- .../lib/resources/response/CommonResponse.kt | 45 ++++++++++++ .../status/GetRemoteCapabilitiesOperation.kt | 73 +++++++------------ 3 files changed, 81 insertions(+), 76 deletions(-) create mode 100644 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonResponse.kt diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt index 374cf96e..bfa03726 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt @@ -31,7 +31,6 @@ import com.squareup.moshi.JsonClass data class CapabilityResponse( @Json(name = NODE_SERVER_VERSION) val serverVersion: ServerVersion, - @Json(name = NODE_CAPABILITIES) val capabilities: Capabilities ) @@ -47,8 +46,7 @@ data class Capabilities( @JsonClass(generateAdapter = true) data class CoreCapabilities( - @Json(name = PROPERTY_CORE_POLLINTERVAL) - val pollInterval: Int + val pollinterval: Int ) @JsonClass(generateAdapter = true) @@ -112,39 +110,23 @@ data class FileSharingFederation( @JsonClass(generateAdapter = true) data class FilesCapabilities( - @Json(name = PROPERTY_FILES_BIGFILECHUNKING) - val filesBigFileChunking: Boolean, - @Json(name = PROPERTY_FILES_UNDELETE) - val filesUnDelete: Boolean, - @Json(name = PROPERTY_FILES_VERSIONING) - val filesVersioning: Boolean + val bigfilechunking: Boolean, + val undelete: Boolean, + val versioning: Boolean ) @JsonClass(generateAdapter = true) data class ServerVersion( - @Json(name = PROPERTY_VERSION_MAJOR) - var versionMayor: Int = 0, - @Json(name = PROPERTY_VERSION_MINOR) - var versionMinor: Int = 0, - @Json(name = PROPERTY_VERSION_MICRO) - var versionMicro: Int = 0, - @Json(name = PROPERTY_VERSION_STRING) - var versionString: String = "", - @Json(name = PROPERTY_VERSION_EDITION) - var versionEdition: String = "" + var major: Int = 0, + var minor: Int = 0, + var micro: Int = 0, + var string: String = "", + var edition: String = "" ) private const val NODE_SERVER_VERSION = "version" -private const val PROPERTY_VERSION_MAJOR = "major" -private const val PROPERTY_VERSION_MINOR = "minor" -private const val PROPERTY_VERSION_MICRO = "micro" -private const val PROPERTY_VERSION_STRING = "string" -private const val PROPERTY_VERSION_EDITION = "edition" - -private const val NODE_CAPABILITIES = "capabilities" private const val NODE_CORE = "core" -private const val PROPERTY_CORE_POLLINTERVAL = "pollinterval" private const val NODE_FILES_SHARING = "files_sharing" private const val PROPERTY_FILES_SHARING_API_ENABLED = "api_enabled" @@ -167,6 +149,3 @@ private const val PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_UPLOAD_ONLY = private const val NODE_EXPIRE_DATE = "expire_date" private const val NODE_FILES = "files" -private const val PROPERTY_FILES_BIGFILECHUNKING = "bigfilechunking" -private const val PROPERTY_FILES_UNDELETE = "undelete" -private const val PROPERTY_FILES_VERSIONING = "versioning" diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonResponse.kt new file mode 100644 index 00000000..e0d8bbf6 --- /dev/null +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonResponse.kt @@ -0,0 +1,45 @@ +/* ownCloud Android Library is available under MIT license + * + * @author Abel García de Prada + * Copyright (C) 2020 ownCloud GmbH. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.owncloud.android.lib.resources.response + +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = true) +data class CommonResponse( + val ocs: OCSResponse +) + +@JsonClass(generateAdapter = true) +data class OCSResponse( + val meta: MetaData, + val data: T +) + +@JsonClass(generateAdapter = true) +data class MetaData( + val status: String, + val statuscode: Int, + val message: String? +) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt index c7dfa452..41fd7ab9 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt @@ -26,7 +26,6 @@ * THE SOFTWARE. * */ - package com.owncloud.android.lib.resources.status import com.owncloud.android.lib.common.OwnCloudClient @@ -36,11 +35,14 @@ import com.owncloud.android.lib.common.operations.RemoteOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK import com.owncloud.android.lib.resources.response.CapabilityResponse +import com.owncloud.android.lib.resources.response.CommonResponse import com.owncloud.android.lib.resources.status.RemoteCapability.CapabilityBooleanType.Companion.fromBooleanValue import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi -import org.json.JSONObject +import com.squareup.moshi.Types +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import timber.log.Timber +import java.lang.reflect.Type import java.net.URL /** @@ -50,9 +52,6 @@ import java.net.URL * @author masensio * @author David González Verdugo */ -/** - * Constructor - */ class GetRemoteCapabilitiesOperation : RemoteOperation() { override fun run(client: OwnCloudClient): RemoteOperationResult { @@ -72,7 +71,7 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { val response = getMethod.responseBodyAsString - if (!isSuccess(status)) { + if (status != HttpConstants.HTTP_OK) { result = RemoteOperationResult(getMethod) Timber.e("Failed response while getting capabilities from the server status code: $status; response message: $response") return result @@ -81,31 +80,27 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { Timber.d("Successful response: $response") // Parse the response - val respJSON = JSONObject(response) - val respOCS = respJSON.getJSONObject(NODE_OCS) - val respMeta = respOCS.getJSONObject(NODE_META) - val respData = respOCS.getJSONObject(NODE_DATA) + val moshi: Moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build() + val type: Type = Types.newParameterizedType(CommonResponse::class.java, CapabilityResponse::class.java) + val adapter: JsonAdapter> = moshi.adapter(type) + val commonResponse: CommonResponse? = adapter.fromJson(response) - // Read meta - val statusProp = respMeta.getString(PROPERTY_STATUS).equals(PROPERTY_STATUS_OK, ignoreCase = true) - val statuscode = respMeta.getInt(PROPERTY_STATUSCODE) - val message = respMeta.getString(PROPERTY_MESSAGE) + // Read MetaData + val statusMessage = commonResponse?.ocs?.meta?.status + val statusCode = commonResponse?.ocs?.meta?.statuscode + val message = commonResponse?.ocs?.meta?.message - if (statusProp) { - val moshi: Moshi = Moshi.Builder().build() - val adapter: JsonAdapter = moshi.adapter(CapabilityResponse::class.java) - val capabilityResponse: CapabilityResponse? = adapter.fromJson(respData.toString()) - - val remoteCapability = capabilityResponse?.let { mapToModel(it) } ?: RemoteCapability() + if (statusMessage.equals(PROPERTY_STATUS_OK, ignoreCase = true)) { + val remoteCapability = commonResponse?.ocs?.data?.let { mapToModel(it) } ?: RemoteCapability() // Result result = RemoteOperationResult(OK) result.data = remoteCapability - Timber.d("*** Get Capabilities completed $remoteCapability") + Timber.d("*** Get Capabilities completed and parsed to: $remoteCapability") } else { - result = RemoteOperationResult(statuscode, message, null) + result = RemoteOperationResult(statusCode!!, message, null) Timber.e("Failed response while getting capabilities from the server ") - Timber.e("*** status: $statusProp; message: $message") + Timber.e("*** statusCode: $status; status: $statusMessage; message: $message") } } catch (e: Exception) { @@ -116,19 +111,15 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { return result } - private fun isSuccess(status: Int): Boolean { - return status == HttpConstants.HTTP_OK - } - private fun mapToModel(capabilityResponse: CapabilityResponse): RemoteCapability = with(capabilityResponse) { RemoteCapability( - versionMayor = serverVersion.versionMayor, - versionMinor = serverVersion.versionMinor, - versionMicro = serverVersion.versionMicro, - versionString = serverVersion.versionString, - versionEdition = serverVersion.versionEdition, - corePollinterval = capabilities.coreCapabilities.pollInterval, + versionMayor = serverVersion.major, + versionMinor = serverVersion.minor, + versionMicro = serverVersion.micro, + versionString = serverVersion.string, + versionEdition = serverVersion.edition, + corePollinterval = capabilities.coreCapabilities.pollinterval, filesSharingApiEnabled = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingApiEnabled), filesSharingResharing = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingReSharing), filesSharingPublicEnabled = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.enabled), @@ -142,9 +133,9 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { filesSharingPublicExpireDateEnabled = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enabled), filesSharingPublicExpireDateDays = capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.days ?: 0, filesSharingPublicExpireDateEnforced = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enforced?:false), - filesBigFileChunking = fromBooleanValue(capabilities.filesCapabilities.filesBigFileChunking), - filesUndelete = fromBooleanValue(capabilities.filesCapabilities.filesUnDelete), - filesVersioning = fromBooleanValue(capabilities.filesCapabilities.filesVersioning), + filesBigFileChunking = fromBooleanValue(capabilities.filesCapabilities.bigfilechunking), + filesUndelete = fromBooleanValue(capabilities.filesCapabilities.undelete), + filesVersioning = fromBooleanValue(capabilities.filesCapabilities.versioning), filesSharingFederationIncoming = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.incoming), filesSharingFederationOutgoing = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.outgoing) ) @@ -161,16 +152,6 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { // Arguments - constant values private const val VALUE_FORMAT = "json" - // JSON Node names - private const val NODE_OCS = "ocs" - - private const val NODE_META = "meta" - - private const val NODE_DATA = "data" - - private const val PROPERTY_STATUS = "status" private const val PROPERTY_STATUS_OK = "ok" - private const val PROPERTY_STATUSCODE = "statuscode" - private const val PROPERTY_MESSAGE = "message" } } From b10e74afec37d0968e0dd69c7c9194ca84686ebf Mon Sep 17 00:00:00 2001 From: agarcia Date: Mon, 20 Apr 2020 12:12:26 +0200 Subject: [PATCH 3/5] Use moshi to parse capabilities --- .../resources/response/CapabilityResponse.kt | 102 ++++++++++-------- .../{ => response}/CommonOcsResponse.kt | 2 +- .../lib/resources/response/CommonResponse.kt | 45 -------- .../{users => response}/UserInfoResponse.kt | 10 +- .../status/GetRemoteCapabilitiesOperation.kt | 94 ++++------------ .../users/GetRemoteUserInfoOperation.kt | 6 +- 6 files changed, 89 insertions(+), 170 deletions(-) rename owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/{ => response}/CommonOcsResponse.kt (97%) delete mode 100644 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonResponse.kt rename owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/{users => response}/UserInfoResponse.kt (90%) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt index bfa03726..90ed459d 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt @@ -24,23 +24,61 @@ */ package com.owncloud.android.lib.resources.response +import com.owncloud.android.lib.resources.status.RemoteCapability +import com.owncloud.android.lib.resources.status.RemoteCapability.CapabilityBooleanType import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) data class CapabilityResponse( - @Json(name = NODE_SERVER_VERSION) + @Json(name = "version") val serverVersion: ServerVersion, val capabilities: Capabilities -) +) { + fun toRemoteCapability(): RemoteCapability = RemoteCapability( + versionMayor = serverVersion.major, + versionMinor = serverVersion.minor, + versionMicro = serverVersion.micro, + versionString = serverVersion.string, + versionEdition = serverVersion.edition, + corePollinterval = capabilities.coreCapabilities.pollinterval, + filesSharingApiEnabled = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingApiEnabled), + filesSharingResharing = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingReSharing), + filesSharingPublicEnabled = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.enabled), + filesSharingPublicUpload = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicUpload), + filesSharingPublicSupportsUploadOnly = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicUploadOnly), + filesSharingPublicMultiple = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicMultiple), + filesSharingPublicPasswordEnforced = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforced), + filesSharingPublicPasswordEnforcedReadOnly = CapabilityBooleanType.fromBooleanValue( + capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedReadOnly + ), + filesSharingPublicPasswordEnforcedReadWrite = CapabilityBooleanType.fromBooleanValue( + capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedReadWrite + ), + filesSharingPublicPasswordEnforcedUploadOnly = CapabilityBooleanType.fromBooleanValue( + capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedUploadOnly + ), + filesSharingPublicExpireDateEnabled = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enabled), + filesSharingPublicExpireDateDays = capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.days + ?: 0, + filesSharingPublicExpireDateEnforced = CapabilityBooleanType.fromBooleanValue( + capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enforced ?: false + ), + filesBigFileChunking = CapabilityBooleanType.fromBooleanValue(capabilities.filesCapabilities.bigfilechunking), + filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities.filesCapabilities.undelete), + filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities.filesCapabilities.versioning), + filesSharingFederationIncoming = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.incoming), + filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.outgoing) + ) +} @JsonClass(generateAdapter = true) data class Capabilities( - @Json(name = NODE_CORE) + @Json(name = "core") val coreCapabilities: CoreCapabilities, - @Json(name = NODE_FILES_SHARING) + @Json(name = "files_sharing") val fileSharingCapabilities: FileSharingCapabilities, - @Json(name = NODE_FILES) + @Json(name = "files") val filesCapabilities: FilesCapabilities ) @@ -51,47 +89,45 @@ data class CoreCapabilities( @JsonClass(generateAdapter = true) data class FileSharingCapabilities( - @Json(name = PROPERTY_FILES_SHARING_API_ENABLED) + @Json(name = "api_enabled") val fileSharingApiEnabled: Boolean, - @Json(name = PROPERTY_FILES_SHARING_SEARCH_MIN_LENGTH) - val fileSharingSearchMinLength: Int, - @Json(name = NODE_FILES_SHARING_PUBLIC) + @Json(name = "public") val fileSharingPublic: FileSharingPublic, - @Json(name = PROPERTY_FILES_SHARING_RESHARING) + @Json(name = "resharing") val fileSharingReSharing: Boolean, - @Json(name = NODE_FEDERATION) + @Json(name = "federation") val fileSharingFederation: FileSharingFederation ) @JsonClass(generateAdapter = true) data class FileSharingPublic( val enabled: Boolean, - @Json(name = PROPERTY_FILES_SHARING_PUBLIC_UPLOAD) + @Json(name = "upload") val fileSharingPublicUpload: Boolean, - @Json(name = PROPERTY_FILES_SHARING_PUBLIC_UPLOAD_ONLY) + @Json(name = "supports_upload_only") val fileSharingPublicUploadOnly: Boolean, - @Json(name = PROPERTY_FILES_SHARING_PUBLIC_MULTIPLE) + @Json(name = "multiple") val fileSharingPublicMultiple: Boolean, - @Json(name = NODE_PASSWORD) + @Json(name = "password") val fileSharingPublicPassword: FileSharingPublicPassword, - @Json(name = NODE_EXPIRE_DATE) + @Json(name = "expire_date") val fileSharingPublicExpireDate: FileSharingPublicExpireDate ) @JsonClass(generateAdapter = true) data class FileSharingPublicPassword( val enforced: Boolean, - @Json(name = NODE_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED) + @Json(name = "enforced_for") val enforcedFor: FileSharingPublicPasswordEnforced ) @JsonClass(generateAdapter = true) data class FileSharingPublicPasswordEnforced( - @Json(name = PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_READ_ONLY) + @Json(name = "read_only") val enforcedReadOnly: Boolean, - @Json(name = PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_READ_WRITE) + @Json(name = "read_write") val enforcedReadWrite: Boolean, - @Json(name = PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_UPLOAD_ONLY) + @Json(name = "upload_only") val enforcedUploadOnly: Boolean ) @@ -123,29 +159,3 @@ data class ServerVersion( var string: String = "", var edition: String = "" ) - -private const val NODE_SERVER_VERSION = "version" - -private const val NODE_CORE = "core" - -private const val NODE_FILES_SHARING = "files_sharing" -private const val PROPERTY_FILES_SHARING_API_ENABLED = "api_enabled" -private const val PROPERTY_FILES_SHARING_SEARCH_MIN_LENGTH = "search_min_length" -private const val PROPERTY_FILES_SHARING_RESHARING = "resharing" - -private const val NODE_FILES_SHARING_PUBLIC = "public" -private const val PROPERTY_FILES_SHARING_PUBLIC_UPLOAD = "upload" -private const val PROPERTY_FILES_SHARING_PUBLIC_UPLOAD_ONLY = "supports_upload_only" -private const val PROPERTY_FILES_SHARING_PUBLIC_MULTIPLE = "multiple" - -private const val NODE_FEDERATION = "federation" - -private const val NODE_PASSWORD = "password" -private const val NODE_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED = "enforced_for" -private const val PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_READ_ONLY = "read_only" -private const val PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_READ_WRITE = "read_write" -private const val PROPERTY_FILES_SHARING_PUBLIC_PASSWORD_ENFORCED_UPLOAD_ONLY = "upload_only" - -private const val NODE_EXPIRE_DATE = "expire_date" - -private const val NODE_FILES = "files" diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonOcsResponse.kt similarity index 97% rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonOcsResponse.kt index 2cfbe2ed..d8402eb9 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/CommonOcsResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonOcsResponse.kt @@ -21,7 +21,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.owncloud.android.lib.resources +package com.owncloud.android.lib.resources.response import com.squareup.moshi.JsonClass diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonResponse.kt deleted file mode 100644 index e0d8bbf6..00000000 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CommonResponse.kt +++ /dev/null @@ -1,45 +0,0 @@ -/* ownCloud Android Library is available under MIT license - * - * @author Abel García de Prada - * Copyright (C) 2020 ownCloud GmbH. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package com.owncloud.android.lib.resources.response - -import com.squareup.moshi.JsonClass - -@JsonClass(generateAdapter = true) -data class CommonResponse( - val ocs: OCSResponse -) - -@JsonClass(generateAdapter = true) -data class OCSResponse( - val meta: MetaData, - val data: T -) - -@JsonClass(generateAdapter = true) -data class MetaData( - val status: String, - val statuscode: Int, - val message: String? -) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/UserInfoResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/UserInfoResponse.kt similarity index 90% rename from owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/UserInfoResponse.kt rename to owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/UserInfoResponse.kt index d0fdcf82..1ff3b94e 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/UserInfoResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/UserInfoResponse.kt @@ -21,8 +21,9 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.owncloud.android.lib.resources.users +package com.owncloud.android.lib.resources.response +import com.owncloud.android.lib.resources.users.RemoteUserInfo import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @@ -32,11 +33,10 @@ data class UserInfoResponse( @Json(name = "display-name") val displayName: String, val email: String? -) - -fun UserInfoResponse.toRemoteUserInfo() = - RemoteUserInfo( +) { + fun toRemoteUserInfo() = RemoteUserInfo( id = id, displayName = displayName, email = email ) +} diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt index 41fd7ab9..d3af0df2 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt @@ -35,12 +35,10 @@ import com.owncloud.android.lib.common.operations.RemoteOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.OK import com.owncloud.android.lib.resources.response.CapabilityResponse -import com.owncloud.android.lib.resources.response.CommonResponse -import com.owncloud.android.lib.resources.status.RemoteCapability.CapabilityBooleanType.Companion.fromBooleanValue +import com.owncloud.android.lib.resources.response.CommonOcsResponse import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi import com.squareup.moshi.Types -import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory import timber.log.Timber import java.lang.reflect.Type import java.net.URL @@ -58,49 +56,33 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { var result: RemoteOperationResult try { - val requestUri = client.baseUri - val uriBuilder = requestUri.buildUpon() - uriBuilder.appendEncodedPath(OCS_ROUTE) // avoid starting "/" in this method - uriBuilder.appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT) - - val getMethod = GetMethod(URL(uriBuilder.build().toString())) - - getMethod.addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) - + val uriBuilder = client.baseUri.buildUpon().run { + appendEncodedPath(OCS_ROUTE) // avoid starting "/" in this method + appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT) + } + val getMethod = GetMethod(URL(uriBuilder.build().toString())).apply { + addRequestHeader(OCS_API_HEADER, OCS_API_HEADER_VALUE) + } val status = client.executeHttpMethod(getMethod) val response = getMethod.responseBodyAsString - if (status != HttpConstants.HTTP_OK) { + if (status == HttpConstants.HTTP_OK) { + Timber.d("Successful response $response") + + // Parse the response + val moshi: Moshi = Moshi.Builder().build() + val type: Type = Types.newParameterizedType(CommonOcsResponse::class.java, CapabilityResponse::class.java) + val adapter: JsonAdapter> = moshi.adapter(type) + val commonResponse: CommonOcsResponse? = adapter.fromJson(response) + + result = RemoteOperationResult(OK) + result.data = commonResponse?.ocs?.data?.toRemoteCapability() + + Timber.d("*** Get Capabilities completed and parsed to ${result.data}") + } else { result = RemoteOperationResult(getMethod) Timber.e("Failed response while getting capabilities from the server status code: $status; response message: $response") - return result - } - - Timber.d("Successful response: $response") - - // Parse the response - val moshi: Moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build() - val type: Type = Types.newParameterizedType(CommonResponse::class.java, CapabilityResponse::class.java) - val adapter: JsonAdapter> = moshi.adapter(type) - val commonResponse: CommonResponse? = adapter.fromJson(response) - - // Read MetaData - val statusMessage = commonResponse?.ocs?.meta?.status - val statusCode = commonResponse?.ocs?.meta?.statuscode - val message = commonResponse?.ocs?.meta?.message - - if (statusMessage.equals(PROPERTY_STATUS_OK, ignoreCase = true)) { - val remoteCapability = commonResponse?.ocs?.data?.let { mapToModel(it) } ?: RemoteCapability() - // Result - result = RemoteOperationResult(OK) - result.data = remoteCapability - - Timber.d("*** Get Capabilities completed and parsed to: $remoteCapability") - } else { - result = RemoteOperationResult(statusCode!!, message, null) - Timber.e("Failed response while getting capabilities from the server ") - Timber.e("*** statusCode: $status; status: $statusMessage; message: $message") } } catch (e: Exception) { @@ -111,36 +93,6 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { return result } - private fun mapToModel(capabilityResponse: CapabilityResponse): RemoteCapability = - with(capabilityResponse) { - RemoteCapability( - versionMayor = serverVersion.major, - versionMinor = serverVersion.minor, - versionMicro = serverVersion.micro, - versionString = serverVersion.string, - versionEdition = serverVersion.edition, - corePollinterval = capabilities.coreCapabilities.pollinterval, - filesSharingApiEnabled = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingApiEnabled), - filesSharingResharing = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingReSharing), - filesSharingPublicEnabled = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.enabled), - filesSharingPublicUpload = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicUpload), - filesSharingPublicSupportsUploadOnly = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicUploadOnly), - filesSharingPublicMultiple = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicMultiple), - filesSharingPublicPasswordEnforced = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforced), - filesSharingPublicPasswordEnforcedReadOnly = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedReadOnly), - filesSharingPublicPasswordEnforcedReadWrite = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedReadWrite), - filesSharingPublicPasswordEnforcedUploadOnly = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedUploadOnly), - filesSharingPublicExpireDateEnabled = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enabled), - filesSharingPublicExpireDateDays = capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.days ?: 0, - filesSharingPublicExpireDateEnforced = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enforced?:false), - filesBigFileChunking = fromBooleanValue(capabilities.filesCapabilities.bigfilechunking), - filesUndelete = fromBooleanValue(capabilities.filesCapabilities.undelete), - filesVersioning = fromBooleanValue(capabilities.filesCapabilities.versioning), - filesSharingFederationIncoming = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.incoming), - filesSharingFederationOutgoing = fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.outgoing) - ) - } - companion object { // OCS Routes @@ -151,7 +103,5 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { // Arguments - constant values private const val VALUE_FORMAT = "json" - - private const val PROPERTY_STATUS_OK = "ok" } } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt index 54aeb32f..d370b449 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt @@ -29,7 +29,8 @@ import com.owncloud.android.lib.common.http.methods.nonwebdav.GetMethod import com.owncloud.android.lib.common.operations.RemoteOperation import com.owncloud.android.lib.common.operations.RemoteOperationResult import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode -import com.owncloud.android.lib.resources.CommonOcsResponse +import com.owncloud.android.lib.resources.response.CommonOcsResponse +import com.owncloud.android.lib.resources.response.UserInfoResponse import com.squareup.moshi.JsonAdapter import com.squareup.moshi.Moshi import com.squareup.moshi.Types @@ -63,6 +64,9 @@ class GetRemoteUserInfoOperation : RemoteOperation() { result = RemoteOperationResult(ResultCode.OK) result.data = commonResponse?.ocs?.data?.toRemoteUserInfo() + + Timber.d("*** Get User Info completed and parsed to ${result.data}") + } else { result = RemoteOperationResult(getMethod) Timber.e("Failed response while getting user information status code: $status, response: $response") From 679b91df7cf6715157f2bd78390223ab6b2f85cf Mon Sep 17 00:00:00 2001 From: agarcia Date: Mon, 20 Apr 2020 14:01:26 +0200 Subject: [PATCH 4/5] Apply CR suggestions --- .../lib/resources/response/CapabilityResponse.kt | 10 +++++----- .../resources/status/GetRemoteCapabilitiesOperation.kt | 4 ++-- .../lib/resources/users/GetRemoteUserInfoOperation.kt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt index 90ed459d..22e792ad 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt @@ -64,9 +64,9 @@ data class CapabilityResponse( filesSharingPublicExpireDateEnforced = CapabilityBooleanType.fromBooleanValue( capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enforced ?: false ), - filesBigFileChunking = CapabilityBooleanType.fromBooleanValue(capabilities.filesCapabilities.bigfilechunking), - filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities.filesCapabilities.undelete), - filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities.filesCapabilities.versioning), + filesBigFileChunking = CapabilityBooleanType.fromBooleanValue(capabilities.fileCapabilities.bigfilechunking), + filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities.fileCapabilities.undelete), + filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities.fileCapabilities.versioning), filesSharingFederationIncoming = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.incoming), filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.outgoing) ) @@ -79,7 +79,7 @@ data class Capabilities( @Json(name = "files_sharing") val fileSharingCapabilities: FileSharingCapabilities, @Json(name = "files") - val filesCapabilities: FilesCapabilities + val fileCapabilities: FileCapabilities ) @JsonClass(generateAdapter = true) @@ -145,7 +145,7 @@ data class FileSharingFederation( ) @JsonClass(generateAdapter = true) -data class FilesCapabilities( +data class FileCapabilities( val bigfilechunking: Boolean, val undelete: Boolean, val versioning: Boolean diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt index d3af0df2..256e03b6 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.kt @@ -56,7 +56,7 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { var result: RemoteOperationResult try { - val uriBuilder = client.baseUri.buildUpon().run { + val uriBuilder = client.baseUri.buildUpon().apply { appendEncodedPath(OCS_ROUTE) // avoid starting "/" in this method appendQueryParameter(PARAM_FORMAT, VALUE_FORMAT) } @@ -79,7 +79,7 @@ class GetRemoteCapabilitiesOperation : RemoteOperation() { result = RemoteOperationResult(OK) result.data = commonResponse?.ocs?.data?.toRemoteCapability() - Timber.d("*** Get Capabilities completed and parsed to ${result.data}") + Timber.d("Get Capabilities completed and parsed to ${result.data}") } else { result = RemoteOperationResult(getMethod) Timber.e("Failed response while getting capabilities from the server status code: $status; response message: $response") diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt index d370b449..7ea63c69 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.kt @@ -65,7 +65,7 @@ class GetRemoteUserInfoOperation : RemoteOperation() { result = RemoteOperationResult(ResultCode.OK) result.data = commonResponse?.ocs?.data?.toRemoteUserInfo() - Timber.d("*** Get User Info completed and parsed to ${result.data}") + Timber.d("Get User Info completed and parsed to ${result.data}") } else { result = RemoteOperationResult(getMethod) From 42b923c3b8c5045d2ff7493b2d90ea36bd6df7f8 Mon Sep 17 00:00:00 2001 From: agarcia Date: Thu, 30 Apr 2020 13:31:32 +0200 Subject: [PATCH 5/5] Allow capabilities to be null --- .../resources/response/CapabilityResponse.kt | 112 +++++++++--------- .../lib/resources/status/RemoteCapability.kt | 4 +- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt index 22e792ad..a2dca06e 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt @@ -32,130 +32,130 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) data class CapabilityResponse( @Json(name = "version") - val serverVersion: ServerVersion, - val capabilities: Capabilities + val serverVersion: ServerVersion?, + val capabilities: Capabilities? ) { fun toRemoteCapability(): RemoteCapability = RemoteCapability( - versionMayor = serverVersion.major, - versionMinor = serverVersion.minor, - versionMicro = serverVersion.micro, - versionString = serverVersion.string, - versionEdition = serverVersion.edition, - corePollinterval = capabilities.coreCapabilities.pollinterval, - filesSharingApiEnabled = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingApiEnabled), - filesSharingResharing = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingReSharing), - filesSharingPublicEnabled = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.enabled), - filesSharingPublicUpload = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicUpload), - filesSharingPublicSupportsUploadOnly = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicUploadOnly), - filesSharingPublicMultiple = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicMultiple), - filesSharingPublicPasswordEnforced = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforced), + versionMayor = serverVersion?.major ?: 0, + versionMinor = serverVersion?.minor ?: 0, + versionMicro = serverVersion?.micro ?: 0, + versionString = serverVersion?.string ?: "", + versionEdition = serverVersion?.edition ?: "", + corePollinterval = capabilities?.coreCapabilities?.pollinterval ?: 0, + filesSharingApiEnabled = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingApiEnabled), + filesSharingResharing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingReSharing), + filesSharingPublicEnabled = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingPublic?.enabled), + filesSharingPublicUpload = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicUpload), + filesSharingPublicSupportsUploadOnly = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicUploadOnly), + filesSharingPublicMultiple = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicMultiple), + filesSharingPublicPasswordEnforced = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicPassword?.enforced), filesSharingPublicPasswordEnforcedReadOnly = CapabilityBooleanType.fromBooleanValue( - capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedReadOnly + capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicPassword?.enforcedFor?.enforcedReadOnly ), filesSharingPublicPasswordEnforcedReadWrite = CapabilityBooleanType.fromBooleanValue( - capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedReadWrite + capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicPassword?.enforcedFor?.enforcedReadWrite ), filesSharingPublicPasswordEnforcedUploadOnly = CapabilityBooleanType.fromBooleanValue( - capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicPassword.enforcedFor.enforcedUploadOnly + capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicPassword?.enforcedFor?.enforcedUploadOnly ), - filesSharingPublicExpireDateEnabled = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enabled), - filesSharingPublicExpireDateDays = capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.days + filesSharingPublicExpireDateEnabled = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicExpireDate?.enabled), + filesSharingPublicExpireDateDays = capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicExpireDate?.days ?: 0, filesSharingPublicExpireDateEnforced = CapabilityBooleanType.fromBooleanValue( - capabilities.fileSharingCapabilities.fileSharingPublic.fileSharingPublicExpireDate.enforced ?: false + capabilities?.fileSharingCapabilities?.fileSharingPublic?.fileSharingPublicExpireDate?.enforced ), - filesBigFileChunking = CapabilityBooleanType.fromBooleanValue(capabilities.fileCapabilities.bigfilechunking), - filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities.fileCapabilities.undelete), - filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities.fileCapabilities.versioning), - filesSharingFederationIncoming = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.incoming), - filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities.fileSharingCapabilities.fileSharingFederation.outgoing) + filesBigFileChunking = CapabilityBooleanType.fromBooleanValue(capabilities?.fileCapabilities?.bigfilechunking), + filesUndelete = CapabilityBooleanType.fromBooleanValue(capabilities?.fileCapabilities?.undelete), + filesVersioning = CapabilityBooleanType.fromBooleanValue(capabilities?.fileCapabilities?.versioning), + filesSharingFederationIncoming = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.incoming), + filesSharingFederationOutgoing = CapabilityBooleanType.fromBooleanValue(capabilities?.fileSharingCapabilities?.fileSharingFederation?.outgoing) ) } @JsonClass(generateAdapter = true) data class Capabilities( @Json(name = "core") - val coreCapabilities: CoreCapabilities, + val coreCapabilities: CoreCapabilities?, @Json(name = "files_sharing") - val fileSharingCapabilities: FileSharingCapabilities, + val fileSharingCapabilities: FileSharingCapabilities?, @Json(name = "files") - val fileCapabilities: FileCapabilities + val fileCapabilities: FileCapabilities? ) @JsonClass(generateAdapter = true) data class CoreCapabilities( - val pollinterval: Int + val pollinterval: Int? ) @JsonClass(generateAdapter = true) data class FileSharingCapabilities( @Json(name = "api_enabled") - val fileSharingApiEnabled: Boolean, + val fileSharingApiEnabled: Boolean?, @Json(name = "public") - val fileSharingPublic: FileSharingPublic, + val fileSharingPublic: FileSharingPublic?, @Json(name = "resharing") - val fileSharingReSharing: Boolean, + val fileSharingReSharing: Boolean?, @Json(name = "federation") - val fileSharingFederation: FileSharingFederation + val fileSharingFederation: FileSharingFederation? ) @JsonClass(generateAdapter = true) data class FileSharingPublic( - val enabled: Boolean, + val enabled: Boolean?, @Json(name = "upload") - val fileSharingPublicUpload: Boolean, + val fileSharingPublicUpload: Boolean?, @Json(name = "supports_upload_only") - val fileSharingPublicUploadOnly: Boolean, + val fileSharingPublicUploadOnly: Boolean?, @Json(name = "multiple") - val fileSharingPublicMultiple: Boolean, + val fileSharingPublicMultiple: Boolean?, @Json(name = "password") - val fileSharingPublicPassword: FileSharingPublicPassword, + val fileSharingPublicPassword: FileSharingPublicPassword?, @Json(name = "expire_date") - val fileSharingPublicExpireDate: FileSharingPublicExpireDate + val fileSharingPublicExpireDate: FileSharingPublicExpireDate? ) @JsonClass(generateAdapter = true) data class FileSharingPublicPassword( - val enforced: Boolean, + val enforced: Boolean?, @Json(name = "enforced_for") - val enforcedFor: FileSharingPublicPasswordEnforced + val enforcedFor: FileSharingPublicPasswordEnforced? ) @JsonClass(generateAdapter = true) data class FileSharingPublicPasswordEnforced( @Json(name = "read_only") - val enforcedReadOnly: Boolean, + val enforcedReadOnly: Boolean?, @Json(name = "read_write") - val enforcedReadWrite: Boolean, + val enforcedReadWrite: Boolean?, @Json(name = "upload_only") - val enforcedUploadOnly: Boolean + val enforcedUploadOnly: Boolean? ) @JsonClass(generateAdapter = true) data class FileSharingPublicExpireDate( - val enabled: Boolean, + val enabled: Boolean?, val days: Int?, val enforced: Boolean? ) @JsonClass(generateAdapter = true) data class FileSharingFederation( - val incoming: Boolean, - val outgoing: Boolean + val incoming: Boolean?, + val outgoing: Boolean? ) @JsonClass(generateAdapter = true) data class FileCapabilities( - val bigfilechunking: Boolean, - val undelete: Boolean, - val versioning: Boolean + val bigfilechunking: Boolean?, + val undelete: Boolean?, + val versioning: Boolean? ) @JsonClass(generateAdapter = true) data class ServerVersion( - var major: Int = 0, - var minor: Int = 0, - var micro: Int = 0, - var string: String = "", - var edition: String = "" + var major: Int?, + var minor: Int?, + var micro: Int?, + var string: String?, + var edition: String? ) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt index 93880c3f..5dd0988f 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/RemoteCapability.kt @@ -87,8 +87,8 @@ data class RemoteCapability( } } - fun fromBooleanValue(boolValue: Boolean): CapabilityBooleanType { - return if (boolValue) { + fun fromBooleanValue(boolValue: Boolean?): CapabilityBooleanType { + return if (boolValue != null && boolValue) { TRUE } else { FALSE