From: AsamK <asamk@gmx.de>
Date: Sun, 26 Dec 2021 11:40:06 +0000 (+0100)
Subject: Move saving out of synchronized block
X-Git-Tag: v0.10.1~32
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/3b81ba3596a9965118034c0e6d767b2f2f4d60c7?ds=sidebyside

Move saving out of synchronized block
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index f24ee99c..49968b3a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -189,6 +189,7 @@ public class GroupStore {
     }
 
     public void mergeRecipients(final RecipientId recipientId, final RecipientId toBeMergedRecipientId) {
+        Storage storage = null;
         synchronized (groups) {
             var modified = false;
             for (var group : this.groups.values()) {
@@ -201,9 +202,12 @@ public class GroupStore {
                 }
             }
             if (modified) {
-                saver.save(toStorageLocked());
+                storage = toStorageLocked();
             }
         }
+        if (storage != null) {
+            saver.save(storage);
+        }
     }
 
     private GroupInfo getGroupLocked(final GroupId groupId) {