github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-03-22 14:29:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(mobile): Prevent premature image cache eviction when higher image loading is enabled (#26208)

Browse Source 
* feat(mobile): enhance image loading with error handling and eviction options

* pull request suggestions: remove log and remove useless local implementation
This commit is contained in:
Luis Nachtigall
2026-02-25 23:31:37 +01:00
committed by GitHub
parent 3bed1b6131
commit 4c79c3c902
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mobile/lib/presentation/widgets/images/image_provider.dart
View File

@@ -48,7 +48,7 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
return null; return null;
} }
Stream<ImageInfo> loadRequest(ImageRequest request, ImageDecoderCallback decode) async* { Stream<ImageInfo> loadRequest(ImageRequest request, ImageDecoderCallback decode, {bool evictOnError = true}) async* {
if (isCancelled) { if (isCancelled) {
this.request = null; this.request = null;
PaintingBinding.instance.imageCache.evict(this); PaintingBinding.instance.imageCache.evict(this);
@@ -57,14 +57,19 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
try { try {
final image = await request.load(decode); final image = await request.load(decode);
if (image == null || isCancelled) { if ((image == null && evictOnError) || isCancelled) {
PaintingBinding.instance.imageCache.evict(this); PaintingBinding.instance.imageCache.evict(this);
return; return;
} else if (image == null) {
return;
} }
yield image; yield image;
} catch (e) { } catch (e, stack) {
if (evictOnError) {
PaintingBinding.instance.imageCache.evict(this); PaintingBinding.instance.imageCache.evict(this);
rethrow; rethrow;
}
_log.warning('Non-fatal image load error', e, stack);
} finally { } finally {
this.request = null; this.request = null;
} }

1
mobile/lib/presentation/widgets/images/local_image_provider.dart
View File

@@ -94,7 +94,6 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio), size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
assetType: key.assetType, assetType: key.assetType,
); );
yield* loadRequest(request, decode); yield* loadRequest(request, decode);
if (!Store.get(StoreKey.loadOriginal, false)) { if (!Store.get(StoreKey.loadOriginal, false)) {

5
mobile/lib/presentation/widgets/images/remote_image_provider.dart
View File

@@ -93,9 +93,10 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash), uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash),
headers: headers, 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; return;
} }