X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed..9afd4e43284e05a322aa261bcf4753eb96ba882a:/src/main/java/org/asamk/signal/json/JsonContactName.java

diff --git a/src/main/java/org/asamk/signal/json/JsonContactName.java b/src/main/java/org/asamk/signal/json/JsonContactName.java
index 9c7af32b..4d8c2327 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactName.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactName.java
@@ -1,18 +1,18 @@
 package org.asamk.signal.json;
 
+import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
-import org.whispersystems.signalservice.api.messages.shared.SharedContact;
 
 public record JsonContactName(
-        String display, String given, String family, String prefix, String suffix, String middle
+        String nickname, String given, String family, String prefix, String suffix, String middle
 ) {
 
-    static JsonContactName from(SharedContact.Name name) {
-        return new JsonContactName(Util.getStringIfNotBlank(name.getDisplay()),
-                Util.getStringIfNotBlank(name.getGiven()),
-                Util.getStringIfNotBlank(name.getFamily()),
-                Util.getStringIfNotBlank(name.getPrefix()),
-                Util.getStringIfNotBlank(name.getSuffix()),
-                Util.getStringIfNotBlank(name.getMiddle()));
+    static JsonContactName from(MessageEnvelope.Data.SharedContact.Name name) {
+        return new JsonContactName(Util.getStringIfNotBlank(name.nickname()),
+                Util.getStringIfNotBlank(name.given()),
+                Util.getStringIfNotBlank(name.family()),
+                Util.getStringIfNotBlank(name.prefix()),
+                Util.getStringIfNotBlank(name.suffix()),
+                Util.getStringIfNotBlank(name.middle()));
     }
 }