nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-09-23 06:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sync issue

Browse Source
This commit is contained in:
AsamK 2026-07-11 14:37:20 +02:00
parent 2a744edd43
commit fb10e1a501
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,24 +117,35 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
IdentityState identityState; IdentityState identityState;
ByteString identityKey; ByteString identityKey;
if (remote.identityKey.size() > 0 && (
!account.isPrimaryDevice()
|| remote.identityState != local.identityState
|| local.identityKey.size() == 0
)) {
identityState = remote.identityState;
identityKey = remote.identityKey;
} else {
identityState = local.identityState;
identityKey = local.identityKey.size() > 0 ? local.identityKey : ByteString.EMPTY;
}
// Parse ACI/PNI first so we can determine if contact has identity
final var localAci = ACI.parseOrNull(local.aci, local.aciBinary); final var localAci = ACI.parseOrNull(local.aci, local.aciBinary);
final var localPni = PNI.parseOrNull(local.pni, local.pniBinary); final var localPni = PNI.parseOrNull(local.pni, local.pniBinary);
final var remoteAci = ACI.parseOrNull(remote.aci, remote.aciBinary); final var remoteAci = ACI.parseOrNull(remote.aci, remote.aciBinary);
final var remotePni = PNI.parseOrNull(remote.pni, remote.pniBinary); final var remotePni = PNI.parseOrNull(remote.pni, remote.pniBinary);
final var hasLocalIdentity = localAci != null || localPni != null;
final var hasRemoteIdentity = remoteAci != null || remotePni != null;
final var remoteIdentityKeySize = remote.identityKey.size();
final var localIdentityKeySize = local.identityKey.size();
final var statesDiffer = remote.identityState != local.identityState;
if (remoteIdentityKeySize > 0 && (!account.isPrimaryDevice() || statesDiffer || localIdentityKeySize == 0)) {
identityState = remote.identityState;
identityKey = remote.identityKey;
} else {
identityState = local.identityState;
// Only use local's identity key if:
// 1. Contact has ACI or PNI
// 2. Remote also has an identity key (if remote size=0, respect that decision)
if (hasLocalIdentity && localIdentityKeySize > 0 && remoteIdentityKeySize > 0) {
identityKey = local.identityKey;
} else {
identityKey = ByteString.EMPTY;
}
}
if (localAci != null if (localAci != null
&& local.identityKey.size() > 0 && local.identityKey.size() > 0
&& remote.identityKey.size() > 0 && remote.identityKey.size() > 0

3
lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
View File

@ -92,6 +92,7 @@ public final class StorageSyncModels {
public static ContactRecord localToRemoteRecord(Recipient recipient, IdentityInfo identity) { public static ContactRecord localToRemoteRecord(Recipient recipient, IdentityInfo identity) {
final var address = recipient.getAddress(); final var address = recipient.getAddress();
final var aciPresent = address.aci().isPresent();
final var pniPresent = address.pni().isPresent(); final var pniPresent = address.pni().isPresent();
final var builder = SignalContactRecord.Companion.newBuilder(recipient.getStorageRecord()) final var builder = SignalContactRecord.Companion.newBuilder(recipient.getStorageRecord())
@ -128,7 +129,7 @@ public final class StorageSyncModels {
.archived(recipient.getContact().isArchived()) .archived(recipient.getContact().isArchived())
.hidden(recipient.getContact().isHidden()); .hidden(recipient.getContact().isHidden());
} }
if (identity != null) { if (identity != null && aciPresent) {
builder.identityKey(ByteString.of(identity.getIdentityKey().serialize())) builder.identityKey(ByteString.of(identity.getIdentityKey().serialize()))
.identityState(localToRemote(identity.getTrustLevel())); .identityState(localToRemote(identity.getTrustLevel()));
} }