Add new dbus message received signals with extendable extras map

[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 8a405fc4a8bdd65bb3807633314fed6a6731fbbd..b78722d1249a87ef1da1e2549b5a8a146349b6eb 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java
@@ -1,31 +1,25 @@
 package org.asamk.signal.json;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 
-class JsonAttachment {
+record JsonAttachment(String contentType, String filename, String id, Long size) {
 
-    String contentType;
-    String filename;
-    String id;
-    int size;
-
-    JsonAttachment(SignalServiceAttachment attachment) {
-        this.contentType = attachment.getContentType();
-
-        final SignalServiceAttachmentPointer pointer = attachment.asPointer();
+    static JsonAttachment from(SignalServiceAttachment attachment) {
         if (attachment.isPointer()) {
-            this.id = String.valueOf(pointer.getId());
-            if (pointer.getFileName().isPresent()) {
-                this.filename = pointer.getFileName().get();
-            }
-            if (pointer.getSize().isPresent()) {
-                this.size = pointer.getSize().get();
-            }
+            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);
         }
     }
 
-    JsonAttachment(String filename) {
-        this.filename = filename;
+    static JsonAttachment from(String filename) {
+        return new JsonAttachment(filename, null, null, null);
     }
 }