From 46c61d9ee621e107cbb02252db2be012f0479749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Tue, 18 Jan 2022 15:17:36 +0100
Subject: [PATCH] Fix NPE when displaying introduction requests with null text
---
.../conversation/ConversationRequestItemView.kt | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationRequestItemView.kt b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationRequestItemView.kt
index 73db6fc889..2428ba133d 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationRequestItemView.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/conversation/ConversationRequestItemView.kt
@@ -81,12 +81,15 @@ fun ConversationRequestItemView(
val noticeColor = if (m.isIncoming) MaterialTheme.colors.textSecondary else MaterialTheme.colors.privateMessageDate
ConversationItemView(m, onDelete) {
Column(Modifier.width(IntrinsicSize.Max)) {
- Text(
- m.text!!,
- fontSize = 16.sp,
- color = textColor,
- modifier = Modifier.padding(12.dp, 8.dp).align(Alignment.Start)
- )
+ val text = m.text
+ if (text != null) {
+ Text(
+ text,
+ fontSize = 16.sp,
+ color = textColor,
+ modifier = Modifier.padding(12.dp, 8.dp).align(Alignment.Start)
+ )
+ }
Column(
Modifier.fillMaxWidth().background(noticeBackground).padding(12.dp, 8.dp)
) {
--
GitLab