From: AsamK <asamk@gmx.de>
Date: Fri, 15 Oct 2021 19:18:47 +0000 (+0200)
Subject: Check if configuration message contains value before using it
X-Git-Tag: v0.9.1~2
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/cf31ad6ccf209f3d69f5ee9de4349f9141e60a4b

Check if configuration message contains value before using it
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 16f47d3c..47aa6156 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -358,11 +358,19 @@ public final class IncomingMessageHandler {
         if (syncMessage.getConfiguration().isPresent()) {
             final var configurationMessage = syncMessage.getConfiguration().get();
             final var configurationStore = account.getConfigurationStore();
-            configurationStore.setReadReceipts(configurationMessage.getReadReceipts().orNull());
-            configurationStore.setLinkPreviews(configurationMessage.getLinkPreviews().orNull());
-            configurationStore.setTypingIndicators(configurationMessage.getTypingIndicators().orNull());
-            configurationStore.setUnidentifiedDeliveryIndicators(configurationMessage.getUnidentifiedDeliveryIndicators()
-                    .orNull());
+            if (configurationMessage.getReadReceipts().isPresent()) {
+                configurationStore.setReadReceipts(configurationMessage.getReadReceipts().get());
+            }
+            if (configurationMessage.getLinkPreviews().isPresent()) {
+                configurationStore.setLinkPreviews(configurationMessage.getLinkPreviews().get());
+            }
+            if (configurationMessage.getTypingIndicators().isPresent()) {
+                configurationStore.setTypingIndicators(configurationMessage.getTypingIndicators().get());
+            }
+            if (configurationMessage.getUnidentifiedDeliveryIndicators().isPresent()) {
+                configurationStore.setUnidentifiedDeliveryIndicators(configurationMessage.getUnidentifiedDeliveryIndicators()
+                        .get());
+            }
         }
         return actions;
     }