ua1zbe/meshcore-sar_android
1
0
Fork 0
mirror of https://github.com/dz0ny/meshcore-sar.git synced 2026-08-11 16:30:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix duplicate self messages

Browse Source
This commit is contained in:
Janez T
2026-03-13 18:44:17 +01:00
parent 24e715d01e
commit 11f3bf9f97
4 changed files with 251 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/providers/messages_provider.dart
View File

@@ -505,6 +505,7 @@ class MessagesProvider with ChangeNotifier {
);
}
}
enhancedMessage = _resolveSenderNameIfNeeded(enhancedMessage);
// For channel messages with sender name, try to link with contact
Message finalMessage = enhancedMessage;
@@ -634,17 +635,36 @@ class MessagesProvider with ChangeNotifier {
if (existing.channelIdx != message.channelIdx) {
return false;
}
final existingSender = existing.senderKeyShort ?? existing.senderName;
final incomingSender = message.senderKeyShort ?? message.senderName;
if (existingSender == incomingSender) {
final existingSenderKey = existing.senderKeyShort;
final incomingSenderKey = message.senderKeyShort;
if (existingSenderKey != null &&
incomingSenderKey != null &&
existingSenderKey == incomingSenderKey) {
return true;
}
// When we send to a channel we add a local "sent" bubble immediately,
// then firmware may later sync back the same message as a received
// channel item with only the public sender handle. Only fold that replay
// into the original bubble after LOG_RX_DATA has already confirmed it as
// our own transmitted packet.
final existingSenderName = _normalizeSenderName(existing.senderName);
final incomingSenderName = _normalizeSenderName(message.senderName);
if (existingSenderName != null &&
incomingSenderName != null &&
existingSenderName == incomingSenderName) {
if (!existing.isSentMessage && !message.isSentMessage) {
return true;
}
// When we send to a channel we add a local "sent" bubble immediately,
// then firmware may later sync back the same message as a received
// channel item under our public handle. Only fold that replay into the
// original bubble after LOG_RX_DATA has already confirmed it as our
// transmitted packet.
if (existing.isSentMessage &&
existing.echoCount > 0 &&
!message.isSentMessage &&
(existing.senderTimestamp - message.senderTimestamp).abs() <= 1) {
return true;
}
}
if (existing.isSentMessage &&
existing.echoCount > 0 &&
!message.isSentMessage &&
@@ -694,6 +714,29 @@ class MessagesProvider with ChangeNotifier {
notifyListeners();
}
String? _normalizeSenderName(String? value) {
final trimmed = value?.trim();
if (trimmed == null || trimmed.isEmpty) {
return null;
}
return trimmed.toLowerCase();
}
Message _resolveSenderNameIfNeeded(Message message) {
if (message.senderName != null || message.senderPublicKeyPrefix == null) {
return message;
}
final resolvedSenderName = resolveContactNameCallback?.call(
message.senderPublicKeyPrefix,
);
if (resolvedSenderName == null || resolvedSenderName.trim().isEmpty) {
return message;
}
return message.copyWith(senderName: resolvedSenderName.trim());
}
/// Trigger urgent notification for SAR marker
Future<void> _triggerSarNotification(
Message message,
@@ -1251,6 +1294,7 @@ class MessagesProvider with ChangeNotifier {
);
}
}
enhancedMessage = _resolveSenderNameIfNeeded(enhancedMessage);
// Check for duplicates (shouldn't happen for sent messages, but be safe)
if (_findDuplicateMessageIndex(enhancedMessage) != -1) {