From 99ef08332aeb2761e68b964c0c2c6b9fee16215c Mon Sep 17 00:00:00 2001 From: ericz Date: Fri, 28 Aug 2026 21:25:58 +0200 Subject: [PATCH] Fix URL image preference scoping and cache behavior --- .../gradle/wrapper/gradle-wrapper.properties | 2 +- lib/connector/meshcore_connector.dart | 1 + lib/helpers/message_url_image_helper.dart | 98 ++++++++++++++++- lib/screens/channel_chat_screen.dart | 7 +- lib/screens/chat_screen.dart | 7 +- linux/flutter/generated_plugins.cmake | 1 + untranslated.json | 102 +++++++++++++++++- windows/flutter/generated_plugins.cmake | 1 + 8 files changed, 205 insertions(+), 14 deletions(-) diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ac3b4792..e4ef43fb 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/lib/connector/meshcore_connector.dart b/lib/connector/meshcore_connector.dart index 55f8a613..37198761 100644 --- a/lib/connector/meshcore_connector.dart +++ b/lib/connector/meshcore_connector.dart @@ -1130,6 +1130,7 @@ class MeshCoreConnector extends ChangeNotifier { } Future loadContactCache() async { + _contactUrlImagesEnabled.clear(); final cached = await _contactStore.loadContacts(); _knownContactKeys ..clear() diff --git a/lib/helpers/message_url_image_helper.dart b/lib/helpers/message_url_image_helper.dart index 9712d517..17a46923 100644 --- a/lib/helpers/message_url_image_helper.dart +++ b/lib/helpers/message_url_image_helper.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:collection'; import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; @@ -11,6 +12,9 @@ import 'package:http/http.dart' as http; class MessageUrlImageHelper { static final Map> _verifiedImageCache = >{}; + static const int _maxMessageImageCacheEntries = 200; + static final LinkedHashMap> _messageImageCache = + LinkedHashMap>(); static final RegExp _pyxPattern = RegExp( r'''https?://pyx\.li/\?i=([^\s<>'"`]+)''', @@ -97,6 +101,35 @@ class MessageUrlImageHelper { return verified ? imageUrl : null; } + /// Caches successful URL-image parsing by stable message identity. + /// + /// Null results are evicted so temporary connectivity or host failures can + /// be retried when a message is shown again. + static Future parseVerifiedForMessage( + String messageId, + String text, + ) { + final cached = _messageImageCache.remove(messageId); + if (cached != null) { + _messageImageCache[messageId] = cached; + return cached; + } + + final parsing = parseVerified(text); + _messageImageCache[messageId] = parsing; + parsing.then((imageUrl) { + if (imageUrl == null && + identical(_messageImageCache[messageId], parsing)) { + _messageImageCache.remove(messageId); + } else if (imageUrl != null) { + while (_messageImageCache.length > _maxMessageImageCacheEntries) { + _messageImageCache.remove(_messageImageCache.keys.first); + } + } + }); + return parsing; + } + static Future _extractFromUrl(String pageUrl, RegExp pattern) async { try { final response = await http @@ -124,10 +157,17 @@ class MessageUrlImageHelper { } static Future _verifyImageUrl(String imageUrl) { - return _verifiedImageCache.putIfAbsent( - imageUrl, - () => _tryLoadImage(imageUrl), - ); + final cached = _verifiedImageCache[imageUrl]; + if (cached != null) return cached; + + final verification = _tryLoadImage(imageUrl); + _verifiedImageCache[imageUrl] = verification; + verification.then((verified) { + if (!verified && identical(_verifiedImageCache[imageUrl], verification)) { + _verifiedImageCache.remove(imageUrl); + } + }); + return verification; } static Future _tryLoadImage(String imageUrl) async { @@ -160,6 +200,56 @@ class MessageUrlImageHelper { } } +class MessageUrlImageFutureBuilder extends StatefulWidget { + const MessageUrlImageFutureBuilder({ + super.key, + required this.messageId, + required this.text, + required this.builder, + }); + + final String messageId; + final String text; + final AsyncWidgetBuilder builder; + + @override + State createState() => + _MessageUrlImageFutureBuilderState(); +} + +class _MessageUrlImageFutureBuilderState + extends State { + late Future _imageFuture; + + @override + void initState() { + super.initState(); + _imageFuture = MessageUrlImageHelper.parseVerifiedForMessage( + widget.messageId, + widget.text, + ); + } + + @override + void didUpdateWidget(covariant MessageUrlImageFutureBuilder oldWidget) { + super.didUpdateWidget(oldWidget); + if (oldWidget.messageId != widget.messageId) { + _imageFuture = MessageUrlImageHelper.parseVerifiedForMessage( + widget.messageId, + widget.text, + ); + } + } + + @override + Widget build(BuildContext context) { + return FutureBuilder( + future: _imageFuture, + builder: widget.builder, + ); + } +} + class MessageUrlImagePreview extends StatelessWidget { const MessageUrlImagePreview({super.key, required this.imageUrl}); diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart index 59e0bbc1..fc8a4460 100644 --- a/lib/screens/channel_chat_screen.dart +++ b/lib/screens/channel_chat_screen.dart @@ -728,10 +728,9 @@ class _ChannelChatScreenState extends State { ], ) else if (urlImagesEnabled) - FutureBuilder( - future: MessageUrlImageHelper.parseVerified( - message.text, - ), + MessageUrlImageFutureBuilder( + messageId: message.messageId, + text: message.text, builder: (context, snapshot) { final imageAttachment = snapshot.data; diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart index 972a2a08..6c1f306f 100644 --- a/lib/screens/chat_screen.dart +++ b/lib/screens/chat_screen.dart @@ -1514,10 +1514,9 @@ class _MessageBubble extends StatelessWidget { ], ) else if (urlImagesEnabled) - FutureBuilder( - future: MessageUrlImageHelper.parseVerified( - message.text, - ), + MessageUrlImageFutureBuilder( + messageId: message.messageId, + text: message.text, builder: (context, snapshot) { final imageAttachment = snapshot.data; diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 3fbca4bc..9c7e2a7a 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST list(APPEND FLUTTER_FFI_PLUGIN_LIST flserial + jni ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/untranslated.json b/untranslated.json index 0967ef42..83b675e2 100644 --- a/untranslated.json +++ b/untranslated.json @@ -1 +1,101 @@ -{} +{ + "bg": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "de": [ + "reaction_report" + ], + + "es": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "fr": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "hu": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "it": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "ja": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "ko": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "nl": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "pl": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "pt": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "ru": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "sk": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "sl": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "sv": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "uk": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ], + + "zh": [ + "urlImage_enable", + "urlImage_possible", + "reaction_report" + ] +} diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index d6ef3354..ae56b7cf 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -13,6 +13,7 @@ list(APPEND FLUTTER_PLUGIN_LIST list(APPEND FLUTTER_FFI_PLUGIN_LIST flserial flutter_local_notifications_windows + jni ) set(PLUGIN_BUNDLED_LIBRARIES)