TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-28 20:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: empty set in appropriate places for current closed groups

Browse Source
This commit is contained in:
0x330a 2023-06-20 13:13:05 +10:00
parent a689e38f33
commit 5a7b67f3f5
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
View File

@ -33,12 +33,13 @@ class MessageReceiveJob(val data: ByteArray, val serverHash: String? = null, val
fun executeAsync(dispatcherName: String): Promise<Unit, Exception> { fun executeAsync(dispatcherName: String): Promise<Unit, Exception> {
val deferred = deferred<Unit, Exception>() val deferred = deferred<Unit, Exception>()
try { try {
val isRetry: Boolean = failureCount != 0 val storage = MessagingModuleConfiguration.shared.storage
val serverPublicKey = openGroupID?.let { val serverPublicKey = openGroupID?.let {
MessagingModuleConfiguration.shared.storage.getOpenGroupPublicKey(it.split(".").dropLast(1).joinToString(".")) storage.getOpenGroupPublicKey(it.split(".").dropLast(1).joinToString("."))
} }
val (message, proto) = MessageReceiver.parse(this.data, this.openGroupMessageServerID, openGroupPublicKey = serverPublicKey) val currentClosedGroups = storage.getAllActiveClosedGroupPublicKeys()
val threadId = Message.getThreadId(message, this.openGroupID, MessagingModuleConfiguration.shared.storage, false) val (message, proto) = MessageReceiver.parse(this.data, this.openGroupMessageServerID, openGroupPublicKey = serverPublicKey, currentClosedGroups = currentClosedGroups)
val threadId = Message.getThreadId(message, this.openGroupID, storage, false)
message.serverHash = serverHash message.serverHash = serverHash
MessageReceiver.handle(message, proto, threadId ?: -1, this.openGroupID) MessageReceiver.handle(message, proto, threadId ?: -1, this.openGroupID)
this.handleSuccess(dispatcherName) this.handleSuccess(dispatcherName)

3
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt
View File

@ -262,7 +262,8 @@ class OpenGroupPoller(private val server: String, private val executorService: S
null, null,
fromOutbox, fromOutbox,
if (fromOutbox) it.recipient else it.sender, if (fromOutbox) it.recipient else it.sender,
serverPublicKey serverPublicKey,
emptySet() // this shouldn't be necessary as we are polling open groups here
) )
if (fromOutbox) { if (fromOutbox) {
val mapping = mappingCache[it.recipient] ?: storage.getOrCreateBlindedIdMapping( val mapping = mappingCache[it.recipient] ?: storage.getOrCreateBlindedIdMapping(

5
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
View File

@ -146,7 +146,10 @@ class Poller(private val configFactory: ConfigFactoryProtocol, debounceTimer: Ti
var latestMessageTimestamp: Long? = null var latestMessageTimestamp: Long? = null
messages.forEach { (envelope, hash) -> messages.forEach { (envelope, hash) ->
try { try {
val (message, _) = MessageReceiver.parse(data = envelope.toByteArray(), openGroupServerID = null) val (message, _) = MessageReceiver.parse(data = envelope.toByteArray(),
// assume no groups in personal poller messages
openGroupServerID = null, currentClosedGroups = emptySet()
)
// sanity checks // sanity checks
if (message !is SharedConfigurationMessage) { if (message !is SharedConfigurationMessage) {
Log.w("Loki", "shared config message handled in configs wasn't SharedConfigurationMessage but was ${message.javaClass.simpleName}") Log.w("Loki", "shared config message handled in configs wasn't SharedConfigurationMessage but was ${message.javaClass.simpleName}")