nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-03-14 02:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve aci/pni comparison in contact record processor

Browse Source
This commit is contained in:
AsamK 2026-02-25 19:49:29 +01:00
parent 6f749352d8
commit 956e17c81c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
View File

@ -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 {