feat: batching poll responses properly and handling groups properly

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -133,7 +133,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper, private val configF
             configFactory.convoVolatile?.let { config ->
                 val convo = when {
                     // recipient closed group
-                    recipient.isClosedGroupRecipient -> config.getOrConstructLegacyClosedGroup(recipient.address.serialize())
+                    recipient.isClosedGroupRecipient -> config.getOrConstructLegacyClosedGroup(GroupUtil.doubleDecodeGroupId(recipient.address.serialize()))
                     // recipient is open group
                     recipient.isOpenGroupRecipient -> {
                         val openGroupJoinUrl = getOpenGroup(threadId)?.joinURL ?: return

app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt

@@ -1,11 +1,11 @@
 package org.thoughtcrime.securesms.home
 
 import android.content.BroadcastReceiver
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.os.Bundle
 import android.text.SpannableString
 import android.widget.Toast
@@ -33,6 +33,7 @@ import org.greenrobot.eventbus.ThreadMode
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.sending_receiving.MessageSender
+import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.ProfilePictureModifiedEvent
@@ -577,7 +578,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
 
     private fun markAllAsRead(thread: ThreadRecord) {
         ThreadUtils.queue {
-            MessagingModuleConfiguration.shared.storage.markConversationAsRead(thread.threadId, System.currentTimeMillis())
+            MessagingModuleConfiguration.shared.storage.markConversationAsRead(thread.threadId, SnodeAPI.nowWithOffset)
         }
     }
 

app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt

@@ -65,7 +65,8 @@ object ConfigurationMessageUtilities {
             // schedule job if none exist
             // don't schedule job if we already have one
             val ourDestination = Destination.Contact(userPublicKey)
-            if (storage.getConfigSyncJob(ourDestination) != null) return Promise.ofFail(NullPointerException("A job is already pending or in progress, don't schedule another job"))
+            val currentStorageJob = storage.getConfigSyncJob(ourDestination)
+            if (currentStorageJob != null && !(currentStorageJob as ConfigurationSyncJob).isRunning.get()) return Promise.ofFail(NullPointerException("A job is already pending or in progress, don't schedule another job"))
             val newConfigSync = ConfigurationSyncJob(ourDestination)
             Log.d("Loki", "Scheduling new ConfigurationSyncJob")
             JobQueue.shared.add(newConfigSync)

libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt

@@ -11,6 +11,7 @@ import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.snode.RawResponse
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsignal.utilities.Log
+import java.util.concurrent.atomic.AtomicBoolean
 
 // only contact (self) and closed group destinations will be supported
 data class ConfigurationSyncJob(val destination: Destination): Job {
@@ -20,7 +21,16 @@ data class ConfigurationSyncJob(val destination: Destination): Job {
     override var failureCount: Int = 0
     override val maxFailureCount: Int = 1
 
-    override suspend fun execute(dispatcherName: String) {
+    val isRunning = AtomicBoolean(false)
+
+    suspend fun wrap(body: suspend ()->Unit) {
+        isRunning.set(true)
+        body()
+        isRunning.set(false)
+    }
+
+
+    override suspend fun execute(dispatcherName: String) = wrap {
         val userEdKeyPair = MessagingModuleConfiguration.shared.getUserED25519KeyPair()
         val userPublicKey = MessagingModuleConfiguration.shared.storage.getUserPublicKey()
         val delegate = delegate
@@ -37,8 +47,7 @@ data class ConfigurationSyncJob(val destination: Destination): Job {
             || (destination is Destination.Contact && destination.publicKey != userPublicKey)
         ) {
             Log.w(TAG, "No need to run config sync job, TODO")
-            delegate?.handleJobSucceeded(this, dispatcherName)
+            return@wrap delegate?.handleJobSucceeded(this, dispatcherName) ?: Unit
-            return
         }
 
         // configFactory singleton instance will come in handy for modifying hashes and fetching configs for namespace etc
@@ -52,7 +61,7 @@ data class ConfigurationSyncJob(val destination: Destination): Job {
         ).filter { config -> config.needsPush() }
 
         // don't run anything if we don't need to push anything
-        if (configsRequiringPush.isEmpty()) return delegate.handleJobSucceeded(this, dispatcherName)
+        if (configsRequiringPush.isEmpty()) return@wrap delegate.handleJobSucceeded(this, dispatcherName)
 
         // allow null results here so the list index matches configsRequiringPush
         val batchObjects: List<Pair<SharedConfigurationMessage, SnodeAPI.SnodeBatchRequestInfo>?> = configsRequiringPush.map { config ->
@@ -79,7 +88,7 @@ data class ConfigurationSyncJob(val destination: Destination): Job {
 
         if (batchObjects.any { it == null }) {
             // stop running here, something like a signing error occurred
-            return delegate.handleJobFailedPermanently(this, dispatcherName, NullPointerException("One or more requests had a null batch request info"))
+            return@wrap delegate.handleJobFailedPermanently(this, dispatcherName, NullPointerException("One or more requests had a null batch request info"))
         }
 
         val allRequests = mutableListOf<SnodeAPI.SnodeBatchRequestInfo>()
@@ -145,7 +154,7 @@ data class ConfigurationSyncJob(val destination: Destination): Job {
             }
         } catch (e: Exception) {
             Log.e(TAG, "Error performing batch request", e)
-            return delegate.handleJobFailedPermanently(this, dispatcherName, e)
+            return@wrap delegate.handleJobFailedPermanently(this, dispatcherName, e)
         }
         delegate.handleJobSucceeded(this, dispatcherName)
     }

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

@@ -194,24 +194,40 @@ class Poller(private val configFactory: ConfigFactoryProtocol, debounceTimer: Ti
                     if (deferred.promise.isDone()) {
                         return@bind Promise.ofSuccess(Unit)
                     } else {
-                        val requestList = (rawResponses["results"] as List<RawResponse>)
+                        val responseList = (rawResponses["results"] as List<RawResponse>)
+                        // the first response will be the personal messages
+                        val personalResponseIndex = requestSparseArray.indexOfKey(Namespace.DEFAULT)
+                        if (personalResponseIndex >= 0) {
+                            responseList.getOrNull(personalResponseIndex)?.let { rawResponse ->
+                                if (rawResponse["code"] as? Int != 200) {
+                                    Log.e("Loki-DBG", "Batch sub-request for personal messages had non-200 response code, returned code ${(rawResponse["code"] as? Int) ?: "[unknown]"}")
+                                } else {
+                                    val body = rawResponse["body"] as? RawResponse
+                                    if (body == null) {
+                                        Log.e("Loki-DBG", "Batch sub-request for personal messages didn't contain a body")
+                                    } else {
+                                        processPersonalMessages(snode, body)
+                                    }
+                                }
+                            }
+                        }
                         // in case we had null configs, the array won't be fully populated
                         // index of the sparse array key iterator should be the request index, with the key being the namespace
-                        requestSparseArray.keyIterator().withIndex().forEach { (requestIndex, key) ->
+                        configDebouncer.publish {
-                            requestList.getOrNull(requestIndex)?.let { rawResponse ->
+                            requestSparseArray.keyIterator().withIndex().forEach { (requestIndex, key) ->
-                                if (rawResponse["code"] as? Int != 200) {
+                                responseList.getOrNull(requestIndex)?.let { rawResponse ->
-                                    Log.e("Loki-DBG", "Batch sub-request had non-200 response code, returned code ${(rawResponse["code"] as? Int) ?: "[unknown]"}")
+                                    if (rawResponse["code"] as? Int != 200) {
-                                    return@forEach
+                                        Log.e("Loki-DBG", "Batch sub-request had non-200 response code, returned code ${(rawResponse["code"] as? Int) ?: "[unknown]"}")
-                                }
+                                        return@forEach
-                                val body = rawResponse["body"] as? RawResponse
+                                    }
-                                if (body == null) {
+                                    val body = rawResponse["body"] as? RawResponse
-                                    Log.e("Loki-DBG", "Batch sub-request didn't contain a body")
+                                    if (body == null) {
-                                    return@forEach
+                                        Log.e("Loki-DBG", "Batch sub-request didn't contain a body")
-                                }
+                                        return@forEach
-                                if (key == Namespace.DEFAULT) {
+                                    }
-                                    processPersonalMessages(snode, body)
+                                    if (key == Namespace.DEFAULT) {
-                                } else {
+                                        return@forEach // continue, skip default namespace
-                                    configDebouncer.publish {
+                                    } else {
                                         when (ConfigBase.kindFor(key)) {
                                             UserProfile::class.java -> processConfig(snode, body, key, configFactory.user)
                                             Contacts::class.java -> processConfig(snode, body, key, configFactory.contacts)