Update libsignal-service

[signal-cli] / 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 9c7af32bcc66f114f0489205f2030f4fa24c54d5..4d8c23274a7b6e562cec9d7116c5893455e6d05f 100644 (file)
--- 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;
 
 package org.asamk.signal.json;
 

+import org.asamk.signal.manager.api.MessageEnvelope;

 import org.asamk.signal.util.Util;
 import org.asamk.signal.util.Util;

-import org.whispersystems.signalservice.api.messages.shared.SharedContact;

 
 public record JsonContactName(
 
 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()));

     }
 }
     }
 }