Cleanup manager package

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

diff --git a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
index a72ba7c6d285692f8586afb9b9c4e401e110bb1a..e5022798ff455ae42599fd0c5d3771c50ee2652a 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
@@ -2,21 +2,18 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;

 
 public record JsonQuotedAttachment(
         String contentType, String filename, @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail
 ) {
 
 
 public record JsonQuotedAttachment(
         String contentType, String filename, @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail
 ) {
 

-    static JsonQuotedAttachment from(SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment) {
-        final var contentType = quotedAttachment.getContentType();
-        final var filename = quotedAttachment.getFileName();
-        final JsonAttachment thumbnail;
-        if (quotedAttachment.getThumbnail() != null) {
-            thumbnail = JsonAttachment.from(quotedAttachment.getThumbnail());
-        } else {
-            thumbnail = null;
-        }
+    static JsonQuotedAttachment from(MessageEnvelope.Data.Attachment quotedAttachment) {
+        final var contentType = quotedAttachment.contentType();
+        final var filename = quotedAttachment.fileName().orElse(null);
+        final var thumbnail = quotedAttachment.thumbnail().isPresent()
+                ? JsonAttachment.from(quotedAttachment.thumbnail().get())
+                : null;

         return new JsonQuotedAttachment(contentType, filename, thumbnail);
     }
 }
         return new JsonQuotedAttachment(contentType, filename, thumbnail);
     }
 }