From 9839be48f3ff80456ddec3ad28cf0b583bf80226 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 1 Oct 2021 17:52:33 +0200
Subject: [PATCH] Extract configurationStore variable

---
 .../java/org/asamk/signal/manager/ManagerImpl.java   | 10 ++++++----
 .../manager/helper/IncomingMessageHandler.java       | 12 ++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 36c131db..86ec34c1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -330,17 +330,19 @@ public class ManagerImpl implements Manager {
         if (!account.isMasterDevice()) {
             throw new NotMasterDeviceException();
         }
+
+        final var configurationStore = account.getConfigurationStore();
         if (readReceipts != null) {
-            account.getConfigurationStore().setReadReceipts(readReceipts);
+            configurationStore.setReadReceipts(readReceipts);
         }
         if (unidentifiedDeliveryIndicators != null) {
-            account.getConfigurationStore().setUnidentifiedDeliveryIndicators(unidentifiedDeliveryIndicators);
+            configurationStore.setUnidentifiedDeliveryIndicators(unidentifiedDeliveryIndicators);
         }
         if (typingIndicators != null) {
-            account.getConfigurationStore().setTypingIndicators(typingIndicators);
+            configurationStore.setTypingIndicators(typingIndicators);
         }
         if (linkPreviews != null) {
-            account.getConfigurationStore().setLinkPreviews(linkPreviews);
+            configurationStore.setLinkPreviews(linkPreviews);
         }
         syncHelper.sendConfigurationMessage();
     }
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 dead91b0..16f47d3c 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
@@ -357,12 +357,12 @@ public final class IncomingMessageHandler {
         }
         if (syncMessage.getConfiguration().isPresent()) {
             final var configurationMessage = syncMessage.getConfiguration().get();
-            account.getConfigurationStore().setReadReceipts(configurationMessage.getReadReceipts().orNull());
-            account.getConfigurationStore().setLinkPreviews(configurationMessage.getLinkPreviews().orNull());
-            account.getConfigurationStore().setTypingIndicators(configurationMessage.getTypingIndicators().orNull());
-            account.getConfigurationStore()
-                    .setUnidentifiedDeliveryIndicators(configurationMessage.getUnidentifiedDeliveryIndicators()
-                            .orNull());
+            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());
         }
         return actions;
     }
-- 
2.50.1