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

Resolve localization and name bugs

Browse Source
This commit is contained in:
Janez T
2026-03-11 15:54:00 +01:00
parent 467371946d
commit ae16417886
24 changed files with 4108 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/providers/app_provider.dart
View File

@@ -574,8 +574,20 @@ class AppProvider with ChangeNotifier {
connectionProvider.addListener(_handleConnectionStateChange);
messagesProvider.resolveContactNameCallback =
_resolveContactNameForNotification;
messagesProvider.resolveChannelNameCallback =
channelsProvider.getChannelDisplayName;
messagesProvider.resolveChannelNameCallback = (channelIdx) {
if (channelIdx == 0) {
return 'Public';
}
for (final channel in contactsProvider.channels) {
if (channel.publicKey.length > 1 &&
channel.publicKey[1] == channelIdx) {
return channel.displayName;
}
}
return channelsProvider.getChannelDisplayName(channelIdx);
};
voiceProvider.sendRawPacketCallback =
({

10
lib/providers/messages_provider.dart
View File

@@ -765,9 +765,17 @@ class MessagesProvider with ChangeNotifier {
final idx = channelIdx ?? 0;
final resolved = resolveChannelNameCallback?.call(idx).trim();
if (resolved != null && resolved.isNotEmpty) {
if (idx == 0 && resolved == 'Public') {
return _localizations?.publicChannel ?? resolved;
}
return resolved;
}
return idx == 0 ? 'Public' : 'Channel $idx';
if (idx == 0) {
return _localizations?.publicChannel ?? 'Public';
}
return _localizations != null
? '${_localizations!.channel} $idx'
: 'Channel $idx';
}
String _buildNotificationMessageText(