From 25f8d6ae271f93cd6f0222bab33bcad53fb4c6ef Mon Sep 17 00:00:00 2001 From: zjs81 Date: Sun, 27 Sep 2026 21:55:43 -0700 Subject: [PATCH] Add notification replies, Android Auto support, and channel mute bell - Message notifications use Android MessagingStyle with Reply, Mark as read, and Mute channel actions, so they work in Android Auto and on watches - Replies go through the normal send path (length limits, SMAZ, Cyr2Lat, retries), split into up to 3 messages, and report failures - Declare Android Auto notification support and register the action receiver - Add a bell icon to channel chat to mute/unmute; unify the channel mute key so unnamed channels mute correctly - Update README and docs for Android Auto support --- README.md | 5 +- android/app/src/main/AndroidManifest.xml | 8 + .../src/main/res/xml/automotive_app_desc.xml | 4 + documentation/README.md | 3 +- documentation/channels.md | 1 + documentation/notifications.md | 57 +- documentation/settings.md | 2 + lib/connector/meshcore_connector.dart | 159 +++++- lib/l10n/app_en.arb | 11 + lib/l10n/app_localizations.dart | 66 +++ lib/l10n/app_localizations_bg.dart | 38 ++ lib/l10n/app_localizations_de.dart | 38 ++ lib/l10n/app_localizations_en.dart | 38 ++ lib/l10n/app_localizations_es.dart | 38 ++ lib/l10n/app_localizations_fr.dart | 38 ++ lib/l10n/app_localizations_hu.dart | 38 ++ lib/l10n/app_localizations_it.dart | 38 ++ lib/l10n/app_localizations_ja.dart | 38 ++ lib/l10n/app_localizations_ko.dart | 38 ++ lib/l10n/app_localizations_nl.dart | 38 ++ lib/l10n/app_localizations_pl.dart | 38 ++ lib/l10n/app_localizations_pt.dart | 38 ++ lib/l10n/app_localizations_ru.dart | 38 ++ lib/l10n/app_localizations_sk.dart | 38 ++ lib/l10n/app_localizations_sl.dart | 38 ++ lib/l10n/app_localizations_sv.dart | 38 ++ lib/l10n/app_localizations_uk.dart | 38 ++ lib/l10n/app_localizations_zh.dart | 38 ++ lib/models/channel.dart | 3 + lib/screens/channel_chat_screen.dart | 19 + lib/screens/channels_screen.dart | 8 +- lib/services/notification_reply.dart | 197 +++++++ lib/services/notification_service.dart | 528 ++++++++++++------ test/services/notification_reply_test.dart | 128 +++++ untranslated.json | 190 +++++++ 35 files changed, 1874 insertions(+), 199 deletions(-) create mode 100644 android/app/src/main/res/xml/automotive_app_desc.xml create mode 100644 lib/services/notification_reply.dart create mode 100644 test/services/notification_reply_test.dart diff --git a/README.md b/README.md index 955ab6a6..68b015a6 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,8 @@ See the [user documentation](documentation/README.md), [connection guide](docume - **Contact Groups**: Create custom groups to organize your mesh network contacts - **Message Reactions**: React to messages with emoji responses - **Message Replies**: Thread conversations with inline reply functionality +- **Android Auto & Watches**: Hear messages and reply by voice in Android Auto, or reply from the notification shade and Wear OS/Galaxy watches ([guide](documentation/notifications.md#android-auto)) +- **Channel Muting**: Mute a channel from its chat screen, the channel list, or its notification ### Mesh Network @@ -101,6 +103,7 @@ See the [user documentation](documentation/README.md), [connection guide](docume | Map & Location | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | Device Management | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | Repeater Hub | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | +| Notification replies | ✅
(incl. Android Auto, watches) | ❌ | ❌ | ❌ | ❌ | ❌ | The matrix describes implemented functionality, not a guarantee that every feature has been tested on every device. Web device connections use Web Serial and require Chrome and a secure origin. Image inference and translation require native runtimes and are unavailable on web. Android APKs currently include only `arm64-v8a`; the minimum Android API follows the Flutter SDK used to build. @@ -225,7 +228,7 @@ Messages are transmitted as binary frames using a custom protocol optimized for - **Theme**: System default, light, or dark mode - **Language**: Use one of 18 languages (English, Chinese, French, Spanish, Portuguese, German, Dutch, Polish, Swedish, Italian, Slovak, Slovenian, Bulgarian, Russian, Ukrainian, Hungarian, Japanese, Korean) -- **Notifications**: Configurable for messages, channels, and node advertisements +- **Notifications**: Configurable for messages, channels, and node advertisements; per-channel muting; reply, mark-as-read, and mute actions on Android notifications and watches (reply and mark-as-read in Android Auto) - **Battery Chemistry**: Support for NMC, LiFePO4, LiPo, and LiPo HV battery types - **Message Retry**: Automatic retry with configurable path clearing diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 5a533139..3bb75c69 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -30,6 +30,14 @@ android:exported="false" android:foregroundServiceType="connectedDevice" android:stopWithTask="false" /> + + + + + + + diff --git a/documentation/README.md b/documentation/README.md index 0afb4bc5..af6c73bb 100644 --- a/documentation/README.md +++ b/documentation/README.md @@ -18,7 +18,7 @@ MeshCore Open is an open-source Flutter client for MeshCore LoRa mesh networking 5. [Channels](channels.md) - Broadcast channels, communities, and channel chat 6. [Map & Location](map-and-location.md) - Node map, path tracing, line-of-sight, and offline caching 7. [Settings](settings.md) - Device settings, app settings, radio configuration, and exports -8. [Notifications](notifications.md) - System notifications, unread badges, and notification preferences +8. [Notifications](notifications.md) - System notifications, replies from watches and Android Auto, unread badges, and notification preferences 9. [Repeater Management](repeater-management.md) - Repeater hub, status, CLI, telemetry, and neighbors 10. [Additional Features](additional-features.md) - GIF picker, localization, debug logs, SMAZ compression, and more 11. [Routing Paths](routing-paths.md) - Path encoding, validation, device capability detection, and storage @@ -40,6 +40,7 @@ MeshCore Open connects to MeshCore LoRa mesh radios over BLE, USB, or TCP. Once - **Configure radio settings** including frequency, power, bandwidth, and spreading factor - **Cache offline maps** for use without internet connectivity - **Analyze line-of-sight** between nodes with terrain elevation profiles +- **Use Android Auto** to hear new messages and reply by voice while driving (Android) ## What needs internet? diff --git a/documentation/channels.md b/documentation/channels.md index 05510d08..d3c68a1f 100644 --- a/documentation/channels.md +++ b/documentation/channels.md @@ -73,6 +73,7 @@ Tap a channel card to open the channel chat screen. - Channel name - Subtitle: channel type and effective region when set, with `(default)` when inherited - Tap the title or landscape icon to select a region; see [Regions](regions.md) +- Bell icon: mute or unmute notifications for this channel (crossed-out bell when muted) ### Message Display diff --git a/documentation/notifications.md b/documentation/notifications.md index 85d21bda..fdfce76c 100644 --- a/documentation/notifications.md +++ b/documentation/notifications.md @@ -12,6 +12,7 @@ MeshCore Open provides both **system notifications** (push-style OS alerts) and - **Body**: Message text (reactions show "Reacted [emoji]", GIFs show "Sent a GIF") - **Priority**: High - **Android channel**: `messages` +- **Android style**: conversation (MessagingStyle) showing the last few messages, with **Reply** and a hidden **Mark as read** action. When URL images are enabled, an image preview appears as the notification's thumbnail ### 2. Channel Message Notifications - **Triggered when**: A new message arrives on a non-muted channel @@ -19,6 +20,7 @@ MeshCore Open provides both **system notifications** (push-style OS alerts) and - **Body**: `": "` - **Priority**: High - **Android channel**: `channel_messages` +- **Android style**: group conversation with each sender shown by name, with **Reply**, **Mute channel**, and a hidden **Mark as read** action ### 3. Advertisement Notifications - **Triggered when**: A new node is discovered on the mesh for the first time @@ -33,6 +35,36 @@ MeshCore Open provides both **system notifications** (push-style OS alerts) and - Tap to re-launch the app - **Does not auto-start on reboot** — the user must re-open the app manually after a phone restart +### Replying from Notifications, Watches, and Android Auto (Android) + +Message notifications can be answered without opening the app, from the notification shade, a paired Wear OS or Galaxy watch, or Android Auto (which reads messages aloud and takes voice replies). + +- **Reply** sends through the connected radio exactly like the chat screen: same length limits, SMAZ and Cyr2Lat handling, and retries. Your reply is then added to the notification. +- **Replies over the message limit** are split at word boundaries into up to 3 messages. Longer replies are not sent; a "Reply not sent" notification asks you to open the app. +- **Mark as read** clears the unread count on the phone only. MeshCore has no read receipts, so nothing is sent over the mesh. +- **Mute channel** (phone and watch) mutes that channel, the same as the bell icon in the channel chat. +- If the radio is disconnected, the conversation is no longer on the radio, the radio reports a send error, or the app isn't running, a "Reply not sent" notification explains why. The reply is not queued. If a split reply fails partway, earlier parts may already have been sent. +- Replies are sent as typed; composer translation is not applied. + +iOS notifications do not have reply actions yet. + +### Android Auto + +MeshCore Open works in Android Auto as a notification-based messaging app. There is no MeshCore screen in the car; Android Auto provides the interface. + +- New direct and channel messages appear on the car display and can be read aloud. +- Reply by voice or with a suggested reply; replies follow the rules above (splitting, failure notifications, no translation). +- Android Auto shows **Reply** and **Mark as read**. **Mute channel** is marked as a mute action, but Android Auto only documents reply and mark-as-read for messaging apps, so mute may not appear in the car; use the phone, a watch, or the bell icon. +- Setup: none beyond allowing MeshCore Open notifications. The app must be running with the radio connected, as for any notification. + +Limitations: + +- Only messages that arrive during the Android Auto session are shown; there is no conversation list or message history in the car. +- You can reply to a received message, but you cannot start a new message by voice (for example, "send a MeshCore message to Public"). Android Auto does not currently offer this to third-party messaging apps. +- Sideloaded or debug builds only appear in Android Auto when its developer setting **Unknown sources** is on. + +Testing with the Desktop Head Unit (DHU): enable Android Auto developer mode (tap **Version** about 10 times in Android Auto settings), turn on **Unknown sources**, choose **Start head unit server**, run `adb forward tcp:5277 tcp:5277`, then start `desktop-head-unit` from the SDK's `extras/google/auto` package. Use DHU 2.1 or newer; version 2.0 disconnects from current Android Auto releases. + ### Notification Tap Behavior Tapping a notification currently re-launches the app at the root route. It does **not** navigate directly to the relevant chat or channel. @@ -65,15 +97,20 @@ Access via **App Settings → Notifications**: ### Per-Channel Muting -Long-press a channel in the channels list → "Mute channel" / "Unmute channel". Muted channels do not generate OS notifications. +Mute or unmute a channel from any of these places. Muted channels do not generate OS notifications. + +- The bell icon in the channel chat app bar +- Long-press a channel in the channels list → "Mute channel" / "Unmute channel" +- **Mute channel** on a channel notification (Android) There is no per-contact muting. ## Rate Limiting The notification system prevents notification storms: -- **Minimum interval**: 3 seconds between individual notifications -- **Batch window**: If multiple notifications arrive within 5 seconds, they are combined into a single summary notification on a fourth Android channel (`batch_summary`). The title is "MeshCore Activity" and the body lists the grouped counts (e.g., "2 messages, 1 channel message, 3 new nodes"). Batch summaries are Android-only; queued notifications that overflow the batch window are silently dropped on other platforms +- **Minimum interval**: 3 seconds between alerts +- **Messages**: each direct or channel message always updates its conversation notification, so Reply stays available. Messages arriving within 3 seconds of the last alert update silently instead of alerting again. +- **Advertisements batch window**: If multiple advertisement notifications arrive within 5 seconds, they are combined into a single summary notification on a fourth Android channel (`batch_summary`). The title is "MeshCore Activity" and the body lists the count (e.g., "3 new nodes"). Batch summaries are Android-only; queued notifications that overflow the batch window are silently dropped on other platforms ## Notification Clearing @@ -87,10 +124,10 @@ Automatic incoming translation can also translate notification text when enabled ## Platform Support -| Platform | Message Notifs | Badge | Background Service | -|---|---|---|---| -| Android | Yes | Via notification number | Yes (foreground service) | -| iOS | Yes | Yes (app badge) | No | -| macOS | Yes | Yes | No | -| Windows | Yes | No | No | -| Linux | Yes (if D-Bus available) | No | No | +| Platform | Message Notifs | Reply / Mute Actions | Android Auto | Badge | Background Service | +|---|---|---|---|---|---| +| Android | Yes | Yes (incl. watches) | Yes | Via notification number | Yes (foreground service) | +| iOS | Yes | No | — | Yes (app badge) | No | +| macOS | Yes | No | — | Yes | No | +| Windows | Yes | No | — | No | No | +| Linux | Yes (if D-Bus available) | No | — | No | No | diff --git a/documentation/settings.md b/documentation/settings.md index f43bfb78..9c63133e 100644 --- a/documentation/settings.md +++ b/documentation/settings.md @@ -113,6 +113,8 @@ A dedicated sub-screen for app-level preferences (nothing here is sent to the de - **Channel message notifications**: New channel message alerts - **Advertisement notifications**: New node discovery alerts +Individual channels can be muted from the channel chat bell icon, the channel list, or the channel notification. Replying from notifications, watches, and Android Auto is described in [Notifications](notifications.md). + ### Messaging - **Clear Path on Max Retry**: Erases the stored routing path after all retries fail - **Jump to Oldest Unread**: When opening a chat, scrolls to the oldest unread message instead of the newest diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart index 54243b8a..7874bc18 100644 --- a/lib/connector/meshcore_connector.dart +++ b/lib/connector/meshcore_connector.dart @@ -40,6 +40,7 @@ import '../services/app_settings_service.dart'; import '../services/background_service.dart'; import '../services/timeout_prediction_service.dart'; import '../services/translation_service.dart'; +import '../services/notification_reply.dart'; import '../services/notification_service.dart'; import 'meshcore_connector_usb.dart'; import 'meshcore_connector_tcp.dart'; @@ -231,6 +232,7 @@ class MeshCoreConnector extends ChangeNotifier { StreamSubscription? _isScanningSubscription; StreamSubscription? _connectionSubscription; StreamSubscription>? _notifySubscription; + StreamSubscription? _notificationReplySubscription; Timer? _notifyListenersTimer; Timer? _selfInfoRetryTimer; Timer? _reconnectTimer; @@ -987,6 +989,137 @@ class MeshCoreConnector extends ChangeNotifier { } } + /// Handles a reply or mark-as-read action from a message notification + /// (notification shade, watch, or Android Auto). + Future handleNotificationReply(NotificationReply reply) async { + if (reply.action == NotificationReplyAction.mute) { + await _appSettingsService?.muteChannel( + _channelDisplayName(reply.channelIndex!), + ); + await _notificationService.clearChannelNotification( + reply.channelIndex!, + getTotalUnreadCount(), + ); + return; + } + if (reply.action == NotificationReplyAction.markRead) { + // markXRead only clears the notification when there were unread + // messages; clear it here otherwise so the action always dismisses it. + if (reply.isChannel) { + final index = reply.channelIndex!; + final hadUnread = getUnreadCountForChannelIndex(index) > 0; + markChannelRead(index); + if (!hadUnread) { + await _notificationService.clearChannelNotification( + index, + getTotalUnreadCount(), + ); + } + } else { + final key = reply.contactKeyHex!; + final hadUnread = getUnreadCountForContactKey(key) > 0; + markContactRead(key); + if (!hadUnread) { + await _notificationService.clearContactNotification( + key, + getTotalUnreadCount(), + ); + } + } + return; + } + + if (!isConnected) { + await _notificationService.showReplyFailed( + reply, + NotificationReplyFailure.notConnected, + badgeCount: getTotalUnreadCount(), + ); + return; + } + + final channel = reply.isChannel + ? _findChannelByIndex(reply.channelIndex!) + : null; + final contact = reply.isChannel + ? null + : getContactByPubKeyHex(reply.contactKeyHex!); + if (channel == null && contact == null) { + await _notificationService.showReplyFailed( + reply, + NotificationReplyFailure.unavailable, + badgeCount: getTotalUnreadCount(), + ); + return; + } + + // Same length limits and Cyr2Lat handling as the chat screens. + final parts = splitMessageToFit(reply.text, (part) { + if (channel != null) { + return utf8 + .encode(prepareChannelOutboundText(channel.index, part)) + .length <= + maxChannelMessageBytes(selfName); + } + return utf8.encode(prepareContactOutboundText(contact!, part)).length <= + maxContactMessageBytes(); + }); + if (parts == null) { + await _notificationService.showReplyFailed( + reply, + NotificationReplyFailure.tooLong, + badgeCount: getTotalUnreadCount(), + ); + return; + } + + _appDebugLogService?.info( + 'Sending notification reply in ${parts.length} part(s)', + tag: 'Notification', + ); + for (final part in parts) { + // sendMessage/sendChannelMessage silently do nothing when disconnected, + // so check before every part in case the link dropped mid-reply. + if (!isConnected) { + await _notificationService.showReplyFailed( + reply, + NotificationReplyFailure.notConnected, + badgeCount: getTotalUnreadCount(), + ); + return; + } + var text = part; + try { + final cyr2lat = channel != null + ? isChannelCyr2LatEnabled(channel.index) + : isContactCyr2LatEnabled(contact!.publicKeyHex); + if (cyr2lat) text = Cyr2Lat.encode(text); + } catch (_) {} + try { + if (channel != null) { + await sendChannelMessage(channel, text); + } else { + await sendMessage(contact!, text); + } + } catch (e) { + appLogger.warn('Notification reply send failed: $e'); + await _notificationService.showReplyFailed( + reply, + isConnected + ? NotificationReplyFailure.sendFailed + : NotificationReplyFailure.notConnected, + badgeCount: getTotalUnreadCount(), + ); + return; + } + } + await _notificationService.showOwnReply( + reply, + reply.text, + badgeCount: getTotalUnreadCount(), + ); + } + Future setChannelSmazEnabled(int channelIndex, bool enabled) async { _channelSmazEnabled[channelIndex] = enabled; if (enabled) { @@ -1137,6 +1270,13 @@ class MeshCoreConnector extends ChangeNotifier { // Initialize notification service _notificationService.initialize(); + _notificationReplySubscription ??= _notificationService.replies.listen( + (reply) => unawaited( + handleNotificationReply(reply).catchError((Object e) { + appLogger.warn('Notification action failed: $e'); + }), + ), + ); _loadChannelOrder(); // Initialize retry service callbacks @@ -4936,6 +5076,7 @@ class MeshCoreConnector extends ChangeNotifier { _currentCr = reader.readByte(); _selfName = reader.readCString(); + _notificationService.setSelfName(_selfName); // The local public key only exists once SELF_INFO has arrived, so the // image sender prefix (first 2 bytes, big-endian) is refreshed here. @@ -6066,13 +6207,10 @@ class MeshCoreConnector extends ChangeNotifier { return text; } - String _channelDisplayName(int channelIndex) { - for (final channel in _channels) { - if (channel.index != channelIndex) continue; - return channel.name.isEmpty ? 'Channel $channelIndex' : channel.name; - } - return 'Channel $channelIndex'; - } + // Falls back to the cached channel list, which stays populated while a + // channel refresh has temporarily emptied _channels. + String _channelDisplayName(int channelIndex) => + _findChannelByIndex(channelIndex)?.muteKey ?? 'Channel $channelIndex'; void _maybeNotifyChannelMessage( ChannelMessage message, { @@ -6243,12 +6381,9 @@ class MeshCoreConnector extends ChangeNotifier { channel.index, message, ); - final label = channel.name.isEmpty - ? 'Channel ${channel.index}' - : channel.name; _maybeNotifyChannelMessage( message, - channelName: label, + channelName: channel.muteKey, translationResult: translationResult, ); }()); @@ -7400,6 +7535,8 @@ class MeshCoreConnector extends ChangeNotifier { _connectionSubscription?.cancel(); _usbFrameSubscription?.cancel(); _notifySubscription?.cancel(); + _notificationReplySubscription?.cancel(); + _notificationService.releaseReplyPort(); _notifyListenersTimer?.cancel(); _reconnectTimer?.cancel(); _batteryPollTimer?.cancel(); diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 8cd05cfb..47f2dba6 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -2606,6 +2606,17 @@ } }, "notification_receivedNewMessage": "Received new message", + "notification_actionReply": "Reply", + "notification_actionMarkRead": "Mark as read", + "notification_actionMuteChannel": "Mute channel", + "notification_replyHint": "Message", + "notification_you": "You", + "notification_replyFailedTitle": "Reply not sent", + "notification_replyNotConnected": "Not connected to a radio. Reconnect in MeshCore Open and send your reply again.", + "notification_replyTooLong": "Your reply is too long to send from a notification. Send it from MeshCore Open instead.", + "notification_replyUnavailable": "This conversation is no longer on the connected radio.", + "notification_replySendFailed": "Your reply may not have been sent. Check in MeshCore Open and try again.", + "notification_replyAppNotRunning": "MeshCore Open isn't running. Open it and send your reply again.", "settings_gpxExportRepeaters": "Export repeaters / room server to GPX", "settings_gpxExportRepeatersSubtitle": "Exports repeaters / roomserver with a location to GPX file.", "settings_gpxExportContacts": "Export companions to GPX", diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index ea2fc67d..66eedf4c 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -7954,6 +7954,72 @@ abstract class AppLocalizations { /// **'Received new message'** String get notification_receivedNewMessage; + /// No description provided for @notification_actionReply. + /// + /// In en, this message translates to: + /// **'Reply'** + String get notification_actionReply; + + /// No description provided for @notification_actionMarkRead. + /// + /// In en, this message translates to: + /// **'Mark as read'** + String get notification_actionMarkRead; + + /// No description provided for @notification_actionMuteChannel. + /// + /// In en, this message translates to: + /// **'Mute channel'** + String get notification_actionMuteChannel; + + /// No description provided for @notification_replyHint. + /// + /// In en, this message translates to: + /// **'Message'** + String get notification_replyHint; + + /// No description provided for @notification_you. + /// + /// In en, this message translates to: + /// **'You'** + String get notification_you; + + /// No description provided for @notification_replyFailedTitle. + /// + /// In en, this message translates to: + /// **'Reply not sent'** + String get notification_replyFailedTitle; + + /// No description provided for @notification_replyNotConnected. + /// + /// In en, this message translates to: + /// **'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'** + String get notification_replyNotConnected; + + /// No description provided for @notification_replyTooLong. + /// + /// In en, this message translates to: + /// **'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'** + String get notification_replyTooLong; + + /// No description provided for @notification_replyUnavailable. + /// + /// In en, this message translates to: + /// **'This conversation is no longer on the connected radio.'** + String get notification_replyUnavailable; + + /// No description provided for @notification_replySendFailed. + /// + /// In en, this message translates to: + /// **'Your reply may not have been sent. Check in MeshCore Open and try again.'** + String get notification_replySendFailed; + + /// No description provided for @notification_replyAppNotRunning. + /// + /// In en, this message translates to: + /// **'MeshCore Open isn\'t running. Open it and send your reply again.'** + String get notification_replyAppNotRunning; + /// No description provided for @settings_gpxExportRepeaters. /// /// In en, this message translates to: diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart index 72882439..58d7bb72 100644 --- a/lib/l10n/app_localizations_bg.dart +++ b/lib/l10n/app_localizations_bg.dart @@ -4638,6 +4638,44 @@ class AppLocalizationsBg extends AppLocalizations { @override String get notification_receivedNewMessage => 'Получено ново съобщение'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Експортиране на повтарящи се устройства / сървър на стаята до GPX'; diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart index f4af0ab2..19c996f3 100644 --- a/lib/l10n/app_localizations_de.dart +++ b/lib/l10n/app_localizations_de.dart @@ -4648,6 +4648,44 @@ class AppLocalizationsDe extends AppLocalizations { @override String get notification_receivedNewMessage => 'Neue Nachricht empfangen'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Repeater und Raumserver als GPX exportieren'; diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index bc1ddd5a..70ce610f 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -4574,6 +4574,44 @@ class AppLocalizationsEn extends AppLocalizations { @override String get notification_receivedNewMessage => 'Received new message'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Export repeaters / room server to GPX'; diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart index 19add60e..1f790d8c 100644 --- a/lib/l10n/app_localizations_es.dart +++ b/lib/l10n/app_localizations_es.dart @@ -4640,6 +4640,44 @@ class AppLocalizationsEs extends AppLocalizations { @override String get notification_receivedNewMessage => 'Nuevo mensaje recibido'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Exportar repetidores / servidores de sala a GPX'; diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart index 1e25cc8b..1cc75d7a 100644 --- a/lib/l10n/app_localizations_fr.dart +++ b/lib/l10n/app_localizations_fr.dart @@ -4659,6 +4659,44 @@ class AppLocalizationsFr extends AppLocalizations { @override String get notification_receivedNewMessage => 'Nouveau message reçu'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Exporter les répéteurs / room servers au format GPX'; diff --git a/lib/l10n/app_localizations_hu.dart b/lib/l10n/app_localizations_hu.dart index d246b17d..ecce5213 100644 --- a/lib/l10n/app_localizations_hu.dart +++ b/lib/l10n/app_localizations_hu.dart @@ -4638,6 +4638,44 @@ class AppLocalizationsHu extends AppLocalizations { @override String get notification_receivedNewMessage => 'Új üzenet érkezett'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Ismétlők / szobaszerver exportálása GPX-be'; diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart index b9072d2c..132fb742 100644 --- a/lib/l10n/app_localizations_it.dart +++ b/lib/l10n/app_localizations_it.dart @@ -4645,6 +4645,44 @@ class AppLocalizationsIt extends AppLocalizations { @override String get notification_receivedNewMessage => 'Nuovo messaggio ricevuto'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Esporta ripetitori / server di stanza in GPX'; diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart index 9710201e..5069c065 100644 --- a/lib/l10n/app_localizations_ja.dart +++ b/lib/l10n/app_localizations_ja.dart @@ -4423,6 +4423,44 @@ class AppLocalizationsJa extends AppLocalizations { @override String get notification_receivedNewMessage => '新しいメッセージを受信'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'GPX へのエクスポート用リピータ/ルームサーバー'; diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart index 536094e0..2ab51348 100644 --- a/lib/l10n/app_localizations_ko.dart +++ b/lib/l10n/app_localizations_ko.dart @@ -4433,6 +4433,44 @@ class AppLocalizationsKo extends AppLocalizations { @override String get notification_receivedNewMessage => '새로운 메시지를 받았습니다'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'GPX로 전송/방 관리 서버'; diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart index 8d224430..854a4e54 100644 --- a/lib/l10n/app_localizations_nl.dart +++ b/lib/l10n/app_localizations_nl.dart @@ -4616,6 +4616,44 @@ class AppLocalizationsNl extends AppLocalizations { @override String get notification_receivedNewMessage => 'Nieuw bericht ontvangen'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Exporteer repeaters / roomserver naar GPX'; diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart index 484fdf9a..a1bc338e 100644 --- a/lib/l10n/app_localizations_pl.dart +++ b/lib/l10n/app_localizations_pl.dart @@ -4666,6 +4666,44 @@ class AppLocalizationsPl extends AppLocalizations { @override String get notification_receivedNewMessage => 'Otrzymano nową wiadomość'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Eksportuj przekaźniki / roomservery do GPX'; diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart index d4eed43a..5457b3fe 100644 --- a/lib/l10n/app_localizations_pt.dart +++ b/lib/l10n/app_localizations_pt.dart @@ -4641,6 +4641,44 @@ class AppLocalizationsPt extends AppLocalizations { @override String get notification_receivedNewMessage => 'Nova mensagem recebida'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Exportar repetidores / servidor de sala para GPX'; diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart index 3d79a16f..eed32f1d 100644 --- a/lib/l10n/app_localizations_ru.dart +++ b/lib/l10n/app_localizations_ru.dart @@ -4654,6 +4654,44 @@ class AppLocalizationsRu extends AppLocalizations { @override String get notification_receivedNewMessage => 'Получено новое сообщение'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Экспортировать рипитеры / сервер комнаты в GPX'; diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart index 4f446002..32d435b2 100644 --- a/lib/l10n/app_localizations_sk.dart +++ b/lib/l10n/app_localizations_sk.dart @@ -4623,6 +4623,44 @@ class AppLocalizationsSk extends AppLocalizations { @override String get notification_receivedNewMessage => 'Prijatá nová správa'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Exportovať repeater / server miestnosti do GPX'; diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart index 74c8f3ab..0301fa76 100644 --- a/lib/l10n/app_localizations_sl.dart +++ b/lib/l10n/app_localizations_sl.dart @@ -4624,6 +4624,44 @@ class AppLocalizationsSl extends AppLocalizations { @override String get notification_receivedNewMessage => 'Prejeto novo sporočilo'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Izvoz ponoviteljev / strežnika sobe v GPX'; diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart index b7e57bb9..f6aa3466 100644 --- a/lib/l10n/app_localizations_sv.dart +++ b/lib/l10n/app_localizations_sv.dart @@ -4598,6 +4598,44 @@ class AppLocalizationsSv extends AppLocalizations { @override String get notification_receivedNewMessage => 'Nytt meddelande mottaget'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Exportera repeatrar/rumsservrar till GPX'; diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart index 7acd785e..769a5c79 100644 --- a/lib/l10n/app_localizations_uk.dart +++ b/lib/l10n/app_localizations_uk.dart @@ -4654,6 +4654,44 @@ class AppLocalizationsUk extends AppLocalizations { @override String get notification_receivedNewMessage => 'Отримано нове повідомлення'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => 'Експорт ретрансляторів і серверів кімнат у GPX'; diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index 30efd17e..0bf7d490 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -4323,6 +4323,44 @@ class AppLocalizationsZh extends AppLocalizations { @override String get notification_receivedNewMessage => '收到新消息'; + @override + String get notification_actionReply => 'Reply'; + + @override + String get notification_actionMarkRead => 'Mark as read'; + + @override + String get notification_actionMuteChannel => 'Mute channel'; + + @override + String get notification_replyHint => 'Message'; + + @override + String get notification_you => 'You'; + + @override + String get notification_replyFailedTitle => 'Reply not sent'; + + @override + String get notification_replyNotConnected => + 'Not connected to a radio. Reconnect in MeshCore Open and send your reply again.'; + + @override + String get notification_replyTooLong => + 'Your reply is too long to send from a notification. Send it from MeshCore Open instead.'; + + @override + String get notification_replyUnavailable => + 'This conversation is no longer on the connected radio.'; + + @override + String get notification_replySendFailed => + 'Your reply may not have been sent. Check in MeshCore Open and try again.'; + + @override + String get notification_replyAppNotRunning => + 'MeshCore Open isn\'t running. Open it and send your reply again.'; + @override String get settings_gpxExportRepeaters => '导出转发节点/房间服务器到 GPX'; diff --git a/lib/models/channel.dart b/lib/models/channel.dart index f05295ae..73a9f3c7 100644 --- a/lib/models/channel.dart +++ b/lib/models/channel.dart @@ -25,6 +25,9 @@ class Channel { bool get isEmpty => name.isEmpty && psk.every((b) => b == 0); + /// Key used for per-channel notification muting. + String get muteKey => name.isEmpty ? 'Channel $index' : name; + bool get isPublicChannel => pskHex == publicChannelPsk; bool get isHashtagChannel => name.startsWith('#'); diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart index e98cd98c..dc3124c0 100644 --- a/lib/screens/channel_chat_screen.dart +++ b/lib/screens/channel_chat_screen.dart @@ -361,6 +361,25 @@ class _ChannelChatScreenState extends State { centerTitle: false, bottom: const SyncProgressAppBarBottom(), actions: [ + Consumer( + builder: (context, settings, _) { + final muteKey = widget.channel.muteKey; + final muted = settings.isChannelMuted(muteKey); + return IconButton( + tooltip: muted + ? context.l10n.channels_unmuteChannel + : context.l10n.channels_muteChannel, + icon: Icon( + muted + ? Icons.notifications_off_outlined + : Icons.notifications_outlined, + ), + onPressed: () => muted + ? settings.unmuteChannel(muteKey) + : settings.muteChannel(muteKey), + ); + }, + ), IconButton( tooltip: context.l10n.channels_regionSelect_Title, icon: const Icon(Icons.landscape), diff --git a/lib/screens/channels_screen.dart b/lib/screens/channels_screen.dart index 1abba59c..199702e0 100644 --- a/lib/screens/channels_screen.dart +++ b/lib/screens/channels_screen.dart @@ -363,7 +363,7 @@ class _ChannelsScreenState extends State }) { final unreadCount = connector.getUnreadCountForChannel(channel); final isMuted = context.watch().isChannelMuted( - channel.name, + channel.muteKey, ); final scheme = Theme.of(context).colorScheme; @@ -623,7 +623,7 @@ class _ChannelsScreenState extends State ) { final parentContext = context; final settingsService = context.read(); - final isMuted = settingsService.isChannelMuted(channel.name); + final isMuted = settingsService.isChannelMuted(channel.muteKey); showModalBottomSheet( context: parentContext, @@ -656,9 +656,9 @@ class _ChannelsScreenState extends State onTap: () async { Navigator.pop(sheetContext); if (isMuted) { - await settingsService.unmuteChannel(channel.name); + await settingsService.unmuteChannel(channel.muteKey); } else { - await settingsService.muteChannel(channel.name); + await settingsService.muteChannel(channel.muteKey); } }, ), diff --git a/lib/services/notification_reply.dart b/lib/services/notification_reply.dart new file mode 100644 index 00000000..821ac75d --- /dev/null +++ b/lib/services/notification_reply.dart @@ -0,0 +1,197 @@ +import 'dart:ui'; + +import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_local_notifications/flutter_local_notifications.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +import '../l10n/app_localizations.dart'; + +/// Name under which the main isolate registers the port that receives +/// notification actions from the plugin's background isolate. +const notificationReplyPortName = 'meshcore.notification_reply'; + +const notificationReplyActionId = 'reply'; +const notificationMarkReadActionId = 'mark_read'; +const notificationMuteActionId = 'mute'; + +/// Preference holding the app's language code, so the background isolate can +/// localize its notices the same way the app does. +const notificationLanguagePrefsKey = 'notification_language'; + +enum NotificationReplyAction { reply, markRead, mute } + +enum NotificationReplyFailure { notConnected, unavailable, tooLong, sendFailed } + +/// A reply or mark-as-read action taken on a message notification, e.g. from +/// the notification shade, a watch, or Android Auto. +class NotificationReply { + final NotificationReplyAction action; + final String? contactKeyHex; + final int? channelIndex; + final String text; + + const NotificationReply._({ + required this.action, + this.contactKeyHex, + this.channelIndex, + this.text = '', + }); + + bool get isChannel => channelIndex != null; + + /// Parses the plugin's action id, notification payload (`message:` + /// or `channel:`) and reply input. Returns null for taps, unknown + /// actions, malformed payloads, and empty replies. + static NotificationReply? parse({ + required String? actionId, + required String? payload, + String? input, + }) { + final NotificationReplyAction action; + if (actionId == notificationReplyActionId) { + action = NotificationReplyAction.reply; + } else if (actionId == notificationMarkReadActionId) { + action = NotificationReplyAction.markRead; + } else if (actionId == notificationMuteActionId) { + action = NotificationReplyAction.mute; + } else { + return null; + } + final text = input?.trim() ?? ''; + if (action == NotificationReplyAction.reply && text.isEmpty) return null; + if (payload == null) return null; + final sep = payload.indexOf(':'); + if (sep <= 0) return null; + final kind = payload.substring(0, sep); + final value = payload.substring(sep + 1); + if (kind == 'message' && + value.isNotEmpty && + value != 'null' && + action != NotificationReplyAction.mute) { + return NotificationReply._( + action: action, + contactKeyHex: value, + text: text, + ); + } + if (kind == 'channel') { + final index = int.tryParse(value); + if (index == null) return null; + return NotificationReply._( + action: action, + channelIndex: index, + text: text, + ); + } + return null; + } +} + +/// Splits [text] at word boundaries into at most [maxParts] pieces that each +/// satisfy [fits]. Words that are too long on their own are split by +/// character. Returns null when the text needs more than [maxParts] pieces, +/// or when a single character doesn't fit. +List? splitMessageToFit( + String text, + bool Function(String part) fits, { + int maxParts = 3, +}) { + final trimmed = text.trim(); + if (trimmed.isEmpty) return const []; + if (fits(trimmed)) return [trimmed]; + + final parts = []; + var current = ''; + for (final word in trimmed.split(RegExp(r'\s+'))) { + final candidate = current.isEmpty ? word : '$current $word'; + if (fits(candidate)) { + current = candidate; + continue; + } + if (current.isNotEmpty) parts.add(current); + if (fits(word)) { + current = word; + continue; + } + current = ''; + for (final char in word.characters) { + final next = '$current$char'; + if (fits(next)) { + current = next; + } else { + if (current.isEmpty || !fits(char)) return null; + parts.add(current); + current = char; + } + } + } + if (current.isNotEmpty) parts.add(current); + return parts.length <= maxParts ? parts : null; +} + +/// Runs in the plugin's background isolate when a notification action that +/// doesn't open the app is used. Forwards it to the main isolate, which owns +/// the radio connection; if the app isn't running, tells the user. +@pragma('vm:entry-point') +Future notificationActionBackgroundHandler( + NotificationResponse response, +) async { + final port = IsolateNameServer.lookupPortByName(notificationReplyPortName); + if (port != null) { + port.send({ + 'actionId': response.actionId, + 'payload': response.payload, + 'input': response.input, + }); + return; + } + if (response.actionId != notificationReplyActionId) return; + try { + WidgetsFlutterBinding.ensureInitialized(); + DartPluginRegistrant.ensureInitialized(); + final plugin = FlutterLocalNotificationsPlugin(); + await plugin.initialize( + settings: const InitializationSettings( + android: AndroidInitializationSettings('@mipmap/ic_launcher'), + ), + ); + final l10n = await _backgroundLocalizations(); + await plugin.show( + id: 'reply_failed'.hashCode, + title: l10n.notification_replyFailedTitle, + body: l10n.notification_replyAppNotRunning, + notificationDetails: const NotificationDetails( + android: AndroidNotificationDetails( + 'messages', + 'Messages', + channelDescription: 'New message notifications', + importance: Importance.high, + priority: Priority.high, + icon: '@mipmap/ic_launcher', + ), + ), + ); + if (response.id != null) await plugin.cancel(id: response.id!); + } catch (e) { + debugPrint('Failed to report unsent notification reply: $e'); + } +} + +Future _backgroundLocalizations() async { + String? code; + try { + code = (await SharedPreferences.getInstance()).getString( + notificationLanguagePrefsKey, + ); + } catch (_) {} + for (final locale in [ + if (code != null) Locale(code), + PlatformDispatcher.instance.locale, + ]) { + try { + return lookupAppLocalizations(locale); + } catch (_) {} + } + return lookupAppLocalizations(const Locale('en')); +} diff --git a/lib/services/notification_service.dart b/lib/services/notification_service.dart index f4578558..83714cfa 100644 --- a/lib/services/notification_service.dart +++ b/lib/services/notification_service.dart @@ -1,4 +1,6 @@ +import 'dart:async'; import 'dart:io' show Platform, File; +import 'dart:isolate'; import 'dart:ui'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; @@ -10,6 +12,7 @@ import '../helpers/reaction_helper.dart'; import '../l10n/app_localizations.dart'; import '../storage/prefs_manager.dart'; import '../utils/platform_info.dart'; +import 'notification_reply.dart'; class NotificationService { static final NotificationService _instance = NotificationService._internal(); @@ -26,10 +29,48 @@ class NotificationService { /// Set the locale for notification strings (call when app locale changes) void setLocale(Locale locale) { _locale = locale; + // The background action isolate reads this to localize its notices. + try { + PrefsManager.instance.setString( + notificationLanguagePrefsKey, + locale.languageCode, + ); + } catch (_) {} } AppLocalizations get _l10n => lookupAppLocalizations(_locale); + String? _selfName; + + /// Name of the connected radio, shown as the sender of your own replies. + void setSelfName(String? name) { + _selfName = name; + } + + // Recent messages per conversation notification id, so each notification + // shows the conversation (Android MessagingStyle, used by Android Auto). + static const _maxConversationMessages = 6; + final Map _conversations = {}; + + // Single-subscription so actions that arrive before the connector listens + // (e.g. during startup) are buffered instead of dropped. + final StreamController _replies = + StreamController(); + ReceivePort? _replyPort; + + /// Reply, mark-as-read and mute actions taken on message notifications. + /// Has a single listener (the connector). + Stream get replies => _replies.stream; + + /// Stops receiving notification actions. The background handler then tells + /// the user the app isn't running instead of forwarding to nobody. + void releaseReplyPort() { + if (_replyPort == null) return; + IsolateNameServer.removePortNameMapping(notificationReplyPortName); + _replyPort!.close(); + _replyPort = null; + } + String _logSafe(String value) { final sanitized = value.replaceAll(RegExp(r'[\x00-\x1F\x7F]'), ' '); return Uri.encodeComponent(sanitized); @@ -99,13 +140,48 @@ class NotificationService { await _notifications.initialize( settings: initSettings, onDidReceiveNotificationResponse: _onNotificationTapped, + onDidReceiveBackgroundNotificationResponse: + notificationActionBackgroundHandler, ); + _registerReplyPort(); _isInitialized = true; } catch (e) { debugPrint('Error initializing notifications: $e'); } } + void _registerReplyPort() { + if (kIsWeb || _replyPort != null) return; + final port = ReceivePort(); + IsolateNameServer.removePortNameMapping(notificationReplyPortName); + IsolateNameServer.registerPortWithName( + port.sendPort, + notificationReplyPortName, + ); + port.listen((dynamic message) { + if (message is! Map) return; + _dispatchAction( + actionId: message['actionId'] as String?, + payload: message['payload'] as String?, + input: message['input'] as String?, + ); + }); + _replyPort = port; + } + + void _dispatchAction({ + required String? actionId, + required String? payload, + String? input, + }) { + final reply = NotificationReply.parse( + actionId: actionId, + payload: payload, + input: input, + ); + if (reply != null) _replies.add(reply); + } + static bool _isDbusSessionAvailable() { final addr = Platform.environment['DBUS_SESSION_BUS_ADDRESS']; if (addr != null && addr.isNotEmpty) return true; @@ -234,12 +310,85 @@ class NotificationService { } } - Future _showMessageNotificationImpl({ - required String contactName, + List _conversationActions(bool isChannel) => [ + AndroidNotificationAction( + notificationReplyActionId, + _l10n.notification_actionReply, + inputs: [ + AndroidNotificationActionInput(label: _l10n.notification_replyHint), + ], + semanticAction: SemanticAction.reply, + allowGeneratedReplies: true, + cancelNotification: false, + ), + AndroidNotificationAction( + notificationMarkReadActionId, + _l10n.notification_actionMarkRead, + semanticAction: SemanticAction.markAsRead, + invisible: true, + ), + if (isChannel) + AndroidNotificationAction( + notificationMuteActionId, + _l10n.notification_actionMuteChannel, + semanticAction: SemanticAction.mute, + ), + ]; + + // Always MessagingStyle: Android Auto only handles messaging notifications + // in that style, so an image preview is shown as the large icon instead. + AndroidNotificationDetails _androidConversationDetails( + _Conversation conversation, { + int? badgeCount, + bool silent = false, + }) { + final imagePath = conversation.imagePath; + return AndroidNotificationDetails( + conversation.isChannel ? 'channel_messages' : 'messages', + conversation.isChannel ? 'Channel Messages' : 'Messages', + channelDescription: conversation.isChannel + ? 'New channel message notifications' + : 'New message notifications', + importance: Importance.high, + priority: Priority.high, + icon: '@mipmap/ic_launcher', + number: badgeCount, + silent: silent, + category: AndroidNotificationCategory.message, + largeIcon: imagePath != null ? FilePathAndroidBitmap(imagePath) : null, + styleInformation: MessagingStyleInformation( + Person(key: 'self', name: _selfName ?? _l10n.notification_you), + conversationTitle: conversation.isChannel ? conversation.title : null, + groupConversation: conversation.isChannel, + messages: List.of(conversation.messages), + ), + actions: _conversationActions(conversation.isChannel), + ); + } + + DarwinNotificationDetails _darwinDetails(String? imagePath, int? badge) => + DarwinNotificationDetails( + presentAlert: true, + presentBadge: true, + presentSound: true, + badgeNumber: badge, + attachments: imagePath != null + ? [ + DarwinNotificationAttachment(imagePath), + ] + : null, + ); + + Future _showConversationNotificationImpl({ + required int id, + required String payload, + required String title, + required bool isChannel, required String message, required bool urlImagesEnabled, - String? contactId, + String? senderName, int? badgeCount, + bool silent = false, }) async { if (!await _ensureCanNotify()) return; @@ -247,66 +396,158 @@ class NotificationService { message, urlImagesEnabled: urlImagesEnabled, ); + final preview = formatNotificationText(message.trim()); + final body = preview.isEmpty + ? _l10n.notification_receivedNewMessage + : preview; - final androidDetails = AndroidNotificationDetails( - 'messages', - 'Messages', - channelDescription: 'New message notifications', - importance: Importance.high, - priority: Priority.high, - icon: '@mipmap/ic_launcher', - number: badgeCount, - styleInformation: imagePath != null - ? BigPictureStyleInformation( - FilePathAndroidBitmap(imagePath), - summaryText: formatNotificationText(message), - ) - : null, - ); - - final iosDetails = DarwinNotificationDetails( - presentAlert: true, - presentBadge: true, - presentSound: true, - badgeNumber: badgeCount, - attachments: imagePath != null - ? [ - DarwinNotificationAttachment(imagePath), - ] - : null, - ); - - final macDetails = DarwinNotificationDetails( - presentAlert: true, - presentBadge: true, - presentSound: true, - badgeNumber: badgeCount, - attachments: imagePath != null - ? [ - DarwinNotificationAttachment(imagePath), - ] - : null, + final conversation = + _conversations.putIfAbsent( + id, + () => _Conversation( + title: title, + payload: payload, + isChannel: isChannel, + ), + ) + ..title = title + ..badgeCount = badgeCount + ..imagePath = imagePath; + final sender = isChannel ? (senderName ?? title) : title; + conversation.add( + Message( + body, + DateTime.now(), + Person(key: isChannel ? 'sender:$sender' : payload, name: sender), + ), + _maxConversationMessages, ); final notificationDetails = NotificationDetails( - android: androidDetails, - iOS: iosDetails, - macOS: macDetails, + android: _androidConversationDetails( + conversation, + badgeCount: badgeCount, + silent: silent, + ), + iOS: _darwinDetails(imagePath, badgeCount), + macOS: _darwinDetails(imagePath, badgeCount), ); try { await _notifications.show( - id: contactId?.hashCode ?? 0, - title: contactName, - body: formatNotificationText(message), + id: id, + title: title, + body: _collapsedBody(conversation), notificationDetails: notificationDetails, - payload: 'message:$contactId', + payload: payload, ); } catch (e) { debugPrint('Failed to show message notification: $e'); } } + /// Text shown when the notification is collapsed. Channel messages keep + /// the sender prefix, including after your own reply. + String _collapsedBody(_Conversation conversation) { + final last = conversation.messages.last; + if (!conversation.isChannel) return last.text; + final sender = last.person?.name ?? _selfName ?? _l10n.notification_you; + return '$sender: ${last.text}'; + } + + int _conversationId(NotificationReply reply) => reply.isChannel + ? reply.channelIndex!.hashCode + : reply.contactKeyHex!.hashCode; + + /// Adds the user's reply to the conversation notification. Android keeps + /// showing a progress spinner on a replied notification until it is updated. + /// Pass the current [badgeCount]: an update replaces the whole notification, + /// and the Android launcher badge comes from the notification number. + Future showOwnReply( + NotificationReply reply, + String text, { + int? badgeCount, + }) async { + if (!await _ensureInitialized()) return; + final id = _conversationId(reply); + final conversation = _conversations[id]; + if (conversation == null) { + await _notifications.cancel(id: id); + return; + } + conversation.badgeCount = badgeCount ?? conversation.badgeCount; + conversation.add( + Message(text, DateTime.now(), null), + _maxConversationMessages, + ); + await _repostConversation(id, conversation); + } + + /// Tells the user a notification reply could not be sent. + Future showReplyFailed( + NotificationReply reply, + NotificationReplyFailure failure, { + int? badgeCount, + }) async { + if (!await _ensureInitialized()) return; + final reason = switch (failure) { + NotificationReplyFailure.notConnected => + _l10n.notification_replyNotConnected, + NotificationReplyFailure.unavailable => + _l10n.notification_replyUnavailable, + NotificationReplyFailure.tooLong => _l10n.notification_replyTooLong, + NotificationReplyFailure.sendFailed => _l10n.notification_replySendFailed, + }; + final id = _conversationId(reply); + final conversation = _conversations[id]; + if (conversation != null) { + conversation.badgeCount = badgeCount ?? conversation.badgeCount; + await _repostConversation(id, conversation); + } else { + await _notifications.cancel(id: id); + } + try { + await _notifications.show( + id: 'reply_failed:$id'.hashCode, + title: _l10n.notification_replyFailedTitle, + body: reason, + notificationDetails: const NotificationDetails( + android: AndroidNotificationDetails( + 'messages', + 'Messages', + channelDescription: 'New message notifications', + importance: Importance.high, + priority: Priority.high, + icon: '@mipmap/ic_launcher', + ), + ), + payload: conversation?.payload, + ); + } catch (e) { + debugPrint('Failed to show reply failure notification: $e'); + } + } + + Future _repostConversation(int id, _Conversation conversation) async { + try { + await _notifications.show( + id: id, + title: conversation.title, + body: _collapsedBody(conversation), + notificationDetails: NotificationDetails( + android: _androidConversationDetails( + conversation, + badgeCount: conversation.badgeCount, + silent: true, + ), + ), + payload: conversation.payload, + ); + } catch (e) { + debugPrint('Failed to update message notification: $e'); + } + } + Future _showAdvertNotificationImpl({ required String contactName, required String contactType, @@ -356,86 +597,6 @@ class NotificationService { } } - Future _showChannelMessageNotificationImpl({ - required String channelName, - required String message, - required bool urlImagesEnabled, - int? channelIndex, - int? badgeCount, - }) async { - if (!await _ensureCanNotify()) return; - - final imagePath = await _resolveNotificationImagePath( - message, - urlImagesEnabled: urlImagesEnabled, - ); - - final androidDetails = AndroidNotificationDetails( - 'channel_messages', - 'Channel Messages', - channelDescription: 'New channel message notifications', - importance: Importance.high, - priority: Priority.high, - icon: '@mipmap/ic_launcher', - number: badgeCount, - styleInformation: imagePath != null - ? BigPictureStyleInformation( - FilePathAndroidBitmap(imagePath), - summaryText: formatNotificationText(message), - ) - : null, - ); - - final iosDetails = DarwinNotificationDetails( - presentAlert: true, - presentBadge: true, - presentSound: true, - badgeNumber: badgeCount, - attachments: imagePath != null - ? [ - DarwinNotificationAttachment(imagePath), - ] - : null, - ); - - final macDetails = DarwinNotificationDetails( - presentAlert: true, - presentBadge: true, - presentSound: true, - badgeNumber: badgeCount, - attachments: imagePath != null - ? [ - DarwinNotificationAttachment(imagePath), - ] - : null, - ); - - final notificationDetails = NotificationDetails( - android: androidDetails, - iOS: iosDetails, - macOS: macDetails, - ); - - final preview = formatNotificationText(message.trim()); - final body = preview.isEmpty - ? _l10n.notification_receivedNewMessage - : preview; - - try { - await _notifications.show( - id: - channelIndex?.hashCode ?? - DateTime.now().millisecondsSinceEpoch & 0x7FFFFFFF, - title: channelName, - body: body, - notificationDetails: notificationDetails, - payload: 'channel:$channelIndex', - ); - } catch (e) { - debugPrint('Failed to show channel notification: $e'); - } - } - /// Returns a privacy-safe identifier for debug logging. /// - advert: shows device name (body contains contactName) /// - message: shows "from: sender" (avoids logging message content) @@ -461,6 +622,7 @@ class NotificationService { } Future cancelAll() async { + _conversations.clear(); await _notifications.cancelAll(); } @@ -474,6 +636,7 @@ class NotificationService { int totalUnreadCount, ) async { if (!await _ensureInitialized()) return; + _conversations.remove(contactId.hashCode); await _notifications.cancel(id: contactId.hashCode); await _updateBadge(totalUnreadCount); } @@ -484,6 +647,7 @@ class NotificationService { int totalUnreadCount, ) async { if (!await _ensureInitialized()) return; + _conversations.remove(channelIndex.hashCode); await _notifications.cancel(id: channelIndex.hashCode); await _updateBadge(totalUnreadCount); } @@ -579,7 +743,8 @@ class NotificationService { _PendingNotification( type: _NotificationType.channelMessage, title: channelName, - body: '$senderName: $message', + body: message, + senderName: senderName, urlImagesEnabled: urlImagesEnabled, id: channelIndex?.toString(), badgeCount: badgeCount, @@ -589,10 +754,20 @@ class NotificationService { void _queueNotification(_PendingNotification notification) { final now = DateTime.now(); + final throttled = + _lastNotificationTime != null && + now.difference(_lastNotificationTime!) < _minNotificationInterval; + + // Messages always update their conversation notification so the reply + // action stays available; during a burst they update silently. + if (notification.type != _NotificationType.advert) { + _showNotificationImmediately(notification, silent: throttled); + if (!throttled) _lastNotificationTime = now; + return; + } // If we recently showed a notification, start batching - if (_lastNotificationTime != null && - now.difference(_lastNotificationTime!) < _minNotificationInterval) { + if (throttled) { _pendingNotifications.add(notification); debugPrint( '[Notification] queued: ${notification.type.name} (${_getNotificationIdentifier(notification)})', @@ -634,17 +809,21 @@ class NotificationService { } Future _showNotificationImmediately( - _PendingNotification notification, - ) async { + _PendingNotification notification, { + bool silent = false, + }) async { try { switch (notification.type) { case _NotificationType.message: - await _showMessageNotificationImpl( - contactName: notification.title, + await _showConversationNotificationImpl( + id: notification.id?.hashCode ?? 0, + payload: 'message:${notification.id}', + title: notification.title, + isChannel: false, message: notification.body, urlImagesEnabled: notification.urlImagesEnabled, - contactId: notification.id, badgeCount: notification.badgeCount, + silent: silent, ); break; case _NotificationType.advert: @@ -655,12 +834,19 @@ class NotificationService { ); break; case _NotificationType.channelMessage: - await _showChannelMessageNotificationImpl( - channelName: notification.title, + final channelIndex = int.tryParse(notification.id ?? ''); + await _showConversationNotificationImpl( + id: + channelIndex?.hashCode ?? + DateTime.now().millisecondsSinceEpoch & 0x7FFFFFFF, + payload: 'channel:$channelIndex', + title: notification.title, + isChannel: true, message: notification.body, + senderName: notification.senderName, urlImagesEnabled: notification.urlImagesEnabled, - channelIndex: int.tryParse(notification.id ?? ''), badgeCount: notification.badgeCount, + silent: silent, ); break; } @@ -669,39 +855,15 @@ class NotificationService { } } - Future _showBatchSummary(List<_PendingNotification> batch) async { - if (!await _ensureCanNotify()) return; + /// Only adverts are batched; messages always update their conversation + /// notification instead. + Future _showBatchSummary(List<_PendingNotification> adverts) async { + if (adverts.isEmpty || !await _ensureCanNotify()) return; - // Group by type - final messages = batch - .where((n) => n.type == _NotificationType.message) - .toList(); - final adverts = batch - .where((n) => n.type == _NotificationType.advert) - .toList(); - final channelMsgs = batch - .where((n) => n.type == _NotificationType.channelMessage) - .toList(); - - // Build summary text using localized plurals - final parts = []; - if (messages.isNotEmpty) { - parts.add(_l10n.notification_messagesCount(messages.length)); - } - if (channelMsgs.isNotEmpty) { - parts.add(_l10n.notification_channelMessagesCount(channelMsgs.length)); - } - if (adverts.isNotEmpty) { - parts.add(_l10n.notification_newNodesCount(adverts.length)); - } - - if (parts.isEmpty) return; - - // Show first few device names in batch summary for debugging (only if adverts exist) - final deviceInfo = adverts.isNotEmpty - ? ' (${adverts.take(5).map((n) => _logSafe(n.body)).join(', ')}${adverts.length > 5 ? ', ...' : ''})' - : ''; - debugPrint('[Notification] batch summary: ${parts.join(", ")}$deviceInfo'); + final summary = _l10n.notification_newNodesCount(adverts.length); + final deviceInfo = + ' (${adverts.take(5).map((n) => _logSafe(n.body)).join(', ')}${adverts.length > 5 ? ', ...' : ''})'; + debugPrint('[Notification] batch summary: $summary$deviceInfo'); const androidDetails = AndroidNotificationDetails( 'batch_summary', @@ -718,7 +880,7 @@ class NotificationService { await _notifications.show( id: 'batch_summary'.hashCode, title: _l10n.notification_activityTitle, - body: parts.join(', '), + body: summary, notificationDetails: notificationDetails, payload: 'batch', ); @@ -735,6 +897,7 @@ class _PendingNotification { final _NotificationType type; final String title; final String body; + final String? senderName; final bool urlImagesEnabled; final String? id; final int? badgeCount; @@ -743,8 +906,29 @@ class _PendingNotification { required this.type, required this.title, required this.body, + this.senderName, this.urlImagesEnabled = false, this.id, this.badgeCount, }); } + +class _Conversation { + String title; + int? badgeCount; + String? imagePath; + final String payload; + final bool isChannel; + final List messages = []; + + _Conversation({ + required this.title, + required this.payload, + required this.isChannel, + }); + + void add(Message message, int max) { + messages.add(message); + if (messages.length > max) messages.removeRange(0, messages.length - max); + } +} diff --git a/test/services/notification_reply_test.dart b/test/services/notification_reply_test.dart new file mode 100644 index 00000000..5ef7f7ec --- /dev/null +++ b/test/services/notification_reply_test.dart @@ -0,0 +1,128 @@ +import 'dart:convert'; + +import 'package:flutter_test/flutter_test.dart'; +import 'package:meshcore_open/services/notification_reply.dart'; + +void main() { + group('NotificationReply.parse', () { + test('parses a contact reply', () { + final reply = NotificationReply.parse( + actionId: notificationReplyActionId, + payload: 'message:ab12cd', + input: ' on my way ', + )!; + expect(reply.action, NotificationReplyAction.reply); + expect(reply.isChannel, isFalse); + expect(reply.contactKeyHex, 'ab12cd'); + expect(reply.text, 'on my way'); + }); + + test('parses a channel reply', () { + final reply = NotificationReply.parse( + actionId: notificationReplyActionId, + payload: 'channel:3', + input: 'ok', + )!; + expect(reply.isChannel, isTrue); + expect(reply.channelIndex, 3); + }); + + test('parses mark as read without input', () { + final reply = NotificationReply.parse( + actionId: notificationMarkReadActionId, + payload: 'channel:0', + )!; + expect(reply.action, NotificationReplyAction.markRead); + expect(reply.channelIndex, 0); + }); + + test('parses mute for channels only', () { + final reply = NotificationReply.parse( + actionId: notificationMuteActionId, + payload: 'channel:2', + )!; + expect(reply.action, NotificationReplyAction.mute); + expect(reply.channelIndex, 2); + expect( + NotificationReply.parse( + actionId: notificationMuteActionId, + payload: 'message:ab12', + ), + isNull, + ); + }); + + test('ignores taps, unknown actions, empty replies and bad payloads', () { + expect( + NotificationReply.parse(actionId: null, payload: 'message:ab'), + isNull, + ); + expect( + NotificationReply.parse(actionId: 'archive', payload: 'message:ab'), + isNull, + ); + expect( + NotificationReply.parse( + actionId: notificationReplyActionId, + payload: 'message:ab', + input: ' ', + ), + isNull, + ); + for (final payload in [null, 'message:', 'message:null', 'channel:x']) { + expect( + NotificationReply.parse( + actionId: notificationReplyActionId, + payload: payload, + input: 'hi', + ), + isNull, + reason: '$payload', + ); + } + }); + }); + + group('splitMessageToFit', () { + bool fitsBytes(String s, int max) => utf8.encode(s).length <= max; + + test('returns short text unchanged', () { + expect(splitMessageToFit('hello there', (s) => fitsBytes(s, 20)), [ + 'hello there', + ]); + }); + + test('splits at word boundaries within the byte budget', () { + final parts = splitMessageToFit( + 'one two three four five six', + (s) => fitsBytes(s, 10), + )!; + expect(parts, ['one two', 'three four', 'five six']); + expect(parts.every((p) => fitsBytes(p, 10)), isTrue); + }); + + test('counts multi-byte characters by UTF-8 size', () { + final parts = splitMessageToFit( + 'привет привет привет', + (s) => fitsBytes(s, 13), + )!; + expect(parts, ['привет', 'привет', 'привет']); + }); + + test('hard-splits a word that is too long on its own', () { + final parts = splitMessageToFit('abcdefghij', (s) => fitsBytes(s, 4))!; + expect(parts, ['abcd', 'efgh', 'ij']); + }); + + test('returns null when a single character does not fit', () { + expect(splitMessageToFit('aé', (s) => fitsBytes(s, 1)), isNull); + }); + + test('returns null when more than maxParts are needed', () { + expect( + splitMessageToFit('a b c d e f g h', (s) => fitsBytes(s, 1)), + isNull, + ); + }); + }); +} diff --git a/untranslated.json b/untranslated.json index 8c5f5dc2..298cf0be 100644 --- a/untranslated.json +++ b/untranslated.json @@ -65,6 +65,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -147,6 +158,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -229,6 +251,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -311,6 +344,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -393,6 +437,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -470,6 +525,17 @@ "repeater_refreshAll", "repeater_settingsNotLoaded", "repeater_settingsLoadIncomplete", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -552,6 +618,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -634,6 +711,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -650,6 +738,20 @@ "receivedImage_saveFailed" ], + "nl": [ + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning" + ], + "pl": [ "messageStatus_failedChannel", "messageStatus_resending", @@ -716,6 +818,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -798,6 +911,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -880,6 +1004,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -962,6 +1097,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -1044,6 +1190,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -1126,6 +1283,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -1208,6 +1376,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime", @@ -1290,6 +1469,17 @@ "contacts_qrFromGallery", "contacts_noQrCodeFound", "contacts_qrGalleryFailed", + "notification_actionReply", + "notification_actionMarkRead", + "notification_actionMuteChannel", + "notification_replyHint", + "notification_you", + "notification_replyFailedTitle", + "notification_replyNotConnected", + "notification_replyTooLong", + "notification_replyUnavailable", + "notification_replySendFailed", + "notification_replyAppNotRunning", "snrIndicator_nearByRepeatersDescription", "radioStats_sectionSignal", "radioStats_sectionAirtime",