Convert RecipientAddress to record

[signal-cli] / src / main / java / org / asamk / signal / json / JsonAttachment.java

diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java
index b78722d1249a87ef1da1e2549b5a8a146349b6eb..1f6e65101cd5fc2e18241e9d3c108bbd26a6e7e6 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java
@@ -1,25 +1,13 @@
 package org.asamk.signal.json;
 
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
+import org.asamk.signal.manager.api.MessageEnvelope;
 
 record JsonAttachment(String contentType, String filename, String id, Long size) {
 
-    static JsonAttachment from(SignalServiceAttachment attachment) {
-        if (attachment.isPointer()) {
-            final var pointer = attachment.asPointer();
-            final var id = pointer.getRemoteId().toString();
-            final var filename = pointer.getFileName().orNull();
-            final var size = pointer.getSize().transform(Integer::longValue).orNull();
-            return new JsonAttachment(attachment.getContentType(), filename, id, size);
-        } else {
-            final var stream = attachment.asStream();
-            final var filename = stream.getFileName().orNull();
-            final var size = stream.getLength();
-            return new JsonAttachment(attachment.getContentType(), filename, null, size);
-        }
-    }
-
-    static JsonAttachment from(String filename) {
-        return new JsonAttachment(filename, null, null, null);
+    static JsonAttachment from(MessageEnvelope.Data.Attachment attachment) {
+        final var id = attachment.id().orElse(null);
+        final var filename = attachment.fileName().orElse(null);
+        final var size = attachment.size().orElse(null);
+        return new JsonAttachment(attachment.contentType(), filename, id, size);
     }
 }