From 737cffc74a5dd21d0756bbbd185d259c4d8748a3 Mon Sep 17 00:00:00 2001
From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com>
Date: Thu, 27 Feb 2025 15:23:00 +1100
Subject: [PATCH] Make sure group keys are pushed before anything else (#987)

---
 .../securesms/configs/ConfigUploader.kt       | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/configs/ConfigUploader.kt b/app/src/main/java/org/thoughtcrime/securesms/configs/ConfigUploader.kt
index 25fa26e846..59bd20825b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/configs/ConfigUploader.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/configs/ConfigUploader.kt
@@ -228,25 +228,8 @@ class ConfigUploader @Inject constructor(
         val snode = SnodeAPI.getSingleTargetSnode(groupId.hexString).await()
         val auth = OwnedSwarmAuth.ofClosedGroup(groupId, adminKey)
 
-        // Spawn the config pushing concurrently
-        val membersConfigHashTask = membersPush?.let { push ->
-            async {
-                push to pushConfig(
-                    auth,
-                    snode,
-                    push,
-                    Namespace.GROUP_MEMBERS()
-                )
-            }
-        }
-
-        val infoConfigHashTask = infoPush?.let { push ->
-            async {
-                push to pushConfig(auth, snode, push, Namespace.GROUP_INFO())
-            }
-        }
-
-        // Keys push is different: it doesn't have the delete call so we don't call pushConfig
+        // Keys push is different: it doesn't have the delete call so we don't call pushConfig.
+        // Keys must be pushed first because the other configs depend on it.
         val keysPushResult = keysPush?.let { push ->
             SnodeAPI.sendBatchRequest(
                 snode = snode,
@@ -265,6 +248,24 @@ class ConfigUploader @Inject constructor(
             ).toConfigPushResult()
         }
 
+        // Spawn the config pushing concurrently
+        val membersConfigHashTask = membersPush?.let { push ->
+            async {
+                push to pushConfig(
+                    auth,
+                    snode,
+                    push,
+                    Namespace.GROUP_MEMBERS()
+                )
+            }
+        }
+
+        val infoConfigHashTask = infoPush?.let { push ->
+            async {
+                push to pushConfig(auth, snode, push, Namespace.GROUP_INFO())
+            }
+        }
+
         // Wait for all other config push to come back
         val memberPushResult = membersConfigHashTask?.await()
         val infoPushResult = infoConfigHashTask?.await()