From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 07:24:51 +0000 (+0200)
Subject: Fix stripping the correct identifiers when merging recipients
X-Git-Tag: v0.13.6~9
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/d8b1a2fffeeb1b39cb32861bb6636efa5068c719

Fix stripping the correct identifiers when merging recipients
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
index 2fa91a59..edc1121e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -34,8 +34,7 @@ public class MergeRecipientHelper {
 
             if (recipient.address().aci().isEmpty() || (
                     address.aci().isEmpty() && (
-                            address.pni().isEmpty()
-                                    || recipient.address().pni().equals(address.pni())
+                            address.pni().isEmpty() || recipient.address().pni().equals(address.pni())
                     )
             ) || recipient.address().aci().equals(address.aci())) {
                 logger.debug("Got existing recipient {}, updating with high trust address", recipient.id());
@@ -104,7 +103,7 @@ public class MergeRecipientHelper {
         }
 
         for (final var recipient : recipientsToBeStripped) {
-            store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(address));
+            store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(finalAddress));
         }
 
         // Create fixed RecipientIds that won't update its id after merged