Move saving out of synchronized block

AsamK · Dec 26, 2021 · 3b81ba3 · 3b81ba3
1 parent f7b2916
commit 3b81ba3
Showing 1 changed file with 5 additions and 1 deletion.
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
@@ -189,6 +189,7 @@ public List<GroupInfo> getGroups() {
     }
 
     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 void mergeRecipients(final RecipientId recipientId, final RecipientId toB
                 }
             }
             if (modified) {
-                saver.save(toStorageLocked());
+                storage = toStorageLocked();
             }
         }
+        if (storage != null) {
+            saver.save(storage);
+        }
     }
 
     private GroupInfo getGroupLocked(final GroupId groupId) {