zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-04-20 22:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

removed timestamp on location sharing, deduplicate marker instead (update to location of latest timestamp).

Browse source
This commit is contained in:
ericz 2026-03-28 17:29:36 +01:00
parent 2e6f4ebad8
commit 5b537b879d
7 changed files with 113 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/l10n/app_localizations_hu.dart
View file

@ -1295,6 +1295,15 @@ class AppLocalizationsHu extends AppLocalizations {
@override
String get chat_sendGif => 'Küldj GIF-ot';
@override
String get chat_insertEmoji => 'Insert emoji';
@override
String get chat_shareLocation => 'Share location';
@override
String get chat_locationUnavailable => 'Location not available';
@override
String get chat_reply => 'Válasz';
@ -1732,6 +1741,9 @@ class AppLocalizationsHu extends AppLocalizations {
@override
String get map_sharedPin => 'Gemeinsames PIN-kód';
@override
String get map_sharedAt => 'Shared';
@override
String get map_joinRoom => 'Csatlakozás a szobához';

12
lib/l10n/app_localizations_ja.dart
View file

@ -1228,6 +1228,15 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get chat_sendGif => 'GIFを送信する';
@override
String get chat_insertEmoji => 'Insert emoji';
@override
String get chat_shareLocation => 'Share location';
@override
String get chat_locationUnavailable => 'Location not available';
@override
String get chat_reply => '返信';
@ -1647,6 +1656,9 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get map_sharedPin => '共有パスワード';
@override
String get map_sharedAt => 'Shared';
@override
String get map_joinRoom => '部屋に参加する';

12
lib/l10n/app_localizations_ko.dart
View file

@ -1223,6 +1223,15 @@ class AppLocalizationsKo extends AppLocalizations {
@override
String get chat_sendGif => 'GIF 보내기';
@override
String get chat_insertEmoji => 'Insert emoji';
@override
String get chat_shareLocation => 'Share location';
@override
String get chat_locationUnavailable => 'Location not available';
@override
String get chat_reply => '답변';
@ -1643,6 +1652,9 @@ class AppLocalizationsKo extends AppLocalizations {
@override
String get map_sharedPin => '공유 비밀번호';
@override
String get map_sharedAt => 'Shared';
@override
String get map_joinRoom => '방에 참여';

3
lib/screens/channel_chat_screen.dart
View file

@ -936,8 +936,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
final maxLabelBytes =
maxBytes - utf8.encode(prefix).length - utf8.encode(suffix).length;
final defaultLabel =
'${connector.deviceDisplayName} ${DateTime.now().toUtc().toIso8601String()}';
final defaultLabel = connector.deviceDisplayName;
final controller = TextEditingController(
text: truncateToUtf8Bytes(defaultLabel, maxLabelBytes),
);

3
lib/screens/chat_screen.dart
View file

@ -693,8 +693,7 @@ class _ChatScreenState extends State<ChatScreen> {
final maxLabelBytes =
maxBytes - utf8.encode(prefix).length - utf8.encode(suffix).length;
final defaultLabel =
'${connector.deviceDisplayName} ${DateTime.now().toUtc().toIso8601String()}';
final defaultLabel = connector.deviceDisplayName;
final controller = TextEditingController(
text: truncateToUtf8Bytes(defaultLabel, maxLabelBytes),
);

90
lib/screens/map_screen.dart
View file

@ -1222,7 +1222,7 @@ class _MapScreenState extends State<MapScreen> {
}
List<_SharedMarker> _collectSharedMarkers(MeshCoreConnector connector) {
final markers = <_SharedMarker>[];
final markersByKey = <String, _SharedMarker>{};
final selfName = connector.selfName ?? 'Me';
for (final contact in connector.contacts) {
@ -1231,24 +1231,28 @@ class _MapScreenState extends State<MapScreen> {
final payload = _parseMarkerText(message.text);
if (payload == null) continue;
final fromName = message.isOutgoing ? selfName : contact.name;
final id = _buildMarkerId(
final key = _buildSharedMarkerKey(
sourceId: contact.publicKeyHex,
label: payload.label,
fromName: fromName,
flags: payload.flags,
isChannel: false,
);
final marker = _SharedMarker(
id: key,
position: payload.position,
label: payload.label,
flags: payload.flags,
fromName: fromName,
sourceLabel: contact.name,
timestamp: message.timestamp,
text: message.text,
);
markers.add(
_SharedMarker(
id: id,
position: payload.position,
label: payload.label,
flags: payload.flags,
fromName: fromName,
sourceLabel: contact.name,
timestamp: message.timestamp,
isChannel: false,
isPublicChannel: false,
),
isChannel: false,
isPublicChannel: false,
);
final existing = markersByKey[key];
if (existing == null || marker.timestamp.isAfter(existing.timestamp)) {
markersByKey[key] = marker;
}
}
}
@ -1258,29 +1262,35 @@ class _MapScreenState extends State<MapScreen> {
for (final message in messages) {
final payload = _parseMarkerText(message.text);
if (payload == null) continue;
final id = _buildMarkerId(
final key = _buildSharedMarkerKey(
sourceId: 'channel:${channel.index}',
label: payload.label,
fromName: message.senderName,
flags: payload.flags,
isChannel: true,
);
final marker = _SharedMarker(
id: key,
position: payload.position,
label: payload.label,
flags: payload.flags,
fromName: message.senderName,
sourceLabel: channel.name.isEmpty
? 'Channel ${channel.index}'
: channel.name,
timestamp: message.timestamp,
text: message.text,
);
markers.add(
_SharedMarker(
id: id,
position: payload.position,
label: payload.label,
flags: payload.flags,
fromName: message.senderName,
sourceLabel: channel.name.isEmpty
? 'Channel ${channel.index}'
: channel.name,
timestamp: message.timestamp,
isChannel: true,
isPublicChannel: isPublic,
),
isChannel: true,
isPublicChannel: isPublic,
);
final existing = markersByKey[key];
if (existing == null || marker.timestamp.isAfter(existing.timestamp)) {
markersByKey[key] = marker;
}
}
}
final markers = markersByKey.values.toList()
..sort((a, b) => b.timestamp.compareTo(a.timestamp));
return markers;
}
@ -1305,12 +1315,18 @@ class _MapScreenState extends State<MapScreen> {
);
}
String _buildMarkerId({
String _buildSharedMarkerKey({
required String sourceId,
required DateTime timestamp,
required String text,
required String label,
required String fromName,
required String flags,
required bool isChannel,
}) {
return '$sourceId|${timestamp.millisecondsSinceEpoch}|$text';
final normalizedLabel = label.trim().toLowerCase();
final normalizedFrom = fromName.trim().toLowerCase();
final normalizedFlags = flags.trim().toLowerCase();
final scope = isChannel ? 'ch' : 'dm';
return '$scope|$sourceId|$normalizedFrom|$normalizedLabel|$normalizedFlags';
}
Marker _buildSharedMarker(_SharedMarker marker) {

23
untranslated.json
View file

@ -1 +1,22 @@
{}
{
"hu": [
"chat_insertEmoji",
"chat_shareLocation",
"chat_locationUnavailable",
"map_sharedAt"
],
"ja": [
"chat_insertEmoji",
"chat_shareLocation",
"chat_locationUnavailable",
"map_sharedAt"
],
"ko": [
"chat_insertEmoji",
"chat_shareLocation",
"chat_locationUnavailable",
"map_sharedAt"
]
}