X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed..4f8da7819e080382ffea7754e4fa5f29177d102f:/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..fdf11298 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 ) { - 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.display()), + Util.getStringIfNotBlank(name.given()), + Util.getStringIfNotBlank(name.family()), + Util.getStringIfNotBlank(name.prefix()), + Util.getStringIfNotBlank(name.suffix()), + Util.getStringIfNotBlank(name.middle())); } }