marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stripping the correct identifiers when merging recipients

Browse Source
This commit is contained in:
AsamK 2024-09-08 09:24:51 +02:00
parent ea436ecb64
commit d8b1a2fffe
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
View File

@ -34,8 +34,7 @@ public class MergeRecipientHelper {
if (recipient.address().aci().isEmpty() || ( if (recipient.address().aci().isEmpty() || (
address.aci().isEmpty() && ( address.aci().isEmpty() && (
address.pni().isEmpty() address.pni().isEmpty() || recipient.address().pni().equals(address.pni())
|| recipient.address().pni().equals(address.pni())
) )
) || recipient.address().aci().equals(address.aci())) { ) || recipient.address().aci().equals(address.aci())) {
logger.debug("Got existing recipient {}, updating with high trust address", recipient.id()); logger.debug("Got existing recipient {}, updating with high trust address", recipient.id());
@ -104,7 +103,7 @@ public class MergeRecipientHelper {
} }
for (final var recipient : recipientsToBeStripped) { 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 // Create fixed RecipientIds that won't update its id after merged