diff --git a/docs/PRIVACY_POLICY.md b/docs/PRIVACY_POLICY.md index bdbe89d0..64bff9fb 100644 --- a/docs/PRIVACY_POLICY.md +++ b/docs/PRIVACY_POLICY.md @@ -1,6 +1,6 @@ # Privacy Policy for MeshCore Open -**Last Updated:** January 11, 2026 +**Last Updated:** August 23, 2026 ## Introduction @@ -11,16 +11,17 @@ MeshCore Open ("the App") is an open-source Flutter application for communicatin ### Data We Do NOT Collect MeshCore Open does **not**: -- Collect personal information -- Send data to external servers (except map tile requests) +- Collect personal information for the developer - Track your usage or behavior - Use analytics services - Require account creation -- Share any data with third parties +- Sell personal information + +The App does make limited requests to third-party services when you use features that require internet access, as described below. ### Data Stored Locally on Your Device -The App stores the following data **locally on your device only**: +The App stores the following data **locally on your device**: - **Messages**: Chat messages sent and received through the mesh network - **Contacts**: Names and identifiers of mesh network contacts @@ -30,7 +31,7 @@ The App stores the following data **locally on your device only**: - **Debug Logs**: Optional BLE and app debug logs (if enabled by user) - **Cached Map Tiles**: Offline map data for the mapping feature -All locally stored data remains on your device and is never transmitted to us or any third party. +This locally stored data is not transmitted to the MeshCore Open developer. Some features may send specific data to third-party services as described in the Third-Party Services section. ## Permissions @@ -45,12 +46,12 @@ These permissions are used solely to discover and communicate with MeshCore hard ### Location Permission - **ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION** -Required by Android for BLE scanning on Android 11 and below. The App does not track or store your location. Location data may be optionally shared over the mesh network if you choose to enable location sharing features. +Required by Android for BLE scanning on Android 11 and below. MeshCore Open does not use the phone's GPS to determine your location. Location data shown in the App comes from MeshCore devices and mesh advertisements. Location data may also be optionally shared over the mesh network if you choose to enable location sharing features. ### Internet Permission - **INTERNET** -Used only for downloading map tiles from OpenStreetMap tile servers when using the map feature. No personal data is transmitted. +Used for features that access third-party internet services, including map tiles, Line-of-Sight elevation lookups, optional model downloads, and optional GIF search. ### Notification Permission - **POST_NOTIFICATIONS** (Android 13+) @@ -65,7 +66,23 @@ Used to maintain BLE connection with your MeshCore device while the app is in th ## Third-Party Services ### Map Tiles -The App uses OpenStreetMap tile servers to display maps. When viewing maps, your device's IP address may be visible to the tile server. No other data is shared. See [OpenStreetMap's Privacy Policy](https://wiki.osmfoundation.org/wiki/Privacy_Policy) for more information. +The App uses OpenStreetMap and, when selected in settings, Stadia Maps tile servers to display maps. Map tile requests include tile coordinates that identify the geographic area being viewed, and your device's IP address may be visible to the tile provider. + +See [OpenStreetMap's Privacy Policy](https://wiki.osmfoundation.org/wiki/Privacy_Policy) and [Stadia Maps' Privacy Policy](https://stadiamaps.com/privacy/) for more information. + +### Line-of-Sight Elevation Lookups (Open-Meteo) +When you use the Line-of-Sight (LOS) analysis feature, the App sends latitude and longitude coordinates for points along the selected radio path to the Open-Meteo Elevation API. These coordinates come from MeshCore node positions or locations selected in the map, not from the phone's GPS. + +Open-Meteo uses these coordinates to return terrain elevation data needed for the LOS calculation. The request also exposes your device's IP address to Open-Meteo as part of normal internet communication. + +LOS elevation lookups are only made when the LOS feature is used. See [Open-Meteo's Terms and Privacy information](https://open-meteo.com/en/terms) for more information. + +### Model Downloads (Hugging Face) +The App can download optional translation models and the optional neural image-codec model bundle from Hugging Face when you choose to install or update those models in Settings. + +When a model download is requested, the App sends standard HTTP requests for the selected model files to `huggingface.co`. Your device's IP address is visible to Hugging Face as part of normal internet communication. The App does not upload your messages, contacts, mesh location data, or other locally stored content to Hugging Face as part of these model downloads. + +Model-download requests are only made when you choose to download or update a model. See [Hugging Face's Privacy Policy](https://huggingface.co/privacy) for more information. ### GIF Search (Giphy) The App includes a GIF picker feature powered by Giphy. When you use the GIF search feature: @@ -81,7 +98,7 @@ Messages sent through the MeshCore mesh network are transmitted over radio frequ ## Data Security -All data is stored locally on your device using standard Flutter/Android storage mechanisms. The App does not implement additional encryption for locally stored data beyond what the operating system provides. +All data stored locally on your device uses standard Flutter/Android storage mechanisms. The App does not implement additional encryption for locally stored data beyond what the operating system provides. ## Children's Privacy @@ -101,4 +118,4 @@ If you have questions about this Privacy Policy or the App's privacy practices, --- -**Summary**: MeshCore Open is a privacy-respecting app that stores all data locally on your device. We do not collect, track, or share your personal information. +**Summary**: MeshCore Open does not use the phone's GPS for location, does not include analytics, and does not collect personal information for the developer. Some optional features communicate with third-party services, including map tile providers, Open-Meteo for LOS elevation lookups, Hugging Face for model downloads, and Giphy for GIF search. diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart index 8dd733eb..55f8a613 100644 --- a/lib/connector/meshcore_connector.dart +++ b/lib/connector/meshcore_connector.dart @@ -456,6 +456,13 @@ class MeshCoreConnector extends ChangeNotifier { ); } + Contact? getContactByPubKeyHex(String contactPubKeyHex) { + return _contacts.cast().firstWhere( + (c) => c?.publicKeyHex == contactPubKeyHex, + orElse: () => null, + ); + } + List get allContacts => List.unmodifiable([ ..._contacts, ..._discoveredContacts.where( @@ -3183,9 +3190,15 @@ class MeshCoreConnector extends ChangeNotifier { // Check if this is a reaction - apply locally with pending status and route through retry service final reactionInfo = ReactionHelper.parseReaction(text); if (reactionInfo != null) { + appLogger.info('Sending reaction: ${reactionInfo.identifier()}'); _conversations.putIfAbsent(contact.publicKeyHex, () => []); final messages = _conversations[contact.publicKeyHex]!; + // No check for duplicates. If you want to do it again to resend, you can. + final String reactionID = reactionInfo.identifier(); + _processedContactReactions.putIfAbsent(contact.publicKeyHex, () => {}); + _processedContactReactions[contact.publicKeyHex]!.add(reactionID); + // Apply reaction locally with pending status _processOutgoingContactReaction(messages, reactionInfo, contact); _setReactionStatus( @@ -3227,7 +3240,7 @@ class MeshCoreConnector extends ChangeNotifier { translatedLanguageCode: translatedLanguageCode, translationModelId: translationModelId, ); - _addMessage(contact.publicKeyHex, message); + _addMessage(contact.publicKeyHex, message); // recipient as "sender" notifyListeners(); final outboundText = prepareContactOutboundText(contact, text); await sendFrame(buildSendTextMsgFrame(contact.publicKey, outboundText)); @@ -3564,11 +3577,12 @@ class MeshCoreConnector extends ChangeNotifier { // Check if this is a reaction - if so, process it immediately instead of adding as a message final reactionInfo = ReactionHelper.parseReaction(text); if (reactionInfo != null) { + reactionInfo.senderName = selfName; // Check if we've already processed this reaction _processedChannelReactions.putIfAbsent(channel.index, () => {}); - final reactionIdentifier = - '${reactionInfo.targetHash}_${reactionInfo.emoji}'; + final reactionIdentifier = reactionInfo.identifier(); + // Maybe we should allow resending. Recipients can drop duplicates. if (_processedChannelReactions[channel.index]!.contains( reactionIdentifier, )) { @@ -3581,6 +3595,7 @@ class MeshCoreConnector extends ChangeNotifier { final messages = _channelMessages[channel.index]!; // Process reaction locally to update the UI immediately + appLogger.info('Adding sent channel reaction, id: $reactionIdentifier'); _processReaction(messages, reactionInfo); await _channelMessageStore.saveChannelMessages(channel.index, messages); @@ -6254,15 +6269,23 @@ class MeshCoreConnector extends ChangeNotifier { if (reactionInfo != null) { // Check if we've already processed this exact reaction _processedContactReactions.putIfAbsent(pubKeyHex, () => {}); - final reactionIdentifier = - '${reactionInfo.targetHash}_${reactionInfo.emoji}'; - + reactionInfo.senderName = _resolveContactSenderName(message, null, false); + final reactionIdentifier = reactionInfo.identifier(); final isDuplicate = _processedContactReactions[pubKeyHex]!.contains( reactionIdentifier, ); if (!isDuplicate) { // New reaction - process it + appLogger.info('Adding reaction, id: $reactionIdentifier'); + // For hashing and dup checking, we use null for sender names in + // normal 1:1 chats. This way if we and they have different ideas + // about what their name is, reactions still work. But for reaction + // reports, we want to know who sent what, rather than infer it later, + // so we'll add it to the reactionInfo before storing it. + reactionInfo.senderName ??= message.isOutgoing + ? selfName + : getContactByPubKeyHex(pubKeyHex)?.name ?? '???'; _processContactReaction(messages, reactionInfo, pubKeyHex); _messageStore.saveMessages(pubKeyHex, messages); @@ -6287,10 +6310,7 @@ class MeshCoreConnector extends ChangeNotifier { ReactionInfo reactionInfo, String contactPubKeyHex, ) { - final contact = _contacts.cast().firstWhere( - (c) => c?.publicKeyHex == contactPubKeyHex, - orElse: () => null, - ); + final contact = getContactByPubKeyHex(contactPubKeyHex); final isRoomServer = contact?.type == advTypeRoom; ReactionHelper.applyReaction( @@ -6339,10 +6359,7 @@ class MeshCoreConnector extends ChangeNotifier { ) { final messages = _conversations[pubKeyHex]; if (messages == null) return; - final contact = _contacts.cast().firstWhere( - (c) => c?.publicKeyHex == pubKeyHex, - orElse: () => null, - ); + final contact = getContactByPubKeyHex(pubKeyHex); final isRoomServer = contact?.type == advTypeRoom; for (int i = messages.length - 1; i >= 0; i--) { final msg = messages[i]; @@ -6501,12 +6518,11 @@ class MeshCoreConnector extends ChangeNotifier { final messages = _channelMessages[channelIndex]!; // Parse reaction info - final reactionInfo = ChannelMessage.parseReaction(message.text); + final reactionInfo = message.parseReaction(); if (reactionInfo != null) { // Check if we've already processed this exact reaction _processedChannelReactions.putIfAbsent(channelIndex, () => {}); - final reactionIdentifier = - '${reactionInfo.targetHash}_${reactionInfo.emoji}'; + final reactionIdentifier = reactionInfo.identifier(); final isDuplicate = _processedChannelReactions[channelIndex]!.contains( reactionIdentifier, @@ -6514,6 +6530,7 @@ class MeshCoreConnector extends ChangeNotifier { if (!isDuplicate) { // New reaction - process it + appLogger.info('Adding channel reaction, id: $reactionIdentifier'); _processReaction(messages, reactionInfo); // Save updated messages _channelMessageStore.saveChannelMessages(channelIndex, messages); diff --git a/lib/helpers/reaction_helper.dart b/lib/helpers/reaction_helper.dart index 36118ca3..18a72388 100644 --- a/lib/helpers/reaction_helper.dart +++ b/lib/helpers/reaction_helper.dart @@ -3,8 +3,17 @@ import '../widgets/emoji_picker.dart'; class ReactionInfo { final String targetHash; final String emoji; + String? senderName; - ReactionInfo({required this.targetHash, required this.emoji}); + ReactionInfo({ + required this.targetHash, + required this.emoji, + this.senderName, + }); + + String identifier() { + return '$targetHash:$emoji:${senderName ?? ""}'; + } } class ReactionHelper { @@ -26,9 +35,8 @@ class ReactionHelper { required int Function(T) getTimestampSecs, required String? Function(T) getSenderName, required String Function(T) getMessageText, - required Map Function(T) getReactions, + required Map> Function(T) getReactions, required bool Function(T) shouldSkip, - required void Function(int index, Map newReactions) updateMessage, }) { final targetHash = reactionInfo.targetHash; @@ -42,9 +50,12 @@ class ReactionHelper { getMessageText(msg), ); if (msgHash == targetHash) { - final currentReactions = Map.from(getReactions(msg)); - currentReactions[reactionInfo.emoji] = - (currentReactions[reactionInfo.emoji] ?? 0) + 1; + final currentReactions = Map>.from( + getReactions(msg), + ); + (currentReactions[reactionInfo.emoji] ??= []).add( + reactionInfo.senderName, + ); updateMessage(i, currentReactions); return true; } diff --git a/lib/l10n/app_bg.arb b/lib/l10n/app_bg.arb index 723fc17f..fe84e37d 100644 --- a/lib/l10n/app_bg.arb +++ b/lib/l10n/app_bg.arb @@ -485,6 +485,7 @@ } } }, + "chat_selectSendAction": "Изберете действие за изпращане", "chat_sendGif": "Изпрати GIF", "chat_reply": "Отговори", "chat_addReaction": "Добави Реакция", @@ -2756,7 +2757,7 @@ "channels_regionNotSet": "Регион: ние", "channels_regionSelect_Title": "Выберете регион", "channels_clearRegion": "Чиста зона", - "chat_sendImage": "Изпрати изображение", + "chat_sendImageLora": "Изпращане на изображение чрез MeshCore", "chat_imagePickFailed": "Не мог да откривам та изображин", "chat_receivedGif": "Получил GIF", "repeater_keySettings": "Изменяне на идентичности ключа", diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index 38ce9820..cc34c09e 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -507,6 +507,7 @@ } } }, + "chat_selectSendAction": "Sendeaktion auswählen", "chat_sendGif": "GIF senden", "chat_reply": "Antworten", "chat_addReaction": "Reaktion hinzufügen", @@ -2892,7 +2893,7 @@ "repeater_pathHashModeOption2": "2 - 3 Bytes", "repeater_pathHashModeOption3": "3 - 4 Bytes", "appSettings_batteryLipoHv": "LiPo HV (3,0–4,35 V)", - "chat_sendImage": "Bild senden", + "chat_sendImageLora": "Bild über MeshCore senden", "chat_imagePickFailed": "Konnte dieses Bild nicht öffnen.", "chat_receivedGif": "Erhalten eines GIF", "repeater_keySettings": "Identitätsschlüssel ändern", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 9efdb026..bc5098f8 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -742,8 +742,9 @@ } } }, + "chat_selectSendAction": "Select send action", "chat_sendGif": "Send GIF", - "chat_sendImage": "Send image", + "chat_sendImageLora": "Send image via meshcore", "chat_imagePickFailed": "Couldn't open that image", "@chat_imagePickFailed": { "description": "Shown when picking or reading a photo to send fails" @@ -752,6 +753,7 @@ "chat_reply": "Reply", "chat_addReaction": "Add Reaction", "chat_me": "Me", + "reaction_report": "Emoji Reactions", "emojiCategorySmileys": "Smileys", "emojiCategoryGestures": "Gestures", "emojiCategoryHearts": "Hearts", diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb index fc2b0fbc..07a22733 100644 --- a/lib/l10n/app_es.arb +++ b/lib/l10n/app_es.arb @@ -507,6 +507,7 @@ } } }, + "chat_selectSendAction": "Seleccionar acción de envío", "chat_sendGif": "Enviar GIF", "chat_reply": "Responder", "chat_addReaction": "Añadir Reacción", @@ -2890,7 +2891,7 @@ "channels_regionNotSet": "Región: ninguna", "channels_regionSelect_Title": "Seleccione una región", "channels_clearRegion": "Zona despejada", - "chat_sendImage": "Enviar imagen", + "chat_sendImageLora": "Enviar imagen mediante MeshCore", "chat_imagePickFailed": "No pude abrir esa imagen", "chat_receivedGif": "Recibido un GIF", "repeater_keySettings": "Cambiar Claves de Identidad", diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb index 6b7a28f4..678c4e21 100644 --- a/lib/l10n/app_fr.arb +++ b/lib/l10n/app_fr.arb @@ -507,6 +507,7 @@ } } }, + "chat_selectSendAction": "Sélectionner une action d’envoi", "chat_sendGif": "Envoyer un GIF", "chat_reply": "Répondre", "chat_addReaction": "Ajouter une réaction", @@ -2890,7 +2891,7 @@ "channels_regionNotSet": "Région : aucune", "channels_regionSelect_Title": "Choisissez une région", "channels_clearRegion": "Zone dégagée", - "chat_sendImage": "Envoyer l'image", + "chat_sendImageLora": "Envoyer une image via MeshCore", "chat_imagePickFailed": "Je n'ai pas pu ouvrir cette image", "chat_receivedGif": "Reçu un GIF", "repeater_keySettings": "Modifier les clés d'identité", diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb index 6df4f5bb..432a8895 100644 --- a/lib/l10n/app_hu.arb +++ b/lib/l10n/app_hu.arb @@ -657,6 +657,7 @@ } } }, + "chat_selectSendAction": "Küldési művelet kiválasztása", "chat_sendGif": "GIF küldése", "chat_reply": "Válasz", "chat_addReaction": "Reakció hozzáadása", @@ -2794,7 +2795,7 @@ "channels_regionNotSet": "Tájékoztetés: nem", "channels_regionSelect_Title": "Válassz egy regionot", "channels_clearRegion": "Kéres kör", - "chat_sendImage": "Felhasználj az image", + "chat_sendImageLora": "Kép küldése MeshCore-on keresztül", "chat_imagePickFailed": "Nem tudtam ezt a fenti fényre kapni", "chat_receivedGif": "GIF-ot kapott", "repeater_keySettings": "Képzőítsekei jelölt", diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb index 70b74dcb..91e52f67 100644 --- a/lib/l10n/app_it.arb +++ b/lib/l10n/app_it.arb @@ -551,6 +551,7 @@ } } }, + "chat_selectSendAction": "Seleziona azione di invio", "chat_sendGif": "Invia GIF", "chat_reply": "Rispondi", "chat_addReaction": "Aggiungi Reazione", @@ -2890,7 +2891,7 @@ "channels_regionNotSet": "Regione: nessuna", "channels_regionSelect_Title": "Scegli una regione", "channels_clearRegion": "Zona chiara", - "chat_sendImage": "Invia immagine", + "chat_sendImageLora": "Invia immagine tramite MeshCore", "chat_imagePickFailed": "Non sono riuscito ad aprire quell'immagine", "chat_receivedGif": "Ricevuto un GIF", "repeater_keySettings": "Cambia le Chiavi di Identità", diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb index 26ec3caf..3652c9b6 100644 --- a/lib/l10n/app_ja.arb +++ b/lib/l10n/app_ja.arb @@ -675,6 +675,7 @@ } } }, + "chat_selectSendAction": "送信アクションを選択", "chat_sendGif": "GIF を送信", "chat_reply": "返信", "chat_addReaction": "リアクションを追加", @@ -2890,7 +2891,7 @@ "channels_regionNotSet": "地域:なし", "channels_regionSelect_Title": "地域を選択する", "channels_clearRegion": "クリアな地域", - "chat_sendImage": "画像を送信", + "chat_sendImageLora": "MeshCore経由で画像を送信", "chat_imagePickFailed": "その画像を開けませんでした", "chat_receivedGif": "GIFを受け取りました", "repeater_keySettings": "アイデンティティキーの変更", diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb index 686e02e1..fcea4e39 100644 --- a/lib/l10n/app_ko.arb +++ b/lib/l10n/app_ko.arb @@ -657,6 +657,7 @@ } } }, + "chat_selectSendAction": "전송 작업 선택", "chat_sendGif": "GIF 보내기", "chat_reply": "답변", "chat_addReaction": "댓글 추가", @@ -2890,7 +2891,7 @@ "channels_regionNotSet": "지역: 없음", "channels_regionSelect_Title": "지역을 선택하세요", "channels_clearRegion": "명확한 지역", - "chat_sendImage": "이미지를 보내세요", + "chat_sendImageLora": "MeshCore를 통해 이미지 보내기", "chat_imagePickFailed": "그 이미지를 열 수 없었어요.", "chat_receivedGif": "GIF를 받았습니다", "repeater_keySettings": "신원 키 변경", diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index 9e0d1b6a..20dbfc3a 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -2740,17 +2740,23 @@ abstract class AppLocalizations { /// **'Retry {current}/{max}'** String chat_retryCount(int current, int max); + /// No description provided for @chat_selectSendAction. + /// + /// In en, this message translates to: + /// **'Select send action'** + String get chat_selectSendAction; + /// No description provided for @chat_sendGif. /// /// In en, this message translates to: /// **'Send GIF'** String get chat_sendGif; - /// No description provided for @chat_sendImage. + /// No description provided for @chat_sendImageLora. /// /// In en, this message translates to: - /// **'Send image'** - String get chat_sendImage; + /// **'Send image via meshcore'** + String get chat_sendImageLora; /// Shown when picking or reading a photo to send fails /// @@ -2782,6 +2788,12 @@ abstract class AppLocalizations { /// **'Me'** String get chat_me; + /// No description provided for @reaction_report. + /// + /// In en, this message translates to: + /// **'Emoji Reactions'** + String get reaction_report; + /// No description provided for @emojiCategorySmileys. /// /// In en, this message translates to: diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart index 3b6c6259..8c32d7e6 100644 --- a/lib/l10n/app_localizations_bg.dart +++ b/lib/l10n/app_localizations_bg.dart @@ -1495,11 +1495,14 @@ class AppLocalizationsBg extends AppLocalizations { return 'Опитай отново $current/$max'; } + @override + String get chat_selectSendAction => 'Изберете действие за изпращане'; + @override String get chat_sendGif => 'Изпрати GIF'; @override - String get chat_sendImage => 'Изпрати изображение'; + String get chat_sendImageLora => 'Изпращане на изображение чрез MeshCore'; @override String get chat_imagePickFailed => 'Не мог да откривам та изображин'; @@ -1516,6 +1519,9 @@ class AppLocalizationsBg extends AppLocalizations { @override String get chat_me => 'Аз'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Емотикони'; diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart index 37802509..8e24579e 100644 --- a/lib/l10n/app_localizations_de.dart +++ b/lib/l10n/app_localizations_de.dart @@ -1495,11 +1495,14 @@ class AppLocalizationsDe extends AppLocalizations { return 'Wiederholen $current/$max'; } + @override + String get chat_selectSendAction => 'Sendeaktion auswählen'; + @override String get chat_sendGif => 'GIF senden'; @override - String get chat_sendImage => 'Bild senden'; + String get chat_sendImageLora => 'Bild über MeshCore senden'; @override String get chat_imagePickFailed => 'Konnte dieses Bild nicht öffnen.'; @@ -1516,6 +1519,9 @@ class AppLocalizationsDe extends AppLocalizations { @override String get chat_me => 'Ich'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Emoticons'; diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index 650a28f9..91534db3 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -1462,11 +1462,14 @@ class AppLocalizationsEn extends AppLocalizations { return 'Retry $current/$max'; } + @override + String get chat_selectSendAction => 'Select send action'; + @override String get chat_sendGif => 'Send GIF'; @override - String get chat_sendImage => 'Send image'; + String get chat_sendImageLora => 'Send image via meshcore'; @override String get chat_imagePickFailed => 'Couldn\'t open that image'; @@ -1483,6 +1486,9 @@ class AppLocalizationsEn extends AppLocalizations { @override String get chat_me => 'Me'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Smileys'; diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart index 2cc9bd1d..ceeaf7ac 100644 --- a/lib/l10n/app_localizations_es.dart +++ b/lib/l10n/app_localizations_es.dart @@ -1490,11 +1490,14 @@ class AppLocalizationsEs extends AppLocalizations { return 'Reintentar $current/$max'; } + @override + String get chat_selectSendAction => 'Seleccionar acción de envío'; + @override String get chat_sendGif => 'Enviar GIF'; @override - String get chat_sendImage => 'Enviar imagen'; + String get chat_sendImageLora => 'Enviar imagen mediante MeshCore'; @override String get chat_imagePickFailed => 'No pude abrir esa imagen'; @@ -1511,6 +1514,9 @@ class AppLocalizationsEs extends AppLocalizations { @override String get chat_me => 'Yo'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Emoticones'; diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart index 6460ff15..9732f8c7 100644 --- a/lib/l10n/app_localizations_fr.dart +++ b/lib/l10n/app_localizations_fr.dart @@ -1493,11 +1493,14 @@ class AppLocalizationsFr extends AppLocalizations { return 'Essai $current/$max'; } + @override + String get chat_selectSendAction => 'Sélectionner une action d’envoi'; + @override String get chat_sendGif => 'Envoyer un GIF'; @override - String get chat_sendImage => 'Envoyer l\'image'; + String get chat_sendImageLora => 'Envoyer une image via MeshCore'; @override String get chat_imagePickFailed => 'Je n\'ai pas pu ouvrir cette image'; @@ -1514,6 +1517,9 @@ class AppLocalizationsFr extends AppLocalizations { @override String get chat_me => 'Moi'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Émojis'; diff --git a/lib/l10n/app_localizations_hu.dart b/lib/l10n/app_localizations_hu.dart index c56044b8..f5af9446 100644 --- a/lib/l10n/app_localizations_hu.dart +++ b/lib/l10n/app_localizations_hu.dart @@ -1485,11 +1485,14 @@ class AppLocalizationsHu extends AppLocalizations { return 'Próbálja újra $current/$max'; } + @override + String get chat_selectSendAction => 'Küldési művelet kiválasztása'; + @override String get chat_sendGif => 'GIF küldése'; @override - String get chat_sendImage => 'Felhasználj az image'; + String get chat_sendImageLora => 'Kép küldése MeshCore-on keresztül'; @override String get chat_imagePickFailed => 'Nem tudtam ezt a fenti fényre kapni'; @@ -1506,6 +1509,9 @@ class AppLocalizationsHu extends AppLocalizations { @override String get chat_me => 'Nekem'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Hangulatjelek'; diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart index a7c143c6..51811401 100644 --- a/lib/l10n/app_localizations_it.dart +++ b/lib/l10n/app_localizations_it.dart @@ -1493,11 +1493,14 @@ class AppLocalizationsIt extends AppLocalizations { return 'Riprova $current/$max'; } + @override + String get chat_selectSendAction => 'Seleziona azione di invio'; + @override String get chat_sendGif => 'Invia GIF'; @override - String get chat_sendImage => 'Invia immagine'; + String get chat_sendImageLora => 'Invia immagine tramite MeshCore'; @override String get chat_imagePickFailed => @@ -1515,6 +1518,9 @@ class AppLocalizationsIt extends AppLocalizations { @override String get chat_me => 'Io'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Emoji'; diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart index a63fc715..e5e5ddc2 100644 --- a/lib/l10n/app_localizations_ja.dart +++ b/lib/l10n/app_localizations_ja.dart @@ -1418,11 +1418,14 @@ class AppLocalizationsJa extends AppLocalizations { return '$current/$max 回目'; } + @override + String get chat_selectSendAction => '送信アクションを選択'; + @override String get chat_sendGif => 'GIF を送信'; @override - String get chat_sendImage => '画像を送信'; + String get chat_sendImageLora => 'MeshCore経由で画像を送信'; @override String get chat_imagePickFailed => 'その画像を開けませんでした'; @@ -1439,6 +1442,9 @@ class AppLocalizationsJa extends AppLocalizations { @override String get chat_me => '私'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => '顔文字'; diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart index 56734578..a3b30012 100644 --- a/lib/l10n/app_localizations_ko.dart +++ b/lib/l10n/app_localizations_ko.dart @@ -1421,11 +1421,14 @@ class AppLocalizationsKo extends AppLocalizations { return '$current/$max 시도'; } + @override + String get chat_selectSendAction => '전송 작업 선택'; + @override String get chat_sendGif => 'GIF 보내기'; @override - String get chat_sendImage => '이미지를 보내세요'; + String get chat_sendImageLora => 'MeshCore를 통해 이미지 보내기'; @override String get chat_imagePickFailed => '그 이미지를 열 수 없었어요.'; @@ -1442,6 +1445,9 @@ class AppLocalizationsKo extends AppLocalizations { @override String get chat_me => '나'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => '이모티콘'; diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart index 186025e9..905eee47 100644 --- a/lib/l10n/app_localizations_nl.dart +++ b/lib/l10n/app_localizations_nl.dart @@ -1480,11 +1480,14 @@ class AppLocalizationsNl extends AppLocalizations { return 'Poging opnieuw $current/$max'; } + @override + String get chat_selectSendAction => 'Verzendactie selecteren'; + @override String get chat_sendGif => 'GIF verzenden'; @override - String get chat_sendImage => 'Beeld verzenden'; + String get chat_sendImageLora => 'Afbeelding verzenden via MeshCore'; @override String get chat_imagePickFailed => 'Kunde die afbeelding niet openen'; @@ -1501,6 +1504,9 @@ class AppLocalizationsNl extends AppLocalizations { @override String get chat_me => 'Mijn'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Emoji\'s'; diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart index 9fce7a14..3317d9fb 100644 --- a/lib/l10n/app_localizations_pl.dart +++ b/lib/l10n/app_localizations_pl.dart @@ -1503,11 +1503,14 @@ class AppLocalizationsPl extends AppLocalizations { return 'Próba $current/$max'; } + @override + String get chat_selectSendAction => 'Wybierz czynność wysyłania'; + @override String get chat_sendGif => 'Wyślij GIF'; @override - String get chat_sendImage => 'Wyślij obraz'; + String get chat_sendImageLora => 'Wyślij obraz przez MeshCore'; @override String get chat_imagePickFailed => 'Nie mogłem otworzyć tego obrazu'; @@ -1524,6 +1527,9 @@ class AppLocalizationsPl extends AppLocalizations { @override String get chat_me => 'Ja'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Emoji'; diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart index 4e9a1bd8..969266a2 100644 --- a/lib/l10n/app_localizations_pt.dart +++ b/lib/l10n/app_localizations_pt.dart @@ -1489,11 +1489,14 @@ class AppLocalizationsPt extends AppLocalizations { return 'Tentar $current/$max'; } + @override + String get chat_selectSendAction => 'Selecionar ação de envio'; + @override String get chat_sendGif => 'Enviar GIF'; @override - String get chat_sendImage => 'Enviar imagem'; + String get chat_sendImageLora => 'Enviar imagem via MeshCore'; @override String get chat_imagePickFailed => 'Não consegui abrir essa imagem'; @@ -1510,6 +1513,9 @@ class AppLocalizationsPt extends AppLocalizations { @override String get chat_me => 'Eu'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Emojis'; diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart index 546a5547..eb9b5fc6 100644 --- a/lib/l10n/app_localizations_ru.dart +++ b/lib/l10n/app_localizations_ru.dart @@ -1493,11 +1493,14 @@ class AppLocalizationsRu extends AppLocalizations { return 'Попытка $current/$max'; } + @override + String get chat_selectSendAction => 'Выберите действие отправки'; + @override String get chat_sendGif => 'Отправить GIF'; @override - String get chat_sendImage => 'Отправьте изображение'; + String get chat_sendImageLora => 'Отправить изображение через MeshCore'; @override String get chat_imagePickFailed => 'Не удалось открыть это изображение'; @@ -1514,6 +1517,9 @@ class AppLocalizationsRu extends AppLocalizations { @override String get chat_me => 'Я'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Смайлы'; diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart index 2d224c9a..2d747521 100644 --- a/lib/l10n/app_localizations_sk.dart +++ b/lib/l10n/app_localizations_sk.dart @@ -1478,11 +1478,14 @@ class AppLocalizationsSk extends AppLocalizations { return 'Skúsiť $current/$max'; } + @override + String get chat_selectSendAction => 'Vybrať akciu odoslania'; + @override String get chat_sendGif => 'Odoslať GIF'; @override - String get chat_sendImage => 'Vyslat obraz'; + String get chat_sendImageLora => 'Odoslať obrázok cez MeshCore'; @override String get chat_imagePickFailed => 'Nesmiela jsem otvoriť tento obrázok'; @@ -1499,6 +1502,9 @@ class AppLocalizationsSk extends AppLocalizations { @override String get chat_me => 'Mne'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Emoji'; diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart index bdc0475d..9a976f1e 100644 --- a/lib/l10n/app_localizations_sl.dart +++ b/lib/l10n/app_localizations_sl.dart @@ -1478,11 +1478,14 @@ class AppLocalizationsSl extends AppLocalizations { return 'Ponovit $current/$max'; } + @override + String get chat_selectSendAction => 'Izberite dejanje pošiljanja'; + @override String get chat_sendGif => 'Pošlji GIF'; @override - String get chat_sendImage => 'Sločaji slik'; + String get chat_sendImageLora => 'Pošlji sliko prek MeshCore'; @override String get chat_imagePickFailed => 'Nispeval sem tega ta slik'; @@ -1499,6 +1502,9 @@ class AppLocalizationsSl extends AppLocalizations { @override String get chat_me => 'jaz'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Emoji'; diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart index b2a2cdc5..de522619 100644 --- a/lib/l10n/app_localizations_sv.dart +++ b/lib/l10n/app_localizations_sv.dart @@ -1470,11 +1470,14 @@ class AppLocalizationsSv extends AppLocalizations { return 'Försök igen $current/$max'; } + @override + String get chat_selectSendAction => 'Välj sändningsåtgärd'; + @override String get chat_sendGif => 'Skicka GIF'; @override - String get chat_sendImage => 'Send vagnbild'; + String get chat_sendImageLora => 'Skicka bild via MeshCore'; @override String get chat_imagePickFailed => 'Kunde inte öppna det bildet'; @@ -1491,6 +1494,9 @@ class AppLocalizationsSv extends AppLocalizations { @override String get chat_me => 'Mig'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Emojis'; diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart index 0608d2ba..63735000 100644 --- a/lib/l10n/app_localizations_uk.dart +++ b/lib/l10n/app_localizations_uk.dart @@ -1483,12 +1483,14 @@ class AppLocalizationsUk extends AppLocalizations { return 'Повторна спроба $current/$max'; } + @override + String get chat_selectSendAction => 'Виберіть дію надсилання'; + @override String get chat_sendGif => 'Надіслати GIF'; @override - String get chat_sendImage => - 'Нашкоду зовні\n\n(or more naturally, depending on context)\n\nПошукуєте изображення'; + String get chat_sendImageLora => 'Надіслати зображення через MeshCore'; @override String get chat_imagePickFailed => 'Неможливо відкрити це изображення'; @@ -1505,6 +1507,9 @@ class AppLocalizationsUk extends AppLocalizations { @override String get chat_me => 'Я'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => 'Емодзі'; diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index c0e6ba99..07725428 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -1404,11 +1404,14 @@ class AppLocalizationsZh extends AppLocalizations { return '重试 $current/$max'; } + @override + String get chat_selectSendAction => '选择发送操作'; + @override String get chat_sendGif => '发送 GIF'; @override - String get chat_sendImage => '发送图片'; + String get chat_sendImageLora => '通过 MeshCore 发送图片'; @override String get chat_imagePickFailed => '无法打开该图片'; @@ -1425,6 +1428,9 @@ class AppLocalizationsZh extends AppLocalizations { @override String get chat_me => '我'; + @override + String get reaction_report => 'Emoji Reactions'; + @override String get emojiCategorySmileys => '表情'; diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb index 11688370..eda38c12 100644 --- a/lib/l10n/app_nl.arb +++ b/lib/l10n/app_nl.arb @@ -485,6 +485,7 @@ } } }, + "chat_selectSendAction": "Verzendactie selecteren", "chat_sendGif": "GIF verzenden", "chat_reply": "Reageren", "chat_addReaction": "Reactie toevoegen", @@ -2756,7 +2757,7 @@ "channels_regionNotSet": "Regio: geen", "channels_regionSelect_Title": "Kies een regio", "channels_clearRegion": "Duidelijke regio", - "chat_sendImage": "Beeld verzenden", + "chat_sendImageLora": "Afbeelding verzenden via MeshCore", "chat_imagePickFailed": "Kunde die afbeelding niet openen", "chat_receivedGif": "Ontvangen van een GIF", "repeater_keySettings": "Verander de Identiteitskies", diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb index f5dab677..6f1811f8 100644 --- a/lib/l10n/app_pl.arb +++ b/lib/l10n/app_pl.arb @@ -495,6 +495,7 @@ } } }, + "chat_selectSendAction": "Wybierz czynność wysyłania", "chat_sendGif": "Wyślij GIF", "chat_reply": "Odpowiedz", "chat_addReaction": "Dodaj Reakcję", @@ -2794,7 +2795,7 @@ "channels_regionNotSet": "Region: brak", "channels_regionSelect_Title": "Wybierz region", "channels_clearRegion": "Przejrzyste obszar", - "chat_sendImage": "Wyślij obraz", + "chat_sendImageLora": "Wyślij obraz przez MeshCore", "chat_imagePickFailed": "Nie mogłem otworzyć tego obrazu", "chat_receivedGif": "Otrzymano GIF", "repeater_keySettings": "Zmiana kluczy tożsamości", diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb index 32364c5a..e0da74bb 100644 --- a/lib/l10n/app_pt.arb +++ b/lib/l10n/app_pt.arb @@ -485,6 +485,7 @@ } } }, + "chat_selectSendAction": "Selecionar ação de envio", "chat_sendGif": "Enviar GIF", "chat_reply": "Responder", "chat_addReaction": "Adicionar Reação", @@ -2756,7 +2757,7 @@ "channels_regionNotSet": "Região: nenhuma", "channels_regionSelect_Title": "Escolha uma região", "channels_clearRegion": "Região desimpedida", - "chat_sendImage": "Enviar imagem", + "chat_sendImageLora": "Enviar imagem via MeshCore", "chat_imagePickFailed": "Não consegui abrir essa imagem", "chat_receivedGif": "Recebi um GIF", "repeater_keySettings": "Alterar Chaves de Identidade", diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb index 614e0201..f34a52e5 100644 --- a/lib/l10n/app_ru.arb +++ b/lib/l10n/app_ru.arb @@ -316,6 +316,7 @@ "chat_messageDeleted": "Сообщение удалено", "chat_retryingMessage": "Повтор отправки сообщения", "chat_retryCount": "Попытка {current}/{max}", + "chat_selectSendAction": "Выберите действие отправки", "chat_sendGif": "Отправить GIF", "chat_reply": "Ответить", "chat_addReaction": "Добавить реакцию", @@ -2059,7 +2060,7 @@ "channels_regionNotSet": "Регион: отсутствует", "channels_regionSelect_Title": "Выберите регион", "channels_clearRegion": "Чистый регион", - "chat_sendImage": "Отправьте изображение", + "chat_sendImageLora": "Отправить изображение через MeshCore", "chat_imagePickFailed": "Не удалось открыть это изображение", "chat_receivedGif": "Получен GIF", "repeater_keySettings": "Изменить ключи идентичности", diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb index 7b217e67..83f4147b 100644 --- a/lib/l10n/app_sk.arb +++ b/lib/l10n/app_sk.arb @@ -485,6 +485,7 @@ } } }, + "chat_selectSendAction": "Vybrať akciu odoslania", "chat_sendGif": "Odoslať GIF", "chat_reply": "Odpovedať", "chat_addReaction": "Pridať Reakciu", @@ -2756,7 +2757,7 @@ "channels_regionNotSet": "Region: žiadné", "channels_regionSelect_Title": "Vyberte region", "channels_clearRegion": "Jasný údajný oblasť", - "chat_sendImage": "Vyslat obraz", + "chat_sendImageLora": "Odoslať obrázok cez MeshCore", "chat_imagePickFailed": "Nesmiela jsem otvoriť tento obrázok", "chat_receivedGif": "Odeslaný GIF", "repeater_keySettings": "Zmena identititačných klíčov", diff --git a/lib/l10n/app_sl.arb b/lib/l10n/app_sl.arb index 868d92d8..1c70803f 100644 --- a/lib/l10n/app_sl.arb +++ b/lib/l10n/app_sl.arb @@ -485,6 +485,7 @@ } } }, + "chat_selectSendAction": "Izberite dejanje pošiljanja", "chat_sendGif": "Pošlji GIF", "chat_reply": "Odgovori", "chat_addReaction": "Dodaj reakcijo", @@ -2756,7 +2757,7 @@ "channels_regionNotSet": "Region: brak", "channels_regionSelect_Title": "Vablajte region", "channels_clearRegion": "Jasna regija", - "chat_sendImage": "Sločaji slik", + "chat_sendImageLora": "Pošlji sliko prek MeshCore", "chat_imagePickFailed": "Nispeval sem tega ta slik", "chat_receivedGif": "Otrvljen GIF", "repeater_keySettings": "Zmeničke ključe identitete", diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb index 33128c4b..25a136b8 100644 --- a/lib/l10n/app_sv.arb +++ b/lib/l10n/app_sv.arb @@ -485,6 +485,7 @@ } } }, + "chat_selectSendAction": "Välj sändningsåtgärd", "chat_sendGif": "Skicka GIF", "chat_reply": "Svara", "chat_addReaction": "Lägg till reaktion", @@ -2756,7 +2757,7 @@ "channels_regionNotSet": "Region: ingen", "channels_regionSelect_Title": "Välj en region", "channels_clearRegion": "klar region", - "chat_sendImage": "Send vagnbild", + "chat_sendImageLora": "Skicka bild via MeshCore", "chat_imagePickFailed": "Kunde inte öppna det bildet", "chat_receivedGif": "Mottagit en GIF", "repeater_keySettings": "Ändra identitetsnyckel", diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb index 3dccd6e3..2e5e3de2 100644 --- a/lib/l10n/app_uk.arb +++ b/lib/l10n/app_uk.arb @@ -488,6 +488,7 @@ } } }, + "chat_selectSendAction": "Виберіть дію надсилання", "chat_sendGif": "Надіслати GIF", "chat_reply": "Відповісти", "chat_addReaction": "Додати реакцію", @@ -2736,7 +2737,7 @@ "channels_regionNotSet": "Ріон: нема", "channels_regionSelect_Title": "Вybірте регіон", "channels_clearRegion": "Чистя зона", - "chat_sendImage": "Нашкоду зовні\n\n(or more naturally, depending on context)\n\nПошукуєте изображення", + "chat_sendImageLora": "Надіслати зображення через MeshCore", "chat_imagePickFailed": "Неможливо відкрити це изображення", "chat_receivedGif": "Підймовано GIF", "repeater_keySettings": "Зміна ключів ідентифікації", diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index 4aabd445..56989f27 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -512,6 +512,7 @@ } } }, + "chat_selectSendAction": "选择发送操作", "chat_sendGif": "发送 GIF", "chat_reply": "回复", "chat_addReaction": "添加表情", @@ -2761,7 +2762,7 @@ "channels_regionNotSet": "地区:无", "channels_regionSelect_Title": "选择一个地区", "channels_clearRegion": "无碍区域", - "chat_sendImage": "发送图片", + "chat_sendImageLora": "通过 MeshCore 发送图片", "chat_imagePickFailed": "无法打开该图片", "chat_receivedGif": "收到一个GIF", "repeater_keySettings": "更改身份密钥", diff --git a/lib/models/channel_message.dart b/lib/models/channel_message.dart index 0113c807..56bf4849 100644 --- a/lib/models/channel_message.dart +++ b/lib/models/channel_message.dart @@ -50,7 +50,7 @@ class ChannelMessage { final String? replyToMessageId; final String? replyToSenderName; final String? replyToText; - final Map reactions; + final Map> reactions; ChannelMessage({ this.senderKey, @@ -76,7 +76,7 @@ class ChannelMessage { this.replyToMessageId, this.replyToSenderName, this.replyToText, - Map? reactions, + Map>? reactions, }) : messageId = messageId ?? '${timestamp.millisecondsSinceEpoch}_${senderName.hashCode}_${text.hashCode}', @@ -107,7 +107,7 @@ class ChannelMessage { Object? translatedLanguageCode = _unset, MessageTranslationStatus? translationStatus, Object? translationModelId = _unset, - Map? reactions, + Map>? reactions, }) { return ChannelMessage( senderKey: senderKey, @@ -297,8 +297,32 @@ class ChannelMessage { ); } - static ReactionInfo? parseReaction(String text) { - return ReactionHelper.parseReaction(text); + ReactionInfo? parseReaction() { + final reactionInfo = ReactionHelper.parseReaction(text); + reactionInfo?.senderName = senderName; + return reactionInfo; + } + + String computeReactionHash() { + return ReactionHelper.computeReactionHash( + timestamp.millisecondsSinceEpoch ~/ 1000, + senderName, + text, + ); + } + + List reactionList() { + final String hash = computeReactionHash(); + List reactionList = []; + for (final entry in reactions.entries) { + final emoji = entry.key; + for (final senderName in entry.value) { + reactionList.add( + ReactionInfo(targetHash: hash, emoji: emoji, senderName: senderName), + ); + } + } + return reactionList; } } diff --git a/lib/models/message.dart b/lib/models/message.dart index e1395617..a9b7c0cd 100644 --- a/lib/models/message.dart +++ b/lib/models/message.dart @@ -8,7 +8,7 @@ enum MessageStatus { pending, sent, delivered, failed } class Message { static const Object _unset = Object(); - final Uint8List senderKey; + final Uint8List senderKey; // For outgoing msgs, gets used as recipientKey final String text; final DateTime timestamp; final bool isOutgoing; @@ -30,7 +30,7 @@ class Message { final int? tripTimeMs; final int? pathLength; final Uint8List pathBytes; - final Map reactions; + final Map> reactions; final Map reactionStatuses; final Uint8List fourByteRoomContactKey; @@ -56,7 +56,7 @@ class Message { this.pathLength, Uint8List? pathBytes, Uint8List? fourByteRoomContactKey, - Map? reactions, + Map>? reactions, Map? reactionStatuses, }) : messageId = messageId ?? @@ -84,7 +84,7 @@ class Message { Object? translatedLanguageCode = _unset, MessageTranslationStatus? translationStatus, Object? translationModelId = _unset, - Map? reactions, + Map>? reactions, Map? reactionStatuses, Uint8List? fourByteRoomContactKey, }) { diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart index 7cd45ba8..59e0bbc1 100644 --- a/lib/screens/channel_chat_screen.dart +++ b/lib/screens/channel_chat_screen.dart @@ -42,7 +42,6 @@ import '../widgets/emoji_picker.dart'; import '../widgets/gif_message.dart'; import '../widgets/jump_to_bottom_button.dart'; import '../widgets/gif_picker.dart'; -import '../widgets/image_send_button.dart'; import '../widgets/image_send_codec_binding.dart'; import '../widgets/image_send_preview_sheet.dart'; import '../widgets/message_translation_button.dart'; @@ -533,7 +532,7 @@ class _ChannelChatScreenState extends State { }, ), ), - _buildMessageComposer(), + _buildInputBar(), ], ), ), @@ -1048,7 +1047,7 @@ class _ChannelChatScreenState extends State { runSpacing: 6, children: message.reactions.entries.map((entry) { final emoji = entry.key; - final count = entry.value; + final int count = entry.value.length; return Container( padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), @@ -1057,35 +1056,97 @@ class _ChannelChatScreenState extends State { borderRadius: BorderRadius.circular(MeshRadii.pill), border: Border.all(color: scheme.outlineVariant, width: 1), ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - emoji, - style: MeshTheme.emoji(fontSize: 16), - textHeightBehavior: const TextHeightBehavior( - applyHeightToFirstAscent: false, - applyHeightToLastDescent: false, - ), - ), - if (count > 1) ...[ - const SizedBox(width: 4), + child: InkWell( + onTap: () => _showReactionsReport(message), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ Text( - '$count', - style: MeshTheme.mono( - fontSize: 11, - fontWeight: FontWeight.w700, - color: scheme.onSurface, + emoji, + style: MeshTheme.emoji(fontSize: 16), + textHeightBehavior: const TextHeightBehavior( + applyHeightToFirstAscent: false, + applyHeightToLastDescent: false, ), ), + if (count > 1) ...[ + const SizedBox(width: 4), + Text( + '$count', + style: MeshTheme.mono( + fontSize: 11, + fontWeight: FontWeight.w700, + color: scheme.onSurface, + ), + ), + ], ], - ], + ), ), ); }).toList(), ); } + void _showReactionsReport(ChannelMessage message) { + final scheme = Theme.of(context).colorScheme; + showDialog( + context: context, + builder: (context) => AlertDialog( + title: Text(context.l10n.reaction_report), + content: SizedBox( + width: double.maxFinite, + child: Scrollbar( + child: ListView( + shrinkWrap: true, + padding: const EdgeInsets.symmetric(vertical: 4), + children: message.reactionList().map((reaction) { + return Container( + padding: const EdgeInsetsDirectional.symmetric(vertical: 4), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 4, + ), + decoration: BoxDecoration( + color: scheme.surfaceContainerHigh, + borderRadius: BorderRadius.circular(MeshRadii.pill), + border: Border.all( + color: scheme.outlineVariant, + width: 1, + ), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 4, + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + reaction.emoji, + style: MeshTheme.emoji(fontSize: 16), + textHeightBehavior: const TextHeightBehavior( + applyHeightToFirstAscent: false, + applyHeightToLastDescent: false, + ), + ), + const SizedBox(width: 12), + Expanded(child: Text(reaction.senderName ?? '???')), + ], + ), + ), + ), + ); + }).toList(), + ), + ), + ), + ), + ); + } + Widget _buildPoiMessage( BuildContext context, MarkerPayload poi, @@ -1166,10 +1227,9 @@ class _ChannelChatScreenState extends State { /// Whether the image codec model is currently downloading. /// - /// The image button must stay hidden while the model downloads: an encode - /// cannot start until the weights are on disk, and the preview sheet would - /// have nothing to show but a spinner. - bool get _imageCodecDownloading { + /// This must be read while [context] is building; popup item builders run + /// from an overlay and cannot listen to a provider. + bool _isImageCodecDownloading(BuildContext context) { try { return context.watch().isDownloading; } on ProviderNotFoundException { @@ -1690,41 +1750,84 @@ class _ChannelChatScreenState extends State { ); } - Widget _buildMessageComposer() { + Widget _buildInputBar() { final connector = context.watch(); final maxBytes = maxChannelMessageBytes(connector.selfName); final settings = context.watch().settings; + final imageCodecDownloading = _isImageCodecDownloading(context); + final showImageAction = + settings.imageMessagesEnabled && !imageCodecDownloading; final scheme = Theme.of(context).colorScheme; - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - if (_replyingToMessage != null) - Builder( - builder: (context) { - final textScale = context.select( - (service) => service.scale, - ); - return _buildReplyBanner(textScale); - }, - ), - if (_imageSendTotal > 0) _buildImageSendProgress(scheme), - Container( - decoration: BoxDecoration( - color: scheme.surface, - border: Border( - top: BorderSide(color: scheme.outlineVariant, width: 1), - ), - ), - child: SafeArea( - child: Padding( + return Container( + decoration: BoxDecoration( + color: scheme.surface, + border: Border(top: BorderSide(color: scheme.outlineVariant, width: 1)), + ), + child: SafeArea( + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + if (_replyingToMessage != null) + Builder( + builder: (context) { + final textScale = context + .select( + (service) => service.scale, + ); + return _buildReplyBanner(textScale); + }, + ), + if (_imageSendTotal > 0) _buildImageSendProgress(scheme), + Padding( padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6), child: Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ - IconButton( - icon: const Icon(Icons.gif_box), - onPressed: () => _showGifPicker(context), - tooltip: context.l10n.chat_sendGif, + PopupMenuButton( + icon: const Icon(Icons.add_circle_outline), + position: PopupMenuPosition.over, + offset: Offset(0, showImageAction ? -112 : -64), + tooltip: context.l10n.chat_selectSendAction, + onSelected: (action) { + switch (action) { + case 'gif': + _showGifPicker(context); + break; + case 'meshcore-image': + _showImageSendPreview(); + break; + } + }, + itemBuilder: (context) => [ + PopupMenuItem( + value: 'gif', + child: Row( + children: [ + const Icon(Icons.gif_box), + const SizedBox(width: 12), + Text(context.l10n.chat_sendGif), + ], + ), + ), + if (showImageAction) + PopupMenuItem( + value: 'meshcore-image', + // Gated on the codec, not just the setting. The preview + // sheet explains why a send is impossible, but a fully + // live button in a build that cannot encode invites the + // tap that produces that explanation. + enabled: + _imageCodec?.availability == + ImageCodecAvailability.ready, + child: Row( + children: [ + const Icon(Icons.image_outlined), + const SizedBox(width: 12), + Text(context.l10n.chat_sendImageLora), + ], + ), + ), + ], ), if (settings.translationEnabled) MessageTranslationButton( @@ -1732,17 +1835,6 @@ class _ChannelChatScreenState extends State { languageCode: settings.translationTargetLanguageCode, onPressed: _showTranslationOptions, ), - if (settings.imageMessagesEnabled && !_imageCodecDownloading) - ImageSendButton( - // Gated on the codec, not just the setting. The preview - // sheet explains why a send is impossible, but a fully - // live button in a build that cannot encode invites the - // tap that produces that explanation. - enabled: - _imageCodec?.availability == - ImageCodecAvailability.ready, - onPressed: () => _showImageSendPreview(), - ), Expanded( child: ValueListenableBuilder( valueListenable: _textController, @@ -1874,9 +1966,9 @@ class _ChannelChatScreenState extends State { ], ), ), - ), + ], ), - ], + ), ); } @@ -2124,12 +2216,7 @@ class _ChannelChatScreenState extends State { final connector = context.read(); final emojiIndex = ReactionHelper.emojiToIndex(emoji); if (emojiIndex == null) return; // Unknown emoji, skip - final timestampSecs = message.timestamp.millisecondsSinceEpoch ~/ 1000; - final hash = ReactionHelper.computeReactionHash( - timestampSecs, - message.senderName, - message.text, - ); + final hash = message.computeReactionHash(); final reactionText = ReactionHelper.encodeReaction(hash, emojiIndex); connector.sendChannelMessage(widget.channel, reactionText); } diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart index 0fee6a04..972a2a08 100644 --- a/lib/screens/chat_screen.dart +++ b/lib/screens/chat_screen.dart @@ -7,6 +7,7 @@ import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; +import '../utils/app_logger.dart'; import '../utils/platform_info.dart'; import '../connector/meshcore_connector.dart'; @@ -478,10 +479,26 @@ class _ChatScreenState extends State { child: Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ - IconButton( - icon: const Icon(Icons.gif_box), - onPressed: () => _showGifPicker(context), - tooltip: context.l10n.chat_sendGif, + PopupMenuButton( + icon: const Icon(Icons.add_circle_outline), + position: PopupMenuPosition.over, + offset: const Offset(0, -64), + tooltip: context.l10n.chat_selectSendAction, + onSelected: (action) { + if (action == 'gif') _showGifPicker(context); + }, + itemBuilder: (context) => [ + PopupMenuItem( + value: 'gif', + child: Row( + children: [ + const Icon(Icons.gif_box), + const SizedBox(width: 12), + Text(context.l10n.chat_sendGif), + ], + ), + ), + ], ), if (settings.translationEnabled) MessageTranslationButton( @@ -1298,6 +1315,7 @@ class _ChatScreenState extends State { final senderName = liveContact.type == advTypeRoom ? senderContact.name : null; + appLogger.info('Sending reaction using senderName: $senderName'); final hash = ReactionHelper.computeReactionHash( timestampSecs, senderName, @@ -1747,7 +1765,7 @@ class _MessageBubble extends StatelessWidget { runSpacing: 6, children: message.reactions.entries.map((entry) { final emoji = entry.key; - final count = entry.value; + final count = entry.value.length; final status = message.reactionStatuses[emoji]; final isPending = status == MessageStatus.pending || status == MessageStatus.sent; diff --git a/lib/storage/channel_message_store.dart b/lib/storage/channel_message_store.dart index f16081a6..2d99f501 100644 --- a/lib/storage/channel_message_store.dart +++ b/lib/storage/channel_message_store.dart @@ -195,7 +195,12 @@ class ChannelMessageStore { replyToText: json['replyToText'] as String?, reactions: (json['reactions'] as Map?)?.map( - (key, value) => MapEntry(key, value as int), + (key, value) => MapEntry( + key, + (value is int) + ? List.filled(value, null) + : List.from(value), + ), ) ?? {}, ); diff --git a/lib/storage/message_store.dart b/lib/storage/message_store.dart index 96aaba9c..52f632b4 100644 --- a/lib/storage/message_store.dart +++ b/lib/storage/message_store.dart @@ -171,7 +171,12 @@ class MessageStore { pathBytes: decodedPathBytes, reactions: (json['reactions'] as Map?)?.map( - (key, value) => MapEntry(key, value as int), + (key, value) => MapEntry( + key, + (value is int) + ? List.filled(value, null) + : List.from(value), + ), ) ?? {}, reactionStatuses: diff --git a/lib/widgets/image_send_button.dart b/lib/widgets/image_send_button.dart deleted file mode 100644 index f1482a5c..00000000 --- a/lib/widgets/image_send_button.dart +++ /dev/null @@ -1,25 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../l10n/l10n.dart'; - -class ImageSendButton extends StatelessWidget { - final bool enabled; - final VoidCallback onPressed; - final String? tooltip; - - const ImageSendButton({ - super.key, - required this.enabled, - required this.onPressed, - this.tooltip, - }); - - @override - Widget build(BuildContext context) { - return IconButton( - icon: Icon(enabled ? Icons.image : Icons.image_outlined), - onPressed: enabled ? onPressed : null, - tooltip: tooltip ?? context.l10n.chat_sendImage, - ); - } -} diff --git a/untranslated.json b/untranslated.json index dd0eaee3..0967ef42 100644 --- a/untranslated.json +++ b/untranslated.json @@ -1,81 +1 @@ -{ - "bg": [ - "urlImage_enable", - "urlImage_possible" - ], - - "es": [ - "urlImage_enable", - "urlImage_possible" - ], - - "fr": [ - "urlImage_enable", - "urlImage_possible" - ], - - "hu": [ - "urlImage_enable", - "urlImage_possible" - ], - - "it": [ - "urlImage_enable", - "urlImage_possible" - ], - - "ja": [ - "urlImage_enable", - "urlImage_possible" - ], - - "ko": [ - "urlImage_enable", - "urlImage_possible" - ], - - "nl": [ - "urlImage_enable", - "urlImage_possible" - ], - - "pl": [ - "urlImage_enable", - "urlImage_possible" - ], - - "pt": [ - "urlImage_enable", - "urlImage_possible" - ], - - "ru": [ - "urlImage_enable", - "urlImage_possible" - ], - - "sk": [ - "urlImage_enable", - "urlImage_possible" - ], - - "sl": [ - "urlImage_enable", - "urlImage_possible" - ], - - "sv": [ - "urlImage_enable", - "urlImage_possible" - ], - - "uk": [ - "urlImage_enable", - "urlImage_possible" - ], - - "zh": [ - "urlImage_enable", - "urlImage_possible" - ] -} +{}