Fixup Conversation Attribute Flow

lib/cwtch/cwtch.dart

@@ -29,36 +29,39 @@ abstract class Cwtch {
   void SendAppEvent(String jsonEvent);
 
   // ignore: non_constant_identifier_names
-  void AcceptContact(String profileOnion, String contactHandle);
+  void AcceptContact(String profileOnion, int contactHandle);
   // ignore: non_constant_identifier_names
-  void BlockContact(String profileOnion, String contactHandle);
+  void BlockContact(String profileOnion, int contactHandle);
 
   // ignore: non_constant_identifier_names
-  Future<dynamic> GetMessage(String profile, String handle, int index);
+  Future<dynamic> GetMessage(String profile, int handle, int index);
-  // ignore: non_constant_identifier_names
-  Future<dynamic> GetMessageByContentHash(String profile, String handle, String contentHash);
-  // ignore: non_constant_identifier_names
-  void UpdateMessageFlags(String profile, String handle, int index, int flags);
-  // ignore: non_constant_identifier_names
-  void SendMessage(String profile, String handle, String message);
-  // ignore: non_constant_identifier_names
-  void SendInvitation(String profile, String handle, String target);
 
   // ignore: non_constant_identifier_names
-  void ShareFile(String profile, String handle, String filepath);
+  Future<dynamic> GetMessageByID(String profile, int handle, int index);
+
   // ignore: non_constant_identifier_names
-  void DownloadFile(String profile, String handle, String filepath, String manifestpath, String filekey);
+  Future<dynamic> GetMessageByContentHash(String profile, int handle, String contentHash);
+
   // ignore: non_constant_identifier_names
-  void CreateDownloadableFile(String profile, String handle, String filenameSuggestion, String filekey);
+  void SendMessage(String profile, int handle, String message);
+  // ignore: non_constant_identifier_names
+  void SendInvitation(String profile, int handle, int target);
+
+  // ignore: non_constant_identifier_names
+  void ShareFile(String profile, int handle, String filepath);
+  // ignore: non_constant_identifier_names
+  void DownloadFile(String profile, int handle, String filepath, String manifestpath, String filekey);
+  // ignore: non_constant_identifier_names
+  void CreateDownloadableFile(String profile, int handle, String filenameSuggestion, String filekey);
   // ignore: non_constant_identifier_names
   void CheckDownloadStatus(String profile, String fileKey);
   // ignore: non_constant_identifier_names
-  void VerifyOrResumeDownload(String profile, String handle, String filekey);
+  void VerifyOrResumeDownload(String profile, int handle, String filekey);
 
   // ignore: non_constant_identifier_names
-  void ArchiveConversation(String profile, String handle);
+  void ArchiveConversation(String profile, int handle);
   // ignore: non_constant_identifier_names
-  void DeleteContact(String profile, String handle);
+  void DeleteContact(String profile, int handle);
 
   // ignore: non_constant_identifier_names
   void CreateGroup(String profile, String server, String groupName);
@@ -66,13 +69,11 @@ abstract class Cwtch {
   // ignore: non_constant_identifier_names
   void ImportBundle(String profile, String bundle);
   // ignore: non_constant_identifier_names
-  void SetGroupAttribute(String profile, String groupHandle, String key, String value);
+  void RejectInvite(String profileOnion, int groupHandle);
-  // ignore: non_constant_identifier_names
-  void RejectInvite(String profileOnion, String groupHandle);
   // ignore: non_constant_identifier_names
   void SetProfileAttribute(String profile, String key, String val);
   // ignore: non_constant_identifier_names
-  void SetContactAttribute(String profile, String contact, String key, String val);
+  void SetConversationAttribute(String profile, int contact, String key, String val);
 
   // ignore: non_constant_identifier_names
   void LoadServers(String password);

lib/cwtch/cwtchNotifier.dart

@@ -23,7 +23,8 @@ class CwtchNotifier {
   late AppState appState;
   late ServerListState serverListState;
 
-  CwtchNotifier(ProfileListState pcn, Settings settingsCN, ErrorHandler errorCN, TorStatus torStatusCN, NotificationsManager notificationManagerP, AppState appStateCN, ServerListState serverListStateCN) {
+  CwtchNotifier(
+      ProfileListState pcn, Settings settingsCN, ErrorHandler errorCN, TorStatus torStatusCN, NotificationsManager notificationManagerP, AppState appStateCN, ServerListState serverListStateCN) {
     profileCN = pcn;
     settings = settingsCN;
     error = errorCN;
@@ -34,6 +35,7 @@ class CwtchNotifier {
   }
 
   void handleMessage(String type, dynamic data) {
+    EnvironmentConfig.debugLog("NewEvent $type $data");
     switch (type) {
       case "CwtchStarted":
         appState.SetCwtchInit();
@@ -42,12 +44,15 @@ class CwtchNotifier {
         appState.SetAppError(data["Error"]);
         break;
       case "NewPeer":
+        EnvironmentConfig.debugLog("NewPeer $data");
         // if tag != v1-defaultPassword then it is either encrypted OR it is an unencrypted account created during pre-beta...
         profileCN.add(data["Identity"], data["name"], data["picture"], data["ContactsJson"], data["ServerList"], data["Online"] == "true", data["tag"] != "v1-defaultPassword");
         break;
-      case "PeerCreated":
+      case "ContactCreated":
+        EnvironmentConfig.debugLog("NewServer $data");
         profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(
               data["ProfileOnion"],
+              int.parse(data["ConversationID"]),
               data["RemotePeer"],
               nickname: data["nick"],
               status: data["status"],
@@ -64,13 +69,7 @@ class CwtchNotifier {
         break;
       case "NewServer":
         EnvironmentConfig.debugLog("NewServer $data");
-        serverListState.add(
+        serverListState.add(data["Onion"], data["ServerBundle"], data["Running"] == "true", data["Description"], data["Autostart"] == "true", data["StorageType"] == "storage-password");
-            data["Onion"],
-            data["ServerBundle"],
-            data["Running"] == "true",
-            data["Description"],
-            data["Autostart"] == "true",
-            data["StorageType"] == "storage-password");
         break;
       case "ServerIntentUpdate":
         EnvironmentConfig.debugLog("ServerIntentUpdate $data");
@@ -88,7 +87,7 @@ class CwtchNotifier {
           status = serverInfoState.status;
         }
         if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"]) == null) {
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(data["ProfileOnion"], data["GroupID"],
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(data["ProfileOnion"], data["ConversationID"], data["GroupID"],
               authorization: ContactAuthorization.approved,
               imagePath: data["PicturePath"],
               nickname: data["GroupName"],
@@ -111,13 +110,13 @@ class CwtchNotifier {
         }
         break;
       case "DeleteContact":
-        profileCN.getProfile(data["ProfileOnion"])?.contactList.removeContact(data["RemotePeer"]);
+        profileCN.getProfile(data["ProfileOnion"])?.contactList.removeContact(data["ConversationID"]);
         break;
       case "DeleteGroup":
-        profileCN.getProfile(data["ProfileOnion"])?.contactList.removeContact(data["GroupID"]);
+        profileCN.getProfile(data["ProfileOnion"])?.contactList.removeContact(data["ConversationID"]);
         break;
       case "PeerStateChange":
-        ContactInfoState? contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"]);
+        ContactInfoState? contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["RemotePeer"]);
         if (contact != null) {
           if (data["ConnectionState"] != null) {
             contact.status = data["ConnectionState"];
@@ -131,19 +130,20 @@ class CwtchNotifier {
         break;
       case "NewMessageFromPeer":
         notificationManager.notify("New Message From Peer!");
-        if (appState.selectedProfile != data["ProfileOnion"] || appState.selectedConversation != data["RemotePeer"]) {
+        var identifier = int.parse(data["ConversationID"]);
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.unreadMessages++;
+        if (appState.selectedProfile != data["ProfileOnion"] || appState.selectedConversation != identifier) {
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.unreadMessages++;
         } else {
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.newMarker++;
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.newMarker++;
         }
-        profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.totalMessages++;
+        profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.totalMessages++;
-        profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["RemotePeer"], DateTime.now());
+        profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(identifier, DateTime.now());
 
         // We only ever see messages from authenticated peers.
         // If the contact is marked as offline then override this - can happen when the contact is removed from the front
         // end during syncing.
-        if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.isOnline() == false) {
+        if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.isOnline() == false) {
-          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.status = "Authenticated";
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.status = "Authenticated";
         }
 
         break;
@@ -151,10 +151,13 @@ class CwtchNotifier {
         // We don't use these anymore, IndexedAcknowledgement is more suited to the UI front end...
         break;
       case "IndexedAcknowledgement":
-        var idx = data["Index"];
+        var messageID = data["Index"];
+        var identifier = int.parse(data["ConversationID"]);
+        var idx = identifier.toString() + messageID;
+
         // We return -1 for protocol message acks if there is no message
         if (idx == "-1") break;
-        var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.getMessageKey(idx);
+        var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.getMessageKey(idx);
         if (key == null) break;
         try {
           var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
@@ -162,8 +165,8 @@ class CwtchNotifier {
           // We only ever see acks from authenticated peers.
           // If the contact is marked as offline then override this - can happen when the contact is removed from the front
           // end during syncing.
-          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.isOnline() == false) {
+          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.isOnline() == false) {
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.status = "Authenticated";
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.status = "Authenticated";
           }
           message.ackd = true;
         } catch (e) {
@@ -172,19 +175,20 @@ class CwtchNotifier {
         }
         break;
       case "NewMessageFromGroup":
+        var identifier = int.parse(data["ConversationID"]);
         if (data["ProfileOnion"] != data["RemotePeer"]) {
           var idx = int.parse(data["Index"]);
-          var currentTotal = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.totalMessages;
+          var currentTotal = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.totalMessages;
 
           // Only bother to do anything if we know about the group and the provided index is greater than our current total...
           if (currentTotal != null && idx >= currentTotal) {
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.totalMessages = idx + 1;
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.totalMessages = idx + 1;
 
             //if not currently open
-            if (appState.selectedProfile != data["ProfileOnion"] || appState.selectedConversation != data["GroupID"]) {
+            if (appState.selectedProfile != data["ProfileOnion"] || appState.selectedConversation != identifier) {
-              profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.unreadMessages++;
+              profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.unreadMessages++;
             } else {
-              profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.newMarker++;
+              profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)!.newMarker++;
             }
 
             var timestampSent = DateTime.tryParse(data['TimestampSent'])!;
@@ -198,13 +202,13 @@ class CwtchNotifier {
             // For now we perform some minimal checks on the sent timestamp to use to provide a useful ordering for honest contacts
             // and ensure that malicious contacts in groups can only set this timestamp to a value within the range of `last seen message time`
             // and `local now`.
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(data["GroupID"], timestampSent.toLocal());
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(identifier, timestampSent.toLocal());
             notificationManager.notify("New Message From Group!");
           }
         } else {
           // from me (already displayed - do not update counter)
           var idx = data["Signature"];
-          var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])?.getMessageKey(idx);
+          var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier)?.getMessageKey(idx);
           if (key == null) break;
           try {
             var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
@@ -219,8 +223,8 @@ class CwtchNotifier {
         var contactHandle = data["RemotePeer"];
         if (contactHandle == null || contactHandle == "") contactHandle = data["GroupID"];
         var total = int.parse(data["Data"]);
-        if (total != profileCN.getProfile(data["Identity"])?.contactList.getContact(contactHandle)!.totalMessages) {
+        if (total != profileCN.getProfile(data["Identity"])?.contactList.findContact(contactHandle)!.totalMessages) {
-          profileCN.getProfile(data["Identity"])?.contactList.getContact(contactHandle)!.totalMessages = total;
+          profileCN.getProfile(data["Identity"])?.contactList.findContact(contactHandle)!.totalMessages = total;
         }
         break;
       case "SendMessageToPeerError":
@@ -228,7 +232,7 @@ class CwtchNotifier {
         break;
       case "IndexedFailure":
         var idx = data["Index"];
-        var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])?.getMessageKey(idx);
+        var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["RemotePeer"])?.getMessageKey(idx);
         try {
           var message = Provider.of<MessageMetadata>(key!.currentContext!, listen: false);
           message.error = true;
@@ -240,7 +244,7 @@ class CwtchNotifier {
         // from me (already displayed - do not update counter)
         EnvironmentConfig.debugLog("SendMessageToGroupError");
         var idx = data["Signature"];
-        var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["GroupID"])!.getMessageKey(idx);
+        var key = profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["GroupID"])!.getMessageKey(idx);
         if (key == null) break;
         try {
           var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
@@ -262,8 +266,8 @@ class CwtchNotifier {
       case "UpdateGlobalSettings":
         settings.handleUpdate(jsonDecode(data["Data"]));
         break;
-      case "SetAttribute":
+      case "UpdatedProfileAttribute":
-        if (data["Key"] == "public.name") {
+        if (data["Key"] == "public.profile.name") {
           profileCN.getProfile(data["ProfileOnion"])?.nickname = data["Data"];
         } else {
           EnvironmentConfig.debugLog("unhandled set attribute event: ${data['Key']}");
@@ -298,8 +302,8 @@ class CwtchNotifier {
             status = serverInfoState.status;
           }
 
-          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(groupInvite["GroupID"]) == null) {
+          if (profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(groupInvite["GroupID"]) == null) {
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(data["ProfileOnion"], groupInvite["GroupID"],
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.add(ContactInfoState(data["ProfileOnion"], data["ConversationID"], groupInvite["GroupID"],
                 authorization: ContactAuthorization.approved,
                 imagePath: data["PicturePath"],
                 nickname: groupInvite["GroupName"],

lib/cwtch/ffi.dart

@@ -36,8 +36,9 @@ typedef VoidFromStringStringStringFn = void Function(Pointer<Utf8>, int, Pointer
 typedef void_from_string_string_string_string_function = Void Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32);
 typedef VoidFromStringStringStringStringFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int, Pointer<Utf8>, int, Pointer<Utf8>, int);
 
-typedef void_from_string_string_string_string_string_function = Void Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32);
+// DownloadFile
-typedef VoidFromStringStringStringStringStringFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int, Pointer<Utf8>, int, Pointer<Utf8>, int, Pointer<Utf8>, int);
+typedef void_from_string_int_string_string_string_function = Void Function(Pointer<Utf8>, Int32, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32);
+typedef VoidFromStringIntStringStringStringFn = void Function(Pointer<Utf8>, int, int, Pointer<Utf8>, int, Pointer<Utf8>, int, Pointer<Utf8>, int);
 
 typedef void_from_string_string_int_int_function = Void Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Int64, Int64);
 typedef VoidFromStringStringIntIntFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int, int, int);
@@ -51,6 +52,9 @@ typedef StringFn = void Function(Pointer<Utf8> dir, int);
 typedef string_string_to_void_function = Void Function(Pointer<Utf8> str, Int32 length, Pointer<Utf8> str2, Int32 length2);
 typedef StringStringFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int);
 
+typedef string_int_to_void_function = Void Function(Pointer<Utf8> str, Int32 length, Int32 handle);
+typedef VoidFromStringIntFn = void Function(Pointer<Utf8>, int, int);
+
 typedef get_json_blob_string_function = Pointer<Utf8> Function(Pointer<Utf8> str, Int32 length);
 typedef GetJsonBlobStringFn = Pointer<Utf8> Function(Pointer<Utf8> str, int len);
 
@@ -58,10 +62,31 @@ typedef GetJsonBlobStringFn = Pointer<Utf8> Function(Pointer<Utf8> str, int len)
 typedef get_json_blob_from_str_str_int_function = Pointer<Utf8> Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Int32);
 typedef GetJsonBlobFromStrStrIntFn = Pointer<Utf8> Function(Pointer<Utf8>, int, Pointer<Utf8>, int, int);
 
+typedef get_json_blob_from_str_int_int_function = Pointer<Utf8> Function(Pointer<Utf8>, Int32, Int32, Int32);
+typedef GetJsonBlobFromStrIntIntFn = Pointer<Utf8> Function(Pointer<Utf8>, int, int, int);
+
+typedef get_json_blob_from_str_int_string_function = Pointer<Utf8> Function(Pointer<Utf8>, Int32, Int32, Pointer<Utf8>, Int32);
+typedef GetJsonBlobFromStrIntStringFn = Pointer<Utf8> Function(
+  Pointer<Utf8>,
+  int,
+  int,
+  Pointer<Utf8>,
+  int,
+);
+
 // func c_GetMessagesByContentHash(profile_ptr *C.char, profile_len C.int, handle_ptr *C.char, handle_len C.int, contenthash_ptr *C.char, contenthash_len C.int) *C.char
 typedef get_json_blob_from_str_str_str_function = Pointer<Utf8> Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32);
 typedef GetJsonBlobFromStrStrStrFn = Pointer<Utf8> Function(Pointer<Utf8>, int, Pointer<Utf8>, int, Pointer<Utf8>, int);
 
+typedef void_from_string_int_string_function = Void Function(Pointer<Utf8>, Int32, Int32, Pointer<Utf8>, Int32);
+typedef VoidFromStringIntStringFn = void Function(Pointer<Utf8>, int, int, Pointer<Utf8>, int);
+
+typedef void_from_string_int_string_string_function = Void Function(Pointer<Utf8>, Int32, Int32, Pointer<Utf8>, Int32, Pointer<Utf8>, Int32);
+typedef VoidFromStringIntStringStringFn = void Function(Pointer<Utf8>, int, int, Pointer<Utf8>, int, Pointer<Utf8>, int);
+
+typedef void_from_string_int_int_function = Void Function(Pointer<Utf8>, Int32, Int32, Int32);
+typedef VoidFromStringIntIntFn = void Function(Pointer<Utf8>, int, int, int);
+
 typedef appbus_events_function = Pointer<Utf8> Function();
 typedef AppbusEventsFn = Pointer<Utf8> Function();
 
@@ -266,17 +291,15 @@ class CwtchFfi implements Cwtch {
   }
 
   // ignore: non_constant_identifier_names
-  Future<String> GetMessage(String profile, String handle, int index) async {
+  Future<String> GetMessage(String profile, int handle, int index) async {
-    var getMessageC = library.lookup<NativeFunction<get_json_blob_from_str_str_int_function>>("c_GetMessage");
+    var getMessageC = library.lookup<NativeFunction<get_json_blob_from_str_int_int_function>>("c_GetMessage");
     // ignore: non_constant_identifier_names
-    final GetMessage = getMessageC.asFunction<GetJsonBlobFromStrStrIntFn>();
+    final GetMessage = getMessageC.asFunction<GetJsonBlobFromStrIntIntFn>();
     final utf8profile = profile.toNativeUtf8();
-    final utf8handle = handle.toNativeUtf8();
+    Pointer<Utf8> jsonMessageBytes = GetMessage(utf8profile, utf8profile.length, handle, index);
-    Pointer<Utf8> jsonMessageBytes = GetMessage(utf8profile, utf8profile.length, utf8handle, utf8handle.length, index);
     String jsonMessage = jsonMessageBytes.toDartString();
     _UnsafeFreePointerAnyUseOfThisFunctionMustBeDoubleApproved(jsonMessageBytes);
     malloc.free(utf8profile);
-    malloc.free(utf8handle);
     return jsonMessage;
   }
 
@@ -306,89 +329,75 @@ class CwtchFfi implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void AcceptContact(String profileOnion, String contactHandle) {
+  void AcceptContact(String profileOnion, int contactHandle) {
-    var acceptContact = library.lookup<NativeFunction<string_string_to_void_function>>("c_AcceptContact");
+    var acceptContact = library.lookup<NativeFunction<string_int_to_void_function>>("c_AcceptConversation");
     // ignore: non_constant_identifier_names
-    final AcceptContact = acceptContact.asFunction<VoidFromStringStringFn>();
+    final AcceptContact = acceptContact.asFunction<VoidFromStringIntFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = contactHandle.toNativeUtf8();
+    AcceptContact(u1, u1.length, contactHandle);
-    AcceptContact(u1, u1.length, u2, u2.length);
     malloc.free(u1);
-    malloc.free(u2);
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void BlockContact(String profileOnion, String contactHandle) {
+  void BlockContact(String profileOnion, int contactHandle) {
-    var blockContact = library.lookup<NativeFunction<string_string_to_void_function>>("c_BlockContact");
+    var blockContact = library.lookup<NativeFunction<string_int_to_void_function>>("c_BlockContact");
     // ignore: non_constant_identifier_names
-    final BlockContact = blockContact.asFunction<VoidFromStringStringFn>();
+    final BlockContact = blockContact.asFunction<VoidFromStringIntFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = contactHandle.toNativeUtf8();
+    BlockContact(u1, u1.length, contactHandle);
-    BlockContact(u1, u1.length, u2, u2.length);
     malloc.free(u1);
-    malloc.free(u2);
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void SendMessage(String profileOnion, String contactHandle, String message) {
+  void SendMessage(String profileOnion, int contactHandle, String message) {
-    var sendMessage = library.lookup<NativeFunction<void_from_string_string_string_function>>("c_SendMessage");
+    var sendMessage = library.lookup<NativeFunction<void_from_string_int_string_function>>("c_SendMessage");
     // ignore: non_constant_identifier_names
-    final SendMessage = sendMessage.asFunction<VoidFromStringStringStringFn>();
+    final SendMessage = sendMessage.asFunction<VoidFromStringIntStringFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = contactHandle.toNativeUtf8();
     final u3 = message.toNativeUtf8();
-    SendMessage(u1, u1.length, u2, u2.length, u3, u3.length);
+    SendMessage(u1, u1.length, contactHandle, u3, u3.length);
     malloc.free(u1);
-    malloc.free(u2);
     malloc.free(u3);
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void SendInvitation(String profileOnion, String contactHandle, String target) {
+  void SendInvitation(String profileOnion, int contactHandle, int target) {
-    var sendInvitation = library.lookup<NativeFunction<void_from_string_string_string_function>>("c_SendInvitation");
+    var sendInvitation = library.lookup<NativeFunction<void_from_string_int_int_function>>("c_SendInvitation");
     // ignore: non_constant_identifier_names
-    final SendInvitation = sendInvitation.asFunction<VoidFromStringStringStringFn>();
+    final SendInvitation = sendInvitation.asFunction<VoidFromStringIntIntFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = contactHandle.toNativeUtf8();
+    SendInvitation(u1, u1.length, contactHandle, target);
-    final u3 = target.toNativeUtf8();
-    SendInvitation(u1, u1.length, u2, u2.length, u3, u3.length);
     malloc.free(u1);
-    malloc.free(u2);
-    malloc.free(u3);
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void ShareFile(String profileOnion, String contactHandle, String filepath) {
+  void ShareFile(String profileOnion, int contactHandle, String filepath) {
-    var shareFile = library.lookup<NativeFunction<void_from_string_string_string_function>>("c_ShareFile");
+    var shareFile = library.lookup<NativeFunction<void_from_string_int_string_function>>("c_ShareFile");
     // ignore: non_constant_identifier_names
-    final ShareFile = shareFile.asFunction<VoidFromStringStringStringFn>();
+    final ShareFile = shareFile.asFunction<VoidFromStringIntStringFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = contactHandle.toNativeUtf8();
     final u3 = filepath.toNativeUtf8();
-    ShareFile(u1, u1.length, u2, u2.length, u3, u3.length);
+    ShareFile(u1, u1.length, contactHandle, u3, u3.length);
     malloc.free(u1);
-    malloc.free(u2);
     malloc.free(u3);
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void DownloadFile(String profileOnion, String contactHandle, String filepath, String manifestpath, String filekey) {
+  void DownloadFile(String profileOnion, int contactHandle, String filepath, String manifestpath, String filekey) {
-    var dlFile = library.lookup<NativeFunction<void_from_string_string_string_string_string_function>>("c_DownloadFile");
+    var dlFile = library.lookup<NativeFunction<void_from_string_int_string_string_string_function>>("c_DownloadFile");
     // ignore: non_constant_identifier_names
-    final DownloadFile = dlFile.asFunction<VoidFromStringStringStringStringStringFn>();
+    final DownloadFile = dlFile.asFunction<VoidFromStringIntStringStringStringFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = contactHandle.toNativeUtf8();
     final u3 = filepath.toNativeUtf8();
     final u4 = manifestpath.toNativeUtf8();
     final u5 = filekey.toNativeUtf8();
-    DownloadFile(u1, u1.length, u2, u2.length, u3, u3.length, u4, u4.length, u5, u5.length);
+    DownloadFile(u1, u1.length, contactHandle, u3, u3.length, u4, u4.length, u5, u5.length);
     malloc.free(u1);
-    malloc.free(u2);
     malloc.free(u3);
     malloc.free(u4);
     malloc.free(u5);
@@ -396,7 +405,7 @@ class CwtchFfi implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void CreateDownloadableFile(String profileOnion, String contactHandle, String filenameSuggestion, String filekey) {
+  void CreateDownloadableFile(String profileOnion, int contactHandle, String filenameSuggestion, String filekey) {
     // android only - do nothing
   }
 
@@ -415,20 +424,17 @@ class CwtchFfi implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void VerifyOrResumeDownload(String profileOnion, String contactHandle, String filekey) {
+  void VerifyOrResumeDownload(String profileOnion, int contactHandle, String filekey) {
-    var fn = library.lookup<NativeFunction<void_from_string_string_string_function>>("c_VerifyOrResumeDownload");
+    var fn = library.lookup<NativeFunction<void_from_string_int_string_function>>("c_VerifyOrResumeDownload");
     // ignore: non_constant_identifier_names
-    final VerifyOrResumeDownload = fn.asFunction<VoidFromStringStringStringFn>();
+    final VerifyOrResumeDownload = fn.asFunction<VoidFromStringIntStringFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = contactHandle.toNativeUtf8();
     final u3 = filekey.toNativeUtf8();
-    VerifyOrResumeDownload(u1, u1.length, u2, u2.length, u3, u3.length);
+    VerifyOrResumeDownload(u1, u1.length, contactHandle, u3, u3.length);
     malloc.free(u1);
-    malloc.free(u2);
     malloc.free(u3);
   }
 
-
   @override
   // ignore: non_constant_identifier_names
   void ResetTor() {
@@ -453,32 +459,13 @@ class CwtchFfi implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void SetGroupAttribute(String profileOnion, String groupHandle, String key, String value) {
+  void RejectInvite(String profileOnion, int groupHandle) {
-    var setGroupAttribute = library.lookup<NativeFunction<void_from_string_string_string_string_function>>("c_SetGroupAttribute");
+    var rejectInvite = library.lookup<NativeFunction<string_int_to_void_function>>("c_RejectInvite");
     // ignore: non_constant_identifier_names
-    final SetGroupAttribute = setGroupAttribute.asFunction<VoidFromStringStringStringStringFn>();
+    final RejectInvite = rejectInvite.asFunction<VoidFromStringIntFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = groupHandle.toNativeUtf8();
+    RejectInvite(u1, u1.length, groupHandle);
-    final u3 = key.toNativeUtf8();
-    final u4 = value.toNativeUtf8();
-    SetGroupAttribute(u1, u1.length, u2, u2.length, u3, u3.length, u4, u4.length);
     malloc.free(u1);
-    malloc.free(u2);
-    malloc.free(u3);
-    malloc.free(u4);
-  }
-
-  @override
-  // ignore: non_constant_identifier_names
-  void RejectInvite(String profileOnion, String groupHandle) {
-    var rejectInvite = library.lookup<NativeFunction<string_string_to_void_function>>("c_RejectInvite");
-    // ignore: non_constant_identifier_names
-    final RejectInvite = rejectInvite.asFunction<VoidFromStringStringFn>();
-    final u1 = profileOnion.toNativeUtf8();
-    final u2 = groupHandle.toNativeUtf8();
-    RejectInvite(u1, u1.length, u2, u2.length);
-    malloc.free(u1);
-    malloc.free(u2);
   }
 
   @override
@@ -499,41 +486,24 @@ class CwtchFfi implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void ArchiveConversation(String profileOnion, String handle) {
+  void ArchiveConversation(String profileOnion, int handle) {
-    var archiveConversation = library.lookup<NativeFunction<string_string_to_void_function>>("c_ArchiveConversation");
+    var archiveConversation = library.lookup<NativeFunction<string_int_to_void_function>>("c_ArchiveConversation");
     // ignore: non_constant_identifier_names
-    final ArchiveConversation = archiveConversation.asFunction<VoidFromStringStringFn>();
+    final ArchiveConversation = archiveConversation.asFunction<VoidFromStringIntFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = handle.toNativeUtf8();
+    ArchiveConversation(u1, u1.length, handle);
-    ArchiveConversation(u1, u1.length, u2, u2.length);
     malloc.free(u1);
-    malloc.free(u2);
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void DeleteContact(String profileOnion, String handle) {
+  void DeleteContact(String profileOnion, int handle) {
-    var deleteContact = library.lookup<NativeFunction<string_string_to_void_function>>("c_DeleteContact");
+    var deleteContact = library.lookup<NativeFunction<string_int_to_void_function>>("c_DeleteContact");
     // ignore: non_constant_identifier_names
-    final DeleteContact = deleteContact.asFunction<VoidFromStringStringFn>();
+    final DeleteContact = deleteContact.asFunction<VoidFromStringIntFn>();
     final u1 = profileOnion.toNativeUtf8();
-    final u2 = handle.toNativeUtf8();
+    DeleteContact(u1, u1.length, handle);
-    DeleteContact(u1, u1.length, u2, u2.length);
     malloc.free(u1);
-    malloc.free(u2);
-  }
-
-  @override
-  // ignore: non_constant_identifier_names
-  void UpdateMessageFlags(String profile, String handle, int index, int flags) {
-    var updateMessageFlagsC = library.lookup<NativeFunction<void_from_string_string_int_int_function>>("c_UpdateMessageFlags");
-    // ignore: non_constant_identifier_names
-    final updateMessageFlags = updateMessageFlagsC.asFunction<VoidFromStringStringIntIntFn>();
-    final utf8profile = profile.toNativeUtf8();
-    final utf8handle = handle.toNativeUtf8();
-    updateMessageFlags(utf8profile, utf8profile.length, utf8handle, utf8handle.length, index, flags);
-    malloc.free(utf8profile);
-    malloc.free(utf8handle);
   }
 
   @override
@@ -557,7 +527,7 @@ class CwtchFfi implements Cwtch {
     final SetProfileAttribute = setProfileAttribute.asFunction<VoidFromStringStringStringFn>();
     final u1 = profile.toNativeUtf8();
     final u2 = key.toNativeUtf8();
-    final u3 = key.toNativeUtf8();
+    final u3 = val.toNativeUtf8();
     SetProfileAttribute(u1, u1.length, u2, u2.length, u3, u3.length);
     malloc.free(u1);
     malloc.free(u2);
@@ -566,17 +536,15 @@ class CwtchFfi implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void SetContactAttribute(String profile, String contact, String key, String val) {
+  void SetConversationAttribute(String profile, int contact, String key, String val) {
-    var setContactAttribute = library.lookup<NativeFunction<void_from_string_string_string_string_function>>("c_SetContactAttribute");
+    var setContactAttribute = library.lookup<NativeFunction<void_from_string_int_string_string_function>>("c_SetConversationAttribute");
     // ignore: non_constant_identifier_names
-    final SetContactAttribute = setContactAttribute.asFunction<VoidFromStringStringStringStringFn>();
+    final SetContactAttribute = setContactAttribute.asFunction<VoidFromStringIntStringStringFn>();
     final u1 = profile.toNativeUtf8();
-    final u2 = contact.toNativeUtf8();
     final u3 = key.toNativeUtf8();
-    final u4 = key.toNativeUtf8();
+    final u4 = val.toNativeUtf8();
-    SetContactAttribute(u1, u1.length, u2, u2.length, u3, u3.length, u4, u4.length);
+    SetContactAttribute(u1, u1.length, contact, u3, u3.length, u4, u4.length);
     malloc.free(u1);
-    malloc.free(u2);
     malloc.free(u3);
     malloc.free(u4);
   }
@@ -703,19 +671,17 @@ class CwtchFfi implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  Future GetMessageByContentHash(String profile, String handle, String contentHash) async {
+  Future GetMessageByContentHash(String profile, int handle, String contentHash) async {
-    var getMessagesByContentHashC = library.lookup<NativeFunction<get_json_blob_from_str_str_str_function>>("c_GetMessagesByContentHash");
+    var getMessagesByContentHashC = library.lookup<NativeFunction<get_json_blob_from_str_int_string_function>>("c_GetMessagesByContentHash");
     // ignore: non_constant_identifier_names
-    final GetMessagesByContentHash = getMessagesByContentHashC.asFunction<GetJsonBlobFromStrStrStrFn>();
+    final GetMessagesByContentHash = getMessagesByContentHashC.asFunction<GetJsonBlobFromStrIntStringFn>();
     final utf8profile = profile.toNativeUtf8();
-    final utf8handle = handle.toNativeUtf8();
     final utf8contentHash = contentHash.toNativeUtf8();
-    Pointer<Utf8> jsonMessageBytes = GetMessagesByContentHash(utf8profile, utf8profile.length, utf8handle, utf8handle.length, utf8contentHash, utf8contentHash.length);
+    Pointer<Utf8> jsonMessageBytes = GetMessagesByContentHash(utf8profile, utf8profile.length, handle, utf8contentHash, utf8contentHash.length);
     String jsonMessage = jsonMessageBytes.toDartString();
 
     _UnsafeFreePointerAnyUseOfThisFunctionMustBeDoubleApproved(jsonMessageBytes);
     malloc.free(utf8profile);
-    malloc.free(utf8handle);
     malloc.free(utf8contentHash);
     return jsonMessage;
   }
@@ -728,4 +694,17 @@ class CwtchFfi implements Cwtch {
     final Free = free.asFunction<FreeFn>();
     Free(ptr);
   }
+
+  @override
+  Future<String> GetMessageByID(String profile, int handle, int index) async {
+    var getMessageC = library.lookup<NativeFunction<get_json_blob_from_str_int_int_function>>("c_GetMessageByID");
+    // ignore: non_constant_identifier_names
+    final GetMessage = getMessageC.asFunction<GetJsonBlobFromStrIntIntFn>();
+    final utf8profile = profile.toNativeUtf8();
+    Pointer<Utf8> jsonMessageBytes = GetMessage(utf8profile, utf8profile.length, handle, index);
+    String jsonMessage = jsonMessageBytes.toDartString();
+    _UnsafeFreePointerAnyUseOfThisFunctionMustBeDoubleApproved(jsonMessageBytes);
+    malloc.free(utf8profile);
+    return jsonMessage;
+  }
 }

lib/cwtch/gomobile.dart

@@ -87,11 +87,15 @@ class CwtchGomobile implements Cwtch {
   }
 
   // ignore: non_constant_identifier_names
-  Future<dynamic> GetMessage(String profile, String handle, int index) {
+  Future<dynamic> GetMessage(String profile, int handle, int index) {
-    print("gomobile.dart GetMessage " + index.toString());
     return cwtchPlatform.invokeMethod("GetMessage", {"profile": profile, "contact": handle, "index": index});
   }
 
+  // ignore: non_constant_identifier_names
+  Future<dynamic> GetMessageByID(String profile, int handle, int index) {
+    return cwtchPlatform.invokeMethod("GetMessageByID", {"profile": profile, "contact": handle, "index": index});
+  }
+
   @override
   // ignore: non_constant_identifier_names
   void SendProfileEvent(String onion, String jsonEvent) {
@@ -109,42 +113,42 @@ class CwtchGomobile implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void AcceptContact(String profileOnion, String contactHandle) {
+  void AcceptContact(String profileOnion, int contactHandle) {
     cwtchPlatform.invokeMethod("AcceptContact", {"ProfileOnion": profileOnion, "handle": contactHandle});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void BlockContact(String profileOnion, String contactHandle) {
+  void BlockContact(String profileOnion, int contactHandle) {
     cwtchPlatform.invokeMethod("BlockContact", {"ProfileOnion": profileOnion, "handle": contactHandle});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void SendMessage(String profileOnion, String contactHandle, String message) {
+  void SendMessage(String profileOnion, int contactHandle, String message) {
     cwtchPlatform.invokeMethod("SendMessage", {"ProfileOnion": profileOnion, "handle": contactHandle, "message": message});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void SendInvitation(String profileOnion, String contactHandle, String target) {
+  void SendInvitation(String profileOnion, int contactHandle, int target) {
     cwtchPlatform.invokeMethod("SendInvitation", {"ProfileOnion": profileOnion, "handle": contactHandle, "target": target});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void ShareFile(String profileOnion, String contactHandle, String filepath) {
+  void ShareFile(String profileOnion, int contactHandle, String filepath) {
     cwtchPlatform.invokeMethod("ShareFile", {"ProfileOnion": profileOnion, "handle": contactHandle, "filepath": filepath});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void DownloadFile(String profileOnion, String contactHandle, String filepath, String manifestpath, String filekey) {
+  void DownloadFile(String profileOnion, int contactHandle, String filepath, String manifestpath, String filekey) {
     cwtchPlatform.invokeMethod("DownloadFile", {"ProfileOnion": profileOnion, "handle": contactHandle, "filepath": filepath, "manifestpath": manifestpath, "filekey": filekey});
   }
 
   // ignore: non_constant_identifier_names
-  void CreateDownloadableFile(String profileOnion, String contactHandle, String filenameSuggestion, String filekey) {
+  void CreateDownloadableFile(String profileOnion, int contactHandle, String filenameSuggestion, String filekey) {
     cwtchPlatform.invokeMethod("CreateDownloadableFile", {"ProfileOnion": profileOnion, "handle": contactHandle, "filename": filenameSuggestion, "filekey": filekey});
   }
 
@@ -156,7 +160,7 @@ class CwtchGomobile implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void VerifyOrResumeDownload(String profileOnion, String contactHandle, String filekey) {
+  void VerifyOrResumeDownload(String profileOnion, int contactHandle, String filekey) {
     cwtchPlatform.invokeMethod("VerifyOrResumeDownload", {"ProfileOnion": profileOnion, "handle": contactHandle, "filekey": filekey});
   }
 
@@ -180,7 +184,7 @@ class CwtchGomobile implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void RejectInvite(String profileOnion, String groupHandle) {
+  void RejectInvite(String profileOnion, int groupHandle) {
     cwtchPlatform.invokeMethod("RejectInvite", {"ProfileOnion": profileOnion, "groupHandle": groupHandle});
   }
 
@@ -191,22 +195,16 @@ class CwtchGomobile implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void DeleteContact(String profileOnion, String handle) {
+  void DeleteContact(String profileOnion, int handle) {
     cwtchPlatform.invokeMethod("DeleteContact", {"ProfileOnion": profileOnion, "handle": handle});
   }
 
   @override
   // ignore: non_constant_identifier_names
-  void ArchiveConversation(String profileOnion, String contactHandle) {
+  void ArchiveConversation(String profileOnion, int contactHandle) {
     cwtchPlatform.invokeMethod("ArchiveConversation", {"ProfileOnion": profileOnion, "handle": contactHandle});
   }
 
-  @override
-  void UpdateMessageFlags(String profile, String handle, int index, int flags) {
-    print("gomobile.dart UpdateMessageFlags " + index.toString());
-    cwtchPlatform.invokeMethod("UpdateMessageFlags", {"profile": profile, "contact": handle, "midx": index, "flags": flags});
-  }
-
   @override
   // ignore: non_constant_identifier_names
   void SetProfileAttribute(String profile, String key, String val) {
@@ -215,7 +213,7 @@ class CwtchGomobile implements Cwtch {
 
   @override
   // ignore: non_constant_identifier_names
-  void SetContactAttribute(String profile, String contact, String key, String val) {
+  void SetConversationAttribute(String profile, int contact, String key, String val) {
     cwtchPlatform.invokeMethod("SetContactAttribute", {"ProfileOnion": profile, "Contact": contact, "Key": key, "Val": val});
   }
 
@@ -273,14 +271,14 @@ class CwtchGomobile implements Cwtch {
     cwtchPlatform.invokeMethod("SetServerAttribute", {"ServerOnion": serverOnion, "Key": key, "Val": val});
   }
 
-    @override
+  @override
   Future<void> Shutdown() async {
     print("gomobile.dart Shutdown");
     cwtchPlatform.invokeMethod("Shutdown", {});
   }
 
   @override
-  Future GetMessageByContentHash(String profile, String handle, String contentHash) {
+  Future GetMessageByContentHash(String profile, int handle, String contentHash) {
     return cwtchPlatform.invokeMethod("GetMessageByContentHash", {"profile": profile, "contact": handle, "contentHash": contentHash});
   }
 }

lib/model.dart

@@ -29,7 +29,7 @@ class AppState extends ChangeNotifier {
   bool cwtchIsClosing = false;
   String appError = "";
   String? _selectedProfile;
-  String? _selectedConversation;
+  int? _selectedConversation;
   int _initialScrollIndex = 0;
   int _hoveredIndex = -1;
   int? _selectedIndex;
@@ -51,8 +51,8 @@ class AppState extends ChangeNotifier {
     notifyListeners();
   }
 
-  String? get selectedConversation => _selectedConversation;
+  int? get selectedConversation => _selectedConversation;
-  set selectedConversation(String? newVal) {
+  set selectedConversation(int? newVal) {
     this._selectedConversation = newVal;
     notifyListeners();
   }
@@ -172,8 +172,8 @@ class ContactListState extends ChangeNotifier {
     //} </todo>
   }
 
-  void updateLastMessageTime(String forOnion, DateTime newMessageTime) {
+  void updateLastMessageTime(int forIdentifier, DateTime newMessageTime) {
-    var contact = getContact(forOnion);
+    var contact = getContact(forIdentifier);
     if (contact == null) return;
 
     // Assert that the new time is after the current last message time AND that
@@ -191,18 +191,23 @@ class ContactListState extends ChangeNotifier {
 
   List<ContactInfoState> get contacts => _contacts.sublist(0); //todo: copy?? dont want caller able to bypass changenotifier
 
-  ContactInfoState? getContact(String onion) {
+  ContactInfoState? getContact(int identifier) {
-    int idx = _contacts.indexWhere((element) => element.onion == onion);
+    int idx = _contacts.indexWhere((element) => element.identifier == identifier);
     return idx >= 0 ? _contacts[idx] : null;
   }
 
-  void removeContact(String onion) {
+  void removeContact(int identifier) {
-    int idx = _contacts.indexWhere((element) => element.onion == onion);
+    int idx = _contacts.indexWhere((element) => element.identifier == identifier);
     if (idx >= 0) {
       _contacts.removeAt(idx);
       notifyListeners();
     }
   }
+
+  ContactInfoState? findContact(String byHandle) {
+    int idx = _contacts.indexWhere((element) => element.onion == byHandle);
+    return idx >= 0 ? _contacts[idx] : null;
+  }
 }
 
 class ProfileInfoState extends ChangeNotifier {
@@ -238,7 +243,7 @@ class ProfileInfoState extends ChangeNotifier {
     if (contactsJson != null && contactsJson != "" && contactsJson != "null") {
       List<dynamic> contacts = jsonDecode(contactsJson);
       this._contacts.addAll(contacts.map((contact) {
-        return ContactInfoState(this.onion, contact["onion"],
+        return ContactInfoState(this.onion, contact["identifier"], contact["onion"],
             nickname: contact["name"],
             status: contact["status"],
             imagePath: contact["picture"],
@@ -254,7 +259,7 @@ class ProfileInfoState extends ChangeNotifier {
 
       // dummy set to invoke sort-on-load
       if (this._contacts.num > 0) {
-        this._contacts.updateLastMessageTime(this._contacts._contacts.first.onion, this._contacts._contacts.first.lastMessageTime);
+        this._contacts.updateLastMessageTime(this._contacts._contacts.first.identifier, this._contacts._contacts.first.lastMessageTime);
       }
     }
 
@@ -341,6 +346,7 @@ class ProfileInfoState extends ChangeNotifier {
         } else {
           this._contacts.add(ContactInfoState(
                 this.onion,
+                contact["identifier"],
                 contact["onion"],
                 nickname: contact["name"],
                 status: contact["status"],
@@ -496,6 +502,7 @@ ContactAuthorization stringToContactAuthorization(String authStr) {
 
 class ContactInfoState extends ChangeNotifier {
   final String profileOnion;
+  final int identifier;
   final String onion;
   late String _nickname;
 
@@ -515,7 +522,7 @@ class ContactInfoState extends ChangeNotifier {
   String? _server;
   late bool _archived;
 
-  ContactInfoState(this.profileOnion, this.onion,
+  ContactInfoState(this.profileOnion, this.identifier, this.onion,
       {nickname = "",
       isGroup = false,
       authorization = ContactAuthorization.unknown,
@@ -593,7 +600,7 @@ class ContactInfoState extends ChangeNotifier {
     if (newVal > 0) {
       this._newMarker = newVal;
     } else {
-      this._newMarkerClearAt = DateTime.now().add(const Duration(minutes:2));
+      this._newMarkerClearAt = DateTime.now().add(const Duration(minutes: 2));
     }
     this._unreadMessages = newVal;
     notifyListeners();
@@ -608,6 +615,7 @@ class ContactInfoState extends ChangeNotifier {
     }
     return this._newMarker;
   }
+
   // what's a getter that sometimes sets without a setter
   // that sometimes doesn't set
   set newMarker(int newVal) {

lib/models/message.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'package:cwtch/config.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 
@@ -31,11 +32,18 @@ abstract class Message {
   Widget getPreviewWidget(BuildContext context);
 }
 
-Future<Message> messageHandler(BuildContext context, String profileOnion, String contactHandle, int index) {
+Future<Message> messageHandler(BuildContext context, String profileOnion, int conversationIdentifier, int index, {bool byID = false}) {
   try {
-    var rawMessageEnvelopeFuture = Provider.of<FlwtchState>(context, listen: false).cwtch.GetMessage(profileOnion, contactHandle, index);
+    Future<dynamic> rawMessageEnvelopeFuture;
+
+    if (byID) {
+      rawMessageEnvelopeFuture = Provider.of<FlwtchState>(context, listen: false).cwtch.GetMessageByID(profileOnion, conversationIdentifier, index);
+    } else {
+      rawMessageEnvelopeFuture = Provider.of<FlwtchState>(context, listen: false).cwtch.GetMessage(profileOnion, conversationIdentifier, index);
+    }
+
     return rawMessageEnvelopeFuture.then((dynamic rawMessageEnvelope) {
-      var metadata = MessageMetadata(profileOnion, contactHandle, index, DateTime.now(), "", "", null, 0, false, true);
+      var metadata = MessageMetadata(profileOnion, conversationIdentifier, index, -1, DateTime.now(), "", "", null, 0, false, true);
       try {
         dynamic messageWrapper = jsonDecode(rawMessageEnvelope);
         // There are 2 conditions in which this error condition can be met:
@@ -50,23 +58,20 @@ Future<Message> messageHandler(BuildContext context, String profileOnion, String
         if (messageWrapper['Message'] == null || messageWrapper['Message'] == '' || messageWrapper['Message'] == '{}') {
           return Future.delayed(Duration(seconds: 2), () {
             print("Tail recursive call to messageHandler called. This should be a rare event. If you see multiples of this log over a short period of time please log it as a bug.");
-            return messageHandler(context, profileOnion, contactHandle, index).then((value) => value);
+            return messageHandler(context, profileOnion, conversationIdentifier, index, byID: byID).then((value) => value);
           });
         }
 
         // Construct the initial metadata
+        var messageID = messageWrapper['ID'];
         var timestamp = DateTime.tryParse(messageWrapper['Timestamp'])!;
         var senderHandle = messageWrapper['PeerID'];
         var senderImage = messageWrapper['ContactImage'];
         var flags = int.parse(messageWrapper['Flags'].toString());
         var ackd = messageWrapper['Acknowledged'];
         var error = messageWrapper['Error'] != null;
-        String? signature;
+        var signature = messageWrapper['Signature'];
-        // If this is a group, store the signature
+        metadata = MessageMetadata(profileOnion, conversationIdentifier, index, messageID, timestamp, senderHandle, senderImage, signature, flags, ackd, error);
-        if (contactHandle.length == GroupConversationHandleLength) {
-          signature = messageWrapper['Signature'];
-        }
-        metadata = MessageMetadata(profileOnion, contactHandle, index, timestamp, senderHandle, senderImage, signature, flags, ackd, error);
 
         dynamic message = jsonDecode(messageWrapper['Message']);
         var content = message['d'] as dynamic;
@@ -87,20 +92,21 @@ Future<Message> messageHandler(BuildContext context, String profileOnion, String
             return MalformedMessage(metadata);
         }
       } catch (e) {
-        print("an error! " + e.toString());
+        EnvironmentConfig.debugLog("an error! " + e.toString());
         return MalformedMessage(metadata);
       }
     });
   } catch (e) {
-    return Future.value(MalformedMessage(MessageMetadata(profileOnion, contactHandle, index, DateTime.now(), "", "", null, 0, false, true)));
+    return Future.value(MalformedMessage(MessageMetadata(profileOnion, conversationIdentifier, index, -1, DateTime.now(), "", "", null, 0, false, true)));
   }
 }
 
 class MessageMetadata extends ChangeNotifier {
   // meta-metadata
   final String profileOnion;
-  final String contactHandle;
+  final int conversationIdentifier;
   final int messageIndex;
+  final int messageID;
 
   final DateTime timestamp;
   final String senderHandle;
@@ -129,5 +135,6 @@ class MessageMetadata extends ChangeNotifier {
     notifyListeners();
   }
 
-  MessageMetadata(this.profileOnion, this.contactHandle, this.messageIndex, this.timestamp, this.senderHandle, this.senderImage, this.signature, this._flags, this._ackd, this._error);
+  MessageMetadata(
+      this.profileOnion, this.conversationIdentifier, this.messageIndex, this.messageID, this.timestamp, this.senderHandle, this.senderImage, this.signature, this._flags, this._ackd, this._error);
 }

lib/models/messages/filemessage.dart

@@ -21,7 +21,7 @@ class FileMessage extends Message {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {
-          String idx = this.metadata.contactHandle + this.metadata.messageIndex.toString();
+          String idx = this.metadata.conversationIdentifier.toString() + this.metadata.messageID.toString();
           dynamic shareObj = jsonDecode(this.content);
           if (shareObj == null) {
             return MessageRow(MalformedBubble());

lib/models/messages/invitemessage.dart

@@ -21,14 +21,14 @@ class InviteMessage extends Message {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {
-          String idx = this.metadata.contactHandle + this.metadata.messageIndex.toString();
+          String idx = this.metadata.conversationIdentifier.toString() + this.metadata.messageID.toString();
           String inviteTarget;
           String inviteNick;
           String invite = this.content;
 
           if (this.content.length == TorV3ContactHandleLength) {
             inviteTarget = this.content;
-            var targetContact = Provider.of<ProfileInfoState>(context).contactList.getContact(inviteTarget);
+            var targetContact = Provider.of<ProfileInfoState>(context).contactList.findContact(inviteTarget);
             inviteNick = targetContact == null ? this.content : targetContact.nickname;
           } else {
             var parts = this.content.toString().split("||");
@@ -54,7 +54,7 @@ class InviteMessage extends Message {
           String invite = this.content;
           if (this.content.length == TorV3ContactHandleLength) {
             inviteTarget = this.content;
-            var targetContact = Provider.of<ProfileInfoState>(context).contactList.getContact(inviteTarget);
+            var targetContact = Provider.of<ProfileInfoState>(context).contactList.findContact(inviteTarget);
             inviteNick = targetContact == null ? this.content : targetContact.nickname;
           } else {
             var parts = this.content.toString().split("||");

lib/models/messages/quotedmessage.dart

@@ -70,7 +70,7 @@ class QuotedMessage extends Message {
         return MalformedMessage(this.metadata).getWidget(context);
       }
 
-      var quotedMessagePotentials = Provider.of<FlwtchState>(context).cwtch.GetMessageByContentHash(metadata.profileOnion, metadata.contactHandle, message["quotedHash"]);
+      var quotedMessagePotentials = Provider.of<FlwtchState>(context).cwtch.GetMessageByContentHash(metadata.profileOnion, metadata.conversationIdentifier, message["quotedHash"]);
       int messageIndex = metadata.messageIndex;
       Future<LocallyIndexedMessage?> quotedMessage = quotedMessagePotentials.then((matchingMessages) {
         if (matchingMessages == "[]") {
@@ -94,11 +94,11 @@ class QuotedMessage extends Message {
       return ChangeNotifierProvider.value(
           value: this.metadata,
           builder: (bcontext, child) {
-            String idx = this.metadata.contactHandle + this.metadata.messageIndex.toString();
+            String idx = this.metadata.conversationIdentifier.toString() + this.metadata.messageID.toString();
             return MessageRow(
                 QuotedMessageBubble(message["body"], quotedMessage.then((LocallyIndexedMessage? localIndex) {
                   if (localIndex != null) {
-                    return messageHandler(context, metadata.profileOnion, metadata.contactHandle, localIndex.index);
+                    return messageHandler(context, metadata.profileOnion, metadata.conversationIdentifier, localIndex.index);
                   }
                   return MalformedMessage(this.metadata);
                 })),

lib/models/messages/textmessage.dart

@@ -32,7 +32,7 @@ class TextMessage extends Message {
     return ChangeNotifierProvider.value(
         value: this.metadata,
         builder: (bcontext, child) {
-          String idx = this.metadata.contactHandle + this.metadata.messageIndex.toString();
+          String idx = this.metadata.conversationIdentifier.toString() + this.metadata.messageID.toString();
           return MessageRow(MessageBubble(this.content), key: Provider.of<ContactInfoState>(bcontext).getMessageKey(idx));
         });
   }

lib/models/servers.dart

@@ -24,12 +24,7 @@ class ServerListState extends ChangeNotifier {
     if (idx >= 0) {
       _servers[idx] = sis;
     } else {
-      _servers.add(ServerInfoState(onion: onion,
+      _servers.add(ServerInfoState(onion: onion, serverBundle: serverBundle, running: running, description: description, autoStart: autoStart, isEncrypted: isEncrypted));
-          serverBundle: serverBundle,
-          running: running,
-          description: description,
-          autoStart: autoStart,
-          isEncrypted: isEncrypted));
     }
     notifyListeners();
   }
@@ -37,7 +32,7 @@ class ServerListState extends ChangeNotifier {
   void updateServer(String onion, String serverBundle, bool running, String description, bool autoStart, bool isEncrypted) {
     int idx = _servers.indexWhere((element) => element.onion == onion);
     if (idx >= 0) {
-      _servers[idx] = ServerInfoState(onion: onion,  serverBundle: serverBundle, running: running, description: description, autoStart: autoStart, isEncrypted: isEncrypted);
+      _servers[idx] = ServerInfoState(onion: onion, serverBundle: serverBundle, running: running, description: description, autoStart: autoStart, isEncrypted: isEncrypted);
     } else {
       print("Tried to update server list without a starting state...this is probably an error");
     }

lib/views/addeditprofileview.dart

@@ -296,11 +296,13 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
         // Profile Editing
         if (ctrlrPass.value.text.isEmpty) {
           // Don't update password, only update name
+          Provider.of<ProfileInfoState>(context, listen: false).nickname = ctrlrNick.value.text;
           Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(Provider.of<ProfileInfoState>(context, listen: false).onion, "profile.name", ctrlrNick.value.text);
           Navigator.of(context).pop();
         } else {
           // At this points passwords have been validated to be the same and not empty
           // Update both password and name, even if name hasn't been changed...
+          Provider.of<ProfileInfoState>(context, listen: false).nickname = ctrlrNick.value.text;
           Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(Provider.of<ProfileInfoState>(context, listen: false).onion, "profile.name", ctrlrNick.value.text);
           final updatePasswordEvent = {
             "EventType": "ChangePassword",

lib/views/addeditservers.dart

@@ -53,7 +53,6 @@ class _AddEditServerViewState extends State<AddEditServerView> {
 
   @override
   Widget build(BuildContext context) {
-
     return Scaffold(
       appBar: AppBar(
         title: ctrlrOnion.text.isEmpty ? Text(AppLocalizations.of(context)!.addServerTitle) : Text(AppLocalizations.of(context)!.editServerTitle),
@@ -82,232 +81,222 @@ class _AddEditServerViewState extends State<AddEditServerView> {
                     child: Form(
                         key: _formKey,
                         child: Container(
-                         margin: EdgeInsets.fromLTRB(30, 0, 30, 10),
+                            margin: EdgeInsets.fromLTRB(30, 0, 30, 10),
-                         padding: EdgeInsets.fromLTRB(20, 0 , 20, 10),
+                            padding: EdgeInsets.fromLTRB(20, 0, 20, 10),
-                         child:  Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch,
+                            child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.stretch, children: [
-                         children: [
+                              // Onion
+                              Visibility(
+                                  visible: serverInfoState.onion.isNotEmpty,
+                                  child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                    CwtchLabel(label: AppLocalizations.of(context)!.serverAddress),
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                    SelectableText(serverInfoState.onion)
+                                  ])),
 
-                          // Onion
+                              // Description
-                           Visibility(
+                              Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
-                           visible: serverInfoState.onion.isNotEmpty,
+                                SizedBox(
-                           child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
+                                  height: 20,
-                            SizedBox(
+                                ),
-                              height: 20,
+                                CwtchLabel(label: AppLocalizations.of(context)!.serverDescriptionLabel),
-                            ),
+                                Text(AppLocalizations.of(context)!.serverDescriptionDescription),
-                            CwtchLabel(label: AppLocalizations.of(context)!.serverAddress),
+                                SizedBox(
-                            SizedBox(
+                                  height: 20,
-                              height: 20,
+                                ),
-                            ),
+                                CwtchTextField(
-                            SelectableText(
+                                  controller: ctrlrDesc,
-                              serverInfoState.onion
+                                  labelText: "Description",
-                            )
+                                  autofocus: false,
-                          ])),
+                                )
+                              ]),
 
-                         // Description
+                              SizedBox(
-                         Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
+                                height: 20,
-                           SizedBox(
+                              ),
-                             height: 20,
-                           ),
-                           CwtchLabel(label: AppLocalizations.of(context)!.serverDescriptionLabel),
-                           Text(AppLocalizations.of(context)!.serverDescriptionDescription),
-                           SizedBox(
-                             height: 20,
-                           ),
-                            CwtchTextField(
-                                controller: ctrlrDesc,
-                                labelText: "Description",
-                                autofocus: false,
-                           )
-                         ]),
 
-                           SizedBox(
+                              // Enabled
-                             height: 20,
+                              Visibility(
-                           ),
+                                  visible: serverInfoState.onion.isNotEmpty,
+                                  child: SwitchListTile(
+                                    title: Text(AppLocalizations.of(context)!.serverEnabled, style: TextStyle(color: settings.current().mainTextColor())),
+                                    subtitle: Text(AppLocalizations.of(context)!.serverEnabledDescription),
+                                    value: serverInfoState.running,
+                                    onChanged: (bool value) {
+                                      serverInfoState.setRunning(value);
+                                      if (value) {
+                                        Provider.of<FlwtchState>(context, listen: false).cwtch.LaunchServer(serverInfoState.onion);
+                                      } else {
+                                        Provider.of<FlwtchState>(context, listen: false).cwtch.StopServer(serverInfoState.onion);
+                                      }
+                                    },
+                                    activeTrackColor: settings.theme.defaultButtonActiveColor(),
+                                    inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
+                                    secondary: Icon(CwtchIcons.negative_heart_24px, color: settings.current().mainTextColor()),
+                                  )),
 
-                           // Enabled
+                              // Auto start
-                            Visibility(
+                              SwitchListTile(
-                              visible: serverInfoState.onion.isNotEmpty,
+                                title: Text(AppLocalizations.of(context)!.serverAutostartLabel, style: TextStyle(color: settings.current().mainTextColor())),
-                              child: SwitchListTile(
+                                subtitle: Text(AppLocalizations.of(context)!.serverAutostartDescription),
-                               title: Text(AppLocalizations.of(context)!.serverEnabled, style: TextStyle(color: settings.current().mainTextColor())),
+                                value: serverInfoState.autoStart,
-                               subtitle: Text(AppLocalizations.of(context)!.serverEnabledDescription),
+                                onChanged: (bool value) {
-                               value: serverInfoState.running,
+                                  serverInfoState.setAutostart(value);
-                               onChanged: (bool value) {
-                                 serverInfoState.setRunning(value);
-                                 if (value) {
-                                   Provider.of<FlwtchState>(context, listen: false).cwtch.LaunchServer(serverInfoState.onion);
-                                 } else {
-                                   Provider.of<FlwtchState>(context, listen: false).cwtch.StopServer(serverInfoState.onion);
-                                 }
-                               },
-                               activeTrackColor: settings.theme.defaultButtonActiveColor(),
-                               inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
-                               secondary: Icon(CwtchIcons.negative_heart_24px, color: settings.current().mainTextColor()),
-                              )),
 
-                           // Auto start
+                                  if (!serverInfoState.onion.isEmpty) {
-                          SwitchListTile(
+                                    Provider.of<FlwtchState>(context, listen: false).cwtch.SetServerAttribute(serverInfoState.onion, "autostart", value ? "true" : "false");
-                             title: Text(AppLocalizations.of(context)!.serverAutostartLabel, style: TextStyle(color: settings.current().mainTextColor())),
+                                  }
-                             subtitle: Text(AppLocalizations.of(context)!.serverAutostartDescription),
+                                },
-                             value: serverInfoState.autoStart,
+                                activeTrackColor: settings.theme.defaultButtonActiveColor(),
-                             onChanged: (bool value) {
+                                inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
-                               serverInfoState.setAutostart(value);
+                                secondary: Icon(CwtchIcons.favorite_24dp, color: settings.current().mainTextColor()),
+                              ),
 
-                               if (! serverInfoState.onion.isEmpty) {
+                              // ***** Password *****
-                                 Provider.of<FlwtchState>(context, listen: false).cwtch.SetServerAttribute(serverInfoState.onion, "autostart", value ? "true" : "false");
-                               }
-                             },
-                             activeTrackColor: settings.theme.defaultButtonActiveColor(),
-                             inactiveTrackColor: settings.theme.defaultButtonDisabledColor(),
-                             secondary: Icon(CwtchIcons.favorite_24dp, color: settings.current().mainTextColor()),
-                          ),
 
+                              // use password toggle
+                              Visibility(
+                                  visible: serverInfoState.onion.isEmpty,
+                                  child: Column(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                    Checkbox(
+                                      value: usePassword,
+                                      fillColor: MaterialStateProperty.all(settings.current().defaultButtonColor()),
+                                      activeColor: settings.current().defaultButtonActiveColor(),
+                                      onChanged: _handleSwitchPassword,
+                                    ),
+                                    Text(
+                                      AppLocalizations.of(context)!.radioUsePassword,
+                                      style: TextStyle(color: settings.current().mainTextColor()),
+                                    ),
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                    Padding(
+                                        padding: EdgeInsets.symmetric(horizontal: 24),
+                                        child: Text(
+                                          usePassword ? AppLocalizations.of(context)!.encryptedServerDescription : AppLocalizations.of(context)!.plainServerDescription,
+                                          textAlign: TextAlign.center,
+                                        )),
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                  ])),
 
-                          // ***** Password *****
+                              // current password
+                              Visibility(
+                                  visible: serverInfoState.onion.isNotEmpty && serverInfoState.isEncrypted,
+                                  child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
+                                    CwtchLabel(label: AppLocalizations.of(context)!.currentPasswordLabel),
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                    CwtchPasswordField(
+                                      controller: ctrlrOldPass,
+                                      autoFillHints: [AutofillHints.newPassword],
+                                      validator: (value) {
+                                        // Password field can be empty when just updating the profile, not on creation
+                                        if (serverInfoState.isEncrypted && serverInfoState.onion.isEmpty && value.isEmpty && usePassword) {
+                                          return AppLocalizations.of(context)!.passwordErrorEmpty;
+                                        }
+                                        if (Provider.of<ErrorHandler>(context).deletedServerError == true) {
+                                          return AppLocalizations.of(context)!.enterCurrentPasswordForDeleteServer;
+                                        }
+                                        return null;
+                                      },
+                                    ),
+                                    SizedBox(
+                                      height: 20,
+                                    ),
+                                  ])),
 
-                           // use password toggle
+                              // new passwords 1 & 2
-                           Visibility(
+                              Visibility(
-                               visible: serverInfoState.onion.isEmpty,
+                                // Currently we don't support password change for servers so also gate this on Add server, when ready to support changing password remove the onion.isEmpty check
-                               child: Column(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
+                                visible: serverInfoState.onion.isEmpty && usePassword,
-                                 SizedBox(
+                                child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
-                                   height: 20,
+                                  CwtchLabel(label: AppLocalizations.of(context)!.newPassword),
-                                 ),
+                                  SizedBox(
-                                 Checkbox(
+                                    height: 20,
-                                   value: usePassword,
+                                  ),
-                                   fillColor: MaterialStateProperty.all(settings.current().defaultButtonColor()),
+                                  CwtchPasswordField(
-                                   activeColor: settings.current().defaultButtonActiveColor(),
+                                    controller: ctrlrPass,
-                                   onChanged: _handleSwitchPassword,
+                                    validator: (value) {
-                                 ),
+                                      // Password field can be empty when just updating the profile, not on creation
-                                 Text(
+                                      if (serverInfoState.onion.isEmpty && value.isEmpty && usePassword) {
-                                   AppLocalizations.of(context)!.radioUsePassword,
+                                        return AppLocalizations.of(context)!.passwordErrorEmpty;
-                                   style: TextStyle(color: settings.current().mainTextColor()),
+                                      }
-                                 ),
+                                      if (value != ctrlrPass2.value.text) {
-                                 SizedBox(
+                                        return AppLocalizations.of(context)!.passwordErrorMatch;
-                                   height: 20,
+                                      }
-                                 ),
+                                      return null;
-                                 Padding(
+                                    },
-                                     padding: EdgeInsets.symmetric(horizontal: 24),
+                                  ),
-                                     child: Text(
+                                  SizedBox(
-                                       usePassword ? AppLocalizations.of(context)!.encryptedServerDescription : AppLocalizations.of(context)!.plainServerDescription,
+                                    height: 20,
-                                       textAlign: TextAlign.center,
+                                  ),
-                                     )),
+                                  CwtchLabel(label: AppLocalizations.of(context)!.password2Label),
-                                 SizedBox(
+                                  SizedBox(
-                                   height: 20,
+                                    height: 20,
-                                 ),
+                                  ),
-                               ])),
+                                  CwtchPasswordField(
+                                      controller: ctrlrPass2,
+                                      validator: (value) {
+                                        // Password field can be empty when just updating the profile, not on creation
+                                        if (serverInfoState.onion.isEmpty && value.isEmpty && usePassword) {
+                                          return AppLocalizations.of(context)!.passwordErrorEmpty;
+                                        }
+                                        if (value != ctrlrPass.value.text) {
+                                          return AppLocalizations.of(context)!.passwordErrorMatch;
+                                        }
+                                        return null;
+                                      }),
+                                ]),
+                              ),
 
+                              SizedBox(
+                                height: 20,
+                              ),
 
-                           // current password
+                              Row(
-                           Visibility(
+                                mainAxisAlignment: MainAxisAlignment.center,
-                               visible: serverInfoState.onion.isNotEmpty && serverInfoState.isEncrypted,
+                                children: [
-                               child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
+                                  Expanded(
-                                     CwtchLabel(label: AppLocalizations.of(context)!.currentPasswordLabel),
+                                    child: ElevatedButton(
-                                     SizedBox(
+                                      onPressed: serverInfoState.onion.isEmpty ? _createPressed : _savePressed,
-                                       height: 20,
+                                      child: Text(
-                                     ),
+                                        serverInfoState.onion.isEmpty ? AppLocalizations.of(context)!.addServerTitle : AppLocalizations.of(context)!.saveServerButton,
-                                     CwtchPasswordField(
+                                        textAlign: TextAlign.center,
-                                       controller: ctrlrOldPass,
+                                      ),
-                                       autoFillHints: [AutofillHints.newPassword],
+                                    ),
-                                       validator: (value) {
+                                  ),
-                                         // Password field can be empty when just updating the profile, not on creation
+                                ],
-                                         if (serverInfoState.isEncrypted &&
+                              ),
-                                             serverInfoState.onion.isEmpty &&
+                              Visibility(
-                                             value.isEmpty &&
+                                  visible: serverInfoState.onion.isNotEmpty,
-                                             usePassword) {
+                                  child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.end, children: [
-                                           return AppLocalizations.of(context)!.passwordErrorEmpty;
+                                    SizedBox(
-                                         }
+                                      height: 20,
-                                         if (Provider.of<ErrorHandler>(context).deletedServerError == true) {
+                                    ),
-                                           return AppLocalizations.of(context)!.enterCurrentPasswordForDeleteServer;
+                                    Tooltip(
-                                         }
+                                        message: AppLocalizations.of(context)!.enterCurrentPasswordForDeleteServer,
-                                         return null;
+                                        child: ElevatedButton.icon(
-                                       },
+                                          onPressed: () {
-                                     ),
+                                            showAlertDialog(context);
-                                     SizedBox(
+                                          },
-                                       height: 20,
+                                          icon: Icon(Icons.delete_forever),
-                                     ),
+                                          label: Text(AppLocalizations.of(context)!.deleteBtn),
-                                   ])),
+                                        ))
+                                  ]))
 
-                          // new passwords 1 & 2
+                              // ***** END Password *****
-                          Visibility(
+                            ]))))));
-                            // Currently we don't support password change for servers so also gate this on Add server, when ready to support changing password remove the onion.isEmpty check
-                              visible: serverInfoState.onion.isEmpty && usePassword,
-                              child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
-                               CwtchLabel(label: AppLocalizations.of(context)!.newPassword),
-                               SizedBox(
-                                 height: 20,
-                               ),
-                               CwtchPasswordField(
-                                 controller: ctrlrPass,
-                                 validator: (value) {
-                                   // Password field can be empty when just updating the profile, not on creation
-                                   if (serverInfoState.onion.isEmpty && value.isEmpty && usePassword) {
-                                     return AppLocalizations.of(context)!.passwordErrorEmpty;
-                                   }
-                                   if (value != ctrlrPass2.value.text) {
-                                     return AppLocalizations.of(context)!.passwordErrorMatch;
-                                   }
-                                   return null;
-                                 },
-                               ),
-                               SizedBox(
-                                 height: 20,
-                               ),
-                               CwtchLabel(label: AppLocalizations.of(context)!.password2Label),
-                               SizedBox(
-                                 height: 20,
-                               ),
-                               CwtchPasswordField(
-                                   controller: ctrlrPass2,
-                                   validator: (value) {
-                                     // Password field can be empty when just updating the profile, not on creation
-                                     if (serverInfoState.onion.isEmpty && value.isEmpty && usePassword) {
-                                       return AppLocalizations.of(context)!.passwordErrorEmpty;
-                                     }
-                                     if (value != ctrlrPass.value.text) {
-                                       return AppLocalizations.of(context)!.passwordErrorMatch;
-                                     }
-                                     return null;
-                                   }),
-                             ]),
-                           ),
-
-                           SizedBox(
-                             height: 20,
-                           ),
-
-                           Row(
-                             mainAxisAlignment: MainAxisAlignment.center,
-                             children: [
-                               Expanded(
-                                 child: ElevatedButton(
-                                   onPressed: serverInfoState.onion.isEmpty ?  _createPressed : _savePressed,
-                                   child: Text(
-                                     serverInfoState.onion.isEmpty ? AppLocalizations.of(context)!.addServerTitle : AppLocalizations.of(context)!.saveServerButton,
-                                     textAlign: TextAlign.center,
-                                   ),
-                                 ),
-                               ),
-                             ],
-                           ),
-                           Visibility(
-                               visible: serverInfoState.onion.isNotEmpty,
-                               child: Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.end, children: [
-                                 SizedBox(
-                                   height: 20,
-                                 ),
-                                 Tooltip(
-                                     message: AppLocalizations.of(context)!.enterCurrentPasswordForDeleteServer,
-                                     child: ElevatedButton.icon(
-                                       onPressed: () {
-                                         showAlertDialog(context);
-                                       },
-                                       icon: Icon(Icons.delete_forever),
-                                       label: Text(AppLocalizations.of(context)!.deleteBtn),
-                                     ))
-                               ]))
-
-                           // ***** END Password *****
-
-                        ]))))));
       });
     });
   }
@@ -318,29 +307,20 @@ class _AddEditServerViewState extends State<AddEditServerView> {
     // match (and are provided if the user has requested an encrypted profile).
     if (_formKey.currentState!.validate()) {
       if (usePassword) {
-        Provider
+        Provider.of<FlwtchState>(context, listen: false).cwtch.CreateServer(ctrlrPass.value.text, ctrlrDesc.value.text, Provider.of<ServerInfoState>(context, listen: false).autoStart);
-            .of<FlwtchState>(context, listen: false)
-            .cwtch
-            .CreateServer(ctrlrPass.value.text, ctrlrDesc.value.text, Provider.of<ServerInfoState>(context, listen: false).autoStart);
       } else {
-        Provider
+        Provider.of<FlwtchState>(context, listen: false).cwtch.CreateServer(DefaultPassword, ctrlrDesc.value.text, Provider.of<ServerInfoState>(context, listen: false).autoStart);
-            .of<FlwtchState>(context, listen: false)
-            .cwtch
-            .CreateServer(DefaultPassword, ctrlrDesc.value.text, Provider.of<ServerInfoState>(context, listen: false).autoStart);
       }
       Navigator.of(context).pop();
     }
   }
 
   void _savePressed() {
-
     var server = Provider.of<ServerInfoState>(context, listen: false);
 
-    Provider.of<FlwtchState>(context, listen: false)
+    Provider.of<FlwtchState>(context, listen: false).cwtch.SetServerAttribute(server.onion, "description", ctrlrDesc.text);
-        .cwtch.SetServerAttribute(server.onion, "description", ctrlrDesc.text);
     server.setDescription(ctrlrDesc.text);
 
-
     if (_formKey.currentState!.validate()) {
       // TODO support change password
     }
@@ -358,16 +338,11 @@ class _AddEditServerViewState extends State<AddEditServerView> {
     Widget continueButton = ElevatedButton(
         child: Text(AppLocalizations.of(context)!.deleteServerConfirmBtn),
         onPressed: () {
-          var onion = Provider
+          var onion = Provider.of<ServerInfoState>(context, listen: false).onion;
-              .of<ServerInfoState>(context, listen: false)
+          Provider.of<FlwtchState>(context, listen: false).cwtch.DeleteServer(onion, Provider.of<ServerInfoState>(context, listen: false).isEncrypted ? ctrlrOldPass.value.text : DefaultPassword);
-              .onion;
-          Provider
-              .of<FlwtchState>(context, listen: false)
-              .cwtch
-              .DeleteServer(onion, Provider.of<ServerInfoState>(context, listen: false).isEncrypted ? ctrlrOldPass.value.text : DefaultPassword);
           Future.delayed(
             const Duration(milliseconds: 500),
-                () {
+            () {
               if (globalErrorHandler.deletedServerSuccess) {
                 final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.deleteServerSuccess + ":" + onion));
                 ScaffoldMessenger.of(context).showSnackBar(snackBar);
@@ -395,4 +370,4 @@ class _AddEditServerViewState extends State<AddEditServerView> {
       },
     );
   }
-}
+}

lib/views/contactsview.dart

@@ -22,7 +22,7 @@ class ContactsView extends StatefulWidget {
 }
 
 // selectConversation can be called from anywhere to set the active conversation
-void selectConversation(BuildContext context, String handle) {
+void selectConversation(BuildContext context, int handle) {
   // requery instead of using contactinfostate directly because sometimes listview gets confused about data that resorts
   var initialIndex = Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle)!.unreadMessages;
   Provider.of<ProfileInfoState>(context, listen: false).contactList.getContact(handle)!.unreadMessages = 0;
@@ -36,7 +36,7 @@ void selectConversation(BuildContext context, String handle) {
   if (Provider.of<Settings>(context, listen: false).uiColumns(isLandscape).length == 1) _pushMessageView(context, handle);
 }
 
-void _pushMessageView(BuildContext context, String handle) {
+void _pushMessageView(BuildContext context, int handle) {
   var profileOnion = Provider.of<ProfileInfoState>(context, listen: false).onion;
   Navigator.of(context).push(
     MaterialPageRoute<void>(
@@ -112,7 +112,6 @@ class _ContactsViewState extends State<ContactsView> {
           Clipboard.setData(new ClipboardData(text: Provider.of<ProfileInfoState>(context, listen: false).onion));
         }));
 
-
     // TODO servers
 
     // Search contacts

lib/views/doublecolview.dart

@@ -34,8 +34,8 @@ class _DoubleColumnViewState extends State<DoubleColumnView> {
               MultiProvider(providers: [
                   ChangeNotifierProvider.value(value: Provider.of<ProfileInfoState>(context)),
                   ChangeNotifierProvider.value(
-                      value: flwtch.selectedConversation != null ? Provider.of<ProfileInfoState>(context).contactList.getContact(flwtch.selectedConversation!)! : ContactInfoState("", "")),
+                      value: flwtch.selectedConversation != null ? Provider.of<ProfileInfoState>(context).contactList.getContact(flwtch.selectedConversation!)! : ContactInfoState("", -1, "")),
-                ], child: Container(key: Key(flwtch.selectedConversation??"never_this"), child: MessageView())),
+                ], child: Container(key: Key(flwtch.selectedConversation!.toString()), child: MessageView())),
         ),
       ],
     );

lib/views/globalsettingsview.dart

@@ -191,9 +191,8 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
                                 secondary: Icon(CwtchIcons.enable_groups, color: settings.current().mainTextColor()),
                               ),
                               Visibility(
-                                visible: !Platform.isAndroid && !Platform.isIOS,
+                                  visible: !Platform.isAndroid && !Platform.isIOS,
-                                child:
+                                  child: SwitchListTile(
-                                  SwitchListTile(
                                     title: Text(AppLocalizations.of(context)!.settingServers, style: TextStyle(color: settings.current().mainTextColor())),
                                     subtitle: Text(AppLocalizations.of(context)!.settingServersDescription),
                                     value: settings.isExperimentEnabled(ServerManagementExperiment),

lib/views/groupsettingsview.dart

@@ -78,9 +78,9 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
                               readonly: false,
                               onPressed: () {
                                 var profileOnion = Provider.of<ContactInfoState>(context, listen: false).profileOnion;
-                                var handle = Provider.of<ContactInfoState>(context, listen: false).onion;
+                                var handle = Provider.of<ContactInfoState>(context, listen: false).identifier;
                                 Provider.of<ContactInfoState>(context, listen: false).nickname = ctrlrNick.text;
-                                Provider.of<FlwtchState>(context, listen: false).cwtch.SetGroupAttribute(profileOnion, handle, "local.name", ctrlrNick.text);
+                                Provider.of<FlwtchState>(context, listen: false).cwtch.SetConversationAttribute(profileOnion, handle, "profile.name", ctrlrNick.text);
                                 // todo translations
                                 final snackBar = SnackBar(content: Text("Group Nickname changed successfully"));
                                 ScaffoldMessenger.of(context).showSnackBar(snackBar);
@@ -140,7 +140,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
                                 child: ElevatedButton.icon(
                                   onPressed: () {
                                     var profileOnion = Provider.of<ContactInfoState>(context, listen: false).profileOnion;
-                                    var handle = Provider.of<ContactInfoState>(context, listen: false).onion;
+                                    var handle = Provider.of<ContactInfoState>(context, listen: false).identifier;
                                     // locally update cache...
                                     Provider.of<ContactInfoState>(context, listen: false).isArchived = true;
                                     Provider.of<FlwtchState>(context, listen: false).cwtch.ArchiveConversation(profileOnion, handle);
@@ -195,7 +195,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
       child: Text(AppLocalizations.of(context)!.yesLeave),
       onPressed: () {
         var profileOnion = Provider.of<ContactInfoState>(context, listen: false).profileOnion;
-        var handle = Provider.of<ContactInfoState>(context, listen: false).onion;
+        var handle = Provider.of<ContactInfoState>(context, listen: false).identifier;
         // locally update cache...
         Provider.of<ContactInfoState>(context, listen: false).isArchived = true;
         Provider.of<FlwtchState>(context, listen: false).cwtch.DeleteContact(profileOnion, handle);

lib/views/messageview.dart

@@ -33,7 +33,7 @@ class MessageView extends StatefulWidget {
 class _MessageViewState extends State<MessageView> {
   final ctrlrCompose = TextEditingController();
   final focusNode = FocusNode();
-  String selectedContact = "";
+  int selectedContact = -1;
   ItemPositionsListener scrollListener = ItemPositionsListener.create();
   ItemScrollController scrollController = ItemScrollController();
 
@@ -41,10 +41,10 @@ class _MessageViewState extends State<MessageView> {
   void initState() {
     scrollListener.itemPositions.addListener(() {
       if (scrollListener.itemPositions.value.length != 0 &&
-        Provider.of<AppState>(context, listen: false).unreadMessagesBelow == true &&
+          Provider.of<AppState>(context, listen: false).unreadMessagesBelow == true &&
-        scrollListener.itemPositions.value.any((element) => element.index == 0)) {
+          scrollListener.itemPositions.value.any((element) => element.index == 0)) {
-          Provider.of<AppState>(context, listen: false).initialScrollIndex = 0;
+        Provider.of<AppState>(context, listen: false).initialScrollIndex = 0;
-          Provider.of<AppState>(context, listen: false).unreadMessagesBelow = false;
+        Provider.of<AppState>(context, listen: false).unreadMessagesBelow = false;
       }
     });
     super.initState();
@@ -168,7 +168,7 @@ class _MessageViewState extends State<MessageView> {
       if (Provider.of<AppState>(context, listen: false).selectedConversation != null && Provider.of<AppState>(context, listen: false).selectedIndex != null) {
         Provider.of<FlwtchState>(context, listen: false)
             .cwtch
-            .GetMessage(Provider.of<AppState>(context, listen: false).selectedProfile!, Provider.of<AppState>(context, listen: false).selectedConversation!,
+            .GetMessageByID(Provider.of<AppState>(context, listen: false).selectedProfile!, Provider.of<AppState>(context, listen: false).selectedConversation!,
                 Provider.of<AppState>(context, listen: false).selectedIndex!)
             .then((data) {
           try {
@@ -180,7 +180,7 @@ class _MessageViewState extends State<MessageView> {
             ChatMessage cm = new ChatMessage(o: QuotedMessageOverlay, d: quotedMessage);
             Provider.of<FlwtchState>(context, listen: false)
                 .cwtch
-                .SendMessage(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).onion, jsonEncode(cm));
+                .SendMessage(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).identifier, jsonEncode(cm));
           } catch (e) {}
           Provider.of<AppState>(context, listen: false).selectedIndex = null;
           _sendMessageHelper();
@@ -189,7 +189,7 @@ class _MessageViewState extends State<MessageView> {
         ChatMessage cm = new ChatMessage(o: TextMessageOverlay, d: ctrlrCompose.value.text);
         Provider.of<FlwtchState>(context, listen: false)
             .cwtch
-            .SendMessage(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).onion, jsonEncode(cm));
+            .SendMessage(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).identifier, jsonEncode(cm));
         _sendMessageHelper();
       }
     }
@@ -198,14 +198,14 @@ class _MessageViewState extends State<MessageView> {
   void _sendInvitation([String? ignoredParam]) {
     Provider.of<FlwtchState>(context, listen: false)
         .cwtch
-        .SendInvitation(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).onion, this.selectedContact);
+        .SendInvitation(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).identifier, this.selectedContact);
     _sendMessageHelper();
   }
 
   void _sendFile(String filePath) {
     Provider.of<FlwtchState>(context, listen: false)
         .cwtch
-        .ShareFile(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).onion, filePath);
+        .ShareFile(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).identifier, filePath);
     _sendMessageHelper();
   }
 
@@ -216,7 +216,7 @@ class _MessageViewState extends State<MessageView> {
       Provider.of<ContactInfoState>(context, listen: false).totalMessages++;
       Provider.of<ContactInfoState>(context, listen: false).newMarker++;
       // Resort the contact list...
-      Provider.of<ProfileInfoState>(context, listen: false).contactList.updateLastMessageTime(Provider.of<ContactInfoState>(context, listen: false).onion, DateTime.now());
+      Provider.of<ProfileInfoState>(context, listen: false).contactList.updateLastMessageTime(Provider.of<ContactInfoState>(context, listen: false).identifier, DateTime.now());
     });
   }
 
@@ -268,7 +268,8 @@ class _MessageViewState extends State<MessageView> {
     var children;
     if (Provider.of<AppState>(context).selectedConversation != null && Provider.of<AppState>(context).selectedIndex != null) {
       var quoted = FutureBuilder(
-        future: messageHandler(context, Provider.of<AppState>(context).selectedProfile!, Provider.of<AppState>(context).selectedConversation!, Provider.of<AppState>(context).selectedIndex!),
+        future:
+            messageHandler(context, Provider.of<AppState>(context).selectedProfile!, Provider.of<AppState>(context).selectedConversation!, Provider.of<AppState>(context).selectedIndex!, byID: true),
         builder: (context, snapshot) {
           if (snapshot.hasData) {
             var message = snapshot.data! as Message;

lib/views/peersettingsview.dart

@@ -69,14 +69,9 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                               readonly: false,
                               onPressed: () {
                                 var profileOnion = Provider.of<ContactInfoState>(context, listen: false).profileOnion;
-                                var onion = Provider.of<ContactInfoState>(context, listen: false).onion;
+                                var conversation = Provider.of<ContactInfoState>(context, listen: false).identifier;
                                 Provider.of<ContactInfoState>(context, listen: false).nickname = ctrlrNick.text;
-                                final setPeerAttribute = {
+                                Provider.of<FlwtchState>(context, listen: false).cwtch.SetConversationAttribute(profileOnion, conversation, "profile.name", ctrlrNick.text);
-                                  "EventType": "SetPeerAttribute",
-                                  "Data": {"RemotePeer": onion, "Key": "local.name", "Data": ctrlrNick.text},
-                                };
-                                final setPeerAttributeJson = jsonEncode(setPeerAttribute);
-                                Provider.of<FlwtchState>(context, listen: false).cwtch.SendProfileEvent(profileOnion, setPeerAttributeJson);
                                 final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.nickChangeSuccess));
                                 ScaffoldMessenger.of(context).showSnackBar(snackBar);
                               },
@@ -200,7 +195,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
                                   child: ElevatedButton.icon(
                                     onPressed: () {
                                       var profileOnion = Provider.of<ContactInfoState>(context, listen: false).profileOnion;
-                                      var handle = Provider.of<ContactInfoState>(context, listen: false).onion;
+                                      var handle = Provider.of<ContactInfoState>(context, listen: false).identifier;
                                       // locally update cache...
                                       Provider.of<ContactInfoState>(context, listen: false).isArchived = true;
                                       Provider.of<FlwtchState>(context, listen: false).cwtch.ArchiveConversation(profileOnion, handle);
@@ -239,7 +234,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
       child: Text(AppLocalizations.of(context)!.yesLeave),
       onPressed: () {
         var profileOnion = Provider.of<ContactInfoState>(context, listen: false).profileOnion;
-        var handle = Provider.of<ContactInfoState>(context, listen: false).onion;
+        var handle = Provider.of<ContactInfoState>(context, listen: false).identifier;
         // locally update cache...
         Provider.of<ContactInfoState>(context, listen: false).isArchived = true;
         Provider.of<FlwtchState>(context, listen: false).cwtch.DeleteContact(profileOnion, handle);

lib/views/profilemgrview.dart

@@ -57,9 +57,9 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
                 SizedBox(
                   width: 10,
                 ),
-                Expanded(child: Text(MediaQuery.of(context).size.width > 600 ?
+                Expanded(
-                    AppLocalizations.of(context)!.titleManageProfiles : AppLocalizations.of(context)!.titleManageProfilesShort,
+                    child: Text(MediaQuery.of(context).size.width > 600 ? AppLocalizations.of(context)!.titleManageProfiles : AppLocalizations.of(context)!.titleManageProfilesShort,
-                    style: TextStyle(color: settings.current().mainTextColor())))
+                        style: TextStyle(color: settings.current().mainTextColor())))
               ]),
               actions: getActions(),
             ),
@@ -238,7 +238,7 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
         if (tiles.isEmpty) {
           return Center(
               child: Text(
-                AppLocalizations.of(context)!.unlockProfileTip,
+            AppLocalizations.of(context)!.unlockProfileTip,
             textAlign: TextAlign.center,
           ));
         }

lib/views/serversview.dart

@@ -30,44 +30,45 @@ class _ServersView extends State<ServersView> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
+        appBar: AppBar(
-        title: Text( MediaQuery.of(context).size.width > 600 ? AppLocalizations.of(context)!.serversManagerTitleLong : AppLocalizations.of(context)!.serversManagerTitleShort),
+          title: Text(MediaQuery.of(context).size.width > 600 ? AppLocalizations.of(context)!.serversManagerTitleLong : AppLocalizations.of(context)!.serversManagerTitleShort),
-        actions: getActions(),
+          actions: getActions(),
-      ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: _pushAddServer,
-        tooltip: AppLocalizations.of(context)!.addServerTooltip,
-        child: Icon(
-          Icons.add,
-          semanticLabel: AppLocalizations.of(context)!.addServerTooltip,
         ),
-      ),
+        floatingActionButton: FloatingActionButton(
-      body: Consumer<ServerListState>(
+          onPressed: _pushAddServer,
-        builder: (context, svrs, child) {
+          tooltip: AppLocalizations.of(context)!.addServerTooltip,
-          final tiles = svrs.servers.map((ServerInfoState server) {
+          child: Icon(
-            return ChangeNotifierProvider<ServerInfoState>.value(
+            Icons.add,
-              value: server,
+            semanticLabel: AppLocalizations.of(context)!.addServerTooltip,
-              builder: (context, child) => RepaintBoundary(child: ServerRow()),
+          ),
+        ),
+        body: Consumer<ServerListState>(
+          builder: (context, svrs, child) {
+            final tiles = svrs.servers.map(
+              (ServerInfoState server) {
+                return ChangeNotifierProvider<ServerInfoState>.value(
+                  value: server,
+                  builder: (context, child) => RepaintBoundary(child: ServerRow()),
+                );
+              },
             );
+
+            final divided = ListTile.divideTiles(
+              context: context,
+              tiles: tiles,
+            ).toList();
+
+            if (tiles.isEmpty) {
+              return Center(
+                  child: Text(
+                AppLocalizations.of(context)!.unlockServerTip,
+                textAlign: TextAlign.center,
+              ));
+            }
+
+            return ListView(children: divided);
           },
-        );
+        ));
-
-        final divided = ListTile.divideTiles(
-          context: context,
-          tiles: tiles,
-        ).toList();
-
-        if (tiles.isEmpty) {
-          return Center(
-            child: Text(
-              AppLocalizations.of(context)!.unlockServerTip,
-            textAlign: TextAlign.center,
-          ));
-        }
-
-        return ListView(children: divided);
-      },
-    ));
   }
 
   List<Widget> getActions() {
@@ -93,41 +94,41 @@ class _ServersView extends State<ServersView> {
               padding: MediaQuery.of(context).viewInsets,
               child: RepaintBoundary(
                   child: Container(
-                    height: 200, // bespoke value courtesy of the [TextField] docs
+                height: 200, // bespoke value courtesy of the [TextField] docs
-                    child: Center(
+                child: Center(
-                        child: Padding(
+                    child: Padding(
-                            padding: EdgeInsets.all(10.0),
+                        padding: EdgeInsets.all(10.0),
-                            child: Column(
+                        child: Column(
-                              mainAxisAlignment: MainAxisAlignment.center,
+                          mainAxisAlignment: MainAxisAlignment.center,
-                              mainAxisSize: MainAxisSize.min,
+                          mainAxisSize: MainAxisSize.min,
-                              children: <Widget>[
+                          children: <Widget>[
-                                Text(AppLocalizations.of(context)!.enterServerPassword),
+                            Text(AppLocalizations.of(context)!.enterServerPassword),
-                                SizedBox(
+                            SizedBox(
-                                  height: 20,
+                              height: 20,
-                                ),
+                            ),
-                                CwtchPasswordField(
+                            CwtchPasswordField(
-                                  autofocus: true,
+                              autofocus: true,
-                                  controller: ctrlrPassword,
+                              controller: ctrlrPassword,
-                                  action: unlock,
+                              action: unlock,
-                                  validator: (value) {},
+                              validator: (value) {},
-                                ),
+                            ),
-                                SizedBox(
+                            SizedBox(
-                                  height: 20,
+                              height: 20,
-                                ),
+                            ),
-                                Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
+                            Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [
-                                  Spacer(),
+                              Spacer(),
-                                  Expanded(
+                              Expanded(
-                                      child: ElevatedButton(
+                                  child: ElevatedButton(
-                                        child: Text(AppLocalizations.of(context)!.unlock, semanticsLabel: AppLocalizations.of(context)!.unlock),
+                                child: Text(AppLocalizations.of(context)!.unlock, semanticsLabel: AppLocalizations.of(context)!.unlock),
-                                        onPressed: () {
+                                onPressed: () {
-                                          unlock(ctrlrPassword.value.text);
+                                  unlock(ctrlrPassword.value.text);
-                                        },
+                                },
-                                      )),
+                              )),
-                                  Spacer()
+                              Spacer()
-                                ]),
+                            ]),
-                              ],
+                          ],
-                            ))),
+                        ))),
-                  )));
+              )));
         });
   }
 
@@ -141,9 +142,11 @@ class _ServersView extends State<ServersView> {
     Navigator.of(context).push(MaterialPageRoute<void>(
       builder: (BuildContext context) {
         return MultiProvider(
-          providers: [ChangeNotifierProvider<ServerInfoState>(
+          providers: [
-        create: (_) => ServerInfoState(onion: "", serverBundle: "", description: "", autoStart: true, running: false, isEncrypted: true),
+            ChangeNotifierProvider<ServerInfoState>(
-        )],
+              create: (_) => ServerInfoState(onion: "", serverBundle: "", description: "", autoStart: true, running: false, isEncrypted: true),
+            )
+          ],
           child: AddEditServerView(),
         );
       },

lib/widgets/contactrow.dart

@@ -105,7 +105,7 @@ class _ContactRowState extends State<ContactRow> {
             ),
           ]),
           onTap: () {
-            selectConversation(context, contact.onion);
+            selectConversation(context, contact.identifier);
           },
         ));
   }
@@ -113,16 +113,16 @@ class _ContactRowState extends State<ContactRow> {
   void _btnApprove() {
     Provider.of<FlwtchState>(context, listen: false)
         .cwtch
-        .AcceptContact(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).onion);
+        .AcceptContact(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).identifier);
   }
 
   void _btnReject() {
     ContactInfoState contact = Provider.of<ContactInfoState>(context, listen: false);
     if (contact.isGroup == true) {
-      Provider.of<FlwtchState>(context, listen: false).cwtch.RejectInvite(Provider.of<ContactInfoState>(context, listen: false).profileOnion, contact.onion);
+      Provider.of<FlwtchState>(context, listen: false).cwtch.RejectInvite(Provider.of<ContactInfoState>(context, listen: false).profileOnion, contact.identifier);
       Provider.of<ProfileInfoState>(context, listen: false).removeContact(contact.onion);
     } else {
-      Provider.of<FlwtchState>(context, listen: false).cwtch.BlockContact(Provider.of<ContactInfoState>(context, listen: false).profileOnion, contact.onion);
+      Provider.of<FlwtchState>(context, listen: false).cwtch.BlockContact(Provider.of<ContactInfoState>(context, listen: false).profileOnion, contact.identifier);
     }
   }
 

lib/widgets/filebubble.dart

@@ -49,7 +49,7 @@ class FileBubbleState extends State<FileBubble> {
     // If the sender is not us, then we want to give them a nickname...
     var senderDisplayStr = "";
     if (!fromMe) {
-      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle);
+      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
       if (contact != null) {
         senderDisplayStr = contact.nickname;
       } else {
@@ -89,15 +89,15 @@ class FileBubbleState extends State<FileBubble> {
     } else if (flagStarted) {
       // in this case, the download was done in a previous application launch,
       // so we probably have to request an info lookup
-      if (!Provider.of<ProfileInfoState>(context).downloadInterrupted(widget.fileKey()) ) {
+      if (!Provider.of<ProfileInfoState>(context).downloadInterrupted(widget.fileKey())) {
         wdgDecorations = Text(AppLocalizations.of(context)!.fileCheckingStatus + '...' + '\u202F');
         Provider.of<FlwtchState>(context, listen: false).cwtch.CheckDownloadStatus(Provider.of<ProfileInfoState>(context, listen: false).onion, widget.fileKey());
       } else {
         var path = Provider.of<ProfileInfoState>(context).downloadFinalPath(widget.fileKey()) ?? "";
-        wdgDecorations = Column(
+        wdgDecorations = Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-            crossAxisAlignment: CrossAxisAlignment.start,
+          Text(AppLocalizations.of(context)!.fileInterrupted + ': ' + path + '\u202F'),
-            children:[Text(AppLocalizations.of(context)!.fileInterrupted + ': ' + path + '\u202F'),ElevatedButton(onPressed: _btnResume, child: Text(AppLocalizations.of(context)!.verfiyResumeButton))]
+          ElevatedButton(onPressed: _btnResume, child: Text(AppLocalizations.of(context)!.verfiyResumeButton))
-        );
+        ]);
       }
     } else {
       wdgDecorations = Center(
@@ -152,9 +152,12 @@ class FileBubbleState extends State<FileBubble> {
 
     if (Platform.isAndroid) {
       Provider.of<ProfileInfoState>(context, listen: false).downloadInit(widget.fileKey(), (widget.fileSize / 4096).ceil());
-      Provider.of<FlwtchState>(context, listen: false).cwtch.UpdateMessageFlags(profileOnion, contact, idx, Provider.of<MessageMetadata>(context, listen: false).flags | 0x02);
+      //Provider.of<FlwtchState>(context, listen: false).cwtch.UpdateMessageFlags(profileOnion, contact, idx, Provider.of<MessageMetadata>(context, listen: false).flags | 0x02);
       Provider.of<MessageMetadata>(context, listen: false).flags |= 0x02;
-      Provider.of<FlwtchState>(context, listen: false).cwtch.CreateDownloadableFile(profileOnion, handle, widget.nameSuggestion, widget.fileKey());
+      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
+      if (contact != null) {
+        Provider.of<FlwtchState>(context, listen: false).cwtch.CreateDownloadableFile(profileOnion, contact.identifier, widget.nameSuggestion, widget.fileKey());
+      }
     } else {
       try {
         selectedFileName = await saveFile(
@@ -165,9 +168,12 @@ class FileBubbleState extends State<FileBubble> {
           print("saving to " + file.path);
           var manifestPath = file.path + ".manifest";
           Provider.of<ProfileInfoState>(context, listen: false).downloadInit(widget.fileKey(), (widget.fileSize / 4096).ceil());
-          Provider.of<FlwtchState>(context, listen: false).cwtch.UpdateMessageFlags(profileOnion, contact, idx, Provider.of<MessageMetadata>(context, listen: false).flags | 0x02);
+          //Provider.of<FlwtchState>(context, listen: false).cwtch.UpdateMessageFlags(profileOnion, contact, idx, Provider.of<MessageMetadata>(context, listen: false).flags | 0x02);
           Provider.of<MessageMetadata>(context, listen: false).flags |= 0x02;
-          Provider.of<FlwtchState>(context, listen: false).cwtch.DownloadFile(profileOnion, handle, file.path, manifestPath, widget.fileKey());
+          ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
+          if (contact != null) {
+            Provider.of<FlwtchState>(context, listen: false).cwtch.DownloadFile(profileOnion, contact.identifier, file.path, manifestPath, widget.fileKey());
+          }
         }
       } catch (e) {
         print(e);
@@ -177,7 +183,7 @@ class FileBubbleState extends State<FileBubble> {
 
   void _btnResume() async {
     var profileOnion = Provider.of<ProfileInfoState>(context, listen: false).onion;
-    var handle = Provider.of<MessageMetadata>(context, listen: false).senderHandle;
+    var handle = Provider.of<MessageMetadata>(context, listen: false).conversationIdentifier;
     Provider.of<ProfileInfoState>(context, listen: false).downloadMarkResumed(widget.fileKey());
     Provider.of<FlwtchState>(context, listen: false).cwtch.VerifyOrResumeDownload(profileOnion, handle, widget.fileKey());
   }

lib/widgets/invitationbubble.dart

@@ -36,7 +36,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
   Widget build(BuildContext context) {
     var fromMe = Provider.of<MessageMetadata>(context).senderHandle == Provider.of<ProfileInfoState>(context).onion;
     var isGroup = widget.overlay == InviteGroupOverlay;
-    isAccepted = Provider.of<ProfileInfoState>(context).contactList.getContact(widget.inviteTarget) != null;
+    isAccepted = Provider.of<ProfileInfoState>(context).contactList.findContact(widget.inviteTarget) != null;
     var borderRadiousEh = 15.0;
     var showGroupInvite = Provider.of<Settings>(context).isExperimentEnabled(TapirGroupsExperiment);
     rejected = Provider.of<MessageMetadata>(context).flags & 0x01 == 0x01;
@@ -45,7 +45,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
     // If the sender is not us, then we want to give them a nickname...
     var senderDisplayStr = "";
     if (!fromMe) {
-      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle);
+      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
       if (contact != null) {
         senderDisplayStr = contact.nickname;
       } else {
@@ -69,7 +69,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
         ? Text(AppLocalizations.of(context)!.groupInviteSettingsWarning)
         : fromMe
             ? senderInviteChrome(
-                AppLocalizations.of(context)!.sendAnInvitation, isGroup ? Provider.of<ProfileInfoState>(context).contactList.getContact(widget.inviteTarget)!.nickname : widget.inviteTarget)
+                AppLocalizations.of(context)!.sendAnInvitation, isGroup ? Provider.of<ProfileInfoState>(context).contactList.findContact(widget.inviteTarget)!.nickname : widget.inviteTarget)
             : (inviteChrome(isGroup ? AppLocalizations.of(context)!.inviteToGroup : AppLocalizations.of(context)!.contactSuggestion, widget.inviteNick, widget.inviteTarget));
 
     Widget wdgDecorations;
@@ -130,7 +130,7 @@ class InvitationBubbleState extends State<InvitationBubble> {
       var profileOnion = Provider.of<ProfileInfoState>(context, listen: false).onion;
       var contact = Provider.of<ContactInfoState>(context, listen: false).onion;
       var idx = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
-      Provider.of<FlwtchState>(context, listen: false).cwtch.UpdateMessageFlags(profileOnion, contact, idx, Provider.of<MessageMetadata>(context, listen: false).flags | 0x01);
+      //Provider.of<FlwtchState>(context, listen: false).cwtch.UpdateMessageFlags(profileOnion, contact, idx, Provider.of<MessageMetadata>(context, listen: false).flags | 0x01);
       Provider.of<MessageMetadata>(context, listen: false).flags |= 0x01;
     });
   }

lib/widgets/messagebubble.dart

@@ -40,7 +40,7 @@ class MessageBubbleState extends State<MessageBubble> {
     // If the sender is not us, then we want to give them a nickname...
     var senderDisplayStr = "";
     if (!fromMe) {
-      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle);
+      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
       if (contact != null) {
         senderDisplayStr = contact.nickname;
       } else {
@@ -52,7 +52,7 @@ class MessageBubbleState extends State<MessageBubble> {
 
     var wdgMessage;
 
-    if (!showClickableLinks) {   
+    if (!showClickableLinks) {
       wdgMessage = SelectableText(
         widget.content + '\u202F',
         //key: Key(myKey),
@@ -134,8 +134,7 @@ class MessageBubbleState extends State<MessageBubble> {
                       mainAxisSize: MainAxisSize.min,
                       children: <Widget>[
                         Text(
-                          "Opening this link will launch an application outside of Cwtch and may reveal metadata or otherwise compromise the security of Cwtch. Only open links from people you trust. Are you sure you want to continue?"
+                            "Opening this link will launch an application outside of Cwtch and may reveal metadata or otherwise compromise the security of Cwtch. Only open links from people you trust. Are you sure you want to continue?"),
-                        ),
                         Flex(direction: Axis.horizontal, mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
                           Container(
                             margin: EdgeInsets.symmetric(vertical: 20, horizontal: 10),
@@ -170,6 +169,6 @@ class MessageBubbleState extends State<MessageBubble> {
                       ],
                     )),
               ));
-      });
+        });
   }
 }

lib/widgets/messagelist.dart

@@ -76,8 +76,8 @@ class _MessageListState extends State<MessageList> {
                       reverse: true, // NOTE: There seems to be a bug in flutter that corrects the mouse wheel scroll, but not the drag direction...
                       itemBuilder: (itemBuilderContext, index) {
                         var profileOnion = Provider.of<ProfileInfoState>(outerContext, listen: false).onion;
-                        var contactHandle = Provider.of<ContactInfoState>(outerContext, listen: false).onion;
+                        var contactHandle = Provider.of<ContactInfoState>(outerContext, listen: false).identifier;
-                        var messageIndex = Provider.of<ContactInfoState>(outerContext).totalMessages - index - 1;
+                        var messageIndex = index;
 
                         return FutureBuilder(
                           future: messageHandler(outerContext, profileOnion, contactHandle, messageIndex),

lib/widgets/messagerow.dart

@@ -48,8 +48,8 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
   @override
   Widget build(BuildContext context) {
     var fromMe = Provider.of<MessageMetadata>(context).senderHandle == Provider.of<ProfileInfoState>(context).onion;
-    var isContact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle) != null;
+    var isContact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle) != null;
-    var isBlocked = isContact ? Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle)!.isBlocked : false;
+    var isBlocked = isContact ? Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle)!.isBlocked : false;
     var actualMessage = Flexible(flex: 3, fit: FlexFit.loose, child: widget.child);
 
     _dragAffinity = fromMe ? Alignment.centerRight : Alignment.centerLeft;
@@ -60,7 +60,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
 
     var senderDisplayStr = "";
     if (!fromMe) {
-      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle);
+      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
       if (contact != null) {
         senderDisplayStr = contact.nickname;
       } else {
@@ -77,7 +77,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
         child: IconButton(
             tooltip: AppLocalizations.of(context)!.tooltipReplyToThisMessage,
             onPressed: () {
-              Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
+              Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageID;
             },
             icon: Icon(Icons.reply, color: Provider.of<Settings>(context).theme.dropShadowColor())));
     Widget wdgSpacer = Flexible(child: SizedBox(width: 60, height: 10));
@@ -185,7 +185,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
             },
             onPanEnd: (details) {
               _runAnimation(details.velocity.pixelsPerSecond, size);
-              Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageIndex;
+              Provider.of<AppState>(context, listen: false).selectedIndex = Provider.of<MessageMetadata>(context, listen: false).messageID;
             },
             child: Padding(
                 padding: EdgeInsets.all(2),
@@ -198,8 +198,8 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
                       children: widgetRow,
                     )))));
     var mark = Provider.of<ContactInfoState>(context).newMarker;
-    if (mark > 0 && mark == Provider.of<ContactInfoState>(context).totalMessages - Provider.of<MessageMetadata>(context).messageIndex) {
+    if (mark > 0 && mark == Provider.of<MessageMetadata>(context).messageIndex + 1) {
-      return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [Align(alignment:Alignment.center ,child:_bubbleNew()), mr]);
+      return Column(crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start, children: [Align(alignment: Alignment.center, child: _bubbleNew()), mr]);
     } else {
       return mr;
     }
@@ -209,9 +209,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
     return Container(
         decoration: BoxDecoration(
           color: Provider.of<Settings>(context).theme.messageFromMeBackgroundColor(),
-          border: Border.all(
+          border: Border.all(color: Provider.of<Settings>(context).theme.messageFromMeBackgroundColor(), width: 1),
-              color: Provider.of<Settings>(context).theme.messageFromMeBackgroundColor(),
-              width: 1),
           borderRadius: BorderRadius.only(
             topLeft: Radius.circular(8),
             topRight: Radius.circular(8),
@@ -219,9 +217,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
             bottomRight: Radius.circular(8),
           ),
         ),
-        child: Padding(
+        child: Padding(padding: EdgeInsets.all(9.0), child: Text(AppLocalizations.of(context)!.newMessagesLabel)));
-            padding: EdgeInsets.all(9.0),
-            child: Text(AppLocalizations.of(context)!.newMessagesLabel)));
   }
 
   void _runAnimation(Offset pixelsPerSecond, Size size) {
@@ -249,7 +245,7 @@ class MessageRowState extends State<MessageRow> with SingleTickerProviderStateMi
   }
 
   void _btnGoto() {
-    selectConversation(context, Provider.of<MessageMetadata>(context, listen: false).senderHandle);
+    selectConversation(context, Provider.of<MessageMetadata>(context, listen: false).conversationIdentifier);
   }
 
   void _btnAdd() {

lib/widgets/quotedmessage.dart

@@ -34,7 +34,7 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
     // If the sender is not us, then we want to give them a nickname...
     var senderDisplayStr = "";
     if (!fromMe) {
-      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageMetadata>(context).senderHandle);
+      ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(Provider.of<MessageMetadata>(context).senderHandle);
       if (contact != null) {
         senderDisplayStr = contact.nickname;
       } else {

lib/widgets/serverrow.dart

@@ -21,40 +21,38 @@ class _ServerRowState extends State<ServerRow> {
   @override
   Widget build(BuildContext context) {
     var server = Provider.of<ServerInfoState>(context);
-    return Card(clipBehavior: Clip.antiAlias,
+    return Card(
+        clipBehavior: Clip.antiAlias,
         margin: EdgeInsets.all(0.0),
         child: InkWell(
-        child: Row(
+            child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
           Padding(
               padding: const EdgeInsets.all(6.0), //border size
               child: Icon(CwtchIcons.dns_24px,
-                  color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor(),
+                  color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor(), size: 64)),
-                size: 64)
-
-          ),
           Expanded(
               child: Column(
-                children: [
+            children: [
-                  Text(
+              Text(
-                    server.description,
+                server.description,
-                    semanticsLabel: server.description,
+                semanticsLabel: server.description,
-                    style: Provider.of<FlwtchState>(context).biggerFont.apply(color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
+                style: Provider.of<FlwtchState>(context)
+                    .biggerFont
+                    .apply(color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
+                softWrap: true,
+                overflow: TextOverflow.ellipsis,
+              ),
+              Visibility(
+                  visible: !Provider.of<Settings>(context).streamerMode,
+                  child: ExcludeSemantics(
+                      child: Text(
+                    server.onion,
                     softWrap: true,
                     overflow: TextOverflow.ellipsis,
-                  ),
+                    style: TextStyle(color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
-                  Visibility(
+                  )))
-                      visible: !Provider.of<Settings>(context).streamerMode,
+            ],
-                      child: ExcludeSemantics(
+          )),
-                          child: Text(
-                            server.onion,
-                            softWrap: true,
-                            overflow: TextOverflow.ellipsis,
-                            style: TextStyle(color: server.running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
-                          )))
-                ],
-              )),
 
           // Copy server button
           IconButton(
@@ -75,23 +73,23 @@ class _ServerRowState extends State<ServerRow> {
               _pushEditServer(server);
             },
           )
-
-
         ])));
   }
 
-  void _pushEditServer(ServerInfoState server ) {
+  void _pushEditServer(ServerInfoState server) {
     Provider.of<ErrorHandler>(context).reset();
     Navigator.of(context).push(MaterialPageRoute<void>(
       settings: RouteSettings(name: "serveraddedit"),
       builder: (BuildContext context) {
         return MultiProvider(
-          providers: [ChangeNotifierProvider<ServerInfoState>(
+          providers: [
-            create: (_) => server,
+            ChangeNotifierProvider<ServerInfoState>(
-          )],
+              create: (_) => server,
+            )
+          ],
           child: AddEditServerView(),
         );
       },
     ));
   }
-}
+}