TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #573 from hjubb/fix_message_deletion_ids

Browse Source 
Fix Incorrect Open Group Deletion Usage
This commit is contained in:
Niels Andriesse 2021-05-28 10:59:16 +10:00 committed by GitHub
commit b9461c09f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt
View File

@ -17,14 +17,9 @@ import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPolle
import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.snode.OnionRequestAPI
import org.session.libsession.utilities.AESGCM import org.session.libsession.utilities.AESGCM
import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.*
import org.session.libsignal.utilities.HTTP.Verb.*
import org.session.libsignal.utilities.removing05PrefixIfNeeded
import org.session.libsignal.utilities.toHexString
import org.session.libsignal.utilities.Base64.* import org.session.libsignal.utilities.Base64.*
import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.HTTP.Verb.*
import org.session.libsignal.utilities.JsonUtil
import org.session.libsignal.utilities.Log
import org.whispersystems.curve25519.Curve25519 import org.whispersystems.curve25519.Curve25519
import java.util.* import java.util.*
@ -63,7 +58,7 @@ object OpenGroupAPIV2 {
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy::class) @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy::class)
data class CompactPollRequest(val roomID: String, val authToken: String, val fromDeletionServerID: Long?, val fromMessageServerID: Long?) data class CompactPollRequest(val roomID: String, val authToken: String, val fromDeletionServerID: Long?, val fromMessageServerID: Long?)
data class CompactPollResult(val messages: List<OpenGroupMessageV2>, val deletions: List<Long>, val moderators: List<String>) data class CompactPollResult(val messages: List<OpenGroupMessageV2>, val deletions: List<MessageDeletion>, val moderators: List<String>)
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy::class) @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy::class)
data class MessageDeletion data class MessageDeletion
@ -402,7 +397,7 @@ object OpenGroupAPIV2 {
val messages = parseMessages(roomID, server, rawMessages) val messages = parseMessages(roomID, server, rawMessages)
roomID to CompactPollResult( roomID to CompactPollResult(
messages = messages, messages = messages,
deletions = deletedServerIDs.map { it.deletedMessageId }, deletions = deletedServerIDs,
moderators = moderators moderators = moderators
) )
}.toMap() }.toMap()

10
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPollerV2.kt
View File

@ -97,15 +97,15 @@ class OpenGroupPollerV2(private val server: String, private val executorService:
JobQueue.shared.add(TrimThreadJob(threadId)) JobQueue.shared.add(TrimThreadJob(threadId))
} }
private fun handleDeletedMessages(room: String, openGroupID: String, deletedMessageServerIDs: List<Long>) { private fun handleDeletedMessages(room: String, openGroupID: String, deletedMessages: List<OpenGroupAPIV2.MessageDeletion>) {
val storage = MessagingModuleConfiguration.shared.storage val storage = MessagingModuleConfiguration.shared.storage
val dataProvider = MessagingModuleConfiguration.shared.messageDataProvider val dataProvider = MessagingModuleConfiguration.shared.messageDataProvider
val groupID = GroupUtil.getEncodedOpenGroupID(openGroupID.toByteArray()) val groupID = GroupUtil.getEncodedOpenGroupID(openGroupID.toByteArray())
val threadID = storage.getThreadId(Address.fromSerialized(groupID)) ?: return val threadID = storage.getThreadId(Address.fromSerialized(groupID)) ?: return
val deletedMessageIDs = deletedMessageServerIDs.mapNotNull { serverID -> val deletedMessageIDs = deletedMessages.mapNotNull { deletion ->
val messageID = dataProvider.getMessageID(serverID, threadID) val messageID = dataProvider.getMessageID(deletion.deletedMessageId, threadID)
if (messageID == null) { if (messageID == null) {
Log.d("Loki", "Couldn't find message ID for message with serverID: $serverID.") Log.d("Loki", "Couldn't find message ID for message with serverID: ${deletion.deletedMessageId}.")
} }
messageID messageID
} }
@ -113,7 +113,7 @@ class OpenGroupPollerV2(private val server: String, private val executorService:
MessagingModuleConfiguration.shared.messageDataProvider.deleteMessage(messageId, isSms) MessagingModuleConfiguration.shared.messageDataProvider.deleteMessage(messageId, isSms)
} }
val currentMax = storage.getLastDeletionServerID(room, server) ?: 0L val currentMax = storage.getLastDeletionServerID(room, server) ?: 0L
val latestMax = deletedMessageServerIDs.maxOrNull() ?: 0L val latestMax = deletedMessages.map { it.id }.maxOrNull() ?: 0L
if (latestMax > currentMax && latestMax != 0L) { if (latestMax > currentMax && latestMax != 0L) {
storage.setLastDeletionServerID(room, server, latestMax) storage.setLastDeletionServerID(room, server, latestMax)
} }