Skip to content
Snippets Groups Projects

Include last private chat activity in list of contacts

Merged Nico requested to merge (removed):1722-lastChatActivity into master
Files
6
@@ -17,6 +17,7 @@ import org.briarproject.bramble.api.event.Event
@@ -17,6 +17,7 @@ import org.briarproject.bramble.api.event.Event
import org.briarproject.bramble.api.event.EventListener
import org.briarproject.bramble.api.event.EventListener
import org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH
import org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH
import org.briarproject.bramble.util.StringUtils.toUtf8
import org.briarproject.bramble.util.StringUtils.toUtf8
 
import org.briarproject.briar.api.conversation.ConversationManager
import org.briarproject.briar.headless.event.WebSocketController
import org.briarproject.briar.headless.event.WebSocketController
import org.briarproject.briar.headless.getContactIdFromPathParam
import org.briarproject.briar.headless.getContactIdFromPathParam
import org.briarproject.briar.headless.getFromJson
import org.briarproject.briar.headless.getFromJson
@@ -38,6 +39,7 @@ internal class ContactControllerImpl
@@ -38,6 +39,7 @@ internal class ContactControllerImpl
@Inject
@Inject
constructor(
constructor(
private val contactManager: ContactManager,
private val contactManager: ContactManager,
 
private val conversationManager: ConversationManager,
private val objectMapper: ObjectMapper,
private val objectMapper: ObjectMapper,
private val webSocket: WebSocketController
private val webSocket: WebSocketController
) : ContactController, EventListener {
) : ContactController, EventListener {
@@ -61,7 +63,8 @@ constructor(
@@ -61,7 +63,8 @@ constructor(
override fun list(ctx: Context): Context {
override fun list(ctx: Context): Context {
val contacts = contactManager.contacts.map { contact ->
val contacts = contactManager.contacts.map { contact ->
contact.output()
val latestMsgTime = conversationManager.getGroupCount(contact.id).latestMsgTime
 
contact.output(latestMsgTime)
}
}
return ctx.json(contacts)
return ctx.json(contacts)
}
}
Loading