Move channel-preset capability check into ConversationUtils.isChannel

isChannel() was a raw attribute check, so every caller had to repeat
"conversation.isChannel() && hasSpreedFeatureCapability(..., ANNOUNCEMENT_PRESET)"
themselves. Renamed the raw checks to isChannelAttribute()/
isAnnouncementAttribute() (mirroring isClassifiedAttribute()) and added
a capability-gated isChannel(conversation, spreedCapabilities), mirroring
the existing isClassified()/isClassifiedAttribute() split. Callers now
call ConversationUtils.isChannel(...) directly.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

Author: mahibi

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -175,7 +175,6 @@ import com.nextcloud.talk.utils.CapabilitiesUtil.retentionOfSIPRoom
 import com.nextcloud.talk.utils.ContactUtils
 import com.nextcloud.talk.utils.ConversationUtils
 import com.nextcloud.talk.utils.ConversationUtils.checkIfVoiceRoom
-import com.nextcloud.talk.utils.ConversationUtils.isChannel
 import com.nextcloud.talk.utils.DateConstants
 import com.nextcloud.talk.utils.DateUtils
 import com.nextcloud.talk.utils.DisplayUtils
@@ -1973,10 +1972,7 @@ class ChatActivity :
             !ConversationUtils.isNoteToSelfConversation(conversation) &&
             !isReadOnlyConversation() &&
             !shouldShowLobby() &&
-            !(
-                conversation.isChannel() &&
-                    hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.ANNOUNCEMENT_PRESET)
-                )
+            !ConversationUtils.isChannel(conversation, spreedCapabilities)
 
     private fun isSearchAvailable(capabilitiesReady: Boolean, conversation: ConversationModel?): Boolean =
         capabilitiesReady &&
@@ -2249,8 +2245,7 @@ class ChatActivity :
 
     private fun checkShowMessageInputView() {
         val permissions = participantPermissionsFlow.value
-        val isChannel = currentConversation.isChannel() &&
-            hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.ANNOUNCEMENT_PRESET)
+        val isChannel = ConversationUtils.isChannel(currentConversation, spreedCapabilities)
 
         if (isReadOnlyConversation() ||
             (permissions?.hasChatPermission() == false && (!isChannel || permissions.hasReactPermission() == false))

app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt

@@ -82,7 +82,7 @@ import com.nextcloud.talk.users.UserManager
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.CapabilitiesUtil
 import com.nextcloud.talk.utils.CharPolicy
-import com.nextcloud.talk.utils.ConversationUtils.isChannel
+import com.nextcloud.talk.utils.ConversationUtils
 import com.nextcloud.talk.utils.DateUtils
 import com.nextcloud.talk.utils.DisplayUtils
 import com.nextcloud.talk.utils.EmojiTextInputEditText
@@ -1310,8 +1310,7 @@ class MessageInputFragment : Fragment() {
     private fun isReactionOnlyMode(spreedCapabilities: SpreedCapability): Boolean {
         val conversation = chatActivity.currentConversation
         val permissions = chatActivity.participantPermissionsFlow.value
-        val isChannel = conversation.isChannel() &&
-            CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.ANNOUNCEMENT_PRESET)
+        val isChannel = ConversationUtils.isChannel(conversation, spreedCapabilities)
         return isChannel && permissions?.hasChatPermission() == false && permissions.hasReactPermission() == true
     }
 

app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt

@@ -67,7 +67,6 @@ import com.nextcloud.talk.ui.PlaybackSpeed
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability
 import com.nextcloud.talk.utils.ConversationUtils
-import com.nextcloud.talk.utils.ConversationUtils.isChannel
 import com.nextcloud.talk.utils.ParticipantPermissions
 import com.nextcloud.talk.utils.SpreedFeatures
 import com.nextcloud.talk.utils.UserIdUtils
@@ -1375,7 +1374,7 @@ class ChatViewModel @AssistedInject constructor(
         conversation: ConversationModel?,
         capabilities: SpreedCapability?
     ): List<ChatMessage> {
-        if (conversation.isChannel() && hasSpreedFeatureCapability(capabilities, SpreedFeatures.ANNOUNCEMENT_PRESET)) {
+        if (ConversationUtils.isChannel(conversation, capabilities)) {
             return chatMessageList.filter { !it.isSystemMessage }
         }
 

app/src/main/java/com/nextcloud/talk/conversationinfo/viewmodel/ConversationInfoViewModel.kt

@@ -44,7 +44,6 @@ import com.nextcloud.talk.utils.ApiUtils.getUrlForRooms
 import com.nextcloud.talk.utils.CapabilitiesUtil
 import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability
 import com.nextcloud.talk.utils.ConversationUtils
-import com.nextcloud.talk.utils.ConversationUtils.isChannel
 import com.nextcloud.talk.utils.DateConstants
 import com.nextcloud.talk.utils.DisplayUtils
 import com.nextcloud.talk.utils.SpreedFeatures
@@ -422,8 +421,7 @@ class ConversationInfoViewModel @Inject constructor(
         val showMessageExpiration = isModerator &&
             hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.MESSAGE_EXPIRATION)
 
-        val isChannel = conversationModel.isChannel() &&
-            hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.ANNOUNCEMENT_PRESET)
+        val isChannel = ConversationUtils.isChannel(conversationModel, spreedCapabilities)
         val showParticipants = if (isChannel) isModerator else true
 
         val credentials = ApiUtils.getCredentials(user.username, user.token) ?: ""

app/src/main/java/com/nextcloud/talk/utils/ConversationUtils.kt

@@ -65,8 +65,13 @@ object ConversationUtils {
 
     fun ConversationModel?.checkIfVoiceRoom(): Boolean = hasAttribute(ConversationEnums.ATTRIBUTE_IS_VOICE_ROOM)
     fun ConversationModel?.isClassifiedAttribute(): Boolean = hasAttribute(ConversationEnums.ATTRIBUTE_IS_CLASSIFIED)
-    fun ConversationModel?.isChannel(): Boolean = hasAttribute(ConversationEnums.ATTRIBUTE_IS_CHANNEL)
-    fun ConversationModel?.isAnnouncement(): Boolean = hasAttribute(ConversationEnums.ATTRIBUTE_IS_ANNOUNCEMENT)
+    fun ConversationModel?.isChannelAttribute(): Boolean = hasAttribute(ConversationEnums.ATTRIBUTE_IS_CHANNEL)
+    fun ConversationModel?.isAnnouncementAttribute(): Boolean =
+        hasAttribute(ConversationEnums.ATTRIBUTE_IS_ANNOUNCEMENT)
+
+    fun isChannel(conversation: ConversationModel?, spreedCapabilities: SpreedCapability?): Boolean =
+        conversation.isChannelAttribute() &&
+            CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.ANNOUNCEMENT_PRESET)
 
     fun isClassified(conversation: ConversationModel, spreedCapabilities: SpreedCapability?): Boolean =
         CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.CLASSIFIED_CONVERSATIONS) &&