From 424030046512a50715454a6e8f79774f74a7e4ee Mon Sep 17 00:00:00 2001
From: ialokim <ialokim@mailbox.org>
Date: Wed, 2 Feb 2022 12:14:07 +0100
Subject: [PATCH] always show alias in notice texts when there is one
---
.../org/briarproject/briar/desktop/contact/ContactItem.kt | 2 +-
.../briar/desktop/conversation/ConversationViewModel.kt | 6 +++---
.../briar/desktop/conversation/ConversationVisitor.kt | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactItem.kt b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactItem.kt
index 94911e5bb0..b17f536a1c 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactItem.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/contact/ContactItem.kt
@@ -28,7 +28,7 @@ import kotlin.math.max
data class ContactItem(
override val idWrapper: RealContactIdWrapper,
val authorId: AuthorId,
- val name: String,
+ private val name: String,
val alias: String?,
val isConnected: Boolean,
val isEmpty: Boolean,
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
index cddd2bf08e..c2c98b3c8b 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationViewModel.kt
@@ -188,7 +188,7 @@ constructor(
)
val visitor =
ConversationVisitor(
- contactItem.value!!.name,
+ contactItem.value!!.displayName,
messagingManager,
attachmentReader,
desktopFeatureFlags,
@@ -299,7 +299,7 @@ constructor(
val sorted = headers.sortedBy { it.timestamp }
start = LogUtils.now()
val visitor =
- ConversationVisitor(contact.name, messagingManager, attachmentReader, desktopFeatureFlags, txn)
+ ConversationVisitor(contact.displayName, messagingManager, attachmentReader, desktopFeatureFlags, txn)
val messages = sorted.map { h -> h.accept(visitor)!! }
LOG.logDuration("Loading messages", start)
txn.attach {
@@ -324,7 +324,7 @@ constructor(
runOnDbThreadWithTransaction(true) { txn ->
val visitor =
ConversationVisitor(
- contactItem.value!!.name,
+ contactItem.value!!.displayName,
messagingManager,
attachmentReader,
desktopFeatureFlags,
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationVisitor.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationVisitor.kt
index 4b65167610..ca40ff293e 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationVisitor.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationVisitor.kt
@@ -68,7 +68,7 @@ internal class ConversationVisitor(
val item = ConversationMessageItem(h)
item.attachments = buildList {
for (header in h.attachmentHeaders) {
- ImageUtils.loadImage(txn, attachmentReader, header)?.also {
+ ImageUtils.loadImage(txn, attachmentReader, header).also {
add(AttachmentItem(it))
}
}
--
GitLab