High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(mobile): do not try to load video as image (#25495)
Mert54143023507f
diff --git a/mobile/lib/presentation/widgets/images/image_provider.dart b/mobile/lib/presentation/widgets/images/image_provider.dartindex 09b9719ddf..6e60c59c7f 100644--- a/mobile/lib/presentation/widgets/images/image_provider.dart+++ b/mobile/lib/presentation/widgets/images/image_provider.dart@@ -120,7 +120,7 @@ ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080} else {throw ArgumentError("Unsupported asset type: ${asset.runtimeType}");}- provider = RemoteFullImageProvider(assetId: assetId, thumbhash: thumbhash);+ provider = RemoteFullImageProvider(assetId: assetId, thumbhash: thumbhash, assetType: asset.type);}return provider;diff --git a/mobile/lib/presentation/widgets/images/remote_image_provider.dart b/mobile/lib/presentation/widgets/images/remote_image_provider.dartindex 0cbaec4480..08d1ef13db 100644--- a/mobile/lib/presentation/widgets/images/remote_image_provider.dart+++ b/mobile/lib/presentation/widgets/images/remote_image_provider.dart@@ -1,5 +1,6 @@import 'package:flutter/foundation.dart';import 'package:flutter/painting.dart';+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';import 'package:immich_mobile/domain/models/setting.model.dart';import 'package:immich_mobile/domain/services/setting.service.dart';import 'package:immich_mobile/infrastructure/loaders/image_request.dart';@@ -59,8 +60,9 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePrwith CancellableImageProviderMixin<RemoteFullImageProvider> {final String assetId;final String thumbhash;+ final AssetType assetType;- RemoteFullImageProvider({required this.assetId, required this.thumbhash});+ RemoteFullImageProvider({required this.assetId, required this.thumbhash, required this.assetType});@overrideFuture<RemoteFullImageProvider> obtainKey(ImageConfiguration configuration) {@@ -89,21 +91,23 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr}final headers = ApiService.getRequestHeaders();- final request = this.request = RemoteImageRequest(+ final previewRequest = request = RemoteImageRequest(uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview, thumbhash: key.thumbhash),headers: headers,);- yield* loadRequest(request, decode);+ yield* loadRequest(previewRequest, decode);++ if (assetType != AssetType.image || !AppSetting.get(Setting.loadOriginal)) {+ return;+ }if (isCancelled) {PaintingBinding.instance.imageCache.evict(this);return;}- if (AppSetting.get(Setting.loadOriginal)) {- final request = this.request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId), headers: headers);- yield* loadRequest(request, decode);- }+ final originalRequest = request = RemoteImageRequest(uri: getOriginalUrlForRemoteId(key.assetId), headers: headers);+ yield* loadRequest(originalRequest, decode);}@override