High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat(mobile): Prevent premature image cache eviction when higher image loading is enabled (#26208)
Luis Nachtigall4c79c3c9029c
diff --git a/mobile/lib/presentation/widgets/images/image_provider.dart b/mobile/lib/presentation/widgets/images/image_provider.dartindex 3c3ed460b4..c3cda46e81 100644--- a/mobile/lib/presentation/widgets/images/image_provider.dart+++ b/mobile/lib/presentation/widgets/images/image_provider.dart@@ -48,7 +48,7 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvidereturn null;}- Stream<ImageInfo> loadRequest(ImageRequest request, ImageDecoderCallback decode) async* {+ Stream<ImageInfo> loadRequest(ImageRequest request, ImageDecoderCallback decode, {bool evictOnError = true}) async* {if (isCancelled) {this.request = null;PaintingBinding.instance.imageCache.evict(this);@@ -57,14 +57,19 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvidetry {final image = await request.load(decode);- if (image == null || isCancelled) {+ if ((image == null && evictOnError) || isCancelled) {PaintingBinding.instance.imageCache.evict(this);return;+ } else if (image == null) {+ return;}yield image;- } catch (e) {- PaintingBinding.instance.imageCache.evict(this);- rethrow;+ } catch (e, stack) {+ if (evictOnError) {+ PaintingBinding.instance.imageCache.evict(this);+ rethrow;+ }+ _log.warning('Non-fatal image load error', e, stack);} finally {this.request = null;}diff --git a/mobile/lib/presentation/widgets/images/local_image_provider.dart b/mobile/lib/presentation/widgets/images/local_image_provider.dartindex 03b9370190..1c7d102239 100644--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart@@ -94,7 +94,6 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProvsize: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),assetType: key.assetType,);-yield* loadRequest(request, decode);if (!Store.get(StoreKey.loadOriginal, false)) {diff --git a/mobile/lib/presentation/widgets/images/remote_image_provider.dart b/mobile/lib/presentation/widgets/images/remote_image_provider.dartindex 20db0cc1e1..e7e5deb6a6 100644--- a/mobile/lib/presentation/widgets/images/remote_image_provider.dart+++ b/mobile/lib/presentation/widgets/images/remote_image_provider.dart@@ -93,9 +93,10 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePruri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash),headers: headers,);- yield* loadRequest(previewRequest, decode);+ final loadOriginal = assetType == AssetType.image && AppSetting.get(Setting.loadOriginal);+ yield* loadRequest(previewRequest, decode, evictOnError: !loadOriginal);- if (assetType != AssetType.image || !AppSetting.get(Setting.loadOriginal)) {+ if (!loadOriginal) {return;}