From b748b96237679f450049229ac5a1e985fdfa8aec Mon Sep 17 00:00:00 2001
From: Winston Lowe <wel97459@gmail.com>
Date: Sat, 7 Mar 2026 01:45:53 -0800
Subject: [PATCH] Enhance contact handling logic in MeshCoreConnector to
 support conditional addition based on auto-add settings (#268)

---
 lib/connector/meshcore_connector.dart | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart
index 75b5287..7aa0e5d 100644
--- a/lib/connector/meshcore_connector.dart
+++ b/lib/connector/meshcore_connector.dart
@@ -1926,7 +1926,7 @@ class MeshCoreConnector extends ChangeNotifier {
       case pushCodeNewAdvert:
         debugPrint('Got New CONTACT');
         // It's the same format as respCodeContact, so we can reuse the handler
-        _handleContact(frame);
+        _handleContact(frame, isContact: false);
         break;
       case respCodeContact:
         debugPrint('Got CONTACT');
@@ -2217,7 +2217,7 @@ class MeshCoreConnector extends ChangeNotifier {
     }
   }
 
-  void _handleContact(Uint8List frame) {
+  void _handleContact(Uint8List frame, {bool isContact = true}) {
     final contact = Contact.fromFrame(frame);
     if (contact != null) {
       if (contact.type == advTypeRepeater) {
@@ -2256,11 +2256,23 @@ class MeshCoreConnector extends ChangeNotifier {
           tag: 'Connector',
         );
       } else {
-        _contacts.add(contact);
-        appLogger.info(
-          'Added new contact ${contact.name}: pathLen=${contact.pathLength}',
-          tag: 'Connector',
-        );
+        if ((_autoAddUsers && contact.type == advTypeChat) ||
+            (_autoAddRepeaters && contact.type == advTypeRepeater) ||
+            (_autoAddRoomServers && contact.type == advTypeRoom) ||
+            (_autoAddSensors && contact.type == advTypeSensor) ||
+            isContact) {
+          _contacts.add(contact);
+          appLogger.info(
+            'Added new contact ${contact.name}: pathLen=${contact.pathLength}',
+            tag: 'Connector',
+          );
+        } else {
+          appLogger.info(
+            "Discovered contact ${contact.name} (type ${contact.typeLabel}) not added due to auto-add settings",
+            tag: 'Connector',
+          );
+          return;
+        }
       }
       _knownContactKeys.add(contact.publicKeyHex);
       _loadMessagesForContact(contact.publicKeyHex);