From 47843ad96b3efea02946c7bc1b2c72cfa332e38b Mon Sep 17 00:00:00 2001
From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com>
Date: Wed, 12 Feb 2025 14:48:07 +1100
Subject: [PATCH] Rekey always to be performed regardless of sharing history or
 not (#938)

---
 .../org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
index 3b053bed6c..041acb93a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2Impl.kt
@@ -238,7 +238,6 @@ class GroupManagerV2Impl @Inject constructor(
                 configs.groupMembers.set(toSet)
             }
 
-            // Depends on whether we want to share history, we may need to rekey or just adding rsupplement keys
             if (shareHistory) {
                 val memberKey = configs.groupKeys.supplementFor(newMembers.map { it.hexString })
                 batchRequests.add(
@@ -253,10 +252,9 @@ class GroupManagerV2Impl @Inject constructor(
                         auth = groupAuth,
                     )
                 )
-            } else {
-                configs.rekey()
             }
 
+            configs.rekey()
             newMembers.map { configs.groupKeys.getSubAccountToken(it) }
         }