Unify contact retrieval by introducing allContacts getter

This commit is contained in:
Winston Lowe
2026-03-14 11:45:47 -07:00
parent 8b280b37be
commit 79a45c527b
9 changed files with 25 additions and 29 deletions
+1 -1
View File
@@ -107,7 +107,7 @@ class _PathManagementDialogState extends State<_PathManagementDialog> {
}
final pathForInput = currentContact.pathIdList;
final availableContacts = connector.contacts
final availableContacts = connector.allContacts
.where((c) => c.publicKeyHex != currentContact.publicKeyHex)
.toList();
+2 -1
View File
@@ -1,5 +1,6 @@
import 'dart:typed_data';
import 'package:flutter/material.dart';
import 'package:meshcore_open/connector/meshcore_protocol.dart';
import '../l10n/l10n.dart';
import '../models/contact.dart';
@@ -65,7 +66,7 @@ class _PathSelectionDialogState extends State<PathSelectionDialog> {
void _filterValidContacts() {
_validContacts = widget.availableContacts
.where((c) => c.type == 2 || c.type == 3)
.where((c) => c.type == advTypeRepeater || c.type == advTypeRoom)
.toList();
}
+1 -4
View File
@@ -157,10 +157,7 @@ class _SNRIndicatorState extends State<SNRIndicator> {
repeater.snr,
widget.connector.currentSf,
);
final allContacts = [
...widget.connector.contacts,
...widget.connector.discoveredContacts,
];
final allContacts = widget.connector.allContacts;
final name = allContacts
.where((c) => c.publicKey.first == repeater.pubkeyFirstByte)
.map((c) => c.name)