mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-24 14:05:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2963 from nextcloud/bugfix/2962/adaptJsonParsingToNewCapabiliesStructure

Browse source 
Handle new capabilities json structure
This commit is contained in:
Marcel Hibbe 2023-04-22 06:35:08 +02:00 committed by GitHub
commit c3b91bd908
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/data/user/model/User.kt
View file

@ -44,7 +44,7 @@ data class User(
) : Parcelable {
fun getMaxMessageLength(): Int {
return capabilities?.spreedCapability?.config?.get("chat")?.get("max-length")?.toInt()
return (capabilities?.spreedCapability?.config?.get("chat")?.get("max-length") as? String)?.toInt()
?: DEFAULT_CHAT_MESSAGE_LENGTH
}
@ -53,7 +53,7 @@ data class User(
}
fun canUserCreateGroupConversations(): Boolean {
val canCreateValue = capabilities?.spreedCapability?.config?.get("conversations")?.get("can-create")
val canCreateValue = capabilities?.spreedCapability?.config?.get("conversations")?.get("can-create") as? String
canCreateValue?.let {
return it.toBoolean()
}

6
app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt
View file

@ -24,7 +24,10 @@ package com.nextcloud.talk.models.json.capabilities
import android.os.Parcelable
import com.bluelinelabs.logansquare.annotation.JsonField
import com.bluelinelabs.logansquare.annotation.JsonObject
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.RawValue
import kotlinx.serialization.Contextual
import kotlinx.serialization.Serializable
@Parcelize
@ -34,7 +37,8 @@ data class SpreedCapability(
@JsonField(name = ["features"])
var features: List<String>?,
@JsonField(name = ["config"])
var config: HashMap<String, HashMap<String, String>>?
var config: HashMap<String, HashMap<String, @RawValue @Contextual
Any>>?
) : Parcelable {
// This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
constructor() : this(null, null)

16
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) {
val chatConfigHashMap = user.capabilities!!.spreedCapability!!.config!!["chat"]
if (chatConfigHashMap?.containsKey("max-length") == true) {
val chatSize = chatConfigHashMap["max-length"]!!.toInt()
return if (chatSize > 0) {
val chatSize = (chatConfigHashMap["max-length"]!! as? String)?.toInt()
return if (chatSize != null && chatSize > 0) {
chatSize
} else {
DEFAULT_CHAT_SIZE
@ -85,7 +85,7 @@ object CapabilitiesUtilNew {
fun isReadStatusAvailable(user: User): Boolean {
if (user.capabilities?.spreedCapability?.config?.containsKey("chat") == true) {
val map: Map<String, String>? = user.capabilities!!.spreedCapability!!.config!!["chat"]
val map: Map<String, Any>? = user.capabilities!!.spreedCapability!!.config!!["chat"]
return map != null && map.containsKey("read-privacy")
}
return false
@ -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"]!!.toInt() == 1
return (map["read-privacy"]!! as? String)?.toInt() == 1
}
}
@ -107,9 +107,9 @@ object CapabilitiesUtilNew {
if (hasSpreedFeatureCapability(user, "recording-v1") &&
user.capabilities?.spreedCapability?.config?.containsKey("call") == true
) {
val map: Map<String, String>? = user.capabilities!!.spreedCapability!!.config!!["call"]
val map: Map<String, Any>? = user.capabilities!!.spreedCapability!!.config!!["call"]
if (map != null && map.containsKey("recording")) {
return map["recording"].toBoolean()
return (map["recording"] as? String).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"]
return map["folder"] as? String
}
}
return "/Talk"
@ -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"])
java.lang.Boolean.parseBoolean(capabilities.spreedCapability!!.config!!["call"]!!["enabled"] as? String)
} else {
// older nextcloud versions without the capability can't disable the calls
true