From d5dbecddfa3636888e64072e88d52805eeef8c9e Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Fri, 28 May 2021 15:23:36 -0700
Subject: [PATCH] Use sender onion when we don't have a contact (now will null
 safety)

---
 lib/widgets/messagebubble.dart | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/widgets/messagebubble.dart b/lib/widgets/messagebubble.dart
index c5f32a44..84415f3e 100644
--- a/lib/widgets/messagebubble.dart
+++ b/lib/widgets/messagebubble.dart
@@ -29,8 +29,12 @@ class MessageBubbleState extends State<MessageBubble> {
     // If the sender is not us, then we want to give them a nickname...
     var senderDisplayStr = "";
     if (!fromMe && Provider.of<MessageState>(context).senderOnion != null) {
-      var contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageState>(context).senderOnion);
-      senderDisplayStr = contact!.nickname;
+      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageState>(context).senderOnion);
+      if (contact != null) {
+        senderDisplayStr = contact.nickname;
+      } else {
+        senderDisplayStr = Provider.of<MessageState>(context).senderOnion;
+      }
     }
     var wdgSender = SelectableText(senderDisplayStr,
         style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()));