From dbbc3fbd71faf18e73ad409a3a7b308ce56cd52d Mon Sep 17 00:00:00 2001 From: AsamK Date: Tue, 24 Sep 2024 17:28:24 +0200 Subject: [PATCH] Remove unnecessary proto conversion --- .../org/asamk/signal/manager/helper/AttachmentHelper.java | 4 ++-- .../java/org/asamk/signal/manager/helper/GroupHelper.java | 2 +- .../org/asamk/signal/manager/internal/ManagerImpl.java | 4 ++-- .../org/asamk/signal/manager/util/AttachmentUtils.java | 8 +++----- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java index 951b7c5c7..3005325a2 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java @@ -60,14 +60,14 @@ private List createAttachmentStreams(List } final var signalServiceAttachments = new ArrayList(attachments.size()); for (var attachment : attachments) { - final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto(); + final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec(); signalServiceAttachments.add(AttachmentUtils.createAttachmentStream(attachment, uploadSpec)); } return signalServiceAttachments; } public SignalServiceAttachmentPointer uploadAttachment(String attachment) throws IOException, AttachmentInvalidException { - final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto(); + final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec(); var attachmentStream = AttachmentUtils.createAttachmentStream(attachment, uploadSpec); return uploadAttachment(attachmentStream); } diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java index 268e61866..ad31f35b1 100644 --- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java +++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java @@ -113,7 +113,7 @@ public Optional createGroupAvatarAttachment(Group return Optional.empty(); } - final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto(); + final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec(); return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty(), uploadSpec)); } diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java index 39f59ccdc..a6121e2fd 100644 --- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java @@ -750,7 +750,7 @@ private void applyMessage( final var additionalAttachments = new ArrayList(); if (message.messageText().length() > 2000) { final var messageBytes = message.messageText().getBytes(StandardCharsets.UTF_8); - final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto(); + final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec(); final var streamDetails = new StreamDetails(new ByteArrayInputStream(messageBytes), MimeUtils.LONG_TEXT, messageBytes.length); @@ -813,7 +813,7 @@ private void applyMessage( if (streamDetails == null) { throw new InvalidStickerException("Missing local sticker file"); } - final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto(); + final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec(); final var stickerAttachment = AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty(), uploadSpec); diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java index 5504640fa..ac15a30a9 100644 --- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java +++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java @@ -1,7 +1,6 @@ package org.asamk.signal.manager.util; import org.asamk.signal.manager.api.AttachmentInvalidException; -import org.signal.protos.resumableuploads.ResumableUpload; import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream; import org.whispersystems.signalservice.api.push.exceptions.ResumeLocationInvalidException; import org.whispersystems.signalservice.api.util.StreamDetails; @@ -14,23 +13,22 @@ public class AttachmentUtils { public static SignalServiceAttachmentStream createAttachmentStream( - String attachment, ResumableUpload resumableUpload + String attachment, ResumableUploadSpec resumableUploadSpec ) throws AttachmentInvalidException { try { final var streamDetails = Utils.createStreamDetails(attachment); - return createAttachmentStream(streamDetails.first(), streamDetails.second(), resumableUpload); + return createAttachmentStream(streamDetails.first(), streamDetails.second(), resumableUploadSpec); } catch (IOException e) { throw new AttachmentInvalidException(attachment, e); } } public static SignalServiceAttachmentStream createAttachmentStream( - StreamDetails streamDetails, Optional name, ResumableUpload resumableUpload + StreamDetails streamDetails, Optional name, ResumableUploadSpec resumableUploadSpec ) throws ResumeLocationInvalidException { // TODO maybe add a parameter to set the voiceNote, borderless, preview, width, height and caption option final var uploadTimestamp = System.currentTimeMillis(); - final var resumableUploadSpec = ResumableUploadSpec.from(resumableUpload); return SignalServiceAttachmentStream.newStreamBuilder() .withStream(streamDetails.getStream()) .withContentType(streamDetails.getContentType())