gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong parsing of capability values

Browse Source 
This fixes bugs that were introduced with https://github.com/nextcloud/talk-android/pull/2963

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-04-26 09:51:22 +02:00
parent 30e4698c1a
commit 1e87fe9b69
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesUtilNew.kt
View File

@ -67,8 +67,8 @@ object CapabilitiesUtilNew {
if (user?.capabilities?.spreedCapability?.config?.containsKey("chat") == true) { if (user?.capabilities?.spreedCapability?.config?.containsKey("chat") == true) {
val chatConfigHashMap = user.capabilities!!.spreedCapability!!.config!!["chat"] val chatConfigHashMap = user.capabilities!!.spreedCapability!!.config!!["chat"]
if (chatConfigHashMap?.containsKey("max-length") == true) { if (chatConfigHashMap?.containsKey("max-length") == true) {
val chatSize = (chatConfigHashMap["max-length"]!! as? String)?.toInt() val chatSize = (chatConfigHashMap["max-length"]!!.toString()).toInt()
return if (chatSize != null && chatSize > 0) { return if (chatSize > 0) {
chatSize chatSize
} else { } else {
DEFAULT_CHAT_SIZE DEFAULT_CHAT_SIZE
@ -95,7 +95,7 @@ object CapabilitiesUtilNew {
if (user.capabilities?.spreedCapability?.config?.containsKey("chat") == true) { if (user.capabilities?.spreedCapability?.config?.containsKey("chat") == true) {
val map = user.capabilities!!.spreedCapability!!.config!!["chat"] val map = user.capabilities!!.spreedCapability!!.config!!["chat"]
if (map?.containsKey("read-privacy") == true) { 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"] val map: Map<String, Any>? = user.capabilities!!.spreedCapability!!.config!!["call"]
if (map != null && map.containsKey("recording")) { if (map != null && map.containsKey("recording")) {
return (map["recording"] as? String).toBoolean() return (map["recording"].toString()).toBoolean()
} }
} }
return false return false
@ -126,7 +126,7 @@ object CapabilitiesUtilNew {
if (user.capabilities?.spreedCapability?.config?.containsKey("attachments") == true) { if (user.capabilities?.spreedCapability?.config?.containsKey("attachments") == true) {
val map = user.capabilities!!.spreedCapability!!.config!!["attachments"] val map = user.capabilities!!.spreedCapability!!.config!!["attachments"]
if (map?.containsKey("folder") == true) { if (map?.containsKey("folder") == true) {
return map["folder"] as? String return map["folder"].toString()
} }
} }
return "/Talk" return "/Talk"