Ignore renderable content in group update messages.

This commit is contained in:
Cody Henthorne
2026-07-27 14:56:42 -04:00
committed by Michelle Tang
parent 0df6c66d08
commit d25ac71907
2 changed files with 3 additions and 2 deletions
@@ -35,6 +35,7 @@ import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.hasGroupContex
import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.hasSignedGroupChange
import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.hasStarted
import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.isExpirationUpdate
import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.isGroupV2Update
import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.isMediaMessage
import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.isValid
import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.signedGroupChange
@@ -197,7 +198,7 @@ open class MessageContentProcessor(private val context: Context) {
val isTextMessage = message.body != null
val isMediaMessage = message.isMediaMessage
val isExpireMessage = message.isExpirationUpdate
val isGv2Update = message.hasSignedGroupChange
val isGv2Update = message.isGroupV2Update
val isContentMessage = !isGv2Update && !isExpireMessage && (isTextMessage || isMediaMessage)
val isGroupActive = threadRecipient.isActiveGroup
@@ -78,7 +78,7 @@ object SignalServiceProtoUtil {
get() = delete != null && delete!!.targetSentTimestamp != null
val DataMessage.isGroupV2Update: Boolean
get() = !hasRenderableContent && hasSignedGroupChange
get() = hasSignedGroupChange && !hasRenderableContent
val DataMessage?.hasGroupContext: Boolean
get() = this?.groupV2?.masterKey.isNotEmpty()