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: Channel message dedup uses senderTimestamp as primary key

Browse Source
This commit is contained in:
Janez T
2026-03-16 22:17:52 +01:00
parent 993563f059
commit c884f81ca5
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/providers/messages_provider.dart
View File

@@ -746,49 +746,33 @@ class MessagesProvider with ChangeNotifier {
return false; return false;
} }
// Primary dedup: same senderTimestamp = same message from mesh repeats.
// Matches official app's DB uniqueness: (channelSecret, senderTimestamp, text).
if (existing.senderTimestamp == message.senderTimestamp) {
return true;
}
// Secondary: catch near-duplicate repeats within a 30s window
// (clock drift between nodes).
final withinChannelRepeatWindow = final withinChannelRepeatWindow =
(existing.senderTimestamp - message.senderTimestamp).abs() <= 30; (existing.senderTimestamp - message.senderTimestamp).abs() <= 30;
if (!withinChannelRepeatWindow) {
return false;
}
final existingSenderKey = existing.senderKeyShort; final existingSenderKey = existing.senderKeyShort;
final incomingSenderKey = message.senderKeyShort; final incomingSenderKey = message.senderKeyShort;
if (existingSenderKey != null && if (existingSenderKey != null &&
incomingSenderKey != null && incomingSenderKey != null &&
existingSenderKey == incomingSenderKey && existingSenderKey == incomingSenderKey) {
withinChannelRepeatWindow) {
return true; return true;
} }
final existingSenderName = _normalizedResolvedSenderName(existing); final existingSenderName = _normalizedResolvedSenderName(existing);
final incomingSenderName = _normalizedResolvedSenderName(message); final incomingSenderName = _normalizedResolvedSenderName(message);
if (existing.isChannelMessage && message.isChannelMessage) {
debugPrint(
'🧪 [MessagesProvider] Channel dedupe check: '
'existing(id=${existing.id}, sent=${existing.isSentMessage}, senderName=${existing.senderName ?? "-"}, resolvedSender=${existingSenderName ?? "-"}, senderKey=${existing.senderKeyShort ?? "-"}, ts=${existing.senderTimestamp}, pathLen=${existing.pathLen}) '
'incoming(id=${message.id}, sent=${message.isSentMessage}, senderName=${message.senderName ?? "-"}, resolvedSender=${incomingSenderName ?? "-"}, senderKey=${message.senderKeyShort ?? "-"}, ts=${message.senderTimestamp}, pathLen=${message.pathLen}) '
'withinWindow=$withinChannelRepeatWindow',
);
}
if (existingSenderName != null && if (existingSenderName != null &&
incomingSenderName != null && incomingSenderName != null &&
existingSenderName == incomingSenderName) { existingSenderName == incomingSenderName) {
if (!existing.isSentMessage && !message.isSentMessage) {
return withinChannelRepeatWindow;
}
if (!withinChannelRepeatWindow) {
return false;
}
// Mirror meshcore-open behavior for self-authored channel messages:
// zero-hop self replays are dropped earlier in AppProvider, while
// routed self replays should fold into the local sent bubble when the
// public sender name matches within a short window.
if (existing.isSentMessage &&
!message.isSentMessage &&
existingSenderName == incomingSenderName) {
return true;
}
return true; return true;
} }