fix: make sure iOS memory widget render

mobile/ios/WidgetExtension/ImageWidgetView.swift

@@ -17,67 +17,44 @@ struct ImmichWidgetView: View {
   var entry: ImageEntry
 
   var body: some View {
-    if let image = entry.image {
-      ImmichWidgetContentView(image: image, subtitle: entry.metadata.subtitle, deepLink: entry.metadata.deepLink)
-    } else {
-      ImmichWidgetLoadingView(message: entry.metadata.error?.errorDescription)
-    }
-  }
-}
-
-private struct ImmichWidgetLoadingView: View {
-  let message: String?
-
-  var body: some View {
-    let messageText = Text(message ?? "")
-      .minimumScaleFactor(0.25)
-      .multilineTextAlignment(.center)
-      .foregroundStyle(.secondary)
-
-    VStack(spacing: 8) {
-      // This is used as a nicer way to center the image, rather than using offsets
-      messageText.hidden()
-
-      Image("LaunchImage")
-        .tintedWidgetImageModifier()
-
-      messageText
-    }
-  }
-}
-
-private struct ImmichWidgetContentView: View {
-  let image: UIImage
-  let subtitle: String?
-  let deepLink: URL?
-
-  var body: some View {
-    ZStack(alignment: .leading) {
-      Color.clear.overlay(
-        Image(uiImage: image)
-          .resizable()
-          .tintedWidgetImageModifier()
-          .scaledToFill()
-      )
-
+    if entry.image == nil {
       VStack {
-        Spacer()
-        if let subtitle {
-          Text(subtitle)
-            .foregroundColor(.white)
-            .padding(6)
-            .background(ContainerRelativeShape().fill(Color.black.opacity(0.6)))
-            .font(.system(size: 16))
-        }
+        Image("LaunchImage")
+          .tintedWidgetImageModifier()
+        Text(entry.metadata.error?.errorDescription ?? "")
+          .minimumScaleFactor(0.25)
+          .multilineTextAlignment(.center)
+          .foregroundStyle(.secondary)
       }
       .padding(16)
+    } else {
+      ZStack(alignment: .leading) {
+        Color.clear.overlay(
+          Image(uiImage: entry.image!)
+            .resizable()
+            .tintedWidgetImageModifier()
+            .scaledToFill()
+
+        )
+        VStack {
+          Spacer()
+          if let subtitle = entry.metadata.subtitle {
+            Text(subtitle)
+              .foregroundColor(.white)
+              .padding(8)
+              .background(Color.black.opacity(0.6))
+              .cornerRadius(8)
+              .font(.system(size: 16))
+          }
+        }
+        .padding(16)
+      }
+      .widgetURL(entry.metadata.deepLink)
     }
-    .widgetURL(deepLink)
   }
 }
 
 #Preview(
-  "Medium",
   as: .systemMedium,
   widget: {
     ImmichRandomWidget()
@@ -86,93 +63,10 @@ private struct ImmichWidgetContentView: View {
     let date = Date()
     ImageEntry(
       date: date,
-      image: UIImage(named: "LaunchImage"),
+      image: UIImage(named: "ImmichLogo"),
       metadata: EntryMetadata(
         subtitle: "1 year ago"
       )
     )
   }
 )
-
-#Preview(
-  "Medium No Data",
-  as: .systemMedium,
-  widget: {
-    ImmichRandomWidget()
-  },
-  timeline: {
-    let date = Date()
-    ImageEntry(
-      date: date,
-      image: nil
-    )
-  }
-)
-
-#Preview(
-  "Medium No Data Error",
-  as: .systemMedium,
-  widget: {
-    ImmichRandomWidget()
-  },
-  timeline: {
-    let date = Date()
-    ImageEntry(
-      date: date,
-      image: nil,
-      metadata: EntryMetadata(error: WidgetError.fetchFailed)
-    )
-  }
-)
-
-#Preview(
-  "Small",
-  as: .systemSmall,
-  widget: {
-    ImmichRandomWidget()
-  },
-  timeline: {
-    let date = Date()
-    ImageEntry(
-      date: date,
-      image: UIImage(named: "LaunchImage"),
-      metadata: EntryMetadata(
-        subtitle: "Yesterday"
-      )
-    )
-  }
-)
-
-#Preview(
-  "Small No Data Error",
-  as: .systemSmall,
-  widget: {
-    ImmichRandomWidget()
-  },
-  timeline: {
-    let date = Date()
-    ImageEntry(
-      date: date,
-      image: nil,
-      metadata: EntryMetadata(error: WidgetError.fetchFailed)
-    )
-  }
-)
-
-#Preview(
-  "Large",
-  as: .systemLarge,
-  widget: {
-    ImmichRandomWidget()
-  },
-  timeline: {
-    let date = Date()
-    ImageEntry(
-      date: date,
-      image: UIImage(named: "LaunchImage"),
-      metadata: EntryMetadata(
-        subtitle: "2000 seconds ago"
-      )
-    )
-  }
-)

mobile/ios/WidgetExtension/ImmichAPI.swift

@@ -25,7 +25,7 @@ extension WidgetError: LocalizedError {
       return "Login to Immich"
 
     case .fetchFailed:
-      return "Unable to connect to Immich"
+      return "Unable to connect to your Immich instance"
 
     case .albumNotFound:
       return "Album not found"

mobile/ios/WidgetExtension/widgets/MemoryWidget.swift

@@ -83,7 +83,13 @@ struct ImmichMemoryProvider: TimelineProvider {
         return
       }
 
-      let memories = try await api.fetchMemory(for: Date.now)
+      let memories: [MemoryResult]
+      do {
+        memories = try await api.fetchMemory(for: Date.now)
+      } catch {
+        completion(ImageEntry.handleError(for: cacheKey))
+        return
+      }
 
       await withTaskGroup(of: ImageEntry?.self) { group in
         var totalAssets = 0

mobile/mise.lock

@@ -1,30 +1,29 @@
 # @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
 
 [[tools."aqua:flutter/flutter"]]
-version = "3.44.8"
+version = "3.44.6"
 backend = "aqua:flutter/flutter"
 
 [tools."aqua:flutter/flutter"."platforms.linux-arm64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.8-stable.tar.xz"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.6-stable.tar.xz"
 
 [tools."aqua:flutter/flutter"."platforms.linux-arm64-musl"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.8-stable.tar.xz"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.6-stable.tar.xz"
 
 [tools."aqua:flutter/flutter"."platforms.linux-x64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.8-stable.tar.xz"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.6-stable.tar.xz"
 
 [tools."aqua:flutter/flutter"."platforms.linux-x64-musl"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.8-stable.tar.xz"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.6-stable.tar.xz"
 
 [tools."aqua:flutter/flutter"."platforms.macos-arm64"]
-checksum = "blake3:79c780876c64f5a66c015845f544bdb20275f7f3bf819e6c831f23df3e96b8db"
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.44.8-stable.zip"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.44.6-stable.zip"
 
 [tools."aqua:flutter/flutter"."platforms.macos-x64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_3.44.8-stable.zip"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_3.44.6-stable.zip"
 
 [tools."aqua:flutter/flutter"."platforms.windows-x64"]
-url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_3.44.8-stable.zip"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_3.44.6-stable.zip"
 
 [[tools."github:CQLabs/homebrew-dcm"]]
 version = "1.37.0"

mobile/mise.toml

@@ -1,9 +1,9 @@
 [tools]
-"aqua:flutter/flutter" = "3.44.8"
-java = "21.0.12+8.0.LTS"
+"aqua:flutter/flutter" = "3.44.6"
+java = "21.0.2"
 
 [tools."github:CQLabs/homebrew-dcm"]
-version = "1.38.2"
+version = "1.37.0"
 bin = "dcm"
 postinstall = "chmod +x \"$MISE_TOOL_INSTALL_PATH/dcm\" || true"
 

mobile/packages/ui/lib/src/components/column_button.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:core';
 
 import 'package:flutter/material.dart';
 import 'package:immich_ui/src/constants.dart';
@@ -9,7 +8,6 @@ class ImmichColumnButton extends StatefulWidget {
   final IconData icon;
   final String label;
   final FutureOr<void> Function() onPressed;
-  final FutureOr<void> Function()? onLongPress;
   final bool disabled;
   final bool? loading;
 
@@ -18,7 +16,6 @@ class ImmichColumnButton extends StatefulWidget {
     required this.icon,
     required this.label,
     required this.onPressed,
-    this.onLongPress,
     this.disabled = false,
     this.loading,
   });
@@ -28,44 +25,26 @@ class ImmichColumnButton extends StatefulWidget {
 }
 
 class _ImmichColumnButtonState extends State<ImmichColumnButton> {
-  bool _running = false;
-  bool get _isLoading => widget.loading ?? _running;
-  bool get _isDisabled => widget.disabled || _isLoading;
+  bool _loading = false;
+  bool get _isLoading => widget.loading ?? _loading;
 
-  Future<void> _runAction(FutureOr<void> Function() action) async {
-    setState(() => _running = true);
+  Future<void> _onPressed() async {
+    setState(() => _loading = true);
     try {
-      await action();
+      await widget.onPressed();
     } finally {
       if (mounted) {
-        setState(() => _running = false);
+        setState(() => _loading = false);
       }
     }
   }
 
-  Future<void>? _onPressed() {
-    if (_isDisabled) {
-      return null;
-    }
-
-    return _runAction(widget.onPressed);
-  }
-
-  Future<void>? _onLongPress() {
-    if (_isDisabled || widget.onLongPress == null) {
-      return null;
-    }
-
-    return _runAction(widget.onLongPress!);
-  }
-
   @override
   Widget build(BuildContext context) {
     final foreground = context.colorOverride ?? Theme.of(context).colorScheme.onSurface;
 
     return TextButton(
-      onPressed: _onPressed,
-      onLongPress: _onLongPress,
+      onPressed: widget.disabled || _isLoading ? null : _onPressed,
       style: TextButton.styleFrom(
         foregroundColor: foreground,
         padding: const .symmetric(horizontal: ImmichSpacing.sm, vertical: ImmichSpacing.md),

mobile/packages/ui/lib/src/components/icon_button.dart

@@ -7,7 +7,6 @@ import 'package:immich_ui/src/internal.dart';
 class ImmichIconButton extends StatefulWidget {
   final IconData icon;
   final FutureOr<void> Function() onPressed;
-  final FutureOr<void> Function()? onLongPress;
   final ImmichVariant variant;
   final ImmichColor color;
   final bool disabled;
@@ -17,7 +16,6 @@ class ImmichIconButton extends StatefulWidget {
     super.key,
     required this.icon,
     required this.onPressed,
-    this.onLongPress,
     this.color = .primary,
     this.variant = .filled,
     this.disabled = false,
@@ -29,37 +27,20 @@ class ImmichIconButton extends StatefulWidget {
 }
 
 class _ImmichIconButtonState extends State<ImmichIconButton> {
-  bool _running = false;
-  bool get _isLoading => widget.loading ?? _running;
-  bool get _isDisabled => widget.disabled || _isLoading;
+  bool _loading = false;
+  bool get _isLoading => widget.loading ?? _loading;
 
-  Future<void> _runAction(FutureOr<void> Function() action) async {
-    setState(() => _running = true);
+  Future<void> _onPressed() async {
+    setState(() => _loading = true);
     try {
-      await action();
+      await widget.onPressed();
     } finally {
       if (mounted) {
-        setState(() => _running = false);
+        setState(() => _loading = false);
       }
     }
   }
 
-  Future<void>? _onPressed() {
-    if (_isDisabled) {
-      return null;
-    }
-
-    return _runAction(widget.onPressed);
-  }
-
-  Future<void>? _onLongPress() {
-    if (_isDisabled || widget.onLongPress == null) {
-      return null;
-    }
-
-    return _runAction(widget.onLongPress!);
-  }
-
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
@@ -92,8 +73,7 @@ class _ImmichIconButtonState extends State<ImmichIconButton> {
               child: CircularProgressIndicator(strokeWidth: ImmichBorderWidth.md),
             )
           : Icon(widget.icon),
-      onPressed: _onPressed,
-      onLongPress: _onLongPress,
+      onPressed: widget.disabled || _isLoading ? null : _onPressed,
       style: IconButton.styleFrom(backgroundColor: background, foregroundColor: foreground),
     );
   }

mobile/packages/ui/lib/src/components/text_button.dart

@@ -7,7 +7,6 @@ class ImmichTextButton extends StatefulWidget {
   final String labelText;
   final IconData? icon;
   final FutureOr<void> Function() onPressed;
-  final FutureOr<void> Function()? onLongPress;
   final ImmichVariant variant;
   final bool expanded;
   final bool disabled;
@@ -18,7 +17,6 @@ class ImmichTextButton extends StatefulWidget {
     required this.labelText,
     this.icon,
     required this.onPressed,
-    this.onLongPress,
     this.variant = .filled,
     this.expanded = true,
 
@@ -31,37 +29,20 @@ class ImmichTextButton extends StatefulWidget {
 }
 
 class _ImmichTextButtonState extends State<ImmichTextButton> {
-  bool _running = false;
-  bool get _isLoading => widget.loading ?? _running;
-  bool get _isDisabled => widget.disabled || _isLoading;
+  bool _loading = false;
+  bool get _isLoading => widget.loading ?? _loading;
 
-  Future<void> _runAction(FutureOr<void> Function() action) async {
-    setState(() => _running = true);
+  Future<void> _onPressed() async {
+    setState(() => _loading = true);
     try {
-      await action();
+      await widget.onPressed();
     } finally {
       if (mounted) {
-        setState(() => _running = false);
+        setState(() => _loading = false);
       }
     }
   }
 
-  Future<void>? _onPressed() {
-    if (_isDisabled) {
-      return null;
-    }
-
-    return _runAction(widget.onPressed);
-  }
-
-  Future<void>? _onLongPress() {
-    if (_isDisabled || widget.onLongPress == null) {
-      return null;
-    }
-
-    return _runAction(widget.onLongPress!);
-  }
-
   @override
   Widget build(BuildContext context) {
     final Widget? icon = _isLoading
@@ -78,22 +59,11 @@ class _ImmichTextButtonState extends State<ImmichTextButton> {
       style: const .new(fontSize: ImmichTextSize.body, fontWeight: .bold),
     );
     final style = ElevatedButton.styleFrom(padding: const .symmetric(vertical: ImmichSpacing.md));
+    final onPressed = widget.disabled || _isLoading ? null : _onPressed;
 
     final button = switch (widget.variant) {
-      ImmichVariant.filled => ElevatedButton.icon(
-        style: style,
-        onPressed: _onPressed,
-        onLongPress: _onLongPress,
-        icon: icon,
-        label: label,
-      ),
-      ImmichVariant.ghost => TextButton.icon(
-        style: style,
-        onPressed: _onPressed,
-        onLongPress: _onLongPress,
-        icon: icon,
-        label: label,
-      ),
+      ImmichVariant.filled => ElevatedButton.icon(style: style, onPressed: onPressed, icon: icon, label: label),
+      ImmichVariant.ghost => TextButton.icon(style: style, onPressed: onPressed, icon: icon, label: label),
     };
 
     if (widget.expanded) {

mobile/pubspec.lock

@@ -2014,4 +2014,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.12.0 <4.0.0"
-  flutter: "3.44.8"
+  flutter: "3.44.6"

mobile/pubspec.yaml

@@ -6,7 +6,7 @@ version: 3.0.3+3056
 
 environment:
   sdk: '>=3.12.0 <4.0.0'
-  flutter: 3.44.8
+  flutter: 3.44.6
 
 dependencies:
   async: ^2.13.1
@@ -58,7 +58,7 @@ dependencies:
   path_provider: ^2.1.5
   path_provider_foundation: ^2.6.0
   permission_handler: ^11.4.0
-  photo_manager: 3.10.0
+  photo_manager: 3.9.0
   pinput: ^5.0.2
   punycode: ^1.0.0
   scroll_date_picker: ^3.8.0
@@ -68,10 +68,10 @@ dependencies:
   sliver_tools: ^0.2.12
   stream_transform: ^2.1.1
   sqlite3: ^3.3.2
-  sqlite_async: 0.14.3
+  sqlite_async: 0.14.2
   sqlite3_connection_pool: ^0.2.6
   thumbhash: 0.1.0+1
-  timezone: ^0.11.0
+  timezone: ^0.9.4
   url_launcher: ^6.3.2
   uuid: ^4.5.3
   wakelock_plus: ^1.3.3

server/src/schema/migrations/1784836013770-MinFacePreferenceMigration.ts

@@ -1,25 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`
-    INSERT INTO "user_metadata" ("userId", "key", "value")
-    SELECT "user"."id", 'preferences', jsonb_build_object('people', jsonb_build_object('minimumFaces', "config"."minFaces"))
-    FROM "user"
-    CROSS JOIN (
-      SELECT "value"->'machineLearning'->'facialRecognition'->'minFaces' AS "minFaces"
-      FROM "system_metadata"
-      WHERE "key" = 'system-config'
-        AND "value"->'machineLearning'->'facialRecognition'->'minFaces' IS NOT NULL
-    ) AS "config"
-    ON CONFLICT ("userId", "key") DO UPDATE
-    SET "value" = "user_metadata"."value" || jsonb_build_object(
-      'people',
-      COALESCE("user_metadata"."value"->'people', '{}'::jsonb) || (EXCLUDED."value"->'people')
-    )
-    WHERE "user_metadata"."value"->'people'->'minimumFaces' IS NULL
-  `.execute(db);
-}
-
-export async function down(): Promise<void> {
-  // not supported
-}

server/src/services/media.service.spec.ts

@@ -1507,17 +1507,12 @@ describe(MediaService.name, () => {
   });
 
   describe('handleGeneratePersonThumbnail', () => {
-    it('should generate a thumbnail even if machine learning is disabled', async () => {
+    it('should skip if machine learning is disabled', async () => {
       mocks.systemMetadata.get.mockResolvedValue(systemConfigStub.machineLearningDisabled);
-      mocks.person.getDataForThumbnailGenerationJob.mockResolvedValue(personThumbnailStub.newThumbnailMiddle);
-      mocks.media.generateThumbnail.mockResolvedValue();
-      mocks.media.decodeImage.mockResolvedValue({
-        data: Buffer.from(''),
-        info: { width: 1000, height: 1000 } as OutputInfo,
-      });
 
-      await expect(sut.handleGeneratePersonThumbnail({ id: 'person-1' })).resolves.toBe(JobStatus.Success);
-      expect(mocks.media.generateThumbnail).toHaveBeenCalled();
+      await expect(sut.handleGeneratePersonThumbnail({ id: 'person-1' })).resolves.toBe(JobStatus.Skipped);
+      expect(mocks.asset.getByIds).not.toHaveBeenCalled();
+      expect(mocks.systemMetadata.get).toHaveBeenCalled();
     });
 
     it('should skip a person not found', async () => {

server/src/services/media.service.ts

@@ -43,7 +43,7 @@ import { getAssetFile, getDimensions } from 'src/utils/asset.util';
 import { checkFaceVisibility, checkOcrVisibility } from 'src/utils/editor';
 import { BaseConfig, ThumbnailConfig } from 'src/utils/media';
 import { mimeTypes } from 'src/utils/mime-types';
-import { clamp } from 'src/utils/misc';
+import { clamp, isFaceImportEnabled, isFacialRecognitionEnabled } from 'src/utils/misc';
 import { getOutputDimensions } from 'src/utils/transform';
 
 interface UpsertFileOptions {
@@ -410,7 +410,11 @@ export class MediaService extends BaseService {
 
   @OnJob({ name: JobName.PersonGenerateThumbnail, queue: QueueName.ThumbnailGeneration })
   async handleGeneratePersonThumbnail({ id }: JobOf<JobName.PersonGenerateThumbnail>): Promise<JobStatus> {
-    const { image } = await this.getConfig({ withCache: true });
+    const { machineLearning, metadata, image } = await this.getConfig({ withCache: true });
+    if (!isFacialRecognitionEnabled(machineLearning) && !isFaceImportEnabled(metadata)) {
+      return JobStatus.Skipped;
+    }
+
     const data = await this.personRepository.getDataForThumbnailGenerationJob(id);
     if (!data) {
       this.logger.error(`Could not generate person thumbnail for ${id}: missing data`);

web/src/lib/components/AdaptiveImage.svelte

@@ -63,7 +63,6 @@
   import { toTimelineAsset } from '$lib/utils/timeline-util';
   import type { AssetResponseDto, SharedLinkResponseDto } from '@immich/sdk';
   import { untrack, type Snippet } from 'svelte';
-  import { languageManager } from '$lib/managers/language-manager.svelte';
 
   type Props = {
     asset: AssetResponseDto;
@@ -233,7 +232,7 @@
       style:width={rasterWidth}
       style:height={rasterHeight}
       style:transform="scale({rasterScale})"
-      style:transform-origin={languageManager.rtl ? 'right top' : 'left top'}
+      style:transform-origin="0 0"
       style:will-change={maxRasterPixels > 0 ? 'transform' : undefined}
     >
       {#if show.alphaBackground}