From c5c0f21829c8d8f91e8b8cdfac3632ccd7dd4dd1 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Wed, 8 Dec 2021 16:41:01 -0800
Subject: [PATCH] Fix New Marker. Add Placeholder for Import Handling

---
 lib/cwtch/cwtchNotifier.dart | 3 +++
 lib/model.dart               | 2 +-
 lib/widgets/messagerow.dart  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/cwtch/cwtchNotifier.dart b/lib/cwtch/cwtchNotifier.dart
index d24aa00b..aeae4aa2 100644
--- a/lib/cwtch/cwtchNotifier.dart
+++ b/lib/cwtch/cwtchNotifier.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'package:cwtch/main.dart';
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/models/profileservers.dart';
 import 'package:cwtch/models/servers.dart';
@@ -365,6 +366,8 @@ class CwtchNotifier {
       case "FileDownloaded":
         profileCN.getProfile(data["ProfileOnion"])?.downloadMarkFinished(data["FileKey"], data["FilePath"]);
         break;
+      case "ImportingProfileEvent":
+        break;
       default:
         EnvironmentConfig.debugLog("unhandled event: $type");
     }
diff --git a/lib/model.dart b/lib/model.dart
index eb5da8c9..7633688a 100644
--- a/lib/model.dart
+++ b/lib/model.dart
@@ -631,7 +631,7 @@ class ContactInfoState extends ChangeNotifier {
   set newMarker(int newVal) {
     // only unreadMessages++ can set newMarker = 1;
     // avoids drawing a marker when the convo is already open
-    if (newVal > 1) {
+    if (newVal >= 1) {
       this._newMarker = newVal;
       notifyListeners();
     }
diff --git a/lib/widgets/messagerow.dart b/lib/widgets/messagerow.dart
index 55884aa2..9941fb52 100644
--- a/lib/widgets/messagerow.dart
+++ b/lib/widgets/messagerow.dart
@@ -206,7 +206,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
     var mark = Provider.of<ContactInfoState>(context).newMarker;
     if (mark > 0 &&
         Provider.of<ContactInfoState>(context).messageCache.length > mark &&
-        Provider.of<ContactInfoState>(context).messageCache[mark]?.metadata.messageID == Provider.of<MessageMetadata>(context).messageID) {
+        Provider.of<ContactInfoState>(context).messageCache[mark - 1]?.metadata.messageID == Provider.of<MessageMetadata>(context).messageID) {
       return Column(crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start, children: [Align(alignment: Alignment.center, child: _bubbleNew()), mr]);
     } else {
       return mr;