fix: open group fixes for new message receive pipeline

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

@@ -191,16 +191,16 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         // Set application UI mode (day/night theme) to the user selected one.
         UiModeUtilities.setupUiModeToUserSelected(this);
         // ========
-        initializeJobManager();
         initializeExpiringMessageManager();
         initializeTypingStatusRepository();
         initializeTypingStatusSender();
         initializeReadReceiptManager();
         initializeProfileManager();
         initializePeriodicTasks();
+        SSKEnvironment.Companion.configure(getTypingStatusRepository(), getReadReceiptManager(), getProfileManager(), messageNotifier, getExpiringMessageManager());
+        initializeJobManager();
         initializeWebRtc();
         initializeBlobProvider();
-        SSKEnvironment.Companion.configure(getTypingStatusRepository(), getReadReceiptManager(), getProfileManager(), messageNotifier, getExpiringMessageManager());
     }
 
     @Override

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

@@ -94,6 +94,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
     override fun persist(message: VisibleMessage, quotes: QuoteModel?, linkPreview: List<LinkPreview?>, groupPublicKey: String?, openGroupID: String?, attachments: List<Attachment>): Long? {
         var messageID: Long? = null
         val senderAddress = Address.fromSerialized(message.sender!!)
+        val isUserSender = message.sender!! == getUserPublicKey()
         val group: Optional<SignalServiceGroup> = when {
             openGroupID != null -> Optional.of(SignalServiceGroup(openGroupID.toByteArray(), SignalServiceGroup.GroupType.PUBLIC_CHAT))
             groupPublicKey != null -> {
@@ -105,7 +106,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         val pointerAttachments = attachments.mapNotNull {
             it.toSignalAttachment()
         }
-        val targetAddress = if (senderAddress.serialize() == getUserPublicKey() && message.syncTarget != null) {
+        val targetAddress = if (isUserSender && !message.syncTarget.isNullOrEmpty()) {
             Address.fromSerialized(message.syncTarget!!)
         } else if (group.isPresent) {
             Address.fromSerialized(GroupUtil.getEncodedId(group.get()))
@@ -130,7 +131,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
                 }
                 val mediaMessage = IncomingMediaMessage.from(message, senderAddress, targetRecipient.expireMessages * 1000L, group, signalServiceAttachments, quote, linkPreviews)
                 mmsDatabase.beginTransaction()
-                mmsDatabase.insertSecureDecryptedMessageInbox(mediaMessage, message.threadID ?: -1, message.sentTimestamp ?: 0)
+                mmsDatabase.insertSecureDecryptedMessageInbox(mediaMessage, message.threadID ?: -1, message.receivedTimestamp ?: 0)
             }
             if (insertResult.isPresent) {
                 mmsDatabase.setTransactionSuccessful()
@@ -145,7 +146,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
             } else {
                 val textMessage = IncomingTextMessage.from(message, senderAddress, group, targetRecipient.expireMessages * 1000L)
                 val encrypted = IncomingEncryptedMessage(textMessage, textMessage.messageBody)
-                smsDatabase.insertMessageInbox(encrypted, message.sentTimestamp ?: 0)
+                smsDatabase.insertMessageInbox(encrypted, message.receivedTimestamp ?: 0)
             }
             insertResult.orNull()?.let { result ->
                 messageID = result.messageId
@@ -474,7 +475,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
     override fun getOrCreateThreadIdFor(publicKey: String, groupPublicKey: String?, openGroupID: String?): Long {
         val database = DatabaseFactory.getThreadDatabase(context)
         if (!openGroupID.isNullOrEmpty()) {
-            val recipient = Recipient.from(context, Address.fromSerialized(openGroupID), false)
+            val recipient = Recipient.from(context, Address.fromSerialized(GroupUtil.getEncodedOpenGroupID(openGroupID.toByteArray())), false)
             return database.getOrCreateThreadIdFor(recipient)
         } else if (!groupPublicKey.isNullOrEmpty()) {
             val recipient = Recipient.from(context, Address.fromSerialized(GroupUtil.doubleEncodeGroupID(groupPublicKey)), false)

app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt

@@ -17,12 +17,14 @@ import org.thoughtcrime.securesms.database.DatabaseContentProviders
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.util.BitmapUtil
+import java.util.concurrent.Executors
 
 class PublicChatManager(private val context: Context) {
   private var chats = mutableMapOf<Long, OpenGroup>()
   private val pollers = mutableMapOf<Long, OpenGroupPoller>()
   private val observers = mutableMapOf<Long, ContentObserver>()
   private var isPolling = false
+  private val executorService = Executors.newScheduledThreadPool(16)
 
   public fun areAllCaughtUp(): Boolean {
     var areAllCaughtUp = true
@@ -37,7 +39,7 @@ class PublicChatManager(private val context: Context) {
   public fun markAllAsNotCaughtUp() {
     refreshChatsAndPollers()
     for ((threadID, chat) in chats) {
-      val poller = pollers[threadID] ?: OpenGroupPoller(chat)
+      val poller = pollers[threadID] ?: OpenGroupPoller(chat, executorService)
       poller.isCaughtUp = false
     }
   }
@@ -46,7 +48,7 @@ class PublicChatManager(private val context: Context) {
     refreshChatsAndPollers()
 
     for ((threadId, chat) in chats) {
-      val poller = pollers[threadId] ?: OpenGroupPoller(chat)
+      val poller = pollers[threadId] ?: OpenGroupPoller(chat, executorService)
       poller.startIfNeeded()
       listenToThreadDeletion(threadId)
       if (!pollers.containsKey(threadId)) { pollers[threadId] = poller }
@@ -57,6 +59,7 @@ class PublicChatManager(private val context: Context) {
   public fun stopPollers() {
     pollers.values.forEach { it.stop() }
     isPolling = false
+    executorService.shutdown()
   }
 
   //TODO Declare a specific type of checked exception instead of "Exception".

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt

@@ -126,6 +126,5 @@ object MultiDeviceProtocol {
                 threadDatabase.notifyUpdatedFromConfig()
             }
         }
-        // TODO: handle new configuration message fields or handle in new pipeline
     }
 }