configuration message handling

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

@@ -206,6 +206,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
       SessionMetaProtocol.Companion.configureIfNeeded(apiDB, userPublicKey);
       SyncMessagesProtocol.Companion.configureIfNeeded(apiDB, userPublicKey);
     }
+    org.session.libsignal.service.loki.protocol.shelved.multidevice.MultiDeviceProtocol.Companion.configureIfNeeded(apiDB);
     SessionManagementProtocol.Companion.configureIfNeeded(sessionResetImpl, sskDatabase, this);
     setUpP2PAPIIfNeeded();
     PushNotificationAPI.Companion.configureIfNeeded(BuildConfig.DEBUG);

app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java

@@ -157,6 +157,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     while ((record = reader.getNext()) != null) {
       if (record.isActive()) { groups.add(record); }
     }
+    reader.close();
     return groups;
   }
 

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

@@ -27,6 +27,7 @@ import org.session.libsignal.service.api.messages.SignalServiceAttachment
 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.session.libsignal.service.loki.api.opengroups.PublicChat
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase
@@ -371,6 +372,14 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         return DatabaseFactory.getLokiAPIDatabase(context).getLatestClosedGroupEncryptionKeyPair(groupPublicKey)
     }
 
+    override fun getAllClosedGroupPublicKeys(): Set<String> {
+        return DatabaseFactory.getSSKDatabase(context).getAllClosedGroupPublicKeys()
+    }
+
+    override fun getAllOpenGroups(): Map<Long, PublicChat> {
+        return DatabaseFactory.getLokiThreadDatabase(context).getAllPublicChats()
+    }
+
     override fun getAllGroups(): List<GroupRecord> {
         return DatabaseFactory.getGroupDatabase(context).allGroups
     }

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

@@ -80,6 +80,7 @@ import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol;
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocolV2;
+import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol;
 import org.thoughtcrime.securesms.loki.protocol.SessionManagementProtocol;
 import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
 import org.thoughtcrime.securesms.loki.protocol.SessionResetImplementation;
@@ -264,8 +265,8 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
 
       SessionMetaProtocol.handleProfileUpdateIfNeeded(context, content);
 
-      if (content.getDeviceLink().isPresent()) {
-        throw new UnsupportedOperationException("Device link operations are not supported!");
+      if (content.configurationMessageProto.isPresent()) {
+        MultiDeviceProtocol.handleConfigurationMessage(context, content.configurationMessageProto.get(), content.getSender());
       } else if (content.getDataMessage().isPresent()) {
         SignalServiceDataMessage message        = content.getDataMessage().get();
         boolean                  isMediaMessage = message.getAttachments().isPresent() || message.getQuote().isPresent() || message.getSharedContacts().isPresent() || message.getPreviews().isPresent() || message.getSticker().isPresent();
@@ -277,7 +278,6 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
           if (message.getClosedGroupUpdateV2().isPresent()) {
             ClosedGroupsProtocolV2.handleMessage(context, message.getClosedGroupUpdateV2().get(), message.getTimestamp(), envelope.getSource(), content.getSender());
           }
-
           if (message.isEndSession()) {
             handleEndSessionMessage(content, smsMessageId);
           } else if (message.isGroupUpdate()) {

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

@@ -1,12 +1,18 @@
 package org.thoughtcrime.securesms.loki.protocol
 
 import android.content.Context
+import com.google.protobuf.ByteString
+import org.session.libsession.messaging.MessagingConfiguration
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.service.api.push.SignalServiceAddress
+import org.session.libsignal.service.internal.push.SignalServiceProtos
+import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
+import org.session.libsignal.utilities.Hex
 import org.session.libsignal.utilities.logging.Log
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
+import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities
 import org.thoughtcrime.securesms.loki.utilities.recipient
 import java.util.*
 
@@ -14,7 +20,7 @@ object MultiDeviceProtocol {
 
     @JvmStatic
     fun syncConfigurationIfNeeded(context: Context) {
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
+        val userPublicKey = TextSecurePreferences.getLocalNumber(context) ?: return
         val lastSyncTime = TextSecurePreferences.getLastConfigurationSyncTime(context)
         val now = System.currentTimeMillis()
         if (now - lastSyncTime < 2 * 24 * 60 * 60 * 1000) return
@@ -35,7 +41,7 @@ object MultiDeviceProtocol {
     }
 
     fun forceSyncConfigurationNowIfNeeded(context: Context) {
-        val userPublicKey = TextSecurePreferences.getLocalNumber(context)!!
+        val userPublicKey = TextSecurePreferences.getLocalNumber(context) ?: return
         val configurationMessage = ConfigurationMessage.getCurrent()
         val serializedMessage = configurationMessage.toProto()!!.toByteArray()
         val messageSender = ApplicationContext.getInstance(context).communicationModule.provideSignalMessageSender()
@@ -50,4 +56,34 @@ object MultiDeviceProtocol {
             Log.d("Loki", "Failed to send configuration message due to error: $e.")
         }
     }
+
+    @JvmStatic
+    fun handleConfigurationMessage(context: Context, content: SignalServiceProtos.Content, senderPublicKey: String) {
+        val configurationMessage = ConfigurationMessage.fromProto(content) ?: return
+        val userPublicKey = TextSecurePreferences.getLocalNumber(context) ?: return
+        if (senderPublicKey != userPublicKey) return
+        val storage = MessagingConfiguration.shared.storage
+        val allClosedGroupPublicKeys = storage.getAllClosedGroupPublicKeys()
+        for (closedGroup in configurationMessage.closedGroups) {
+            if (allClosedGroupPublicKeys.contains(closedGroup.publicKey)) continue
+
+            val closedGroupUpdate = SignalServiceProtos.ClosedGroupUpdateV2.newBuilder()
+            closedGroupUpdate.type = SignalServiceProtos.ClosedGroupUpdateV2.Type.NEW
+            closedGroupUpdate.publicKey = ByteString.copyFrom(Hex.fromStringCondensed(closedGroup.publicKey))
+            closedGroupUpdate.name = closedGroup.name
+            val encryptionKeyPair = SignalServiceProtos.KeyPair.newBuilder()
+            encryptionKeyPair.publicKey = ByteString.copyFrom(closedGroup.encryptionKeyPair.publicKey.serialize().removing05PrefixIfNeeded())
+            encryptionKeyPair.privateKey = ByteString.copyFrom(closedGroup.encryptionKeyPair.privateKey.serialize())
+            closedGroupUpdate.encryptionKeyPair =  encryptionKeyPair.build()
+            closedGroupUpdate.addAllMembers(closedGroup.members.map { ByteString.copyFrom(Hex.fromStringCondensed(it)) })
+            closedGroupUpdate.addAllAdmins(closedGroup.admins.map { ByteString.copyFrom(Hex.fromStringCondensed(it)) })
+
+            ClosedGroupsProtocolV2.handleNewClosedGroup(context, closedGroupUpdate.build(), userPublicKey)
+        }
+        val allOpenGroups = storage.getAllOpenGroups().map { it.value.server }
+        for (openGroup in configurationMessage.openGroups) {
+            if (allOpenGroups.contains(openGroup)) continue
+            OpenGroupUtilities.addGroup(context, openGroup, 1)
+        }
+    }
 }

app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java

@@ -327,7 +327,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
   private static Drawable getPlaceholderDrawable(Context context, Recipient recipient) {
     String publicKey = recipient.getAddress().serialize();
     String hepk = (recipient.isLocalNumber() && publicKey != null)
-            ? TextSecurePreferences.getMasterHexEncodedPublicKey(context)
+            ? TextSecurePreferences.getLocalNumber(context)
             : publicKey;
     String displayName = recipient.getName();
     return AvatarPlaceholderGenerator.generate(context, 128, hepk, displayName);