From 30e4698c1a304c8adc6646ce1c478af9171b9621 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 25 Apr 2023 20:37:58 +0200 Subject: [PATCH 1/3] Parse value as String which should work for old values (Strings) and new Values (Boolean) Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/utils/database/user/CapabilitiesUtilNew.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 081d37d9c..ea26449c2 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 @@ -157,7 +157,7 @@ object CapabilitiesUtilNew { capabilities.spreedCapability!!.config!!["call"] != null && capabilities.spreedCapability!!.config!!["call"]!!.containsKey("enabled") ) { - java.lang.Boolean.parseBoolean(capabilities.spreedCapability!!.config!!["call"]!!["enabled"] as? String) + java.lang.Boolean.parseBoolean(capabilities.spreedCapability!!.config!!["call"]!!["enabled"].toString()) } else { // older nextcloud versions without the capability can't disable the calls true From 1e87fe9b69983fcc45a70cd63f081140ccfb9c79 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 26 Apr 2023 09:51:22 +0200 Subject: [PATCH 2/3] 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 --- .../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? = 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" From eab052d2accf01f2b9b63ec3fe0b652eff58552a Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 26 Apr 2023 09:52:55 +0200 Subject: [PATCH 3/3] Delete unused methods Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/data/user/model/User.kt | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt b/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt index 31491e1ab..30b8906e1 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt +++ b/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt @@ -43,30 +43,9 @@ data class User( var scheduledForDeletion: Boolean = FALSE ) : Parcelable { - fun getMaxMessageLength(): Int { - return (capabilities?.spreedCapability?.config?.get("chat")?.get("max-length") as? String)?.toInt() - ?: DEFAULT_CHAT_MESSAGE_LENGTH - } - - fun getAttachmentsConfig(key: String): Any? { - return capabilities?.spreedCapability?.config?.get("attachments")?.get(key) - } - - fun canUserCreateGroupConversations(): Boolean { - val canCreateValue = capabilities?.spreedCapability?.config?.get("conversations")?.get("can-create") as? String - canCreateValue?.let { - return it.toBoolean() - } - return true - } - fun getCredentials(): String = ApiUtils.getCredentials(username, token) fun hasSpreedFeatureCapability(capabilityName: String): Boolean { return capabilities?.spreedCapability?.features?.contains(capabilityName) ?: false } - - companion object { - const val DEFAULT_CHAT_MESSAGE_LENGTH: Int = 1000 - } }