feat: basic polling happening with hashes merging

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -65,6 +65,7 @@ import org.thoughtcrime.securesms.dependencies.AppComponent;
 import org.thoughtcrime.securesms.dependencies.ConfigFactory;
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent;
 import org.thoughtcrime.securesms.dependencies.DatabaseModule;
+import org.thoughtcrime.securesms.dependencies.PollerFactory;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.groups.OpenGroupManager;
 import org.thoughtcrime.securesms.home.HomeActivity;
@@ -149,6 +150,7 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
     @Inject TextSecurePreferences textSecurePreferences;
     @Inject PushRegistry pushRegistry;
     @Inject ConfigFactory configFactory;
+    @Inject PollerFactory pollerFactory;
     CallMessageProcessor callMessageProcessor;
     MessagingModuleConfiguration messagingModuleConfiguration;
 
@@ -289,6 +291,7 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
     public void onTerminate() {
         stopKovenant(); // Loki
         OpenGroupManager.INSTANCE.stopPolling();
+        pollerFactory.stopAll();
         super.onTerminate();
     }
 
@@ -445,6 +448,7 @@ public class ApplicationContext extends Application implements DefaultLifecycleO
         if (poller != null) {
             poller.startIfNeeded();
         }
+        pollerFactory.startAll();
         LegacyClosedGroupPollerV2.getShared().start();
     }
 

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

@@ -89,6 +89,7 @@ import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.dependencies.ConfigFactory
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
+import org.thoughtcrime.securesms.dependencies.PollerFactory
 import org.thoughtcrime.securesms.groups.ClosedGroupManager
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.groups.OpenGroupManager
@@ -99,7 +100,12 @@ import java.security.MessageDigest
 import network.loki.messenger.libsession_util.util.Contact as LibSessionContact
 import network.loki.messenger.libsession_util.util.GroupMember as LibSessionGroupMember
 
-open class Storage(context: Context, helper: SQLCipherOpenHelper, private val configFactory: ConfigFactory) : Database(context, helper), StorageProtocol,
+open class Storage(
+    context: Context,
+    helper: SQLCipherOpenHelper,
+    private val configFactory: ConfigFactory,
+    private val pollerFactory: PollerFactory
+) : Database(context, helper), StorageProtocol,
     ThreadDatabase.ConversationThreadUpdateListener {
 
     override fun threadCreated(address: Address, threadId: Long) {
@@ -617,6 +623,7 @@ open class Storage(context: Context, helper: SQLCipherOpenHelper, private val co
             setRecipientApproved(recipient, true)
             val threadId = getOrCreateThreadIdFor(recipient.address)
             setPinned(threadId, closedGroup.priority == PRIORITY_PINNED)
+            pollerFactory.pollerFor(closedGroup.groupSessionId)?.start()
         }
 
         for (group in lgc) {
@@ -1003,6 +1010,7 @@ open class Storage(context: Context, helper: SQLCipherOpenHelper, private val co
             val groupRecipient = Recipient.from(context, Address.fromSerialized(newGroupRecipient), false)
             setRecipientApprovedMe(groupRecipient, true)
             setRecipientApproved(groupRecipient, true)
+            pollerFactory.updatePollers()
             return Optional.of(groupRecipient)
         } catch (e: Exception) {
             Log.e("Group Config", e)

app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt

@@ -7,7 +7,6 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import org.session.libsession.database.MessageDataProvider
-import org.session.libsession.database.StorageProtocol
 import org.thoughtcrime.securesms.attachments.DatabaseAttachmentProvider
 import org.thoughtcrime.securesms.crypto.AttachmentSecret
 import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
@@ -132,8 +131,12 @@ object DatabaseModule {
 
     @Provides
     @Singleton
-    fun provideStorage(@ApplicationContext context: Context, openHelper: SQLCipherOpenHelper, configFactory: ConfigFactory, threadDatabase: ThreadDatabase): Storage {
-        val storage = Storage(context,openHelper, configFactory)
+    fun provideStorage(@ApplicationContext context: Context,
+                       openHelper: SQLCipherOpenHelper,
+                       configFactory: ConfigFactory,
+                       threadDatabase: ThreadDatabase,
+                       pollerFactory: PollerFactory): Storage {
+        val storage = Storage(context, openHelper, configFactory, pollerFactory)
         threadDatabase.setUpdateListener(storage)
         return storage
     }

app/src/main/java/org/thoughtcrime/securesms/dependencies/PollerFactory.kt

@@ -0,0 +1,41 @@
+package org.thoughtcrime.securesms.dependencies
+
+import kotlinx.coroutines.CoroutineScope
+import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPoller
+import org.session.libsignal.utilities.SessionId
+import java.util.concurrent.ConcurrentHashMap
+
+class PollerFactory(private val scope: CoroutineScope, private val configFactory: ConfigFactory) {
+
+    private val pollers = ConcurrentHashMap<SessionId, ClosedGroupPoller>()
+
+    fun pollerFor(sessionId: SessionId): ClosedGroupPoller? {
+        val activeGroup = configFactory.userGroups?.getClosedGroup(sessionId.hexString()) ?: return null
+        // TODO: add check for active group being invited / approved etc
+        return pollers.getOrPut(sessionId) {
+            ClosedGroupPoller(scope, sessionId, configFactory)
+        }
+    }
+
+    fun startAll() {
+        configFactory.userGroups?.allClosedGroupInfo()?.forEach {
+            pollerFor(it.groupSessionId)?.start()
+        }
+    }
+
+    fun stopAll() {
+        pollers.forEach { (_, poller) ->
+            poller.stop()
+        }
+    }
+
+    fun updatePollers() {
+        val currentGroups = configFactory.userGroups?.allClosedGroupInfo() ?: return
+        val toRemove = pollers.filter { (id, _) -> id !in currentGroups.map { it.groupSessionId } }
+        toRemove.forEach { (id, _) ->
+            pollers.remove(id)?.stop()
+        }
+        startAll()
+    }
+
+}

app/src/main/java/org/thoughtcrime/securesms/dependencies/SessionUtilModule.kt

@@ -6,16 +6,23 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.plus
 import org.session.libsession.utilities.ConfigFactoryUpdateListener
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.crypto.KeyPairUtilities
 import org.thoughtcrime.securesms.database.ConfigDatabase
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 object SessionUtilModule {
 
+    const val POLLER_SCOPE = "poller_coroutine_scope"
+
     private fun maybeUserEdSecretKey(context: Context): ByteArray? {
         val edKey = KeyPairUtilities.getUserED25519KeyPair(context) ?: return null
         return edKey.secretKey.asBytes
@@ -33,4 +40,14 @@ object SessionUtilModule {
             registerListener(context as ConfigFactoryUpdateListener)
         }
 
+    @Provides
+    @Named(POLLER_SCOPE)
+    fun providePollerScope(@ApplicationContext applicationContext: Context) =
+        GlobalScope + SupervisorJob()
+
+    @Provides
+    @Singleton
+    fun providePollerFactory(@Named(POLLER_SCOPE) coroutineScope: CoroutineScope,
+                             configFactory: ConfigFactory) = PollerFactory(coroutineScope, configFactory)
+
 }