From 956e17c81c86285910ec7b7e040fbbe29092d9a7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 25 Feb 2026 19:49:29 +0100
Subject: [PATCH] Improve aci/pni comparison in contact record processor

---
 .../manager/syncStorage/ContactRecordProcessor.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 66d18652..4f9fd2b4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -337,15 +337,16 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
     public int compare(SignalContactRecord lhsRecord, SignalContactRecord rhsRecord) {
         final var lhs = lhsRecord.getProto();
         final var rhs = rhsRecord.getProto();
+        final var lhsAci = ACI.parseOrNull(lhs.aci, lhs.aciBinary);
+        final var rhsAci = ACI.parseOrNull(rhs.aci, rhs.aciBinary);
+        final var lhsPni = PNI.parseOrNull(lhs.pni, lhs.pniBinary);
+        final var rhsPni = PNI.parseOrNull(rhs.pni, rhs.pniBinary);
         if ((
-                (!lhs.aci.isEmpty() && Objects.equals(lhs.aci, rhs.aci)) || (
-                        lhs.aciBinary.size() != 0 && Objects.equals(lhs.aciBinary, rhs.aciBinary)
-                )
+                (lhsAci != null && Objects.equals(lhsAci, rhsAci))
         ) || (
                 !lhs.e164.isEmpty() && Objects.equals(lhs.e164, rhs.e164)
         ) || (
-                (!lhs.pni.isEmpty() && Objects.equals(lhs.pni, rhs.pni) && lhs.pniBinary == rhs.pniBinary)
-                        || (lhs.pniBinary.size() != 0 && Objects.equals(lhs.pniBinary, rhs.pniBinary))
+                (lhsPni != null && Objects.equals(lhsPni, rhsPni))
         )) {
             return 0;
         } else {