From: AsamK <asamk@gmx.de>
Date: Fri, 25 Dec 2020 12:42:51 +0000 (+0100)
Subject: Fix prevention of adding group members a second time
X-Git-Tag: v0.7.2~10
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/caabde4acfc1c6bccec981ff763d6dca6f6ed383

Fix prevention of adding group members a second time
---

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index e02106b9..2553a416 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -816,7 +816,10 @@ public class Manager implements Closeable {
 
                 if (members != null) {
                     final Set<SignalServiceAddress> newMembers = new HashSet<>(members);
-                    newMembers.removeAll(group.getMembers());
+                    newMembers.removeAll(group.getMembers()
+                            .stream()
+                            .map(this::resolveSignalServiceAddress)
+                            .collect(Collectors.toSet()));
                     if (newMembers.size() > 0) {
                         Pair<DecryptedGroup, GroupChange> groupGroupChangePair = groupHelper.updateGroupV2(groupInfoV2,
                                 newMembers);