From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 13:20:39 +0000 (+0100)
Subject: Fix remove recipient method
X-Git-Tag: v0.11.7~1
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/91e0db185c179a190843b26e661d861329712cde?ds=inline

Fix remove recipient method

Fixes #1183
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 4eea6af0..e80f7901 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -415,9 +415,9 @@ public class SignalAccount implements Closeable {
     }
 
     public void removeRecipient(final RecipientId recipientId) {
+        final var recipientAddress = getRecipientStore().resolveRecipientAddress(recipientId);
         getRecipientStore().deleteRecipientData(recipientId);
         getMessageCache().deleteMessages(recipientId);
-        final var recipientAddress = getRecipientStore().resolveRecipientAddress(recipientId);
         if (recipientAddress.serviceId().isPresent()) {
             final var serviceId = recipientAddress.serviceId().get();
             getAciSessionStore().deleteAllSessions(serviceId);