Skip to content

High performance self-hosted photo and video management solution.

fix: prefer remote images in new timeline (#22452)

shenlongbea116e1b967
diff --git a/mobile/lib/presentation/widgets/images/image_provider.dart b/mobile/lib/presentation/widgets/images/image_provider.dart
index ab5ead5ca5..810340aeb8 100644
--- a/mobile/lib/presentation/widgets/images/image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/image_provider.dart
@@ -123,28 +123,14 @@ ImageProvider getFullImageProvider(BaseAsset asset, {Size size = const Size(1080
return provider;
}
-ImageProvider getThumbnailImageProvider({BaseAsset? asset, String? remoteId, Size size = kThumbnailResolution}) {
- assert(asset != null || remoteId != null, 'Either asset or remoteId must be provided');
-
- if (remoteId != null) {
- return RemoteThumbProvider(assetId: remoteId);
- }
-
- if (_shouldUseLocalAsset(asset!)) {
+ImageProvider? getThumbnailImageProvider(BaseAsset asset, {Size size = kThumbnailResolution}) {
+ if (_shouldUseLocalAsset(asset)) {
final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).localId!;
return LocalThumbProvider(id: id, size: size, assetType: asset.type);
}
- final String assetId;
- if (asset is LocalAsset && asset.hasRemote) {
- assetId = asset.remoteId!;
- } else if (asset is RemoteAsset) {
- assetId = asset.id;
- } else {
- throw ArgumentError("Unsupported asset type: ${asset.runtimeType}");
- }
-
- return RemoteThumbProvider(assetId: assetId);
+ final assetId = asset is RemoteAsset ? asset.id : (asset as LocalAsset).remoteId;
+ return assetId != null ? RemoteThumbProvider(assetId: assetId) : null;
}
bool _shouldUseLocalAsset(BaseAsset asset) =>
diff --git a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
index 3832029702..92b1bb2544 100644
--- a/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail.widget.dart
@@ -5,7 +5,6 @@ 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';
import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
@@ -39,14 +38,7 @@ class Thumbnail extends StatefulWidget {
),
_ => null,
},
- imageProvider = switch (asset) {
- RemoteAsset() =>
- asset.localId == null
- ? RemoteThumbProvider(assetId: asset.id)
- : LocalThumbProvider(id: asset.localId!, size: size, assetType: asset.type),
- LocalAsset() => LocalThumbProvider(id: asset.id, size: size, assetType: asset.type),
- _ => null,
- };
+ imageProvider = asset == null ? null : getThumbnailImageProvider(asset, size: size);
@override
State<Thumbnail> createState() => _ThumbnailState();