|
|
@ -254,9 +254,9 @@ object MessageSender {
|
|
|
|
fun handleSuccessfulMessageSend(message: Message, destination: Destination, isSyncMessage: Boolean = false, openGroupSentTimestamp: Long = -1) {
|
|
|
|
fun handleSuccessfulMessageSend(message: Message, destination: Destination, isSyncMessage: Boolean = false, openGroupSentTimestamp: Long = -1) {
|
|
|
|
val storage = MessagingModuleConfiguration.shared.storage
|
|
|
|
val storage = MessagingModuleConfiguration.shared.storage
|
|
|
|
val userPublicKey = storage.getUserPublicKey()!!
|
|
|
|
val userPublicKey = storage.getUserPublicKey()!!
|
|
|
|
val messageID = storage.getMessageIdInDatabase(message.sentTimestamp!!, message.sender?:userPublicKey) ?: return
|
|
|
|
|
|
|
|
// Ignore future self-sends
|
|
|
|
// Ignore future self-sends
|
|
|
|
storage.addReceivedMessageTimestamp(message.sentTimestamp!!)
|
|
|
|
storage.addReceivedMessageTimestamp(message.sentTimestamp!!)
|
|
|
|
|
|
|
|
storage.getMessageIdInDatabase(message.sentTimestamp!!, message.sender?:userPublicKey)?.let { messageID ->
|
|
|
|
if (openGroupSentTimestamp != -1L && message is VisibleMessage) {
|
|
|
|
if (openGroupSentTimestamp != -1L && message is VisibleMessage) {
|
|
|
|
storage.addReceivedMessageTimestamp(openGroupSentTimestamp)
|
|
|
|
storage.addReceivedMessageTimestamp(openGroupSentTimestamp)
|
|
|
|
storage.updateSentTimestamp(messageID, message.isMediaMessage(), openGroupSentTimestamp, message.threadID!!)
|
|
|
|
storage.updateSentTimestamp(messageID, message.isMediaMessage(), openGroupSentTimestamp, message.threadID!!)
|
|
|
@ -283,6 +283,7 @@ object MessageSender {
|
|
|
|
if (message is VisibleMessage && !isSyncMessage) {
|
|
|
|
if (message is VisibleMessage && !isSyncMessage) {
|
|
|
|
SSKEnvironment.shared.messageExpirationManager.startAnyExpiration(message.sentTimestamp!!, message.sender?:userPublicKey)
|
|
|
|
SSKEnvironment.shared.messageExpirationManager.startAnyExpiration(message.sentTimestamp!!, message.sender?:userPublicKey)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
// Sync the message if:
|
|
|
|
// Sync the message if:
|
|
|
|
// • it's a visible message
|
|
|
|
// • it's a visible message
|
|
|
|
// • the destination was a contact
|
|
|
|
// • the destination was a contact
|
|
|
|