Skip to content
Snippets Groups Projects
Verified Commit cbcdb11b authored by Mikolai Gütschow's avatar Mikolai Gütschow
Browse files

factor display name logic out for reuse

parent 6ead55dc
No related branches found
No related tags found
1 merge request!69Introduction support
......@@ -3,6 +3,7 @@ package org.briarproject.briar.desktop.contact
import org.briarproject.bramble.api.contact.Contact
import org.briarproject.bramble.api.identity.AuthorId
import org.briarproject.briar.api.client.MessageTracker
import org.briarproject.briar.desktop.utils.UiUtils.getContactDisplayName
import kotlin.math.max
data class ContactItem(
......@@ -16,7 +17,7 @@ data class ContactItem(
override val timestamp: Long
) : BaseContactItem {
override val displayName = if (alias == null) name else "$alias ($name)"
override val displayName = getContactDisplayName(name, alias)
constructor(contact: Contact, isConnected: Boolean, groupCount: MessageTracker.GroupCount) : this(
idWrapper = RealContactIdWrapper(contact.id),
......
......@@ -15,6 +15,7 @@ import org.briarproject.briar.api.messaging.PrivateMessageHeader
import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest
import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse
import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18nF
import org.briarproject.briar.desktop.utils.UiUtils.getContactDisplayName
internal class ConversationVisitor(
private val contactName: String,
......@@ -143,8 +144,7 @@ internal class ConversationVisitor(
}
override fun visitIntroductionRequest(r: IntroductionRequest): ConversationItem {
// todo: use displayName logic somehow?
val name = r.nameable.name
val name = getContactDisplayName(r.nameable.name, r.alias)
return if (r.isLocal)
ConversationNoticeItem(
i18nF("introduction_request_sent", contactName, name),
......@@ -167,8 +167,7 @@ internal class ConversationVisitor(
}
override fun visitIntroductionResponse(r: IntroductionResponse): ConversationItem {
// todo: use displayName logic somehow?
val name = r.introducedAuthor.name
val name = getContactDisplayName(r.introducedAuthor.name, r.introducedAuthorInfo.alias)
return if (r.isLocal) {
val text = when {
r.wasAccepted() -> {
......
package org.briarproject.briar.desktop.utils
object UiUtils {
fun getContactDisplayName(name: String, alias: String?) =
if (alias == null) name else "$alias ($name)"
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment