Skip to content

High performance self-hosted photo and video management solution.

fix(mobile): thumbnail requests not being cancelled (#21331)

Mertdc6ac3aaecac
diff --git a/mobile/lib/presentation/widgets/images/image_provider.dart b/mobile/lib/presentation/widgets/images/image_provider.dart
index d0428e5013..dd87d2f228 100644
--- a/mobile/lib/presentation/widgets/images/image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/image_provider.dart
@@ -50,12 +50,11 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
Stream<ImageInfo> loadRequest(ImageRequest request, ImageDecoderCallback decode) async* {
if (isCancelled) {
+ this.request = null;
evict();
return;
}
- this.request = request;
-
try {
final image = await request.load(decode);
if (image == null || isCancelled) {
diff --git a/mobile/lib/presentation/widgets/images/local_image_provider.dart b/mobile/lib/presentation/widgets/images/local_image_provider.dart
index 8bdbe3c16a..223d095432 100644
--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart
@@ -35,7 +35,8 @@ class LocalThumbProvider extends CancellableImageProvider<LocalThumbProvider>
}
Stream<ImageInfo> _codec(LocalThumbProvider key, ImageDecoderCallback decode) {
- return loadRequest(LocalImageRequest(localId: key.id, size: key.size, assetType: key.assetType), decode);
+ final request = this.request = LocalImageRequest(localId: key.id, size: key.size, assetType: key.assetType);
+ return loadRequest(request, decode);
}
@override
@@ -87,7 +88,7 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
}
final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
- final request = LocalImageRequest(
+ final request = this.request = LocalImageRequest(
localId: key.id,
size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
assetType: key.assetType,
diff --git a/mobile/lib/presentation/widgets/images/remote_image_provider.dart b/mobile/lib/presentation/widgets/images/remote_image_provider.dart
index fcd8cde266..75fd186c8a 100644
--- a/mobile/lib/presentation/widgets/images/remote_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/remote_image_provider.dart
@@ -36,7 +36,7 @@ class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
}
Stream<ImageInfo> _codec(RemoteThumbProvider key, ImageDecoderCallback decode) {
- final request = RemoteImageRequest(
+ final request = this.request = RemoteImageRequest(
uri: getThumbnailUrlForRemoteId(key.assetId),
headers: ApiService.getRequestHeaders(),
cacheManager: cacheManager,
@@ -92,16 +92,12 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
}
final headers = ApiService.getRequestHeaders();
- try {
- final request = RemoteImageRequest(
- uri: getPreviewUrlForRemoteId(key.assetId),
- headers: headers,
- cacheManager: cacheManager,
- );
- yield* loadRequest(request, decode);
- } finally {
- request = null;
- }
+ final request = this.request = RemoteImageRequest(
+ uri: getPreviewUrlForRemoteId(key.assetId),
+ headers: headers,
+ cacheManager: cacheManager,
+ );
+ yield* loadRequest(request, decode);
if (isCancelled) {
evict();
@@ -109,12 +105,8 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
}
if (AppSetting.get(Setting.loadOriginal)) {
- try {
- final request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId), headers: headers);
- yield* loadRequest(request, decode);
- } finally {
- request = null;
- }
+ final request = this.request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId), headers: headers);
+ yield* loadRequest(request, decode);
}
}
diff --git a/mobile/lib/presentation/widgets/images/thumb_hash_provider.dart b/mobile/lib/presentation/widgets/images/thumb_hash_provider.dart
index 2789e52c39..fcd2fca72f 100644
--- a/mobile/lib/presentation/widgets/images/thumb_hash_provider.dart
+++ b/mobile/lib/presentation/widgets/images/thumb_hash_provider.dart
@@ -17,11 +17,12 @@ class ThumbHashProvider extends CancellableImageProvider<ThumbHashProvider>
@override
ImageStreamCompleter loadImage(ThumbHashProvider key, ImageDecoderCallback decode) {
- return OneFramePlaceholderImageStreamCompleter(_loadCodec(key, decode))..addOnLastListenerRemovedCallback(cancel);
+ return OneFramePlaceholderImageStreamCompleter(_loadCodec(key, decode), onDispose: cancel);
}
Stream<ImageInfo> _loadCodec(ThumbHashProvider key, ImageDecoderCallback decode) {
- return loadRequest(ThumbhashImageRequest(thumbhash: key.thumbHash), decode);
+ final request = this.request = ThumbhashImageRequest(thumbhash: key.thumbHash);
+ return loadRequest(request, decode);
}
@override
diff --git a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
index 9cf77cc29e..3ecd5cd491 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart';
import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
import 'package:immich_mobile/presentation/widgets/images/local_image_provider.dart';
import 'package:immich_mobile/presentation/widgets/images/remote_image_provider.dart';
import 'package:immich_mobile/presentation/widgets/images/thumb_hash_provider.dart';
@@ -235,6 +236,16 @@ class _ThumbnailState extends State<Thumbnail> with SingleTickerProviderStateMix
@override
void dispose() {
+ final imageProvider = widget.imageProvider;
+ if (imageProvider is CancellableImageProvider) {
+ imageProvider.cancel();
+ }
+
+ final thumbhashProvider = widget.thumbhashProvider;
+ if (thumbhashProvider is CancellableImageProvider) {
+ thumbhashProvider.cancel();
+ }
+
_fadeController.removeStatusListener(_onAnimationStatusChanged);
_fadeController.dispose();
_stopListeningToStream();