webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
AsamK 2024-02-01 17:54:26 +01:00
parent 3be1c24b1b
commit 7fb263fdf0
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
View file

@ -180,6 +180,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
? local.getSystemFamilyName().orElse("")
: remote.getSystemFamilyName().orElse("");
final var systemNickname = remote.getSystemNickname().orElse("");
final var pniSignatureVerified = remote.isPniSignatureVerified() || local.isPniSignatureVerified();
final var mergedBuilder = new SignalContactRecord.Builder(remote.getId().getRaw(), aci, unknownFields).setE164(
e164)
@ -200,7 +201,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
.setMuteUntil(muteUntil)
.setHideStory(hideStory)
.setUnregisteredTimestamp(unregisteredTimestamp)
.setHidden(hidden);
.setHidden(hidden)
.setPniSignatureVerified(pniSignatureVerified);
final var merged = mergedBuilder.build();
final var matchesRemote = doProtosMatch(merged, remote);