Disallow sending polls in threads. (#5970)

Co-authored-by: Aleksandar Apostolov <[email protected]>

Author: VelikovPetar

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt

@@ -1719,6 +1719,8 @@ internal constructor(
     /**
      * Send a message with a poll to the given channel.
      *
+     * IMPORTANT: Polls cannot be sent inside a thread!
+     *
      * @param channelType The channel type. ie messaging.
      * @param channelId The channel id. ie 123.
      * @param pollConfig The poll configuration.

stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/MessagesActivity.kt

@@ -218,6 +218,7 @@ class MessagesActivity : ComponentActivity() {
         val isShowingAttachments = attachmentsPickerViewModel.isShowingAttachments
         val currentMessagesState by listViewModel.currentMessagesState
         val selectedMessageState = currentMessagesState.selectedMessageState
+        val messageMode by composerViewModel.messageMode.collectAsState()
         val user by listViewModel.user.collectAsState()
         val lazyListState = rememberMessageListState()
 
@@ -294,6 +295,7 @@ class MessagesActivity : ComponentActivity() {
                         attachmentsPickerViewModel.changeAttachmentState(false)
                         attachmentsPickerViewModel.dismissAttachments()
                     },
+                    messageMode = messageMode,
                 )
             }
 

stream-chat-android-compose/api/stream-chat-android-compose.api

@@ -2186,7 +2186,7 @@ public final class io/getstream/chat/android/compose/ui/messages/MessagesScreenK
 }
 
 public final class io/getstream/chat/android/compose/ui/messages/attachments/AttachmentsPickerKt {
-	public static final fun AttachmentsPicker (Lio/getstream/chat/android/compose/viewmodel/messages/AttachmentsPickerViewModel;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;Ljava/util/List;Landroidx/compose/ui/graphics/Shape;Landroidx/compose/runtime/Composer;II)V
+	public static final fun AttachmentsPicker (Lio/getstream/chat/android/compose/viewmodel/messages/AttachmentsPickerViewModel;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Landroidx/compose/ui/Modifier;Ljava/util/List;Landroidx/compose/ui/graphics/Shape;Lio/getstream/chat/android/ui/common/state/messages/MessageMode;Landroidx/compose/runtime/Composer;II)V
 }
 
 public abstract interface class io/getstream/chat/android/compose/ui/messages/attachments/factory/AttachmentPickerAction {

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/MessagesScreen.kt

@@ -57,6 +57,7 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import io.getstream.chat.android.compose.R
 import io.getstream.chat.android.compose.state.mediagallerypreview.MediaGalleryPreviewResultType
@@ -642,6 +643,7 @@ public fun BoxScope.AttachmentsPickerMenu(
     composerViewModel: MessageComposerViewModel,
 ) {
     val isShowingAttachments = attachmentsPickerViewModel.isShowingAttachments
+    val messageMode by composerViewModel.messageMode.collectAsStateWithLifecycle()
 
     // Ensure keyboard is closed when the attachments picker is shown (if instructed by ChatTheme)
     val keyboardController = LocalSoftwareKeyboardController.current
@@ -708,6 +710,7 @@ public fun BoxScope.AttachmentsPickerMenu(
                     attachmentsPickerViewModel.dismissAttachments()
                 }
             },
+            messageMode = messageMode,
         )
     }
 }

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/AttachmentsPicker.kt

@@ -60,6 +60,7 @@ import io.getstream.chat.android.compose.ui.util.mirrorRtl
 import io.getstream.chat.android.compose.viewmodel.messages.AttachmentsPickerViewModel
 import io.getstream.chat.android.models.Attachment
 import io.getstream.chat.android.models.Channel
+import io.getstream.chat.android.ui.common.state.messages.MessageMode
 
 /**
  * Represents the bottom bar UI that allows users to pick attachments. The picker renders its
@@ -74,7 +75,9 @@ import io.getstream.chat.android.models.Channel
  * @param modifier Modifier for styling.
  * @param tabFactories The list of attachment picker tab factories.
  * @param shape The shape of the dialog.
+ * @param messageMode The message mode, used to determine if the default "Polls" tab is enabled.
  */
+@Suppress("LongMethod")
 @Composable
 public fun AttachmentsPicker(
     attachmentsPickerViewModel: AttachmentsPickerViewModel,
@@ -85,6 +88,7 @@ public fun AttachmentsPicker(
     modifier: Modifier = Modifier,
     tabFactories: List<AttachmentsPickerTabFactory> = ChatTheme.attachmentsPickerTabFactories,
     shape: Shape = ChatTheme.shapes.bottomSheet,
+    messageMode: MessageMode = MessageMode.Normal,
 ) {
     val saveAttachmentsOnDismiss = ChatTheme.attachmentPickerTheme.saveAttachmentsOnDismiss
     val dismissAction = {
@@ -96,7 +100,7 @@ public fun AttachmentsPicker(
     BackHandler(onBack = dismissAction)
     // Cross-validate requested tabFactories with the allowed ones from BE
     val filter = remember { AttachmentsPickerTabFactoryFilter() }
-    val allowedFactories = filter.filterAllowedFactories(tabFactories, attachmentsPickerViewModel.channel)
+    val allowedFactories = filter.filterAllowedFactories(tabFactories, attachmentsPickerViewModel.channel, messageMode)
     val defaultTabIndex = allowedFactories
         .indexOfFirst { it.isPickerTabEnabled(attachmentsPickerViewModel.channel) }
         .takeIf { it >= 0 }

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/messages/attachments/factory/AttachmentsPickerTabFactoryFilter.kt

@@ -18,6 +18,7 @@ package io.getstream.chat.android.compose.ui.messages.attachments.factory
 
 import io.getstream.chat.android.compose.util.extensions.isPollEnabled
 import io.getstream.chat.android.models.Channel
+import io.getstream.chat.android.ui.common.state.messages.MessageMode
 
 /**
  * Filter to determine if the tab factory should be shown or not.
@@ -29,16 +30,20 @@ internal class AttachmentsPickerTabFactoryFilter {
      *
      * @param factories The list of factories to filter.
      * @param channel The channel to check against.
+     * @param messageMode The current message mode, used to determine if the default "Polls" tab is enabled.
      */
     internal fun filterAllowedFactories(
         factories: List<AttachmentsPickerTabFactory>,
         channel: Channel,
+        messageMode: MessageMode,
     ): List<AttachmentsPickerTabFactory> {
         return factories
-            .filter { factory -> factory.isPickerTabEnabled(channel) }
+            .filter { factory ->
+                factory.isEnabledForMessageMode(messageMode) && factory.isPickerTabEnabled(channel)
+            }
             .map { factory ->
                 when (factory) {
-                    is AttachmentsPickerSystemTabFactory -> adjustSystemFactory(factory, channel)
+                    is AttachmentsPickerSystemTabFactory -> adjustSystemFactory(factory, channel, messageMode)
                     else -> factory
                 }
             }
@@ -47,11 +52,23 @@ internal class AttachmentsPickerTabFactoryFilter {
     private fun adjustSystemFactory(
         factory: AttachmentsPickerSystemTabFactory,
         channel: Channel,
+        messageMode: MessageMode,
     ): AttachmentsPickerSystemTabFactory {
-        // Adjust pollEnabled based on the channel config
+        // Adjust pollAllowed based on the:
+        // 1. Current message mode (only in Normal mode)
+        // 2. Channel config (are polls enabled for the channel and the user has rights)
+        // 3. Factory config (is the polls tab enabled in the factory config)
         val config = factory.config.copy(
-            pollAllowed = channel.isPollEnabled() && factory.config.pollAllowed,
+            pollAllowed = messageMode is MessageMode.Normal && channel.isPollEnabled() && factory.config.pollAllowed,
         )
         return AttachmentsPickerSystemTabFactory(config)
     }
+
+    private fun AttachmentsPickerTabFactory.isEnabledForMessageMode(mode: MessageMode): Boolean {
+        return when (this) {
+            // The default "Polls" tab is only shown in Normal mode
+            is AttachmentsPickerPollTabFactory -> mode is MessageMode.Normal
+            else -> true
+        }
+    }
 }