High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(mobile): load original image (#22142)
Mert20733bd7df9f
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbnailsImpl.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbnailsImpl.ktindex 1b1716f55c..1ccd742d67 100644--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbnailsImpl.kt+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/images/ThumbnailsImpl.kt@@ -8,7 +8,6 @@ import android.net.Uriimport android.os.Buildimport android.os.CancellationSignalimport android.os.OperationCanceledException-import android.provider.MediaStoreimport android.provider.MediaStore.Imagesimport android.provider.MediaStore.Videoimport android.util.Size@@ -19,7 +18,6 @@ import com.bumptech.glide.Glideimport com.bumptech.glide.Priorityimport com.bumptech.glide.load.DecodeFormatimport java.util.Base64-import java.util.HashMapimport java.util.concurrent.CancellationExceptionimport java.util.concurrent.ConcurrentHashMapimport java.util.concurrent.Future@@ -202,8 +200,10 @@ class ThumbnailsImpl(context: Context) : ThumbnailApi {val source = ImageDecoder.createSource(resolver, uri)signal.throwIfCanceled()ImageDecoder.decodeBitmap(source) { decoder, info, _ ->- val sampleSize = max(1, min(info.size.width / targetWidth, info.size.height / targetHeight))- decoder.setTargetSampleSize(sampleSize)+ if (targetWidth > 0 && targetHeight > 0) {+ val sample = max(1, min(info.size.width / targetWidth, info.size.height / targetHeight))+ decoder.setTargetSampleSize(sample)+ }decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWAREdecoder.setTargetColorSpace(ColorSpace.get(ColorSpace.Named.SRGB))}diff --git a/mobile/ios/Runner/Images/ThumbnailsImpl.swift b/mobile/ios/Runner/Images/ThumbnailsImpl.swiftindex d1ea2cc0e0..452ca62377 100644--- a/mobile/ios/Runner/Images/ThumbnailsImpl.swift+++ b/mobile/ios/Runner/Images/ThumbnailsImpl.swift@@ -105,7 +105,7 @@ class ThumbnailApiImpl: ThumbnailApi {var image: UIImage?Self.imageManager.requestImage(for: asset,- targetSize: CGSize(width: Double(width), height: Double(height)),+ targetSize: width > 0 && height > 0 ? CGSize(width: Double(width), height: Double(height)) : PHImageManagerMaximumSize,contentMode: .aspectFill,options: Self.requestOptions,resultHandler: { (_image, info) -> Void indiff --git a/mobile/lib/presentation/widgets/images/local_image_provider.dart b/mobile/lib/presentation/widgets/images/local_image_provider.dartindex 223d095432..f90961ea5a 100644--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart@@ -4,6 +4,8 @@ import 'dart:ui';import 'package:flutter/foundation.dart';import 'package:flutter/widgets.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';+import 'package:immich_mobile/domain/models/store.model.dart';+import 'package:immich_mobile/entities/store.entity.dart';import 'package:immich_mobile/infrastructure/loaders/image_request.dart';import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_stream_completer.dart';@@ -88,13 +90,26 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv}final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;- final request = this.request = LocalImageRequest(+ var request = this.request = LocalImageRequest(localId: key.id,size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),assetType: key.assetType,);yield* loadRequest(request, decode);++ if (!Store.get(StoreKey.loadOriginal, false)) {+ return;+ }++ if (isCancelled) {+ evict();+ return;+ }++ request = this.request = LocalImageRequest(localId: key.id, assetType: key.assetType, size: Size.zero);++ yield* loadRequest(request, decode);}@override