From 753a25bc2a4c253e8b6ef661cb6c431f3f6420d7 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 13 Nov 2018 15:07:16 -0200 Subject: [PATCH] [core] Attachments will use InputStream rather than ByteBuffer --- .../briarproject/briar/api/messaging/Attachment.java | 12 ++++++------ .../briar/messaging/MessagingManagerImpl.java | 6 +----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/Attachment.java b/briar-api/src/main/java/org/briarproject/briar/api/messaging/Attachment.java index 1cf290f8c..526beced1 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/Attachment.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/Attachment.java @@ -1,17 +1,17 @@ package org.briarproject.briar.api.messaging; -import java.nio.ByteBuffer; +import java.io.InputStream; public class Attachment { - private final ByteBuffer data; + private final InputStream stream; - public Attachment(ByteBuffer data) { - this.data = data; + public Attachment(InputStream stream) { + this.stream = stream; } - public ByteBuffer getData() { - return data; + public InputStream getStream() { + return stream; } } diff --git a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java index da253368c..bc92e6952 100644 --- a/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java +++ b/briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java @@ -42,7 +42,6 @@ import javax.annotation.concurrent.Immutable; import javax.inject.Inject; import static java.util.Collections.emptyList; -import static org.briarproject.bramble.api.sync.SyncConstants.MAX_MESSAGE_BODY_LENGTH; import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ; @Immutable @@ -238,10 +237,7 @@ class MessagingManagerImpl extends ConversationClientImpl @Override public Attachment getAttachment(MessageId m) { // TODO add real implementation - // TODO return actual random/fake image before real implementation is done - byte[] b = new byte[MAX_MESSAGE_BODY_LENGTH]; - new Random().nextBytes(b); - return new Attachment(ByteBuffer.wrap(b)); + throw new IllegalStateException("Not yet implemented"); } }