From 709f0629a01aebfb52beda1830722740f068eeb9 Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Tue, 17 Oct 2023 15:10:45 +1100
Subject: [PATCH] fix: don't do double protobuf

---
 .../messaging/jobs/ConfigurationSyncJob.kt    | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt
index 61a30e146..b3ee4e755 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/ConfigurationSyncJob.kt
@@ -115,20 +115,31 @@ data class ConfigurationSyncJob(val destination: Destination) : Job {
                                 seqNo
                         )
                     }
-                } else {
+                } else if (destination is Destination.Contact) {
                     // assume our own user as check already takes place in `execute` for our own key
                     // if contact
+                    val sentTimestamp = SnodeAPI.nowWithOffset
                     configFactoryProtocol.getUserConfigs().filter { it.needsPush() }.map { config ->
-                        val (bytes, seqNo, obsoleteHashes) = config.push()
+                        val (push, seqNo, obsoleteHashes) = config.push()
                         toDelete += obsoleteHashes
                         val message =
-                                messageForConfig(config, bytes, seqNo)
-                                        ?: throw NullPointerException(
-                                                "SnodeBatchRequest message was null, check group keys exists"
-                                        )
-                        ConfigMessageInformation(message, config, seqNo)
+                            SnodeMessage(
+                                destination.publicKey,
+                                Base64.encodeBytes(push),
+                                SnodeMessage.CONFIG_TTL,
+                                sentTimestamp
+                            )
+
+                        ConfigMessageInformation(
+                            SnodeAPI.buildAuthenticatedStoreBatchInfo(
+                                config.namespace(),
+                                message
+                            )!!,
+                            config,
+                            seqNo
+                        )
                     }
-                }
+                } else throw InvalidDestination()
         return SyncInformation(configsRequiringPush, toDelete)
     }