Copy managers list to prevent ConcurrentModificationException

[signal-cli] / src / main / java / org / asamk / signal / dbus / DbusManagerImpl.java

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index d2b1bec754189cb2d1ed919caa060f1810320157..5421d4ad56ce0f69c7aeb880cd62da204353981c 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -131,7 +131,7 @@ public class DbusManagerImpl implements Manager {
                 emptyIfNull(about),
                 emptyIfNull(aboutEmoji),
                 avatar == null ? "" : avatar.map(File::getPath).orElse(""),
                 emptyIfNull(about),
                 emptyIfNull(aboutEmoji),
                 avatar == null ? "" : avatar.map(File::getPath).orElse(""),

-                avatar != null && !avatar.isPresent());
+                avatar != null && avatar.isEmpty());

     }
 
     @Override
     }
 
     @Override


@@ -381,6 +381,16 @@ public class DbusManagerImpl implements Manager {
         return new SendMessageResults(0, Map.of());
     }
 
         return new SendMessageResults(0, Map.of());
     }
 

+    @Override
+    public void deleteRecipient(final RecipientIdentifier.Single recipient) throws IOException {
+        signal.deleteRecipient(recipient.getIdentifier());
+    }
+
+    @Override
+    public void deleteContact(final RecipientIdentifier.Single recipient) throws IOException {
+        signal.deleteContact(recipient.getIdentifier());
+    }
+

     @Override
     public void setContactName(
             final RecipientIdentifier.Single recipient, final String name
     @Override
     public void setContactName(
             final RecipientIdentifier.Single recipient, final String name


@@ -776,9 +786,8 @@ public class DbusManagerImpl implements Manager {
 
     private void notifyMessageHandlers(final MessageEnvelope envelope) {
         synchronized (messageHandlers) {
 
     private void notifyMessageHandlers(final MessageEnvelope envelope) {
         synchronized (messageHandlers) {

-            Stream.concat(messageHandlers.stream(), weakHandlers.stream()).forEach(h -> {
-                h.handleMessage(envelope, null);
-            });
+            Stream.concat(messageHandlers.stream(), weakHandlers.stream())
+                    .forEach(h -> h.handleMessage(envelope, null));

         }
     }
 
         }
     }