diff --git a/lib/models/messages/quotedmessage.dart b/lib/models/messages/quotedmessage.dart index d1210ff4..4d71a2d9 100644 --- a/lib/models/messages/quotedmessage.dart +++ b/lib/models/messages/quotedmessage.dart @@ -54,6 +54,11 @@ class QuotedMessage extends Message { Widget getWidget(BuildContext context) { try { dynamic message = jsonDecode(this.content); + + if (message["body"] == null || message["quotedHash"] == null) { + return MalformedMessage(this.metadata).getWidget(context); + } + var quotedMessagePotentials = Provider.of(context).cwtch.GetMessageByContentHash(metadata.profileOnion, metadata.contactHandle, message["quotedHash"]); int messageIndex = metadata.messageIndex; Future quotedMessage = quotedMessagePotentials.then((matchingMessages) { @@ -89,7 +94,6 @@ class QuotedMessage extends Message { key: Provider.of(bcontext).getMessageKey(idx)); }); } catch (e) { - print("Quoted message exception" + e.toString()); return MalformedMessage(this.metadata).getWidget(context); } }