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..a2dca06e
--- /dev/null
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/response/CapabilityResponse.kt
@@ -0,0 +1,161 @@
+/* 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.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 = "version")
+ val serverVersion: ServerVersion?,
+ val capabilities: Capabilities?
+) {
+ fun toRemoteCapability(): RemoteCapability = RemoteCapability(
+ 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
+ ),
+ 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
+ ),
+ 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?,
+ @Json(name = "files_sharing")
+ val fileSharingCapabilities: FileSharingCapabilities?,
+ @Json(name = "files")
+ val fileCapabilities: FileCapabilities?
+)
+
+@JsonClass(generateAdapter = true)
+data class CoreCapabilities(
+ val pollinterval: Int?
+)
+
+@JsonClass(generateAdapter = true)
+data class FileSharingCapabilities(
+ @Json(name = "api_enabled")
+ val fileSharingApiEnabled: Boolean?,
+ @Json(name = "public")
+ val fileSharingPublic: FileSharingPublic?,
+ @Json(name = "resharing")
+ val fileSharingReSharing: Boolean?,
+ @Json(name = "federation")
+ val fileSharingFederation: FileSharingFederation?
+)
+
+@JsonClass(generateAdapter = true)
+data class FileSharingPublic(
+ val enabled: Boolean?,
+ @Json(name = "upload")
+ val fileSharingPublicUpload: Boolean?,
+ @Json(name = "supports_upload_only")
+ val fileSharingPublicUploadOnly: Boolean?,
+ @Json(name = "multiple")
+ val fileSharingPublicMultiple: Boolean?,
+ @Json(name = "password")
+ val fileSharingPublicPassword: FileSharingPublicPassword?,
+ @Json(name = "expire_date")
+ val fileSharingPublicExpireDate: FileSharingPublicExpireDate?
+)
+
+@JsonClass(generateAdapter = true)
+data class FileSharingPublicPassword(
+ val enforced: Boolean?,
+ @Json(name = "enforced_for")
+ val enforcedFor: FileSharingPublicPasswordEnforced?
+)
+
+@JsonClass(generateAdapter = true)
+data class FileSharingPublicPasswordEnforced(
+ @Json(name = "read_only")
+ val enforcedReadOnly: Boolean?,
+ @Json(name = "read_write")
+ val enforcedReadWrite: Boolean?,
+ @Json(name = "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 FileCapabilities(
+ val bigfilechunking: Boolean?,
+ val undelete: Boolean?,
+ val versioning: Boolean?
+)
+
+@JsonClass(generateAdapter = true)
+data class ServerVersion(
+ 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/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/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 0d53ce97..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
@@ -2,6 +2,8 @@
* @author masensio
* @author Semih Serhat Karakaya <karakayasemi@itu.edu.tr>
* @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
@@ -24,7 +26,6 @@
* THE SOFTWARE.
*
*/
-
package com.owncloud.android.lib.resources.status
import com.owncloud.android.lib.common.OwnCloudClient
@@ -33,10 +34,14 @@ 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 org.json.JSONObject
-import java.net.URL
-import com.owncloud.android.lib.resources.status.RemoteCapability.CapabilityBooleanType
+import com.owncloud.android.lib.resources.response.CapabilityResponse
+import com.owncloud.android.lib.resources.response.CommonOcsResponse
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
import timber.log.Timber
+import java.lang.reflect.Type
+import java.net.URL
/**
* Get the Capabilities from the server
@@ -45,206 +50,39 @@ import timber.log.Timber
* @author masensio
* @author David González Verdugo
*/
-/**
- * Constructor
- */
class GetRemoteCapabilitiesOperation : RemoteOperation<RemoteCapability>() {
override fun run(client: OwnCloudClient): RemoteOperationResult<RemoteCapability> {
var result: RemoteOperationResult<RemoteCapability>
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().apply {
+ 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 (!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")
- }
+ if (status == HttpConstants.HTTP_OK) {
+ Timber.d("Successful response $response")
- return result
- }
+ // Parse the response
+ val moshi: Moshi = Moshi.Builder().build()
+ val type: Type = Types.newParameterizedType(CommonOcsResponse::class.java, CapabilityResponse::class.java)
+ val adapter: JsonAdapter<CommonOcsResponse<CapabilityResponse>> = moshi.adapter(type)
+ val commonResponse: CommonOcsResponse<CapabilityResponse>? = adapter.fromJson(response)
- 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)
-
- // 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)
-
- 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")
- }
-
- // 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")
- }
- }
- // Result
result = RemoteOperationResult(OK)
- result.data = capability
+ result.data = commonResponse?.ocs?.data?.toRemoteCapability()
- Timber.d("*** Get Capabilities completed ")
+ Timber.d("Get Capabilities completed and parsed to ${result.data}")
} else {
- result = RemoteOperationResult(statuscode, message, null)
- Timber.e("Failed response while getting capabilities from the server ")
- Timber.e("*** status: $statusProp; message: $message")
+ result = RemoteOperationResult(getMethod)
+ Timber.e("Failed response while getting capabilities from the server status code: $status; response message: $response")
}
} catch (e: Exception) {
@@ -255,10 +93,6 @@ class GetRemoteCapabilitiesOperation : RemoteOperation<RemoteCapability>() {
return result
}
- private fun isSuccess(status: Int): Boolean {
- return status == HttpConstants.HTTP_OK
- }
-
companion object {
// OCS Routes
@@ -269,57 +103,5 @@ class GetRemoteCapabilitiesOperation : RemoteOperation<RemoteCapability>() {
// 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 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"
}
}
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
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..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
@@ -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<RemoteUserInfo>() {
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")