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

feat: add timer to all message types #1870

Merged
merged 9 commits into from
Jul 12, 2023
Merged

feat: add timer to all message types #1870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2aa35e0
feat: add message timer to all message types
MohamadJaara Jul 10, 2023
65976c3
parse ephemeral pings from/to proto
MohamadJaara Jul 10, 2023
0f31b61
feat: accept ephemeral system message
MohamadJaara Jul 10, 2023
e6bf712
detekt
MohamadJaara Jul 10, 2023
b2048c6
detekt
MohamadJaara Jul 10, 2023
f8a835e
fix test
MohamadJaara Jul 10, 2023
bf829c5
address PR comments
MohamadJaara Jul 11, 2023
9ed21dc
address PR comments
MohamadJaara Jul 11, 2023
b347eb4
Merge branch 'release/candidate' into feat/add_timer_to_all_message_t…
MohamadJaara Jul 11, 2023
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
3 changes: 2 additions & 1 deletion logic/src/androidAndroidTest/kotlin/com/wire/kalium/logic/feature/call/CallManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ class CallManagerTest {
senderUserId = UserId(value = "value", domain = "domain"),
senderClientId = ClientId(value = "value"),
status = Message.Status.SENT,
isSelfMessage = false
isSelfMessage = false,
expirationData = null
)
}
}
3 changes: 2 additions & 1 deletion .../src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/scenario/OnHttpRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ internal class OnHttpRequest(
senderUserId = userId,
senderClientId = clientId,
status = Message.Status.SENT,
isSelfMessage = true
isSelfMessage = true,
expirationData = null
)

return messageSender.sendMessage(message, messageTarget)
Expand Down
3 changes: 2 additions & 1 deletion logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/CallRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,8 @@ internal class CallDataSource(
DateTimeUtil.currentIsoDateTimeString(),
qualifiedUserId,
Message.Status.SENT,
Message.Visibility.VISIBLE
Message.Visibility.VISIBLE,
expirationData = null,
)
persistMessage(message)
} ?: callingLogger.i("[CallRepository] -> Unable to persist Missed Call due to missing Caller ID")
Expand Down
3 changes: 2 additions & 1 deletion ...onMain/kotlin/com/wire/kalium/logic/data/conversation/NewConversationMembersRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ internal class NewConversationMembersRepositoryImpl(
DateTimeUtil.currentIsoDateTimeString(),
selfUserId,
Message.Status.SENT,
Message.Visibility.VISIBLE
Message.Visibility.VISIBLE,
expirationData = null
)
persistMessage(messageStartedWithMembers)
}
Expand Down
3 changes: 2 additions & 1 deletion ...tlin/com/wire/kalium/logic/data/conversation/NewGroupConversationStartedMessageCreator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ internal class NewGroupConversationStartedMessageCreatorImpl(
DateTimeUtil.currentIsoDateTimeString(),
selfUserId,
Message.Status.SENT,
Message.Visibility.VISIBLE
Message.Visibility.VISIBLE,
expirationData = null
)
)
}
Expand Down
7 changes: 5 additions & 2 deletions logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ sealed interface Message {
val date: String
val senderUserId: UserId
val status: Status
val expirationData: ExpirationData?

/**
* Messages that can be sent from one client to another.
Expand Down Expand Up @@ -78,7 +79,7 @@ sealed interface Message {
override val isSelfMessage: Boolean,
override val senderClientId: ClientId,
val editStatus: EditStatus,
val expirationData: ExpirationData? = null,
override val expirationData: ExpirationData? = null,
val reactions: Reactions = Reactions.EMPTY,
val expectsReadConfirmation: Boolean = false
) : Sendable, Standalone {
Expand Down Expand Up @@ -152,6 +153,7 @@ sealed interface Message {
override val status: Status,
override val senderUserName: String? = null,
override val isSelfMessage: Boolean,
override val expirationData: ExpirationData?
) : Sendable {
override fun toLogString(): String {
val typeKey = "type"
Expand Down Expand Up @@ -232,9 +234,10 @@ sealed interface Message {
override val senderUserId: UserId,
override val status: Status,
override val visibility: Visibility = Visibility.VISIBLE,
override val expirationData: ExpirationData?,
// TODO(refactor): move senderName to inside the specific `content`
// instead of having it nullable in all system messages
val senderUserName: String? = null,
val senderUserName: String? = null
) : Message, Standalone {
fun toLogString(): String {

Expand Down
174 changes: 101 additions & 73 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 @@ -67,93 +67,121 @@ class MessageMapperImpl(
}
val visibility = message.visibility.toEntityVisibility()
return when (message) {
is Message.Regular -> MessageEntity.Regular(
id = message.id,
content = toMessageEntityContent(message.content),
conversationId = message.conversationId.toDao(),
date = message.date.toInstant(),
senderUserId = message.senderUserId.toDao(),
senderClientId = message.senderClientId.value,
status = status,
editStatus = when (message.editStatus) {
is Message.EditStatus.NotEdited -> MessageEntity.EditStatus.NotEdited
is Message.EditStatus.Edited -> MessageEntity.EditStatus.Edited(message.editStatus.lastTimeStamp.toInstant())
},
expireAfterMs = message.expirationData?.let { it.expireAfter.inWholeMilliseconds },
selfDeletionStartDate = message.expirationData?.let {
when (val status = it.selfDeletionStatus) {
is Message.ExpirationData.SelfDeletionStatus.Started -> status.selfDeletionStartDate
is Message.ExpirationData.SelfDeletionStatus.NotStarted -> null
}
},
visibility = visibility,
senderName = message.senderUserName,
isSelfMessage = message.isSelfMessage,
expectsReadConfirmation = message.expectsReadConfirmation
)

is Message.System -> MessageEntity.System(
id = message.id,
content = message.content.toMessageEntityContent(),
conversationId = message.conversationId.toDao(),
date = message.date.toInstant(),
senderUserId = message.senderUserId.toDao(),
status = status,
visibility = visibility,
senderName = message.senderUserName,
)
is Message.Regular -> mapFromRegularMessage(message, status, visibility)
is Message.System -> mapFromSystemMessage(message, status, visibility)
}
}

private fun mapFromRegularMessage(
message: Message.Regular,
status: MessageEntity.Status,
visibility: MessageEntity.Visibility
) =
MessageEntity.Regular(
id = message.id,
content = toMessageEntityContent(message.content),
conversationId = message.conversationId.toDao(),
date = message.date.toInstant(),
senderUserId = message.senderUserId.toDao(),
senderClientId = message.senderClientId.value,
status = status,
editStatus = when (message.editStatus) {
is Message.EditStatus.NotEdited -> MessageEntity.EditStatus.NotEdited
is Message.EditStatus.Edited -> MessageEntity.EditStatus.Edited(message.editStatus.lastTimeStamp.toInstant())
},
expireAfterMs = message.expirationData?.let { it.expireAfter.inWholeMilliseconds },
selfDeletionStartDate = message.expirationData?.let {
when (val status = it.selfDeletionStatus) {
is Message.ExpirationData.SelfDeletionStatus.Started -> status.selfDeletionStartDate
is Message.ExpirationData.SelfDeletionStatus.NotStarted -> null
}
},
visibility = visibility,
senderName = message.senderUserName,
isSelfMessage = message.isSelfMessage,
expectsReadConfirmation = message.expectsReadConfirmation
)

private fun mapFromSystemMessage(
message: Message.System,
status: MessageEntity.Status,
visibility: MessageEntity.Visibility
) = MessageEntity.System(
id = message.id,
content = message.content.toMessageEntityContent(),
conversationId = message.conversationId.toDao(),
date = message.date.toInstant(),
senderUserId = message.senderUserId.toDao(),
status = status,
visibility = visibility,
senderName = message.senderUserName,
expireAfterMs = message.expirationData?.let { it.expireAfter.inWholeMilliseconds },
MohamadJaara marked this conversation as resolved.
Show resolved Hide resolved
selfDeletionStartDate = message.expirationData?.let {
when (it.selfDeletionStatus) {
is Message.ExpirationData.SelfDeletionStatus.Started -> it.selfDeletionStatus.selfDeletionStartDate
is Message.ExpirationData.SelfDeletionStatus.NotStarted -> null
}
},
)

override fun fromEntityToMessage(message: MessageEntity): Message.Standalone {
val status = when (message.status) {
val status: Message.Status = when (message.status) {
MessageEntity.Status.PENDING -> Message.Status.PENDING
MessageEntity.Status.SENT -> Message.Status.SENT
MessageEntity.Status.READ -> Message.Status.READ
MessageEntity.Status.FAILED -> Message.Status.FAILED
MessageEntity.Status.FAILED_REMOTELY -> Message.Status.FAILED_REMOTELY
}
return when (message) {
is MessageEntity.Regular ->
Message.Regular(
id = message.id,
content = message.content.toMessageContent(message.visibility.toModel() == Message.Visibility.HIDDEN),
conversationId = message.conversationId.toModel(),
date = message.date.toIsoDateTimeString(),
senderUserId = message.senderUserId.toModel(),
senderClientId = ClientId(message.senderClientId),
status = status,
editStatus = when (val editStatus = message.editStatus) {
MessageEntity.EditStatus.NotEdited -> Message.EditStatus.NotEdited
is MessageEntity.EditStatus.Edited -> Message.EditStatus.Edited(editStatus.lastDate.toIsoDateTimeString())
},
expirationData = message.expireAfterMs?.let {
Message.ExpirationData(
expireAfter = it.toDuration(DurationUnit.MILLISECONDS),
selfDeletionStatus = message.selfDeletionStartDate
?.let { Message.ExpirationData.SelfDeletionStatus.Started(it) }
?: Message.ExpirationData.SelfDeletionStatus.NotStarted)
},
visibility = message.visibility.toModel(),
reactions = Message.Reactions(message.reactions.totalReactions, message.reactions.selfUserReactions),
senderUserName = message.senderName,
isSelfMessage = message.isSelfMessage,
expectsReadConfirmation = message.expectsReadConfirmation
)

is MessageEntity.System -> Message.System(
id = message.id,
content = message.content.toMessageContent(),
conversationId = message.conversationId.toModel(),
date = message.date.toIsoDateTimeString(),
senderUserId = message.senderUserId.toModel(),
status = status,
visibility = message.visibility.toModel(),
senderUserName = message.senderName,
)
is MessageEntity.Regular -> mapRegularMessage(message, status)
is MessageEntity.System -> mapSystemMessage(message, status)
}
}

private fun mapRegularMessage(message: MessageEntity.Regular, status: Message.Status) = Message.Regular(
id = message.id,
content = message.content.toMessageContent(message.visibility.toModel() == Message.Visibility.HIDDEN),
conversationId = message.conversationId.toModel(),
date = message.date.toIsoDateTimeString(),
senderUserId = message.senderUserId.toModel(),
senderClientId = ClientId(message.senderClientId),
status = status,
editStatus = when (val editStatus = message.editStatus) {
MessageEntity.EditStatus.NotEdited -> Message.EditStatus.NotEdited
is MessageEntity.EditStatus.Edited -> Message.EditStatus.Edited(editStatus.lastDate.toIsoDateTimeString())
},
expirationData = message.expireAfterMs?.let {
Message.ExpirationData(
expireAfter = it.toDuration(DurationUnit.MILLISECONDS),
selfDeletionStatus = message.selfDeletionStartDate
?.let { Message.ExpirationData.SelfDeletionStatus.Started(it) }
?: Message.ExpirationData.SelfDeletionStatus.NotStarted)
},
visibility = message.visibility.toModel(),
reactions = Message.Reactions(message.reactions.totalReactions, message.reactions.selfUserReactions),
senderUserName = message.senderName,
isSelfMessage = message.isSelfMessage,
expectsReadConfirmation = message.expectsReadConfirmation
)

private fun mapSystemMessage(message: MessageEntity.System, status: Message.Status) = Message.System(
id = message.id,
content = message.content.toMessageContent(),
conversationId = message.conversationId.toModel(),
date = message.date.toIsoDateTimeString(),
senderUserId = message.senderUserId.toModel(),
status = status,
visibility = message.visibility.toModel(),
senderUserName = message.senderName,
expirationData = message.expireAfterMs?.let {
Message.ExpirationData(
expireAfter = it.toDuration(DurationUnit.MILLISECONDS),
selfDeletionStatus = message.selfDeletionStartDate
?.let { Message.ExpirationData.SelfDeletionStatus.Started(it) }
?: Message.ExpirationData.SelfDeletionStatus.NotStarted)
}
)

override fun fromEntityToMessagePreview(message: MessagePreviewEntity): MessagePreview {
return MessagePreview(
id = message.id,
Expand Down
41 changes: 36 additions & 5 deletions logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,27 @@ class ProtoContentMapperImpl(
)
}

else -> {
throw IllegalArgumentException("Unexpected message content type for ephemeral message: ${readableContent.getType()}")
is MessageContent.Knock -> {
val knock = GenericMessage.Content.Knock(Knock(hotKnock = readableContent.hotKnock))
Ephemeral.Content.Knock(knock.value)
}

is MessageContent.FailedDecryption,
is MessageContent.RestrictedAsset,
is MessageContent.Unknown,
is MessageContent.Availability,
is MessageContent.Calling,
is MessageContent.Cleared,
MessageContent.ClientAction,
is MessageContent.DeleteForMe,
is MessageContent.DeleteMessage,
MessageContent.Ignored,
is MessageContent.LastRead,
is MessageContent.Reaction,
is MessageContent.Receipt,
is MessageContent.TextEdited -> throw IllegalArgumentException(
"Unexpected message content type: ${readableContent.getType()}"
)
}
return GenericMessage.Content.Ephemeral(Ephemeral(expireAfterMillis = expireAfterMillis, content = ephemeralContent))
}
Expand Down Expand Up @@ -216,7 +234,12 @@ class ProtoContentMapperImpl(
is GenericMessage.Content.LastRead -> unpackLastRead(genericMessage, protoContent)
is GenericMessage.Content.Location -> MessageContent.Unknown(typeName, encodedContent.data)
is GenericMessage.Content.Reaction -> unpackReaction(protoContent)
else -> {

is GenericMessage.Content.External -> {
kaliumLogger.w("External content when parsing protobuf. Message UUID = ${genericMessage.messageId.obfuscateId()}")
MessageContent.Ignored
}
null -> {
MohamadJaara marked this conversation as resolved.
Show resolved Hide resolved
kaliumLogger.w("Null content when parsing protobuf. Message UUID = ${genericMessage.messageId.obfuscateId()}")
MessageContent.Ignored
}
Expand Down Expand Up @@ -355,7 +378,7 @@ class ProtoContentMapperImpl(
}

null -> {
kaliumLogger.w("Edit content is unexpected. Message UUID = $genericMessage.")
kaliumLogger.w("Edit content is unexpected. Message UUID = ${genericMessage.messageId.obfuscateId()}")
MessageContent.Ignored
}
}
Expand Down Expand Up @@ -448,8 +471,16 @@ class ProtoContentMapperImpl(
unpackAsset(genericAssetContent)
}

is Ephemeral.Content.Knock -> {
MessageContent.Knock(
ephemeralContent.value.hotKnock
)
}

// Handle self-deleting Location messages when they are implemented
else -> {
is Ephemeral.Content.Image,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should Image be ignored as well? 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure what image is in this case, it was ignored before and my assumption that it is some sort of old and deprecated message type, maybe @typfel knows more about it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed it was replaced by assets https://github.com/wireapp/generic-message-proto/blob/ff36abddb9d668709e0c793ddc8d034ebfafd8f9/proto/messages.proto#L29 7 years ago.

is Ephemeral.Content.Location,
null -> {
MessageContent.Ignored
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...Main/kotlin/com/wire/kalium/logic/feature/conversation/ClearConversationContentUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ internal class ClearConversationContentUseCaseImpl(
senderUserId = selfUserId,
senderClientId = currentClientId,
status = Message.Status.PENDING,
isSelfMessage = true
isSelfMessage = true,
expirationData = null
)
messageSender.sendMessage(regularMessage)
}
Expand Down
3 changes: 2 additions & 1 deletion ...nMain/kotlin/com/wire/kalium/logic/feature/conversation/CreateGroupConversationUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ class CreateGroupConversationUseCase internal constructor(
DateTimeUtil.currentIsoDateTimeString(),
selfUserId,
Message.Status.SENT,
Message.Visibility.VISIBLE
Message.Visibility.VISIBLE,
expirationData = null
)

persistMessage(message)
Expand Down
3 changes: 2 additions & 1 deletion ...in/kotlin/com/wire/kalium/logic/feature/conversation/UpdateConversationReadDateUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ class UpdateConversationReadDateUseCase internal constructor(
senderUserId = selfUserId,
senderClientId = currentClientId,
status = Message.Status.PENDING,
isSelfMessage = true
isSelfMessage = true,
expirationData = null
)
messageSender.sendMessage(regularMessage)
}
Expand Down
3 changes: 2 additions & 1 deletion ...kotlin/com/wire/kalium/logic/feature/conversation/UpdateConversationReceiptModeUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ internal class UpdateConversationReceiptModeUseCaseImpl(
DateTimeUtil.currentIsoDateTimeString(),
selfUserId,
Message.Status.SENT,
Message.Visibility.VISIBLE
Message.Visibility.VISIBLE,
expirationData = null
)

persistMessage(message)
Expand Down
Loading
Loading