TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-12 08:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add in more config factory for volatile

Browse Source
This commit is contained in:
0x330a
2023-02-06 14:28:00 +11:00
parent f7c5953f5d
commit 28e5794624
5 changed files with 94 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ import org.session.libsession.snode.RawResponse
import org.session.libsession.snode.SnodeAPI
import org.session.libsession.snode.SnodeModule
import org.session.libsession.utilities.ConfigFactoryProtocol
import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.utilities.JsonUtil
import org.session.libsignal.utilities.Log
import org.session.libsignal.utilities.Snode
import java.security.SecureRandom
@@ -104,10 +104,30 @@ class Poller(private val configFactory: ConfigFactoryProtocol) {
}
}
private fun processUserConfig(rawMessages: List<Pair<SignalServiceProtos.Envelope, String?>>) {
private fun processPersonalMessages(snode: Snode, rawMessages: RawResponse) {
val messages = SnodeAPI.parseRawMessagesResponse(rawMessages, snode, userPublicKey)
val parameters = messages.map { (envelope, serverHash) ->
MessageReceiveParameters(envelope.toByteArray(), serverHash = serverHash)
}
parameters.chunked(BatchMessageReceiveJob.BATCH_DEFAULT_NUMBER).forEach { chunk ->
val job = BatchMessageReceiveJob(chunk)
JobQueue.shared.add(job)
}
}
private fun processUserConfig(snode: Snode, rawMessages: RawResponse) {
SnodeAPI.parseRawMessagesResponse(rawMessages, snode, userPublicKey)
}
private fun processContactsConfig(snode: Snode, rawMessages: RawResponse) {
}
private fun processConvoVolatileConfig(snode: Snode, rawMessages: RawResponse) {
}
private fun poll(snode: Snode, deferred: Deferred<Unit, Exception>): Promise<Unit, Exception> {
if (!hasStarted) { return Promise.ofFail(PromiseCanceledException()) }
return task {
@@ -116,7 +136,7 @@ class Poller(private val configFactory: ConfigFactoryProtocol) {
// get messages
SnodeAPI.buildAuthenticatedRetrieveBatchRequest(snode, userPublicKey),
// get user config namespace
configFactory.userConfig?.let { currentUserConfig ->
configFactory.user?.let { currentUserConfig ->
SnodeAPI.buildAuthenticatedRetrieveBatchRequest(
snode,
userPublicKey,
@@ -130,6 +150,13 @@ class Poller(private val configFactory: ConfigFactoryProtocol) {
userPublicKey,
currentContacts.configNamespace()
)
},
// get the latest convo info volatile
configFactory.convoVolatile?.let { currentConvoVolatile ->
SnodeAPI.buildAuthenticatedRetrieveBatchRequest(
snode, userPublicKey,
currentConvoVolatile.configNamespace()
)
}
)
@@ -138,15 +165,7 @@ class Poller(private val configFactory: ConfigFactoryProtocol) {
if (deferred.promise.isDone()) {
return@bind Promise.ofSuccess(Unit)
} else {
val messageResponse = (rawResponses["results"] as List<*>).first() as RawResponse
val messages = SnodeAPI.parseRawMessagesResponse(messageResponse, snode, userPublicKey)
val parameters = messages.map { (envelope, serverHash) ->
MessageReceiveParameters(envelope.toByteArray(), serverHash = serverHash)
}
parameters.chunked(BatchMessageReceiveJob.BATCH_DEFAULT_NUMBER).forEach { chunk ->
val job = BatchMessageReceiveJob(chunk)
JobQueue.shared.add(job)
}
Log.d("Loki-DBG", JsonUtil.toJson(rawResponses))
poll(snode, deferred)
}

5
libsession/src/main/java/org/session/libsession/utilities/ConfigFactoryProtocol.kt
View File

@@ -1,11 +1,14 @@
package org.session.libsession.utilities
import network.loki.messenger.libsession_util.Contacts
import network.loki.messenger.libsession_util.ConversationVolatileConfig
import network.loki.messenger.libsession_util.UserProfile
interface ConfigFactoryProtocol {
val userConfig: UserProfile?
val user: UserProfile?
val contacts: Contacts?
val convoVolatile: ConversationVolatileConfig?
fun saveUserConfigDump()
fun saveContactConfigDump()
fun saveConvoVolatileConfigDump()
}