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

[core] Add attachment support to private messages

Browse Source
This commit is contained in:
Torsten Grote
2018-11-02 18:00:38 -03:00
parent e3abff5ad8
commit 934f14ef31
7 changed files with 75 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-headless/src/test/java/org/briarproject/briar/headless/event/WebSocketControllerTest.kt
View File

@@ -21,7 +21,7 @@ internal class WebSocketControllerTest : ControllerTest() {
private val controller = WebSocketControllerImpl(ImmediateExecutor())
private val header =
PrivateMessageHeader(message.id, group.id, timestamp, true, true, true, true)
PrivateMessageHeader(message.id, group.id, timestamp, true, true, true, true, emptyList())
private val event = PrivateMessageReceivedEvent(header, contact.id)
private val outputEvent = OutputEvent(EVENT_PRIVATE_MESSAGE, event.output(text))

11
briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt
View File

@@ -16,8 +16,11 @@ import org.briarproject.bramble.util.StringUtils.getRandomString
import org.briarproject.briar.api.client.SessionId
import org.briarproject.briar.api.conversation.ConversationManager
import org.briarproject.briar.api.introduction.IntroductionRequest
import org.briarproject.briar.api.messaging.*
import org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_TEXT_LENGTH
import org.briarproject.briar.api.messaging.MessagingManager
import org.briarproject.briar.api.messaging.PrivateMessage
import org.briarproject.briar.api.messaging.PrivateMessageFactory
import org.briarproject.briar.api.messaging.PrivateMessageHeader
import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent
import org.briarproject.briar.headless.ControllerTest
import org.briarproject.briar.headless.event.WebSocketController
@@ -47,7 +50,7 @@ internal class MessagingControllerImplTest : ControllerTest() {
)
private val header =
PrivateMessageHeader(message.id, group.id, timestamp, true, true, true, true)
PrivateMessageHeader(message.id, group.id, timestamp, true, true, true, true, emptyList())
private val sessionId = SessionId(getRandomId())
private val privateMessage = PrivateMessage(message)
@@ -76,10 +79,10 @@ internal class MessagingControllerImplTest : ControllerTest() {
}
@Test
fun emptyList() {
fun testEmptyList() {
every { ctx.pathParam("contactId") } returns contact.id.int.toString()
every { contactManager.getContact(contact.id) } returns contact
every { conversationManager.getMessageHeaders(contact.id) } returns emptyList<PrivateMessageHeader>()
every { conversationManager.getMessageHeaders(contact.id) } returns emptyList()
every { ctx.json(emptyList<Any>()) } returns ctx
controller.list(ctx)