fix(mobile): fix stale refs in use timer

The timer hook preserved the values of the original local variables, which caused issues when hiding controls for videos. The callback can be changed so that it always sees the latest value with useRef, and it can be simplified significantly using a function rather than state class.
2026-06-03 20:55:25 -04:00 · 2026-04-05 04:03:32 +01:00
31 changed files with 180 additions and 377 deletions
@@ -28,17 +28,17 @@ For the full list, refer to the [Immich source code](https://github.com/immich-a

 ## Video formats

-| Format      | Extension(s)                |     Supported?     | Notes |
-| :---------- | :-------------------------- | :----------------: | :---- |
-| `3GPP`      | `.3gp` `.3gpp`              | :white_check_mark: |       |
-| `AVI`       | `.avi`                      | :white_check_mark: |       |
-| `FLV`       | `.flv`                      | :white_check_mark: |       |
-| `M4V`       | `.m4v`                      | :white_check_mark: |       |
-| `MATROSKA`  | `.mkv`                      | :white_check_mark: |       |
-| `MP2T`      | `.mts` `.m2ts` `.m2t` `.ts` | :white_check_mark: |       |
-| `MP4`       | `.mp4` `.insv`              | :white_check_mark: |       |
-| `MPEG`      | `.mpg` `.mpe` `.mpeg`       | :white_check_mark: |       |
-| `MXF`       | `.mxf`                      | :white_check_mark: |       |
-| `QUICKTIME` | `.mov`                      | :white_check_mark: |       |
-| `WEBM`      | `.webm`                     | :white_check_mark: |       |
-| `WMV`       | `.wmv`                      | :white_check_mark: |       |
+| Format      | Extension(s)          |     Supported?     | Notes |
+| :---------- | :-------------------- | :----------------: | :---- |
+| `3GPP`      | `.3gp` `.3gpp`        | :white_check_mark: |       |
+| `AVI`       | `.avi`                | :white_check_mark: |       |
+| `FLV`       | `.flv`                | :white_check_mark: |       |
+| `M4V`       | `.m4v`                | :white_check_mark: |       |
+| `MATROSKA`  | `.mkv`                | :white_check_mark: |       |
+| `MP2T`      | `.mts` `.m2ts` `.m2t` | :white_check_mark: |       |
+| `MP4`       | `.mp4` `.insv`        | :white_check_mark: |       |
+| `MPEG`      | `.mpg` `.mpe` `.mpeg` | :white_check_mark: |       |
+| `MXF`       | `.mxf`                | :white_check_mark: |       |
+| `QUICKTIME` | `.mov`                | :white_check_mark: |       |
+| `WEBM`      | `.webm`               | :white_check_mark: |       |
+| `WMV`       | `.wmv`                | :white_check_mark: |       |
@@ -173,7 +173,6 @@ export const setupBaseMockApiRoutes = async (context: BrowserContext, adminUserI
          '.mpeg',
          '.mpg',
          '.mts',
-          '.ts',
          '.vob',
          '.webm',
          '.wmv',
@@ -6,7 +6,6 @@ import {
  generateTimelineData,
  TimelineAssetConfig,
  TimelineData,
-  toAssetResponseDto,
 } from 'src/ui/generators/timeline';
 import { setupBaseMockApiRoutes } from 'src/ui/mock-network/base-network';
 import { setupTimelineMockApiRoutes, TimelineTestContext } from 'src/ui/mock-network/timeline-network';
@@ -31,10 +30,6 @@ test.describe('search gallery-viewer', () => {
  };

  test.beforeAll(async () => {
-    test.fail(
-      process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS !== '1',
-      'This test requires env var: PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1',
-    );
    adminUserId = faker.string.uuid();
    testContext.adminId = adminUserId;
    timelineRestData = generateTimelineData({ ...createDefaultTimelineConfig(), ownerId: adminUserId });
@@ -49,10 +44,7 @@ test.describe('search gallery-viewer', () => {

    await context.route('**/api/search/metadata', async (route, request) => {
      if (request.method() === 'POST') {
-        const searchAssets = assets
-          .slice(0, 5)
-          .filter((asset) => !changes.assetDeletions.includes(asset.id))
-          .map((asset) => toAssetResponseDto(asset));
+        const searchAssets = assets.slice(0, 5).filter((asset) => !changes.assetDeletions.includes(asset.id));
        return route.fulfill({
          status: 200,
          contentType: 'application/json',
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 77;
+	objectVersion = 54;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -16,7 +16,6 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		A01DD69B2F7F43B40049AB63 /* ImageRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A01DD6982F7F43B40049AB63 /* ImageRequest.swift */; };
 		B21E34AA2E5AFD2B0031FDB9 /* BackgroundWorkerApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21E34A92E5AFD210031FDB9 /* BackgroundWorkerApiImpl.swift */; };
 		B21E34AC2E5B09190031FDB9 /* BackgroundWorker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */; };
 		B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25D37782E72CA15008B6CA7 /* Connectivity.g.swift */; };
@@ -103,7 +102,6 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		A01DD6982F7F43B40049AB63 /* ImageRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageRequest.swift; sourceTree = "<group>"; };
 		B1FBA9EE014DE20271B0FE77 /* Pods-ShareExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShareExtension.profile.xcconfig"; path = "Target Support Files/Pods-ShareExtension/Pods-ShareExtension.profile.xcconfig"; sourceTree = "<group>"; };
 		B21E34A92E5AFD210031FDB9 /* BackgroundWorkerApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorkerApiImpl.swift; sourceTree = "<group>"; };
 		B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.swift; sourceTree = "<group>"; };
@@ -139,23 +137,20 @@
 			);
 			target = F0B57D372DF764BD00DC5BCC /* WidgetExtension */;
 		};
-		FE1BB4572F83196E0087DBF9 /* Exceptions for "Utility" folder in "Runner" target */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				Mutex.swift,
-			);
-			target = 97C146ED1CF9000F007C117D /* Runner */;
-		};
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -167,16 +162,10 @@
 			path = WidgetExtension;
 			sourceTree = "<group>";
 		};
-		FE1BB4562F8319560087DBF9 /* Utility */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-				FE1BB4572F83196E0087DBF9 /* Exceptions for "Utility" folder in "Runner" target */,
-			);
-			path = Utility;
-			sourceTree = "<group>";
-		};
 		FEE084F22EC172080045228E /* Schemas */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Schemas;
 			sourceTree = "<group>";
 		};
@@ -284,7 +273,6 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
-				FE1BB4562F8319560087DBF9 /* Utility */,
 				FEE084F22EC172080045228E /* Schemas */,
 				B231F52D2E93A44A00BC45D1 /* Core */,
 				B25D37792E72CA15008B6CA7 /* Connectivity */,
@@ -339,7 +327,6 @@
 		FED3B1952E253E9B0030FD97 /* Images */ = {
 			isa = PBXGroup;
 			children = (
-				A01DD6982F7F43B40049AB63 /* ImageRequest.swift */,
 				FE5FE4AD2F30FBC000A71243 /* ImageProcessing.swift */,
 				FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */,
 				FE5499F52F11980E006016CB /* LocalImagesImpl.swift */,
@@ -571,14 +558,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -607,14 +590,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -629,7 +608,6 @@
 			files = (
 				65F32F31299BD2F800CE9261 /* BackgroundServicePlugin.swift in Sources */,
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
-				A01DD69B2F7F43B40049AB63 /* ImageRequest.swift in Sources */,
 				B21E34AC2E5B09190031FDB9 /* BackgroundWorker.swift in Sources */,
 				FE5499F32F1197D8006016CB /* LocalImages.g.swift in Sources */,
 				FE5499F62F11980E006016CB /* LocalImagesImpl.swift in Sources */,
@@ -1,12 +1,7 @@
 import Foundation

 enum ImageProcessing {
-  static let queue = {
-    let q = OperationQueue()
-    q.name = "thumbnail.processing"
-    q.qualityOfService = .userInitiated
-    q.maxConcurrentOperationCount = ProcessInfo.processInfo.activeProcessorCount * 2
-    return q
-  }()
+  static let queue = DispatchQueue(label: "thumbnail.processing", qos: .userInitiated, attributes: .concurrent)
+  static let semaphore = DispatchSemaphore(value: ProcessInfo.processInfo.activeProcessorCount * 2)
  static let cancelledResult = Result<[String: Int64]?, any Error>.success(nil)
 }
@@ -1,14 +0,0 @@
-import Foundation
-
-struct RequestRegistry<T: AnyObject & Sendable>: ~Copyable, Sendable {
-  private let requests = Mutex<[Int64: T]>([:])
-
-  func add(requestId: Int64, request: T) {
-    requests.withLock { $0[requestId] = request }
-  }
-
-  @discardableResult
-  func remove(requestId: Int64) -> T? {
-    requests.withLock { $0.removeValue(forKey: requestId) }
-  }
-}
@@ -4,18 +4,13 @@ import MobileCoreServices
 import Photos

 class LocalImageRequest {
-  weak var operation: Operation?
+  weak var workItem: DispatchWorkItem?
  var isCancelled = false
  let callback: (Result<[String: Int64]?, any Error>) -> Void

  init(callback: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
    self.callback = callback
  }
-
-  func cancel() {
-    isCancelled = true
-    operation?.cancel()
-  }
 }

 class LocalImageApiImpl: LocalImageApi {
@@ -36,7 +31,9 @@ class LocalImageApiImpl: LocalImageApi {
    return requestOptions
  }()

-  private static let registry = RequestRegistry<LocalImageRequest>()
+  private static let assetQueue = DispatchQueue(label: "thumbnail.assets", qos: .userInitiated)
+  private static let requestQueue = DispatchQueue(label: "thumbnail.requests", qos: .userInitiated)
+  private static let cancelQueue = DispatchQueue(label: "thumbnail.cancellation", qos: .default)

  private static var rgbaFormat = vImage_CGImageFormat(
    bitsPerComponent: 8,
@@ -45,6 +42,7 @@ class LocalImageApiImpl: LocalImageApi {
    bitmapInfo: CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedLast.rawValue),
    renderingIntent: .defaultIntent
  )!
+  private static var requests = [Int64: LocalImageRequest]()
  private static let assetCache = {
    let assetCache = NSCache<NSString, PHAsset>()
    assetCache.countLimit = 10000
@@ -52,7 +50,7 @@ class LocalImageApiImpl: LocalImageApi {
  }()

  func getThumbhash(thumbhash: String, completion: @escaping (Result<[String : Int64], any Error>) -> Void) {
-    ImageProcessing.queue.addOperation {
+    ImageProcessing.queue.async {
      guard let data = Data(base64Encoded: thumbhash)
      else { return completion(.failure(PigeonError(code: "", message: "Invalid base64 string: \(thumbhash)", details: nil)))}

@@ -68,14 +66,23 @@ class LocalImageApiImpl: LocalImageApi {

  func requestImage(assetId: String, requestId: Int64, width: Int64, height: Int64, isVideo: Bool, preferEncoded: Bool, completion: @escaping (Result<[String: Int64]?, any Error>) -> Void) {
    let request = LocalImageRequest(callback: completion)
-    let operation = BlockOperation {
+    let item = DispatchWorkItem {
+      if request.isCancelled {
+        return completion(ImageProcessing.cancelledResult)
+      }
+
+      ImageProcessing.semaphore.wait()
+      defer {
+        ImageProcessing.semaphore.signal()
+      }
+
      if request.isCancelled {
        return completion(ImageProcessing.cancelledResult)
      }

      guard let asset = Self.requestAsset(assetId: assetId)
      else {
-        Self.registry.remove(requestId: requestId)
+        Self.remove(requestId: requestId)
        completion(.failure(PigeonError(code: "", message: "Could not get asset data for \(assetId)", details: nil)))
        return
      }
@@ -100,11 +107,12 @@ class LocalImageApiImpl: LocalImageApi {
        )

        if request.isCancelled {
+          Self.remove(requestId: requestId)
          return completion(ImageProcessing.cancelledResult)
        }

        guard let data = imageData else {
-          Self.registry.remove(requestId: requestId)
+          Self.remove(requestId: requestId)
          return completion(.failure(PigeonError(code: "", message: "Could not get image data for \(assetId)", details: nil)))
        }

@@ -114,6 +122,7 @@ class LocalImageApiImpl: LocalImageApi {

        if request.isCancelled {
          free(pointer)
+          Self.remove(requestId: requestId)
          return completion(ImageProcessing.cancelledResult)
        }

@@ -121,7 +130,7 @@ class LocalImageApiImpl: LocalImageApi {
          "pointer": Int64(Int(bitPattern: pointer)),
          "length": Int64(length),
        ]))
-        Self.registry.remove(requestId: requestId)
+        Self.remove(requestId: requestId)
        return
      }

@@ -142,7 +151,7 @@ class LocalImageApiImpl: LocalImageApi {

      guard let image = image,
            let cgImage = image.cgImage else {
-        Self.registry.remove(requestId: requestId)
+        Self.remove(requestId: requestId)
        return completion(.failure(PigeonError(code: "", message: "Could not get pixel data for \(assetId)", details: nil)))
      }

@@ -162,32 +171,51 @@ class LocalImageApiImpl: LocalImageApi {
          "pointer": Int64(Int(bitPattern: buffer.data)),
          "width": Int64(buffer.width),
          "height": Int64(buffer.height),
-          "rowBytes": Int64(buffer.rowBytes),
+          "rowBytes": Int64(buffer.rowBytes)
        ]))
-        Self.registry.remove(requestId: requestId)
+        Self.remove(requestId: requestId)
      } catch {
-        Self.registry.remove(requestId: requestId)
+        Self.remove(requestId: requestId)
        return completion(.failure(PigeonError(code: "", message: "Failed to convert image for \(assetId): \(error)", details: nil)))
      }
    }

-    request.operation = operation
-    Self.registry.add(requestId: requestId, request: request)
-    ImageProcessing.queue.addOperation(operation)
+    request.workItem = item
+    Self.add(requestId: requestId, request: request)
+    ImageProcessing.queue.async(execute: item)
  }

  func cancelRequest(requestId: Int64) {
-    Self.registry.remove(requestId: requestId)?.cancel()
+    Self.cancel(requestId: requestId)
+  }
+
+  private static func add(requestId: Int64, request: LocalImageRequest) -> Void {
+    requestQueue.sync { requests[requestId] = request }
+  }
+
+  private static func remove(requestId: Int64) -> Void {
+    requestQueue.sync { requests[requestId] = nil }
+  }
+
+  private static func cancel(requestId: Int64) -> Void {
+    requestQueue.async {
+      guard let request = requests.removeValue(forKey: requestId) else { return }
+      request.isCancelled = true
+      guard let item = request.workItem else { return }
+      if item.isCancelled {
+        cancelQueue.async { request.callback(ImageProcessing.cancelledResult) }
+      }
+    }
  }

  private static func requestAsset(assetId: String) -> PHAsset? {
-    if let cached = assetCache.object(forKey: assetId as NSString) {
-      return cached
-    }
+    var asset: PHAsset?
+    assetQueue.sync { asset = assetCache.object(forKey: assetId as NSString) }
+    if asset != nil { return asset }

    guard let asset = PHAsset.fetchAssets(withLocalIdentifiers: [assetId], options: Self.fetchOptions).firstObject
    else { return nil }
-    assetCache.setObject(asset, forKey: assetId as NSString)
+    assetQueue.async { assetCache.setObject(asset, forKey: assetId as NSString) }
    return asset
  }
 }
@@ -14,15 +14,11 @@ class RemoteImageRequest {
    self.task = task
    self.completion = completion
  }
-
-  func cancel() {
-    isCancelled = true
-    task?.cancel()
-  }
 }

 class RemoteImageApiImpl: NSObject, RemoteImageApi {
-  private static let registry = RequestRegistry<RemoteImageRequest>()
+  private static var lock = os_unfair_lock()
+  private static var requests = [Int64: RemoteImageRequest]()
  private static var rgbaFormat = vImage_CGImageFormat(
    bitsPerComponent: 8,
    bitsPerPixel: 32,
@@ -47,15 +43,20 @@ class RemoteImageApiImpl: NSObject, RemoteImageApi {

    let request = RemoteImageRequest(id: requestId, task: task, completion: completion)

-    Self.registry.add(requestId: requestId, request: request)
+    os_unfair_lock_lock(&Self.lock)
+    Self.requests[requestId] = request
+    os_unfair_lock_unlock(&Self.lock)

    task.resume()
  }

  private static func handleCompletion(requestId: Int64, encoded: Bool, data: Data?, response: URLResponse?, error: Error?) {
-    guard let request = registry.remove(requestId: requestId) else {
-      return
+    os_unfair_lock_lock(&Self.lock)
+    guard let request = requests[requestId] else {
+      return os_unfair_lock_unlock(&Self.lock)
    }
+    requests[requestId] = nil
+    os_unfair_lock_unlock(&Self.lock)

    if let error = error {
      if request.isCancelled || (error as NSError).code == NSURLErrorCancelled {
@@ -72,7 +73,10 @@ class RemoteImageApiImpl: NSObject, RemoteImageApi {
      return request.completion(.failure(PigeonError(code: "", message: "No data received", details: nil)))
    }

-    ImageProcessing.queue.addOperation {
+    ImageProcessing.queue.async {
+      ImageProcessing.semaphore.wait()
+      defer { ImageProcessing.semaphore.signal() }
+
      if request.isCancelled {
        return request.completion(ImageProcessing.cancelledResult)
      }
@@ -126,7 +130,13 @@ class RemoteImageApiImpl: NSObject, RemoteImageApi {
  }

  func cancelRequest(requestId: Int64) {
-    Self.registry.remove(requestId: requestId)?.cancel()
+    os_unfair_lock_lock(&Self.lock)
+    let request = Self.requests[requestId]
+    os_unfair_lock_unlock(&Self.lock)
+
+    guard let request = request else { return }
+    request.isCancelled = true
+    request.task?.cancel()
  }

  func clearCache(completion: @escaping (Result<Int64, any Error>) -> Void) {
@@ -1,54 +0,0 @@
-import Darwin
-
-// Can be replaced with std Mutex when the deployment target is iOS 18+
-struct Mutex<Value: ~Copyable>: ~Copyable, @unchecked Sendable {
-  struct _Buffer: ~Copyable {
-    var lock: os_unfair_lock = .init()
-    var value: Value
-
-    init(value: consuming Value) {
-      self.value = value
-    }
-
-    deinit {}
-  }
-
-  let _buffer: UnsafeMutablePointer<_Buffer>
-
-  init(_ initialValue: consuming sending Value) {
-    _buffer = .allocate(capacity: 1)
-    _buffer.initialize(to: _Buffer(value: initialValue))
-  }
-
-  deinit {
-    _buffer.deinitialize(count: 1)
-    _buffer.deallocate()
-  }
-
-  @discardableResult
-  borrowing func withLock<Result: ~Copyable, E: Error>(
-    _ body: (inout sending Value) throws(E) -> sending Result
-  ) throws(E) -> sending Result {
-    os_unfair_lock_lock(&_buffer.pointee.lock)
-    defer { os_unfair_lock_unlock(&_buffer.pointee.lock) }
-    return try body(&_buffer.pointee.value)
-  }
-}
-
-// Can be replaced with OSAllocatedUnfairLock when the deployment target is iOS 16+
-typealias UnfairLock = Mutex<Void>
-
-extension Mutex where Value == Void {
-  init() {
-    self.init(())
-  }
-
-  @discardableResult
-  borrowing func withLock<Result: ~Copyable, E: Error>(
-    _ body: () throws(E) -> sending Result
-  ) throws(E) -> sending Result {
-    os_unfair_lock_lock(&_buffer.pointee.lock)
-    defer { os_unfair_lock_unlock(&_buffer.pointee.lock) }
-    return try body()
-  }
-}
@@ -10,19 +10,20 @@ class TrashBottomBar extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    return Align(
-      alignment: Alignment.bottomCenter,
-      child: Container(
-        color: context.themeData.canvasColor,
-        padding: const EdgeInsets.symmetric(vertical: 8),
-        child: const SafeArea(
-          top: false,
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-            children: [
-              DeleteTrashActionButton(source: ActionSource.timeline),
-              RestoreTrashActionButton(source: ActionSource.timeline),
-            ],
+    return SafeArea(
+      child: Align(
+        alignment: Alignment.bottomCenter,
+        child: SizedBox(
+          height: 64,
+          child: Container(
+            color: context.themeData.canvasColor,
+            child: const Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: [
+                DeleteTrashActionButton(source: ActionSource.timeline),
+                RestoreTrashActionButton(source: ActionSource.timeline),
+              ],
+            ),
          ),
        ),
      ),
@@ -1,36 +1,17 @@
 import 'package:async/async.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';

-RestartableTimer useTimer(Duration duration, void Function() callback) {
-  return use(_TimerHook(duration: duration, callback: callback));
-}
-
-class _TimerHook extends Hook<RestartableTimer> {
-  final Duration duration;
-  final void Function() callback;
-
-  const _TimerHook({required this.duration, required this.callback});
-  @override
-  HookState<RestartableTimer, Hook<RestartableTimer>> createState() => _TimerHookState();
-}
-
-class _TimerHookState extends HookState<RestartableTimer, _TimerHook> {
-  late RestartableTimer timer;
-  @override
-  void initHook() {
-    super.initHook();
-    timer = RestartableTimer(hook.duration, hook.callback);
-  }
-
-  @override
-  RestartableTimer build(BuildContext context) {
-    return timer;
-  }
-
-  @override
-  void dispose() {
-    timer.cancel();
-    super.dispose();
-  }
+RestartableTimer useTimer(Duration duration, VoidCallback callback) {
+  final latest = useRef(callback);
+  latest.value = callback;
+
+  final timer = useMemoized(
+    () => RestartableTimer(duration, () => latest.value()),
+    [duration],
+  );
+
+  useEffect(() => timer.cancel, [timer]);
+
+  return timer;
 }
@@ -1,6 +1,5 @@
 import 'dart:math';

-import 'package:async/async.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/colors.dart';
@@ -8,63 +7,26 @@ import 'package:immich_mobile/models/cast/cast_manager_state.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
 import 'package:immich_mobile/providers/cast.provider.dart';
+import 'package:immich_mobile/utils/hooks/timer_hook.dart';
 import 'package:immich_mobile/extensions/duration_extensions.dart';
 import 'package:immich_mobile/widgets/asset_viewer/animated_play_pause.dart';

-class VideoControls extends ConsumerStatefulWidget {
+class VideoControls extends HookConsumerWidget {
  final String videoPlayerName;

  static const List<Shadow> _controlShadows = [Shadow(color: Colors.black87, blurRadius: 6, offset: Offset(0, 1))];

  const VideoControls({super.key, required this.videoPlayerName});

-  @override
-  ConsumerState<VideoControls> createState() => _VideoControlsState();
-}
-
-class _VideoControlsState extends ConsumerState<VideoControls> {
-  late final RestartableTimer _hideTimer;
-
-  AutoDisposeStateNotifierProvider<VideoPlayerNotifier, VideoPlayerState> get _provider =>
-      videoPlayerProvider(widget.videoPlayerName);
-
-  @override
-  void initState() {
-    super.initState();
-    _hideTimer = RestartableTimer(const Duration(seconds: 5), _onHideTimer);
-  }
-
-  @override
-  void didUpdateWidget(covariant VideoControls oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.videoPlayerName != widget.videoPlayerName) {
-      _hideTimer.reset();
-    }
-  }
-
-  @override
-  void dispose() {
-    _hideTimer.cancel();
-    super.dispose();
-  }
-
-  void _onHideTimer() {
-    if (!mounted) return;
-    if (ref.read(_provider).status == VideoPlaybackStatus.playing) {
-      ref.read(assetViewerProvider.notifier).setControls(false);
-    }
-  }
-
-  void _toggle(bool isCasting) {
+  void _toggle(WidgetRef ref, bool isCasting) {
    if (isCasting) {
      ref.read(castProvider.notifier).toggle();
-      return;
+    } else {
+      ref.read(videoPlayerProvider(videoPlayerName).notifier).toggle();
    }
-
-    ref.read(_provider.notifier).toggle();
  }

-  void _onSeek(bool isCasting, double value) {
+  void _onSeek(WidgetRef ref, bool isCasting, double value) {
    final seekTo = Duration(microseconds: value.toInt());

    if (isCasting) {
@@ -72,30 +34,38 @@ class _VideoControlsState extends ConsumerState<VideoControls> {
      return;
    }

-    ref.read(_provider.notifier).seekTo(seekTo);
+    ref.read(videoPlayerProvider(videoPlayerName).notifier).seekTo(seekTo);
  }

  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
+    final provider = videoPlayerProvider(videoPlayerName);
    final cast = ref.watch(castProvider);
    final isCasting = cast.isCasting;

    final (position, duration) = isCasting
        ? ref.watch(castProvider.select((c) => (c.currentTime, c.duration)))
-        : ref.watch(_provider.select((v) => (v.position, v.duration)));
+        : ref.watch(provider.select((v) => (v.position, v.duration)));

-    final videoStatus = ref.watch(_provider.select((v) => v.status));
+    final videoStatus = ref.watch(provider.select((v) => v.status));
    final isPlaying = isCasting
        ? cast.castState == CastState.playing
        : videoStatus == VideoPlaybackStatus.playing || videoStatus == VideoPlaybackStatus.buffering;
    final isFinished = !isCasting && videoStatus == VideoPlaybackStatus.completed;

-    ref.listen(assetViewerProvider.select((v) => v.showingControls), (prev, showing) {
-      if (showing && prev != showing) _hideTimer.reset();
+    final hideTimer = useTimer(const Duration(seconds: 5), () {
+      if (!context.mounted) return;
+      if (ref.read(provider).status == VideoPlaybackStatus.playing) {
+        ref.read(assetViewerProvider.notifier).setControls(false);
+      }
    });
-    ref.listen(_provider.select((v) => v.status), (_, __) => _hideTimer.reset());

-    final notifier = ref.read(_provider.notifier);
+    ref.listen(assetViewerProvider.select((v) => v.showingControls), (prev, showing) {
+      if (showing && prev != showing) hideTimer.reset();
+    });
+    ref.listen(provider.select((v) => v.status), (_, __) => hideTimer.reset());
+
+    final notifier = ref.read(provider.notifier);
    final isLoaded = duration != Duration.zero;

    return Padding(
@@ -110,13 +80,9 @@ class _VideoControlsState extends ConsumerState<VideoControls> {
                padding: const EdgeInsets.all(12),
                constraints: const BoxConstraints(),
                icon: isFinished
-                    ? const Icon(Icons.replay, color: Colors.white, shadows: VideoControls._controlShadows)
-                    : AnimatedPlayPause(
-                        color: Colors.white,
-                        playing: isPlaying,
-                        shadows: VideoControls._controlShadows,
-                      ),
-                onPressed: () => _toggle(isCasting),
+                    ? const Icon(Icons.replay, color: Colors.white, shadows: _controlShadows)
+                    : AnimatedPlayPause(color: Colors.white, playing: isPlaying, shadows: _controlShadows),
+                onPressed: () => _toggle(ref, isCasting),
              ),
              const Spacer(),
              Text(
@@ -125,7 +91,7 @@ class _VideoControlsState extends ConsumerState<VideoControls> {
                  color: Colors.white,
                  fontWeight: FontWeight.w500,
                  fontFeatures: [FontFeature.tabularFigures()],
-                  shadows: VideoControls._controlShadows,
+                  shadows: _controlShadows,
                ),
              ),
              const SizedBox(width: 12),
@@ -141,7 +107,7 @@ class _VideoControlsState extends ConsumerState<VideoControls> {
            padding: EdgeInsets.zero,
            onChangeStart: (_) => notifier.hold(),
            onChangeEnd: (_) => notifier.release(),
-            onChanged: isLoaded ? (value) => _onSeek(isCasting, value) : null,
+            onChanged: isLoaded ? (value) => _onSeek(ref, isCasting, value) : null,
          ),
        ],
      ),
@@ -15,36 +15,30 @@ class DatabaseBackupDto {
  DatabaseBackupDto({
    required this.filename,
    required this.filesize,
-    required this.timezone,
  });

  String filename;

  num filesize;

-  String timezone;
-
  @override
  bool operator ==(Object other) => identical(this, other) || other is DatabaseBackupDto &&
    other.filename == filename &&
-    other.filesize == filesize &&
-    other.timezone == timezone;
+    other.filesize == filesize;

  @override
  int get hashCode =>
    // ignore: unnecessary_parenthesis
    (filename.hashCode) +
-    (filesize.hashCode) +
-    (timezone.hashCode);
+    (filesize.hashCode);

  @override
-  String toString() => 'DatabaseBackupDto[filename=$filename, filesize=$filesize, timezone=$timezone]';
+  String toString() => 'DatabaseBackupDto[filename=$filename, filesize=$filesize]';

  Map<String, dynamic> toJson() {
    final json = <String, dynamic>{};
      json[r'filename'] = this.filename;
      json[r'filesize'] = this.filesize;
-      json[r'timezone'] = this.timezone;
    return json;
  }

@@ -59,7 +53,6 @@ class DatabaseBackupDto {
      return DatabaseBackupDto(
        filename: mapValueOfType<String>(json, r'filename')!,
        filesize: num.parse('${json[r'filesize']}'),
-        timezone: mapValueOfType<String>(json, r'timezone')!,
      );
    }
    return null;
@@ -109,7 +102,6 @@ class DatabaseBackupDto {
  static const requiredKeys = <String>{
    'filename',
    'filesize',
-    'timezone',
  };
 }

@@ -17721,15 +17721,11 @@
          },
          "filesize": {
            "type": "number"
-          },
-          "timezone": {
-            "type": "string"
          }
        },
        "required": [
          "filename",
-          "filesize",
-          "timezone"
+          "filesize"
        ],
        "type": "object"
      },
@@ -63,7 +63,6 @@ export type DatabaseBackupDeleteDto = {
 export type DatabaseBackupDto = {
    filename: string;
    filesize: number;
-    timezone: string;
 };
 export type DatabaseBackupListResponseDto = {
    backups: DatabaseBackupDto[];
@@ -4,7 +4,6 @@ import { IsString } from 'class-validator';
 export class DatabaseBackupDto {
  filename!: string;
  filesize!: number;
-  timezone!: string;
 }

 export class DatabaseBackupListResponseDto {
@@ -75,10 +75,6 @@ export interface EnvData {
    server: string;
  };

-  versionCheck: {
-    url: string;
-  };
-
  network: {
    trustedProxies: string[];
  };
@@ -324,10 +320,6 @@ const getEnv = (): EnvData => {

    licensePublicKey: isProd ? productionKeys : stagingKeys,

-    versionCheck: {
-      url: isProd ? 'https://version.immich.cloud/version' : 'https://version.dev.immich.cloud/version',
-    },
-
    network: {
      trustedProxies: dto.IMMICH_TRUSTED_PROXIES ?? ['linklocal', 'uniquelocal'],
    },
@@ -66,8 +66,7 @@ export class ServerInfoRepository {

  async getLatestRelease(): Promise<VersionResponse> {
    try {
-      const { versionCheck } = this.configRepository.getEnv();
-      const response = await fetch(versionCheck.url);
+      const response = await fetch('https://version.immich.cloud/version');

      if (!response.ok) {
        throw new Error(`Version check request failed with status ${response.status}: ${await response.text()}`);
@@ -111,7 +111,6 @@ const validVideos = [
  '.mpg',
  '.mts',
  '.mxf',
-  '.ts',
  '.vob',
  '.webm',
  '.wmv',
@@ -283,7 +283,6 @@ export class DatabaseBackupService {
  async listBackups(): Promise<DatabaseBackupListResponseDto> {
    const backupsFolder = StorageCore.getBaseFolder(StorageFolder.Backups);
    const files = await this.storageRepository.readdir(backupsFolder);
-    const timezone = DateTime.local().zoneName;

    const validFiles = files
      .filter((fn) => isValidDatabaseBackupName(fn))
@@ -293,7 +292,7 @@ export class DatabaseBackupService {
    const backups = await Promise.all(
      validFiles.map(async (filename) => {
        const stats = await this.storageRepository.stat(path.join(backupsFolder, filename));
-        return { filename, filesize: stats.size, timezone };
+        return { filename, filesize: stats.size };
      }),
    );

@@ -2,8 +2,9 @@ import { DateTime } from 'luxon';
 import { SemVer } from 'semver';
 import { defaults } from 'src/config';
 import { serverVersion } from 'src/constants';
-import { JobName, JobStatus, SystemMetadataKey } from 'src/enum';
+import { ImmichEnvironment, JobName, JobStatus, SystemMetadataKey } from 'src/enum';
 import { VersionService } from 'src/services/version.service';
+import { mockEnvData } from 'test/repositories/config.repository.mock';
 import { factory } from 'test/small.factory';
 import { newTestService, ServiceMocks } from 'test/utils';

@@ -72,6 +73,15 @@ describe(VersionService.name, () => {
  });

  describe('handVersionCheck', () => {
+    beforeEach(() => {
+      mocks.config.getEnv.mockReturnValue(mockEnvData({ environment: ImmichEnvironment.Production }));
+    });
+
+    it('should not run in dev mode', async () => {
+      mocks.config.getEnv.mockReturnValue(mockEnvData({ environment: ImmichEnvironment.Development }));
+      await expect(sut.handleVersionCheck()).resolves.toEqual(JobStatus.Skipped);
+    });
+
    it('should not run if the last check was < 60 minutes ago', async () => {
      mocks.systemMetadata.get.mockResolvedValue({
        checkedAt: DateTime.utc().minus({ minutes: 5 }).toISO(),
@@ -4,7 +4,7 @@ import semver, { SemVer } from 'semver';
 import { serverVersion } from 'src/constants';
 import { OnEvent, OnJob } from 'src/decorators';
 import { ReleaseNotification, ServerVersionResponseDto } from 'src/dtos/server.dto';
-import { DatabaseLock, JobName, JobStatus, QueueName, SystemMetadataKey } from 'src/enum';
+import { DatabaseLock, ImmichEnvironment, JobName, JobStatus, QueueName, SystemMetadataKey } from 'src/enum';
 import { ArgOf } from 'src/repositories/event.repository';
 import { BaseService } from 'src/services/base.service';
 import { VersionCheckMetadata } from 'src/types';
@@ -71,6 +71,11 @@ export class VersionService extends BaseService {
    try {
      this.logger.debug('Running version check');

+      const { environment } = this.configRepository.getEnv();
+      if (environment === ImmichEnvironment.Development) {
+        return JobStatus.Skipped;
+      }
+
      const { newVersionCheck } = await this.getConfig({ withCache: true });
      if (!newVersionCheck.enabled) {
        return JobStatus.Skipped;
@@ -83,7 +83,6 @@ describe('mimeTypes', () => {
    { mimetype: 'video/mp2t', extension: '.m2t' },
    { mimetype: 'video/mp2t', extension: '.m2ts' },
    { mimetype: 'video/mp2t', extension: '.mts' },
-    { mimetype: 'video/mp2t', extension: '.ts' },
    { mimetype: 'video/mp4', extension: '.mp4' },
    { mimetype: 'video/mpeg', extension: '.mpe' },
    { mimetype: 'video/mpeg', extension: '.mpeg' },
@@ -114,7 +114,6 @@ const video: Record<string, string[]> = {
  '.mpg': ['video/mpeg'],
  '.mts': ['video/mp2t'],
  '.mxf': ['application/mxf'],
-  '.ts': ['video/mp2t'],
  '.vob': ['video/mpeg'],
  '.webm': ['video/webm'],
  '.wmv': ['video/x-ms-wmv'],
@@ -44,10 +44,6 @@ const envData: EnvData = {
    server: 'server-public-key',
  },

-  versionCheck: {
-    url: 'https://version.immich.cloud/version',
-  },
-
  network: {
    trustedProxies: [],
  },
@@ -276,6 +276,7 @@
  const handleStopSlideshow = async () => {
    try {
      if (document.fullscreenElement) {
+        document.body.style.cursor = '';
        await document.exitFullscreen();
      }
    } catch (error) {
@@ -337,7 +338,7 @@
    onAction?.(action);
  };

-  let isFullScreen = $derived(!!fullscreenElement);
+  let isFullScreen = $derived(fullscreenElement !== null);

  $effect(() => {
    if (album && !album.isActivityEnabled && activityManager.commentCount === 0) {
@@ -85,7 +85,6 @@
  });

  onDestroy(() => {
-    setCursorStyle('');
    if (unsubscribeRestart) {
      unsubscribeRestart();
    }
@@ -1,54 +0,0 @@
-import { locale } from '$lib/stores/preferences.store';
-import { renderWithTooltips } from '$tests/helpers';
-import { screen } from '@testing-library/svelte';
-import { DateTime } from 'luxon';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import MaintenanceBackupEntry from './MaintenanceBackupEntry.svelte';
-
-vi.mock('$lib/services/database-backups.service', () => ({
-  getDatabaseBackupActions: () => ({
-    Download: { type: 'command', title: 'Download', onAction: vi.fn() },
-    Delete: { type: 'command', title: 'Delete', onAction: vi.fn() },
-  }),
-  handleRestoreDatabaseBackup: vi.fn(),
-}));
-
-describe('MaintenanceBackupEntry', () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    vi.setSystemTime(new Date('2026-03-24T12:00:00Z'));
-    locale.set('en');
-  });
-
-  afterEach(() => {
-    vi.useRealTimers();
-  });
-
-  it('renders relative backup time using the user timezone instead of UTC', () => {
-    const backupTimestamp = '20260324T110000';
-
-    const expectedRelativeTime = DateTime.fromFormat(backupTimestamp, "yyyyMMdd'T'HHmmss", {
-      zone: 'Asia/Tokyo',
-    })
-      .toLocal()
-      .toRelative({ locale: 'en' });
-
-    const utcRelativeTime = DateTime.fromFormat(backupTimestamp, "yyyyMMdd'T'HHmmss", {
-      zone: 'UTC',
-    })
-      .toLocal()
-      .toRelative({ locale: 'en' });
-
-    expect(expectedRelativeTime).toBeTruthy();
-    expect(expectedRelativeTime).not.toEqual(utcRelativeTime);
-
-    renderWithTooltips(MaintenanceBackupEntry, {
-      expectedVersion: '1.2.3',
-      filename: 'immich-db-backup-20260324T110000-v1.2.3-snapshot.sql.gz',
-      filesize: 1024,
-      timezone: 'Asia/Tokyo',
-    });
-
-    expect(screen.getByText(expectedRelativeTime!)).toBeInTheDocument();
-  });
-});
@@ -13,17 +13,16 @@
    filename: string;
    filesize: number;
    expectedVersion: string;
-    timezone?: string;
  };

-  const { filename, filesize, expectedVersion, timezone }: Props = $props();
+  const { filename, filesize, expectedVersion }: Props = $props();

  const filesizeText = $derived(getBytesWithUnit(filesize, 1));

  const backupDateTime = $derived.by(() => {
    const dateMatch = filename.match(/\d+T\d+/);
    if (dateMatch) {
-      return DateTime.fromFormat(dateMatch[0], "yyyyMMdd'T'HHmmss", { zone: timezone }).toLocal();
+      return DateTime.fromFormat(dateMatch[0], "yyyyMMdd'T'HHmmss", { zone: 'utc' }).toLocal();
    }
    return null;
  });
@@ -51,13 +51,12 @@
    const unknownDateKey = $t('unknown_date');

    for (const backup of backups) {
-      const timezone = backup.timezone;
      const dateMatch = backup.filename.match(/\d+T\d+/);
      let dateKey: string;
      let dt: DateTime;

      if (dateMatch) {
-        dt = DateTime.fromFormat(dateMatch[0], "yyyyMMdd'T'HHmmss", { zone: timezone });
+        dt = DateTime.fromFormat(dateMatch[0], "yyyyMMdd'T'HHmmss", { zone: 'utc' });
        dateKey = dt.toFormat('LLLL d, yyyy');
      } else {
        dt = DateTime.fromMillis(0);
@@ -129,7 +128,6 @@
          filename={backup.filename}
          filesize={backup.filesize}
          expectedVersion={props.expectedVersion}
-          timezone={backup.timezone}
        />
      {/each}
    </Stack>
@@ -493,13 +493,7 @@

 <svelte:window
  bind:innerHeight={windowHeight}
-  onmousemove={(e) => {
-    if (isDragging && (e.buttons & 1) === 0) {
-      handleMouseEvent({ clientY: e.clientY, isDragging: false });
-    } else if (isDragging || isHover) {
-      handleMouseEvent({ clientY: e.clientY });
-    }
-  }}
+  onmousemove={({ clientY }) => (isDragging || isHover) && handleMouseEvent({ clientY })}
  onmousedown={({ clientY }) => isHover && handleMouseEvent({ clientY, isDragging: true })}
  onmouseup={({ clientY }) => handleMouseEvent({ clientY, isDragging: false })}
 />