Extract RecipientHelper

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / MultiAccountManagerImpl.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
index 8fd1d5aaf7ab72f4e52e024beb8960ee5b26b861..1a5ea266484b0d1bd90aa91b1a9a0da85da67786 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -15,7 +16,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 public class MultiAccountManagerImpl implements MultiAccountManager {
 
@@ -45,7 +45,7 @@ public class MultiAccountManagerImpl implements MultiAccountManager {
     @Override
     public List<String> getAccountNumbers() {
         synchronized (managers) {
-            return managers.stream().map(Manager::getSelfNumber).collect(Collectors.toList());
+            return managers.stream().map(Manager::getSelfNumber).toList();
         }
     }
 
@@ -124,7 +124,7 @@ public class MultiAccountManagerImpl implements MultiAccountManager {
     @Override
     public void close() {
         synchronized (managers) {
-            for (var m : managers) {
+            for (var m : new ArrayList<>(managers)) {
                 try {
                     m.close();
                 } catch (IOException e) {