Skip to content
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

Jump to bottom

fix: show last deleted message [WPB-1899] #2754

Merged
merged 3 commits into from
May 10, 2024
Merged

fix: show last deleted message [WPB-1899] #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
557755a
fix: show last deleted message
Garzas May 10, 2024
6b9697f
detekt fix
Garzas May 10, 2024
98be085
Merge branch 'develop' into fix/deleted-last-message
Garzas May 10, 2024
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
1 change: 1 addition & 0 deletions logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ sealed interface MessagePreviewContent {

data class MissedCall(override val username: String?) : WithUser

data class Deleted(override val username: String?) : WithUser
}

data class Ephemeral(val isGroupConversation: Boolean) : MessagePreviewContent
Expand Down
1 change: 1 addition & 0 deletions logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ private fun MessagePreviewEntityContent.toMessageContent(): MessagePreviewConten
is MessagePreviewEntityContent.ConversationVerificationDegradedMls -> MessagePreviewContent.VerificationChanged.DegradedMls
is MessagePreviewEntityContent.ConversationVerificationDegradedProteus -> MessagePreviewContent.VerificationChanged.DegradedProteus
is MessagePreviewEntityContent.Location -> MessagePreviewContent.WithUser.Location(username = senderName)
is MessagePreviewEntityContent.Deleted -> MessagePreviewContent.WithUser.Deleted(username = senderName)
}

fun AssetTypeEntity.toModel(): AssetType = when (this) {
Expand Down
2 changes: 1 addition & 1 deletion persistence/src/commonMain/db_user/com/wire/kalium/persistence/MessagePreview.sq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ SELECT * FROM MessagePreview AS message
WHERE id IN (
SELECT id FROM Message
WHERE
Message.visibility = 'VISIBLE' AND
Message.visibility IN ('VISIBLE', 'DELETED') AND
Message.content_type IN ('TEXT', 'ASSET', 'KNOCK', 'MISSED_CALL', 'CONVERSATION_RENAMED', 'MEMBER_CHANGE', 'COMPOSITE', 'CONVERSATION_DEGRADED_MLS', 'CONVERSATION_DEGRADED_PROTEUS', 'CONVERSATION_VERIFIED_MLS', 'CONVERSATION_VERIFIED_PROTEUS', 'LOCATION')
GROUP BY Message.conversation_id
HAVING Message.creation_date = MAX(Message.creation_date)
Expand Down
1 change: 1 addition & 0 deletions persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ data class NotificationMessageEntity(

sealed class MessagePreviewEntityContent {

data class Deleted(val senderName: String?) : MessagePreviewEntityContent()
data class Text(val senderName: String?, val messageBody: String) : MessagePreviewEntityContent()

data class Composite(val senderName: String?, val messageBody: String?) : MessagePreviewEntityContent()
Expand Down
8 changes: 8 additions & 0 deletions persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/message/MessageMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ object MessageMapper {
@Suppress("ComplexMethod", "LongMethod")
private fun toMessagePreviewEntityContent(
contentType: MessageEntity.ContentType,
visibility: MessageEntity.Visibility,
senderName: String?,
isSelfMessage: Boolean,
memberChangeList: List<QualifiedIDEntity>?,
Expand All @@ -61,6 +62,7 @@ object MessageMapper {
} else {
mapContentType(
contentType,
visibility,
senderName,
isSelfMessage,
memberChangeList,
Expand All @@ -79,6 +81,7 @@ object MessageMapper {
@Suppress("LongMethod", "ComplexMethod")
private fun mapContentType(
contentType: MessageEntity.ContentType,
visibility: MessageEntity.Visibility,
senderName: String?,
isSelfMessage: Boolean,
memberChangeList: List<QualifiedIDEntity>?,
Expand All @@ -90,6 +93,10 @@ object MessageMapper {
selfUserId: QualifiedIDEntity?,
senderUserId: QualifiedIDEntity?
): MessagePreviewEntityContent {
if (visibility == MessageEntity.Visibility.DELETED) {
return MessagePreviewEntityContent.Deleted(senderName)
}

return when (contentType) {
MessageEntity.ContentType.COMPOSITE -> MessagePreviewEntityContent.Composite(
senderName = senderName,
Expand Down Expand Up @@ -253,6 +260,7 @@ object MessageMapper {
): MessagePreviewEntity {
val content = toMessagePreviewEntityContent(
contentType = contentType,
visibility = visibility,
senderName = senderName,
isSelfMessage = isSelfMessage,
memberChangeList = memberChangeList,
Expand Down
Loading