From b7e2d91faf948ec568908e4392ed1d9e4ad9efbd Mon Sep 17 00:00:00 2001
From: erinn <erinn@openprivacy.ca>
Date: Wed, 10 Feb 2021 14:04:07 -0800
Subject: [PATCH] bugfixes

---
 lib/model.dart               | 2 ++
 lib/widgets/messagelist.dart | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/model.dart b/lib/model.dart
index 6524434..87a9bc9 100644
--- a/lib/model.dart
+++ b/lib/model.dart
@@ -87,6 +87,8 @@ class ContactListState extends ChangeNotifier {
 
   ContactListState(Cwtch cwtch, String profileOnion) {
     cwtch.GetContacts(profileOnion).then((jsonStr) {
+      if (jsonStr == null) return;
+
       print("contacts: " + jsonStr);
       List<dynamic> contacts = jsonDecode(jsonStr);
       contacts.forEach((c) {
diff --git a/lib/widgets/messagelist.dart b/lib/widgets/messagelist.dart
index 7354364..4032b21 100644
--- a/lib/widgets/messagelist.dart
+++ b/lib/widgets/messagelist.dart
@@ -35,7 +35,7 @@ class _MessageListState extends State<MessageList> {
         itemCount: conversationNumMessages,
         itemBuilder: (context, index) {
           return MessageBubble(
-            profile: widget.profile,
+            profile: Provider.of<ProfileInfoState>(context),
             contactOnion: widget.conversationHandle,
             messageIndex: index,
           );
@@ -50,7 +50,7 @@ class _MessageListState extends State<MessageList> {
       return;
     }
 
-    Provider.of<FlwtchState>(context, listen: false).cwtch.NumMessages(widget.profile.onion, widget.conversationHandle).then((n) {
+    Provider.of<FlwtchState>(context, listen: false).cwtch.NumMessages(Provider.of<ProfileInfoState>(context).onion, widget.conversationHandle).then((n) {
       if (n != conversationNumMessages) setState(() => conversationNumMessages = n);
     });
   }