Add ability to cancel link previews

stream-chat-android-compose-sample/src/androidTestE2eDebug/kotlin/io/getstream/chat/android/compose/tests/HyperLinksTests.kt

@@ -22,7 +22,6 @@ import io.getstream.chat.android.compose.robots.assertMessage
 import io.getstream.chat.android.compose.sample.ui.InitTestActivity
 import io.qameta.allure.kotlin.Allure.step
 import io.qameta.allure.kotlin.AllureId
-import org.junit.Ignore
 import org.junit.Test
 
 class HyperLinksTests : StreamTestCase() {
@@ -55,7 +54,6 @@ class HyperLinksTests : StreamTestCase() {
     }
 
     @AllureId("6830")
-    @Ignore("https://linear.app/stream/issue/AND-309")
     @Test
     fun test_unsplashLinkWithoutPreview() {
         step("GIVEN user opens the channel") {
@@ -73,7 +71,7 @@ class HyperLinksTests : StreamTestCase() {
         step("WHEN user taps on the send button") {
             userRobot.tapOnSendButton()
         }
-        step("THEN user observes a message with link preview") {
+        step("THEN user observes a message without link preview") {
             userRobot
                 .assertMessage(unsplashImageLink, isClickable = true)
                 .assertLinkPreviewInMessageList(isDisplayed = false)
@@ -103,7 +101,6 @@ class HyperLinksTests : StreamTestCase() {
     }
 
     @AllureId("6831")
-    @Ignore("https://linear.app/stream/issue/AND-309")
     @Test
     fun test_youtubeLinkWithoutPreview() {
         step("GIVEN user opens the channel") {
@@ -121,7 +118,7 @@ class HyperLinksTests : StreamTestCase() {
         step("WHEN user taps on the send button") {
             userRobot.tapOnSendButton()
         }
-        step("THEN user observes a message with link preview") {
+        step("THEN user observes a message without link preview") {
             userRobot
                 .assertMessage(youtubeVideoLink, isClickable = true)
                 .assertLinkPreviewInMessageList(isDisplayed = false)
@@ -151,7 +148,6 @@ class HyperLinksTests : StreamTestCase() {
     }
 
     @AllureId("6833")
-    @Ignore("https://linear.app/stream/issue/AND-309")
     @Test
     fun test_giphyLinkWithoutPreview() {
         step("GIVEN user opens the channel") {
@@ -169,7 +165,7 @@ class HyperLinksTests : StreamTestCase() {
         step("WHEN user taps on the send button") {
             userRobot.tapOnSendButton()
         }
-        step("THEN user observes a message with link preview") {
+        step("THEN user observes a message without link preview") {
             userRobot
                 .assertMessage(giphyGifLink, isClickable = true)
                 .assertLinkPreviewInMessageList(isDisplayed = false)
@@ -183,7 +179,7 @@ class HyperLinksTests : StreamTestCase() {
             userRobot.login().openChannel()
         }
         step("WHEN participant sends an unsplash url") {
-            userRobot.sendMessage(unsplashImageLink)
+            participantRobot.sendMessage(unsplashImageLink)
         }
         step("THEN user observes a message with link preview") {
             userRobot
@@ -199,7 +195,7 @@ class HyperLinksTests : StreamTestCase() {
             userRobot.login().openChannel()
         }
         step("WHEN participant sends a youtube url") {
-            userRobot.sendMessage(youtubeVideoLink)
+            participantRobot.sendMessage(youtubeVideoLink)
         }
         step("THEN user observes a message with link preview") {
             userRobot
@@ -215,7 +211,7 @@ class HyperLinksTests : StreamTestCase() {
             userRobot.login().openChannel()
         }
         step("WHEN participant sends a giphy url") {
-            userRobot.sendMessage(giphyGifLink)
+            participantRobot.sendMessage(giphyGifLink)
         }
         step("THEN user observes a message with link preview") {
             userRobot

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/composer/ComposerLinkPreview.kt

@@ -82,6 +82,7 @@ public fun ComposerLinkPreview(
     modifier: Modifier = Modifier,
     linkPreview: LinkPreview,
     onClick: ((linkPreview: LinkPreview) -> Unit)? = null,
+    onCancel: () -> Unit = {},
 ) {
     var previewClosed by rememberSaveable { mutableStateOf(false) }
 
@@ -127,7 +128,10 @@ public fun ComposerLinkPreview(
             Spacer(modifier = Modifier.height(theme.titleToSubtitle))
             ComposerLinkDescription(attachment.text)
         }
-        ComposerLinkCancelIcon { previewClosed = true }
+        ComposerLinkCancelIcon {
+            onCancel()
+            previewClosed = true
+        }
     }
 }
 

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

@@ -122,6 +122,7 @@ public fun MessageComposer(
     onAttachmentRemoved: (Attachment) -> Unit = { viewModel.removeSelectedAttachment(it) },
     onCancelAction: () -> Unit = { viewModel.dismissMessageActions() },
     onLinkPreviewClick: ((LinkPreview) -> Unit)? = null,
+    onCancelLinkPreviewClick: () -> Unit = { viewModel.cancelLinkPreview() },
     onMentionSelected: (User) -> Unit = { viewModel.selectMention(it) },
     onCommandSelected: (Command) -> Unit = { viewModel.selectCommand(it) },
     onAlsoSendToChannelSelected: (Boolean) -> Unit = { viewModel.setAlsoSendToChannel(it) },
@@ -132,6 +133,7 @@ public fun MessageComposer(
                 state = it,
                 onCancel = onCancelAction,
                 onLinkPreviewClick = onLinkPreviewClick,
+                onCancelLinkPreviewClick = onCancelLinkPreviewClick,
             )
         }
     },
@@ -224,6 +226,7 @@ public fun MessageComposer(
         onValueChange = onValueChange,
         onAttachmentRemoved = onAttachmentRemoved,
         onLinkPreviewClick = onLinkPreviewClick,
+        onCancelLinkPreviewClick = onCancelLinkPreviewClick,
         label = label,
     )
 }
@@ -269,6 +272,7 @@ public fun MessageComposer(
     onAttachmentRemoved: (Attachment) -> Unit = {},
     onCancelAction: () -> Unit = {},
     onLinkPreviewClick: ((LinkPreview) -> Unit)? = null,
+    onCancelLinkPreviewClick: () -> Unit = {},
     onMentionSelected: (User) -> Unit = {},
     onCommandSelected: (Command) -> Unit = {},
     onAlsoSendToChannelSelected: (Boolean) -> Unit = {},
@@ -279,6 +283,7 @@ public fun MessageComposer(
                 state = it,
                 onCancel = onCancelAction,
                 onLinkPreviewClick = onLinkPreviewClick,
+                onCancelLinkPreviewClick = onCancelLinkPreviewClick,
             )
         }
     },
@@ -408,6 +413,7 @@ public fun DefaultMessageComposerHeaderContent(
     messageComposerState: MessageComposerState,
     onCancelAction: () -> Unit,
     onLinkPreviewClick: ((LinkPreview) -> Unit)? = null,
+    onCancelLinkPreviewClick: () -> Unit = {},
 ) {
     val activeAction = messageComposerState.action
 
@@ -425,6 +431,7 @@ public fun DefaultMessageComposerHeaderContent(
             modifier = Modifier,
             linkPreview = messageComposerState.linkPreviews.first(),
             onClick = onLinkPreviewClick,
+            onCancel = onCancelLinkPreviewClick,
         )
     }
 }

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/theme/ChatComponentFactory.kt

@@ -1403,6 +1403,7 @@ public interface ChatComponentFactory {
         onAttachmentRemoved: (Attachment) -> Unit,
         onCancelAction: () -> Unit,
         onLinkPreviewClick: ((LinkPreview) -> Unit)?,
+        onCancelLinkPreviewClick: () -> Unit,
         onMentionSelected: (User) -> Unit,
         onCommandSelected: (Command) -> Unit,
         onAlsoSendToChannelSelected: (Boolean) -> Unit,
@@ -1427,6 +1428,7 @@ public interface ChatComponentFactory {
             onAttachmentRemoved = onAttachmentRemoved,
             onCancelAction = onCancelAction,
             onLinkPreviewClick = onLinkPreviewClick,
+            onCancelLinkPreviewClick = onCancelLinkPreviewClick,
             onMentionSelected = onMentionSelected,
             onCommandSelected = onCommandSelected,
             onAlsoSendToChannelSelected = onAlsoSendToChannelSelected,
@@ -1457,9 +1459,15 @@ public interface ChatComponentFactory {
         state: MessageComposerState,
         onCancel: () -> Unit,
         onLinkPreviewClick: ((LinkPreview) -> Unit)?,
+        onCancelLinkPreviewClick: () -> Unit,
     ) {
         Column(modifier = Modifier.animateContentSize()) {
-            DefaultMessageComposerHeaderContent(state, onCancel, onLinkPreviewClick)
+            DefaultMessageComposerHeaderContent(
+                messageComposerState = state,
+                onCancelAction = onCancel,
+                onLinkPreviewClick = onLinkPreviewClick,
+                onCancelLinkPreviewClick = onCancelLinkPreviewClick,
+            )
         }
     }
 
@@ -1499,8 +1507,14 @@ public interface ChatComponentFactory {
         modifier: Modifier,
         linkPreview: LinkPreview,
         onClick: ((LinkPreview) -> Unit)?,
+        onCancel: () -> Unit,
     ) {
-        ComposerLinkPreview(modifier, linkPreview, onClick)
+        ComposerLinkPreview(
+            modifier = modifier,
+            linkPreview = linkPreview,
+            onClick = onClick,
+            onCancel = onCancel,
+        )
     }
 
     /**

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/messages/MessageComposerViewModel.kt

@@ -280,4 +280,11 @@ public class MessageComposerViewModel(
         super.onCleared()
         messageComposerController.onCleared()
     }
+
+    /**
+     * @see [MessageComposerController.cancelLinkPreview]
+     */
+    public fun cancelLinkPreview() {
+        messageComposerController.cancelLinkPreview()
+    }
 }

stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/feature/messages/composer/MessageComposerController.kt

@@ -717,7 +717,10 @@ public class MessageComposerController(
             chatClient.sendMessage(
                 channelType,
                 channelId,
-                message.copy(showInChannel = isInThread && alsoSendToChannel.value),
+                message.copy(
+                    showInChannel = isInThread && alsoSendToChannel.value,
+                    skipEnrichUrl = linkPreviews.value.isEmpty(),
+                ),
             ).doOnResult(scope) { result ->
                 result.onSuccessSuspend { resultMessage ->
                     if (channelState.value?.channelConfig?.value?.markMessagesPending == false) {
@@ -1096,4 +1099,10 @@ public class MessageComposerController(
         is MessageMode.MessageThread -> DraftMessage(cid = channelCid, parentId = parentMessage.id)
         else -> DraftMessage(cid = channelCid)
     }
+
+    /**
+     */
+    public fun cancelLinkPreview() {
+        linkPreviews.value = emptyList()
+    }
 }