Эх сурвалжийг харах

make hasChatPermission accept user and userEntity

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 2 жил өмнө
parent
commit
9b28a8cfe3

+ 8 - 1
app/src/main/java/com/nextcloud/talk/utils/AttendeePermissionsUtil.kt

@@ -20,8 +20,10 @@
 
 package com.nextcloud.talk.utils
 
+import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.models.database.CapabilitiesUtil
 import com.nextcloud.talk.models.database.UserEntity
+import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew
 
 /**
  * see https://nextcloud-talk.readthedocs.io/en/latest/constants/#attendee-permissions
@@ -49,8 +51,13 @@ class AttendeePermissionsUtil(flag: Int) {
         hasChatPermission = (flag and CHAT) == CHAT
     }
 
+    @Deprecated("use hasChatPermission(user: User) instead")
     fun hasChatPermission(user: UserEntity): Boolean {
-        if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "chat-permission")) {
+        return hasChatPermission(LegacyUserEntityMapper.toModel(user)!!)
+    }
+
+    fun hasChatPermission(user: User): Boolean {
+        if (CapabilitiesUtilNew.hasSpreedFeatureCapability(user, "chat-permission")) {
             return hasChatPermission
         }
         // if capability is not available then the spreed version doesn't support to restrict this