fix: various fixes wrt open groups, config messages, job queueing

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

@@ -230,14 +230,14 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         if (closedGroupPoller != null) {
             closedGroupPoller.stopIfNeeded();
         }
-        if (publicChatManager != null) {
-            publicChatManager.stopPollers();
-        }
     }
 
     @Override
     public void onTerminate() {
         stopKovenant(); // Loki
+        if (publicChatManager != null) {
+            publicChatManager.stopPollers();
+        }
         super.onTerminate();
     }
 

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

@@ -8,6 +8,7 @@ import org.session.libsession.messaging.jobs.AttachmentUploadJob
 import org.session.libsession.messaging.jobs.Job
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.jobs.MessageSendJob
+import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.messages.signal.*
 import org.session.libsession.messaging.messages.signal.IncomingTextMessage
 import org.session.libsession.messaging.messages.visible.Attachment
@@ -30,7 +31,9 @@ import org.session.libsignal.libsignal.util.guava.Optional
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
 import org.session.libsignal.service.api.messages.SignalServiceGroup
 import org.session.libsignal.service.internal.push.SignalServiceProtos
+import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
+import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase
 import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol
 import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities
@@ -65,12 +68,27 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         return TextSecurePreferences.getProfilePictureURL(context)
     }
 
+    override fun setUserProfilePictureUrl(newProfilePicture: String) {
+        val ourRecipient = Address.fromSerialized(getUserPublicKey()!!).let {
+            Recipient.from(context, it, false)
+        }
+        TextSecurePreferences.setProfilePictureURL(context, newProfilePicture)
+        RetrieveProfileAvatarJob(ourRecipient, newProfilePicture)
+        ApplicationContext.getInstance(context).jobManager.add(RetrieveProfileAvatarJob(ourRecipient, newProfilePicture))
+    }
+
     override fun getProfileKeyForRecipient(recipientPublicKey: String): ByteArray? {
         val address = Address.fromSerialized(recipientPublicKey)
         val recipient = Recipient.from(context, address, false)
         return recipient.profileKey
     }
 
+    override fun setProfileKeyForRecipient(recipientPublicKey: String, profileKey: ByteArray) {
+        val address = Address.fromSerialized(recipientPublicKey)
+        val recipient = Recipient.from(context, address, false)
+        DatabaseFactory.getRecipientDatabase(context).setProfileKey(recipient, profileKey)
+    }
+
     override fun getOrGenerateRegistrationID(): Int {
         var registrationID = TextSecurePreferences.getLocalRegistrationId(context)
         if (registrationID == 0) {
@@ -511,6 +529,10 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         return DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey)
     }
 
+    override fun setDisplayName(publicKey: String, newName: String) {
+        DatabaseFactory.getLokiUserDatabase(context).setDisplayName(publicKey, newName)
+    }
+
     override fun getServerDisplayName(serverID: String, publicKey: String): String? {
         return DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(serverID, publicKey)
     }
@@ -524,6 +546,31 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         return if (recipientSettings.isPresent) { recipientSettings.get() } else null
     }
 
+    override fun addContacts(contacts: List<ConfigurationMessage.Contact>) {
+        val recipientDatabase = DatabaseFactory.getRecipientDatabase(context)
+        val threadDatabase = DatabaseFactory.getThreadDatabase(context)
+        for (contact in contacts) {
+            val address = Address.fromSerialized(contact.publicKey)
+            val recipient = Recipient.from(context, address, true)
+            if (!contact.profilePicture.isNullOrEmpty()) {
+                recipientDatabase.setProfileAvatar(recipient, contact.profilePicture)
+            }
+            if (contact.profileKey?.isNotEmpty() == true) {
+                recipientDatabase.setProfileKey(recipient, contact.profileKey)
+            }
+            if (contact.name.isNotEmpty()) {
+                recipientDatabase.setProfileName(recipient, contact.name)
+            }
+            recipientDatabase.setProfileSharing(recipient, true)
+            recipientDatabase.setRegistered(recipient, Recipient.RegisteredState.REGISTERED)
+            // create Thread if needed
+            threadDatabase.getOrCreateThreadIdFor(recipient)
+        }
+        if (contacts.isNotEmpty()) {
+            threadDatabase.notifyUpdatedFromConfig()
+        }
+    }
+
     override fun getAttachmentDataUri(attachmentId: AttachmentId): Uri {
         return PartAuthority.getAttachmentDataUri(attachmentId)
     }

app/src/main/java/org/thoughtcrime/securesms/jobs/PushReceivedJob.java

@@ -3,11 +3,11 @@ package org.thoughtcrime.securesms.jobs;
 import androidx.annotation.NonNull;
 
 import org.session.libsession.messaging.threads.Address;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.jobmanager.Job;
-import org.session.libsignal.utilities.logging.Log;
 import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.session.libsignal.service.api.messages.SignalServiceEnvelope;
+import org.session.libsignal.utilities.logging.Log;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.jobmanager.Job;
 
 public abstract class PushReceivedJob extends BaseJob {
 

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

@@ -4,13 +4,13 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import org.thoughtcrime.securesms.jobs.PushContentReceiveJob
-import org.thoughtcrime.securesms.notifications.NotificationChannels
+import org.session.libsession.messaging.jobs.JobQueue
+import org.session.libsession.messaging.jobs.MessageReceiveJob
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.utilities.logging.Log
-import org.session.libsignal.service.api.messages.SignalServiceEnvelope
-import org.session.libsignal.utilities.Base64
 import org.session.libsignal.service.loki.api.MessageWrapper
+import org.session.libsignal.utilities.Base64
+import org.session.libsignal.utilities.logging.Log
+import org.thoughtcrime.securesms.notifications.NotificationChannels
 
 class PushNotificationService : FirebaseMessagingService() {
 
@@ -27,8 +27,7 @@ class PushNotificationService : FirebaseMessagingService() {
         val data = base64EncodedData?.let { Base64.decode(it) }
         if (data != null) {
             try {
-                val envelope = MessageWrapper.unwrap(data)
-                PushContentReceiveJob(this).processEnvelope(SignalServiceEnvelope(envelope), true)
+                JobQueue.shared.add(MessageReceiveJob(MessageWrapper.unwrap(data).toByteArray(),true))
             } catch (e: Exception) {
                 Log.d("Loki", "Failed to unwrap data for message due to error: $e.")
             }