Store family name in recipient store

This commit is contained in:
AsamK 2022-05-24 21:08:52 +02:00
parent 9ad24614cb
commit 145962597c

View file

@ -73,7 +73,7 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv
Contact contact = null; Contact contact = null;
if (r.contact != null) { if (r.contact != null) {
contact = new Contact(r.contact.name, contact = new Contact(r.contact.name,
null, r.contact.familyName,
r.contact.color, r.contact.color,
r.contact.messageExpirationTime, r.contact.messageExpirationTime,
r.contact.blocked, r.contact.blocked,
@ -580,7 +580,8 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv
final var recipientContact = recipient.getContact(); final var recipientContact = recipient.getContact();
final var contact = recipientContact == null final var contact = recipientContact == null
? null ? null
: new Storage.Recipient.Contact(recipientContact.getName(), : new Storage.Recipient.Contact(recipientContact.getGivenName(),
recipientContact.getFamilyName(),
recipientContact.getColor(), recipientContact.getColor(),
recipientContact.getMessageExpirationTime(), recipientContact.getMessageExpirationTime(),
recipientContact.isBlocked(), recipientContact.isBlocked(),
@ -640,6 +641,7 @@ public class RecipientStore implements RecipientResolver, RecipientTrustedResolv
private record Contact( private record Contact(
String name, String name,
String familyName,
String color, String color,
int messageExpirationTime, int messageExpirationTime,
boolean blocked, boolean blocked,