Compare commits
1 Commits
beta-1.4.5
...
1242-displ
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1a9fe070b0 |
@@ -1,6 +1,7 @@
|
||||
package org.briarproject.briar.messaging;
|
||||
|
||||
import org.briarproject.bramble.api.FormatException;
|
||||
import org.briarproject.bramble.api.UniqueId;
|
||||
import org.briarproject.bramble.api.client.ClientHelper;
|
||||
import org.briarproject.bramble.api.client.ContactGroupFactory;
|
||||
import org.briarproject.bramble.api.contact.Contact;
|
||||
@@ -32,11 +33,12 @@ import org.briarproject.briar.api.messaging.PrivateMessageHeader;
|
||||
import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent;
|
||||
import org.briarproject.briar.client.ConversationClientImpl;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.BufferedInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
|
||||
@@ -44,7 +46,7 @@ import javax.annotation.concurrent.Immutable;
|
||||
import javax.inject.Inject;
|
||||
|
||||
import static java.util.Collections.emptyList;
|
||||
import static org.briarproject.bramble.util.StringUtils.fromHexString;
|
||||
import static java.util.logging.Logger.getLogger;
|
||||
import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ;
|
||||
|
||||
@Immutable
|
||||
@@ -219,8 +221,26 @@ class MessagingManagerImpl extends ConversationClientImpl
|
||||
long timestamp = meta.getLong("timestamp");
|
||||
boolean local = meta.getBoolean("local");
|
||||
boolean read = meta.getBoolean("read");
|
||||
// TODO replace fake attachments by real ones
|
||||
boolean hasText;
|
||||
List<AttachmentHeader> attachments;
|
||||
Random random = new Random(id.hashCode());
|
||||
if (random.nextBoolean()) {
|
||||
hasText = random.nextBoolean();
|
||||
attachments = new ArrayList<>();
|
||||
int numAttachments = random.nextInt(10) + 1;
|
||||
for (int i = 0; i < numAttachments; i++) {
|
||||
byte[] b = new byte[UniqueId.LENGTH];
|
||||
random.nextBytes(b);
|
||||
attachments.add(new AttachmentHeader(new MessageId(b),
|
||||
"image/jpeg"));
|
||||
}
|
||||
} else {
|
||||
hasText = true;
|
||||
attachments = emptyList();
|
||||
}
|
||||
headers.add(new PrivateMessageHeader(id, g, timestamp, local,
|
||||
read, s.isSent(), s.isSeen(), true, emptyList()));
|
||||
read, s.isSent(), s.isSeen(), hasText, attachments));
|
||||
} catch (FormatException e) {
|
||||
throw new DbException(e);
|
||||
}
|
||||
@@ -241,11 +261,30 @@ class MessagingManagerImpl extends ConversationClientImpl
|
||||
@Override
|
||||
public Attachment getAttachment(MessageId m) {
|
||||
// TODO add real implementation
|
||||
byte[] bytes = fromHexString("89504E470D0A1A0A0000000D49484452" +
|
||||
"000000010000000108060000001F15C4" +
|
||||
"890000000A49444154789C6300010000" +
|
||||
"0500010D0A2DB40000000049454E44AE426082");
|
||||
return new Attachment(new ByteArrayInputStream(bytes));
|
||||
String[] files = new String[] {
|
||||
// "error_animated.gif",
|
||||
// "error_high.jpg",
|
||||
// "error_wide.jpg",
|
||||
// "error_huge.gif",
|
||||
// "error_large.gif",
|
||||
// "error_malformed.jpg",
|
||||
// "wide.jpg",
|
||||
// "high.jpg",
|
||||
// "small.png",
|
||||
"kitten1.jpg",
|
||||
"kitten2.jpg",
|
||||
"kitten3.gif",
|
||||
"kitten4.jpg",
|
||||
"kitten5.jpg",
|
||||
"kitten6.png",
|
||||
};
|
||||
int index = Math.abs(m.hashCode() % files.length);
|
||||
String file = files[index];
|
||||
getLogger(MessagingManagerImpl.class.getName())
|
||||
.warning("Loading file: " + file);
|
||||
|
||||
InputStream is = getClass().getClassLoader().getResourceAsStream(file);
|
||||
return new Attachment(new BufferedInputStream(is));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
BIN
briar-core/src/main/resources/error_animated.gif
Normal file
|
After Width: | Height: | Size: 43 B |
BIN
briar-core/src/main/resources/error_high.jpg
Normal file
|
After Width: | Height: | Size: 3.0 KiB |
BIN
briar-core/src/main/resources/error_huge.gif
Normal file
|
After Width: | Height: | Size: 43 B |
BIN
briar-core/src/main/resources/error_large.gif
Normal file
|
After Width: | Height: | Size: 43 B |
0
briar-core/src/main/resources/error_malformed.jpg
Normal file
BIN
briar-core/src/main/resources/error_wide.jpg
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
briar-core/src/main/resources/high.jpg
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
briar-core/src/main/resources/kitten1.jpg
Normal file
|
After Width: | Height: | Size: 57 KiB |
BIN
briar-core/src/main/resources/kitten2.jpg
Normal file
|
After Width: | Height: | Size: 128 KiB |
BIN
briar-core/src/main/resources/kitten3.gif
Normal file
|
After Width: | Height: | Size: 288 KiB |
BIN
briar-core/src/main/resources/kitten4.jpg
Normal file
|
After Width: | Height: | Size: 35 KiB |
BIN
briar-core/src/main/resources/kitten5.jpg
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
briar-core/src/main/resources/kitten6.png
Normal file
|
After Width: | Height: | Size: 1.2 MiB |
BIN
briar-core/src/main/resources/small.png
Normal file
|
After Width: | Height: | Size: 133 B |
BIN
briar-core/src/main/resources/wide.jpg
Normal file
|
After Width: | Height: | Size: 1.2 KiB |