Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1242-attachment-input-stream' into 'master'

Browse Source 
Attachments will use InputStream rather than ByteBuffer

See merge request briar/briar!992
This commit is contained in:
akwizgran
2018-11-13 17:41:39 +00:00
parent 8f4c3c4528 753a25bc2a
commit bd0fd229c6
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-api/src/main/java/org/briarproject/briar/api/messaging/Attachment.java
View File

@@ -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;
}
}

6
briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java
View File

@@ -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");
}
}