Fix URL image preference scoping and cache behavior

This commit is contained in:
ericz committed 2026-08-28 21:25:58 +02:00
1 parent c8bd1edf0f
commit 99ef08332a
8 files changed
+205 -14

No files matched your search

+1 -1
View File
@@ -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
+1
View File
@@ -1130,6 +1130,7 @@ class MeshCoreConnector extends ChangeNotifier {
}
Future<void> loadContactCache() async {
_contactUrlImagesEnabled.clear();
final cached = await _contactStore.loadContacts();
_knownContactKeys
..clear()
+94 -4
View File
@@ -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<String, Future<bool>> _verifiedImageCache =
<String, Future<bool>>{};
static const int _maxMessageImageCacheEntries = 200;
static final LinkedHashMap<String, Future<String?>> _messageImageCache =
LinkedHashMap<String, Future<String?>>();
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<String?> 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<String?> _extractFromUrl(String pageUrl, RegExp pattern) async {
try {
final response = await http
@@ -124,10 +157,17 @@ class MessageUrlImageHelper {
}
static Future<bool> _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<bool> _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<String?> builder;
@override
State<MessageUrlImageFutureBuilder> createState() =>
_MessageUrlImageFutureBuilderState();
}
class _MessageUrlImageFutureBuilderState
extends State<MessageUrlImageFutureBuilder> {
late Future<String?> _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<String?>(
future: _imageFuture,
builder: widget.builder,
);
}
}
class MessageUrlImagePreview extends StatelessWidget {
const MessageUrlImagePreview({super.key, required this.imageUrl});
+3 -4
View File
@@ -728,10 +728,9 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
],
)
else if (urlImagesEnabled)
FutureBuilder<String?>(
future: MessageUrlImageHelper.parseVerified(
message.text,
),
MessageUrlImageFutureBuilder(
messageId: message.messageId,
text: message.text,
builder: (context, snapshot) {
final imageAttachment = snapshot.data;
+3 -4
View File
@@ -1514,10 +1514,9 @@ class _MessageBubble extends StatelessWidget {
],
)
else if (urlImagesEnabled)
FutureBuilder<String?>(
future: MessageUrlImageHelper.parseVerified(
message.text,
),
MessageUrlImageFutureBuilder(
messageId: message.messageId,
text: message.text,
builder: (context, snapshot) {
final imageAttachment = snapshot.data;
+1
View File
@@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
list(APPEND FLUTTER_FFI_PLUGIN_LIST
flserial
jni
)
set(PLUGIN_BUNDLED_LIBRARIES)
+101 -1
View File
@@ -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"
]
}
+1
View File
@@ -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)