From 9b28a8cfe3f99b10532074c46139d1013d89904d Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 5 Jul 2022 22:43:13 +0200 Subject: [PATCH] make hasChatPermission accept user and userEntity Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/utils/AttendeePermissionsUtil.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/AttendeePermissionsUtil.kt b/app/src/main/java/com/nextcloud/talk/utils/AttendeePermissionsUtil.kt index e1e291b6f..5487c66ed 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/AttendeePermissionsUtil.kt +++ b/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