X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed..8867a7b9eeb3353d059613544899b262f4f47579:/src/main/java/org/asamk/signal/json/JsonContactAddress.java

diff --git a/src/main/java/org/asamk/signal/json/JsonContactAddress.java b/src/main/java/org/asamk/signal/json/JsonContactAddress.java
index 6ffd355b..7184f532 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactAddress.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactAddress.java
@@ -1,10 +1,10 @@
 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 JsonContactAddress(
-        SharedContact.PostalAddress.Type type,
+        String type,
         String label,
         String street,
         String pobox,
@@ -15,15 +15,15 @@ public record JsonContactAddress(
         String country
 ) {
 
-    static JsonContactAddress from(SharedContact.PostalAddress address) {
-        return new JsonContactAddress(address.getType(),
-                Util.getStringIfNotBlank(address.getLabel()),
-                Util.getStringIfNotBlank(address.getStreet()),
-                Util.getStringIfNotBlank(address.getPobox()),
-                Util.getStringIfNotBlank(address.getNeighborhood()),
-                Util.getStringIfNotBlank(address.getCity()),
-                Util.getStringIfNotBlank(address.getRegion()),
-                Util.getStringIfNotBlank(address.getPostcode()),
-                Util.getStringIfNotBlank(address.getCountry()));
+    static JsonContactAddress from(MessageEnvelope.Data.SharedContact.Address address) {
+        return new JsonContactAddress(address.type().name(),
+                Util.getStringIfNotBlank(address.label()),
+                Util.getStringIfNotBlank(address.street()),
+                Util.getStringIfNotBlank(address.pobox()),
+                Util.getStringIfNotBlank(address.neighborhood()),
+                Util.getStringIfNotBlank(address.city()),
+                Util.getStringIfNotBlank(address.region()),
+                Util.getStringIfNotBlank(address.postcode()),
+                Util.getStringIfNotBlank(address.country()));
     }
 }