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

Create correct nickname record if nickname is empty

Browse Source
This commit is contained in:
AsamK 2025-12-08 19:09:57 +01:00
parent b26c521930
commit 5fafa24974
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graalvm-config-dir/reflect-config.json
View File

File diff suppressed because one or more lines are too long

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

@ -1,5 +1,6 @@
package org.asamk.signal.manager.syncStorage; package org.asamk.signal.manager.syncStorage;
import org.asamk.signal.manager.api.Contact;
import org.asamk.signal.manager.api.PhoneNumberSharingMode; import org.asamk.signal.manager.api.PhoneNumberSharingMode;
import org.asamk.signal.manager.api.TrustLevel; import org.asamk.signal.manager.api.TrustLevel;
import org.asamk.signal.manager.storage.configuration.ConfigurationStore; import org.asamk.signal.manager.storage.configuration.ConfigurationStore;
@ -104,10 +105,7 @@ public final class StorageSyncModels {
builder.systemGivenName(emptyIfNull(recipient.getContact().givenName())) builder.systemGivenName(emptyIfNull(recipient.getContact().givenName()))
.systemFamilyName(emptyIfNull(recipient.getContact().familyName())) .systemFamilyName(emptyIfNull(recipient.getContact().familyName()))
.systemNickname(emptyIfNull(recipient.getContact().nickName())) .systemNickname(emptyIfNull(recipient.getContact().nickName()))
.nickname(new ContactRecord.Name.Builder().given(emptyIfNull(recipient.getContact() .nickname(getNicknameRemoteRecord(recipient.getContact()))
.nickNameGivenName()))
.family(emptyIfNull(recipient.getContact().nickNameFamilyName()))
.build())
.note(emptyIfNull(recipient.getContact().note())) .note(emptyIfNull(recipient.getContact().note()))
.blocked(recipient.getContact().isBlocked()) .blocked(recipient.getContact().isBlocked())
.whitelisted(recipient.getContact().isProfileSharingEnabled()) .whitelisted(recipient.getContact().isProfileSharingEnabled())
@ -126,6 +124,15 @@ public final class StorageSyncModels {
return builder.build(); return builder.build();
} }
private static ContactRecord.Name getNicknameRemoteRecord(final Contact contact) {
final var given = emptyIfNull(contact.nickNameGivenName());
final var family = emptyIfNull(contact.nickNameFamilyName());
if (given.isEmpty() && family.isEmpty()) {
return null;
}
return new ContactRecord.Name.Builder().given(given).family(family).build();
}
public static GroupV1Record localToRemoteRecord(GroupInfoV1 group) { public static GroupV1Record localToRemoteRecord(GroupInfoV1 group) {
final var builder = SignalGroupV1Record.Companion.newBuilder(group.getStorageRecord()); final var builder = SignalGroupV1Record.Companion.newBuilder(group.getStorageRecord());
builder.id(ByteString.of(group.getGroupId().serialize())); builder.id(ByteString.of(group.getGroupId().serialize()));