From 3c6b1eff4448b06a0b2bc001dbf912975641ddb6 Mon Sep 17 00:00:00 2001 From: Harris Date: Fri, 23 Jul 2021 16:04:18 +1000 Subject: [PATCH] fix: open groups update the sent timestamp locally to be the returned group --- .../securesms/database/MmsDatabase.java | 9 +++++++++ .../securesms/database/SmsDatabase.java | 11 ++++++++-- .../securesms/database/Storage.kt | 20 ++++++++++++++++--- .../libsession/database/StorageProtocol.kt | 1 + .../sending_receiving/MessageSender.kt | 16 +++++++++------ 5 files changed, 46 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index ef68a39cea..38e9eeccce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -281,6 +281,15 @@ public class MmsDatabase extends MessagingDatabase { } } + public void updateSentTimestamp(long messageId, long newTimestamp, long threadId) { + SQLiteDatabase db = databaseHelper.getWritableDatabase(); + db.execSQL("UPDATE " + TABLE_NAME + " SET " + DATE_SENT + " = ? " + + "WHERE " + ID + " = ?", + new String[] {newTimestamp + "", messageId + ""}); + notifyConversationListeners(threadId); + notifyConversationListListeners(); + } + public long getThreadIdForMessage(long id) { String sql = "SELECT " + THREAD_ID + " FROM " + TABLE_NAME + " WHERE " + ID + " = ?"; String[] sqlArgs = new String[] {id+""}; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index f66479c41f..c148f8ebcc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -20,8 +20,6 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.os.Handler; -import android.os.Looper; import android.text.TextUtils; import android.util.Pair; @@ -320,6 +318,15 @@ public class SmsDatabase extends MessagingDatabase { return results; } + public void updateSentTimestamp(long messageId, long newTimestamp, long threadId) { + SQLiteDatabase db = databaseHelper.getWritableDatabase(); + db.execSQL("UPDATE " + TABLE_NAME + " SET " + DATE_SENT + " = ? " + + "WHERE " + ID + " = ?", + new String[] {newTimestamp + "", messageId + ""}); + notifyConversationListeners(threadId); + notifyConversationListListeners(); + } + public Pair updateBundleMessageBody(long messageId, String body) { long type = Types.BASE_INBOX_TYPE | Types.SECURE_MESSAGE_BIT | Types.PUSH_MESSAGE_BIT; return updateMessageBodyAndType(messageId, body, Types.TOTAL_MASK, type); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index b76610e815..fe9327a13e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -27,12 +27,11 @@ import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.utilities.guava.Optional import org.thoughtcrime.securesms.ApplicationContext -import org.thoughtcrime.securesms.crypto.IdentityKeyUtil import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper -import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob import org.thoughtcrime.securesms.groups.OpenGroupManager -import org.thoughtcrime.securesms.util.SessionMetaProtocol +import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob import org.thoughtcrime.securesms.mms.PartAuthority +import org.thoughtcrime.securesms.util.SessionMetaProtocol class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), StorageProtocol { @@ -284,6 +283,21 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, return database.getMessageFor(timestamp, address)?.getId() } + override fun updateSentTimestamp( + messageID: Long, + isMms: Boolean, + openGroupSentTimestamp: Long, + threadId: Long + ) { + if (isMms) { + val mmsDb = DatabaseFactory.getMmsDatabase(context) + mmsDb.updateSentTimestamp(messageID, openGroupSentTimestamp, threadId) + } else { + val smsDb = DatabaseFactory.getSmsDatabase(context) + smsDb.updateSentTimestamp(messageID, openGroupSentTimestamp, threadId) + } + } + override fun markAsSent(timestamp: Long, author: String) { val database = DatabaseFactory.getMmsSmsDatabase(context) val messageRecord = database.getMessageFor(timestamp, author) ?: return diff --git a/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt index 137a49f73d..bc7324d21a 100644 --- a/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt @@ -88,6 +88,7 @@ interface StorageProtocol { fun persistAttachments(messageID: Long, attachments: List): List fun getAttachmentsForMessage(messageID: Long): List fun getMessageIdInDatabase(timestamp: Long, author: String): Long? // TODO: This is a weird name + fun updateSentTimestamp(messageID: Long, isMms: Boolean, openGroupSentTimestamp: Long, threadId: Long) fun markAsSending(timestamp: Long, author: String) fun markAsSent(timestamp: Long, author: String) fun markUnidentified(timestamp: Long, author: String) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt index 1b1edf2473..c7faefe333 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt @@ -13,20 +13,19 @@ import org.session.libsession.messaging.messages.control.ConfigurationMessage import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate import org.session.libsession.messaging.messages.visible.* import org.session.libsession.messaging.open_groups.* -import org.session.libsession.utilities.Address import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.snode.RawResponsePromise import org.session.libsession.snode.SnodeAPI -import org.session.libsession.snode.SnodeModule import org.session.libsession.snode.SnodeMessage +import org.session.libsession.snode.SnodeModule +import org.session.libsession.utilities.Address import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.SSKEnvironment import org.session.libsignal.crypto.PushTransportDetails import org.session.libsignal.protos.SignalServiceProtos -import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log -import java.lang.IllegalStateException +import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview as SignalLinkPreview import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel as SignalQuote @@ -234,7 +233,7 @@ object MessageSender { ) OpenGroupAPIV2.send(openGroupMessage,room,server).success { message.openGroupServerMessageID = it.serverID - handleSuccessfulMessageSend(message, destination) + handleSuccessfulMessageSend(message, destination, openGroupSentTimestamp = it.sentTimestamp) deferred.resolve(Unit) }.fail { handleFailure(it) @@ -248,12 +247,17 @@ object MessageSender { } // Result Handling - fun handleSuccessfulMessageSend(message: Message, destination: Destination, isSyncMessage: Boolean = false) { + fun handleSuccessfulMessageSend(message: Message, destination: Destination, isSyncMessage: Boolean = false, openGroupSentTimestamp: Long = -1) { val storage = MessagingModuleConfiguration.shared.storage val userPublicKey = storage.getUserPublicKey()!! val messageID = storage.getMessageIdInDatabase(message.sentTimestamp!!, message.sender?:userPublicKey) ?: return // Ignore future self-sends storage.addReceivedMessageTimestamp(message.sentTimestamp!!) + if (openGroupSentTimestamp != -1L && message is VisibleMessage) { + storage.addReceivedMessageTimestamp(openGroupSentTimestamp) + storage.updateSentTimestamp(messageID, message.isMediaMessage(), openGroupSentTimestamp, message.threadID!!) + message.sentTimestamp = openGroupSentTimestamp + } // Track the open group server message ID if (message.openGroupServerMessageID != null && destination is Destination.OpenGroupV2) { val encoded = GroupUtil.getEncodedOpenGroupID("${destination.server}.${destination.room}".toByteArray())