Skip to content

fix: missing message content with bubble disabled [WPB-21763] #4418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vitorhugods merged 1 commit into from
Nov 14, 2025
Merged

fix: missing message content with bubble disabled [WPB-21763] #4418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageBubbleItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import androidx.compose.ui.unit.dp
import com.wire.android.ui.common.applyIf
import com.wire.android.ui.common.colorsScheme
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.common.spacers.HorizontalSpace
import com.wire.android.ui.home.conversations.model.MessageSource
import com.wire.android.ui.home.conversations.model.MessageStatus
import com.wire.android.ui.home.conversations.model.UIMessage
Expand Down Expand Up @@ -90,7 +89,7 @@ fun MessageBubbleItem(
val leadingPadding = if (leading != null) {
dimensions().spacing48x
} else {
dimensions().spacing0x
dimensions().spacing12x
}
Row(
modifier = Modifier.fillMaxWidth(),
Expand All @@ -101,12 +100,10 @@ fun MessageBubbleItem(
},
verticalAlignment = Alignment.Bottom
) {
if (leading != null) {
Box(Modifier.width(leadingPadding), contentAlignment = Alignment.BottomStart) {
Box(Modifier.width(leadingPadding), contentAlignment = Alignment.BottomStart) {
if (leading != null) {
leading()
}
} else {
HorizontalSpace.x12()
}
Column(
modifier = Modifier.applyIf(!message.decryptionFailed) {
Expand Down
25 changes: 13 additions & 12 deletions ...in/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageContentAndStatus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.wire.android.ui.home.conversations.messages.item

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
Expand All @@ -12,6 +13,7 @@ import androidx.compose.ui.res.stringResource
import com.wire.android.R
import com.wire.android.media.audiomessage.AudioMessageArgs
import com.wire.android.model.Clickable
import com.wire.android.ui.common.applyIf
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.common.spacers.HorizontalSpace
import com.wire.android.ui.common.spacers.VerticalSpace
Expand Down Expand Up @@ -52,7 +54,6 @@ internal fun UIMessage.Regular.MessageContentAndStatus(
onReplyClicked: (UIMessage.Regular) -> Unit,
shouldDisplayMessageStatus: Boolean,
conversationDetailsData: ConversationDetailsData,
modifier: Modifier = Modifier,
accent: Accent = Accent.Unknown,
) {
val onAssetClickable = remember(message) {
Expand All @@ -78,17 +79,16 @@ internal fun UIMessage.Regular.MessageContentAndStatus(
onReplyClicked(message)
}
}
Column(
modifier
) {
MessageContent(
message = message,
messageContent = messageContent,
searchQuery = searchQuery,
assetStatus = assetStatus,
onAssetClick = onAssetClickable,
onImageClick = onImageClickable,
onMultipartImageClick = onMultipartImageClickable,
Row {
Column(Modifier.applyIf(!messageStyle.isBubble()) { weight(1F) }) {
MessageContent(
message = message,
messageContent = messageContent,
searchQuery = searchQuery,
assetStatus = assetStatus,
onAssetClick = onAssetClickable,
onImageClick = onImageClickable,
onMultipartImageClick = onMultipartImageClickable,
onOpenProfile = onProfileClicked,
onLinkClick = onLinkClicked,
onReplyClick = onReplyClickable,
Expand Down Expand Up @@ -120,6 +120,7 @@ internal fun UIMessage.Regular.MessageContentAndStatus(
VerticalSpace.x2()
} else {
VerticalSpace.x4()
}
}
}
}
Expand Down
5 changes: 0 additions & 5 deletions ...rc/main/kotlin/com/wire/android/ui/home/conversations/messages/item/MessageContentItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import com.wire.android.R
import com.wire.android.ui.common.applyIf
import com.wire.android.ui.common.dimensions
import com.wire.android.ui.common.spacers.HorizontalSpace
import com.wire.android.ui.common.spacers.VerticalSpace
Expand Down Expand Up @@ -101,10 +100,6 @@ fun MessageContentItem(
shouldDisplayMessageStatus = shouldDisplayMessageStatus,
conversationDetailsData = conversationDetailsData,
onReplyClicked = clickActions.onReplyClicked,
modifier = Modifier
.applyIf(!messageStyle.isBubble()) {
weight(1F)
}
)
if (shouldDisplayFooter && !messageStyle.isBubble()) {
VerticalSpace.x4()
Expand Down