From 1e87fe9b69983fcc45a70cd63f081140ccfb9c79 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe <dev@mhibbe.de> Date: Wed, 26 Apr 2023 09:51:22 +0200 Subject: [PATCH] Fix wrong parsing of capability values This fixes bugs that were introduced with https://github.com/nextcloud/talk-android/pull/2963 Signed-off-by: Marcel Hibbe <dev@mhibbe.de> --- .../talk/utils/database/user/CapabilitiesUtilNew.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.kt b/app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.kt index ea26449c2..928e92121 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.kt @@ -67,8 +67,8 @@ object CapabilitiesUtilNew { if (user?.capabilities?.spreedCapability?.config?.containsKey("chat") == true) { val chatConfigHashMap = user.capabilities!!.spreedCapability!!.config!!["chat"] if (chatConfigHashMap?.containsKey("max-length") == true) { - val chatSize = (chatConfigHashMap["max-length"]!! as? String)?.toInt() - return if (chatSize != null && chatSize > 0) { + val chatSize = (chatConfigHashMap["max-length"]!!.toString()).toInt() + return if (chatSize > 0) { chatSize } else { DEFAULT_CHAT_SIZE @@ -95,7 +95,7 @@ object CapabilitiesUtilNew { if (user.capabilities?.spreedCapability?.config?.containsKey("chat") == true) { val map = user.capabilities!!.spreedCapability!!.config!!["chat"] if (map?.containsKey("read-privacy") == true) { - return (map["read-privacy"]!! as? String)?.toInt() == 1 + return (map["read-privacy"]!!.toString()).toInt() == 1 } } @@ -109,7 +109,7 @@ object CapabilitiesUtilNew { ) { val map: Map<String, Any>? = user.capabilities!!.spreedCapability!!.config!!["call"] if (map != null && map.containsKey("recording")) { - return (map["recording"] as? String).toBoolean() + return (map["recording"].toString()).toBoolean() } } return false @@ -126,7 +126,7 @@ object CapabilitiesUtilNew { if (user.capabilities?.spreedCapability?.config?.containsKey("attachments") == true) { val map = user.capabilities!!.spreedCapability!!.config!!["attachments"] if (map?.containsKey("folder") == true) { - return map["folder"] as? String + return map["folder"].toString() } } return "/Talk"