chore: wtf isar

fix: deep link for assets when asset viewer already open
2026-04-29 12:38:49 -07:00 · 2026-04-19 15:57:45 -05:00 · 2026-04-19 15:54:07 -05:00
591 changed files with 3302 additions and 18016 deletions
--- a/.github/.nvmrc
+++ b/.github/.nvmrc
@@ -1 +1 @@
-24.15.0
+24.14.1
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -103,7 +103,7 @@ jobs:

      - name: Restore Gradle Cache
        id: cache-gradle-restore
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
        with:
          path: |
            ~/.gradle/caches
@@ -160,7 +160,7 @@ jobs:

      - name: Save Gradle Cache
        id: cache-gradle-save
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
        if: github.ref == 'refs/heads/main'
        with:
          path: |
@@ -210,7 +210,7 @@ jobs:
        working-directory: ./mobile

      - name: Setup Ruby
-        uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
+        uses: ruby/setup-ruby@e65c17d16e57e481586a6a5a0282698790062f92 # v1.300.0
        with:
          ruby-version: '3.3'
          bundler-cache: true
--- a/.github/workflows/check-openapi.yml
+++ b/.github/workflows/check-openapi.yml
@@ -24,7 +24,7 @@ jobs:
          persist-credentials: false

      - name: Check for breaking API changes
-        uses: oasdiff/oasdiff-action/breaking@f8cb9308b42121e793f835bd14c0b8090420430c # v0.0.39
+        uses: oasdiff/oasdiff-action/breaking@e6faebce24cf20ac38653d0d2c7f4aa80aaafc79 # v0.0.38
        with:
          base: https://raw.githubusercontent.com/${{ github.repository }}/main/open-api/immich-openapi-specs.json
          revision: open-api/immich-openapi-specs.json
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,7 +57,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
        with:
          languages: ${{ matrix.language }}
          # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,7 +70,7 @@ jobs:
      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        uses: github/codeql-action/autobuild@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -83,6 +83,6 @@ jobs:
      #   ./location_of_script_within_repo/buildscript.sh

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
+        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
        with:
          category: '/language:${{matrix.language}}'
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -211,7 +211,7 @@ jobs:
        run: 'mise run //deployment:tf apply'

      - name: Comment
-        uses: actions-cool/maintain-one-comment@909842216bc8e8658364c572ec52100f4c2cc50a # v3.3.0
+        uses: actions-cool/maintain-one-comment@4b2dbf086015f892dcb5e8c1106f5fccd6c1476b # v3.2.0
        if: ${{ steps.parameters.outputs.event == 'pr' }}
        with:
          token: ${{ steps.token.outputs.token }}
--- a/.github/workflows/docs-destroy.yml
+++ b/.github/workflows/docs-destroy.yml
@@ -42,7 +42,7 @@ jobs:
        run: 'mise run //deployment:tf destroy -- -refresh=false'

      - name: Comment
-        uses: actions-cool/maintain-one-comment@909842216bc8e8658364c572ec52100f4c2cc50a # v3.3.0
+        uses: actions-cool/maintain-one-comment@4b2dbf086015f892dcb5e8c1106f5fccd6c1476b # v3.2.0
        with:
          token: ${{ steps.token.outputs.token }}
          number: ${{ github.event.number }}
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -142,7 +142,7 @@ jobs:
          github-token: ${{ steps.generate-token.outputs.token }}

      - name: Create draft release
-        uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2.6.2
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # v2.6.1
        with:
          draft: true
          tag_name: ${{ needs.bump_version.outputs.version }}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,6 +13,10 @@
    "editor.wordBasedSuggestions": "off"
  },
  "[javascript]": {
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit",
+      "source.removeUnusedImports": "explicit"
+    },
    "editor.defaultFormatter": "esbenp.prettier-vscode",
    "editor.formatOnSave": true
  },
@@ -25,10 +29,18 @@
    "editor.formatOnSave": true
  },
  "[svelte]": {
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit",
+      "source.removeUnusedImports": "explicit"
+    },
    "editor.defaultFormatter": "svelte.svelte-vscode",
    "editor.formatOnSave": true
  },
  "[typescript]": {
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit",
+      "source.removeUnusedImports": "explicit"
+    },
    "editor.defaultFormatter": "esbenp.prettier-vscode",
    "editor.formatOnSave": true
  },
--- a/cli/.nvmrc
+++ b/cli/.nvmrc
@@ -1 +1 @@
-24.15.0
+24.14.1
--- a/cli/package.json
+++ b/cli/package.json
@@ -68,6 +68,6 @@
    "micromatch": "^4.0.8"
  },
  "volta": {
-    "node": "24.15.0"
+    "node": "24.14.1"
  }
 }
--- a/deployment/mise.toml
+++ b/deployment/mise.toml
@@ -1,6 +1,6 @@
 [tools]
-terragrunt = "1.0.1"
-opentofu = "1.11.6"
+terragrunt = "1.0.0"
+opentofu = "1.11.5"

 [tasks."tg:fmt"]
 run = "terragrunt hclfmt"
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -85,7 +85,7 @@ services:
    container_name: immich_prometheus
    ports:
      - 9090:9090
-    image: prom/prometheus@sha256:5550dc63da361dc30f6fe02ac0e4dfc736ededfef3c8d12a634db04a67824d78
+    image: prom/prometheus@sha256:dda13e28bf95a5e5ca5b8ed56852006094c1c8e8871d9c9dbeed30aa6e55271f
    volumes:
      - ./prometheus.yml:/etc/prometheus/prometheus.yml
      - prometheus-data:/prometheus
--- a/docs/.nvmrc
+++ b/docs/.nvmrc
@@ -1 +1 @@
-24.15.0
+24.14.1
--- a/docs/docs/features/supported-formats.md
+++ b/docs/docs/features/supported-formats.md
@@ -18,7 +18,6 @@ For the full list, refer to the [Immich source code](https://github.com/immich-a
 | `JPEG 2000` | `.jp2`                        | :white_check_mark: |                 |
 | `JPEG`      | `.jpeg` `.jpg` `.jpe` `.insp` | :white_check_mark: |                 |
 | `JPEG XL`   | `.jxl`                        | :white_check_mark: |                 |
-| `MPO`       | `.mpo`                        | :white_check_mark: | Multi-Picture   |
 | `PNG`       | `.png`                        | :white_check_mark: |                 |
 | `PSD`       | `.psd`                        | :white_check_mark: | Adobe Photoshop |
 | `RAW`       | `.raw`                        | :white_check_mark: |                 |
--- a/docs/package.json
+++ b/docs/package.json
@@ -17,10 +17,10 @@
    "write-heading-ids": "docusaurus write-heading-ids"
  },
  "dependencies": {
-    "@docusaurus/core": "~3.10.0",
-    "@docusaurus/preset-classic": "~3.10.0",
-    "@docusaurus/theme-common": "~3.10.0",
-    "@docusaurus/theme-mermaid": "~3.10.0",
+    "@docusaurus/core": "~3.9.0",
+    "@docusaurus/preset-classic": "~3.9.0",
+    "@docusaurus/theme-common": "~3.9.0",
+    "@docusaurus/theme-mermaid": "~3.9.0",
    "@mdi/js": "^7.3.67",
    "@mdi/react": "^1.6.1",
    "@mdx-js/react": "^3.0.0",
@@ -36,9 +36,9 @@
    "url": "^0.11.0"
  },
  "devDependencies": {
-    "@docusaurus/module-type-aliases": "~3.10.0",
+    "@docusaurus/module-type-aliases": "~3.9.0",
    "@docusaurus/tsconfig": "^3.10.0",
-    "@docusaurus/types": "^3.10.0",
+    "@docusaurus/types": "^3.7.0",
    "prettier": "^3.7.4",
    "typescript": "^6.0.0"
  },
@@ -58,6 +58,6 @@
    "node": ">=20"
  },
  "volta": {
-    "node": "24.15.0"
+    "node": "24.14.1"
  }
 }
--- a/e2e/.nvmrc
+++ b/e2e/.nvmrc
@@ -1 +1 @@
-24.15.0
+24.14.1
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -58,6 +58,6 @@
    "vitest": "^4.0.0"
  },
  "volta": {
-    "node": "24.15.0"
+    "node": "24.14.1"
  }
 }
--- a/e2e/src/ui/mock-network/base-network.ts
+++ b/e2e/src/ui/mock-network/base-network.ts
@@ -223,7 +223,6 @@ export const setupBaseMockApiRoutes = async (context: BrowserContext, adminUserI
          '.jp2',
          '.jpe',
          '.jxl',
-          '.mpo',
          '.svg',
          '.tif',
          '.tiff',
--- a/e2e/src/ui/specs/timeline/timeline.e2e-spec.ts
+++ b/e2e/src/ui/specs/timeline/timeline.e2e-spec.ts
@@ -349,7 +349,7 @@ test.describe('Timeline', () => {
        expect(visibleMockAssetsYearMonths).toContain(month);
      }
    });
-    test.skip('Deep link to last photo, scroll up', async ({ page }) => {
+    test('Deep link to last photo, scroll up', async ({ page }) => {
      const lastAsset = assets.at(-1)!;
      await pageUtils.deepLinkPhotosPage(page, lastAsset.id);

@@ -361,7 +361,7 @@ test.describe('Timeline', () => {

      await thumbnailUtils.expectInViewport(page, '14e5901f-fd7f-40c0-b186-4d7e7fc67968');
    });
-    test.skip('Deep link to first bucket, scroll down', async ({ page }) => {
+    test('Deep link to first bucket, scroll down', async ({ page }) => {
      const lastAsset = assets.at(0)!;
      await pageUtils.deepLinkPhotosPage(page, lastAsset.id);
      await timelineUtils.locator(page).hover();
@@ -440,7 +440,7 @@ test.describe('Timeline', () => {
      await thumbnailUtils.expectInViewport(page, asset.id);
      await thumbnailUtils.expectSelectedDisabled(page, asset.id);
    });
-    test.skip('Add photos to album', async ({ page }) => {
+    test('Add photos to album', async ({ page }) => {
      const album = timelineRestData.album;
      await pageUtils.openAlbumPage(page, album.id);
      await page.locator('nav button[aria-label="Add photos"]').click();
@@ -752,7 +752,7 @@ test.describe('Timeline', () => {
      await page.getByText('Photos', { exact: true }).click();
      await thumbnailUtils.expectInViewport(page, assetToFavorite.id);
    });
-    test.skip('open /favorites, archive photo, unarchive photo', async ({ page }) => {
+    test('open /favorites, archive photo, unarchive photo', async ({ page }) => {
      await pageUtils.openFavorites(page);
      const assetToArchive = getAsset(timelineRestData, 'ad31e29f-2069-4574-b9a9-ad86523c92cb')!;
      await thumbnailUtils.withAssetId(page, assetToArchive.id).hover();
--- a/mise.toml
+++ b/mise.toml
@@ -14,11 +14,11 @@ config_roots = [
 ]

 [tools]
-node = "24.15.0"
+node = "24.14.1"
 flutter = "3.41.6"
 pnpm = "10.33.0"
-terragrunt = "1.0.1"
-opentofu = "1.11.6"
+terragrunt = "1.0.0"
+opentofu = "1.11.5"
 java = "21.0.2"

 [tools."github:CQLabs/homebrew-dcm"]
--- a/mobile/.vscode/settings.json
+++ b/mobile/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.41.7",
+  "dart.flutterSdkPath": ".fvm/versions/3.41.6",
  "dart.lineLength": 120,
  "[dart]": {
    "editor.rulers": [
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
@@ -216,7 +216,7 @@ data class PlatformAsset (
  val updatedAt: Long? = null,
  val width: Long? = null,
  val height: Long? = null,
-  val durationMs: Long,
+  val durationInSeconds: Long,
  val orientation: Long,
  val isFavorite: Boolean,
  val adjustmentTime: Long? = null,
@@ -234,14 +234,14 @@ data class PlatformAsset (
      val updatedAt = pigeonVar_list[4] as Long?
      val width = pigeonVar_list[5] as Long?
      val height = pigeonVar_list[6] as Long?
-      val durationMs = pigeonVar_list[7] as Long
+      val durationInSeconds = pigeonVar_list[7] as Long
      val orientation = pigeonVar_list[8] as Long
      val isFavorite = pigeonVar_list[9] as Boolean
      val adjustmentTime = pigeonVar_list[10] as Long?
      val latitude = pigeonVar_list[11] as Double?
      val longitude = pigeonVar_list[12] as Double?
      val playbackStyle = pigeonVar_list[13] as PlatformAssetPlaybackStyle
-      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationMs, orientation, isFavorite, adjustmentTime, latitude, longitude, playbackStyle)
+      return PlatformAsset(id, name, type, createdAt, updatedAt, width, height, durationInSeconds, orientation, isFavorite, adjustmentTime, latitude, longitude, playbackStyle)
    }
  }
  fun toList(): List<Any?> {
@@ -253,7 +253,7 @@ data class PlatformAsset (
      updatedAt,
      width,
      height,
-      durationMs,
+      durationInSeconds,
      orientation,
      isFavorite,
      adjustmentTime,
@@ -270,7 +270,7 @@ data class PlatformAsset (
      return true
    }
    val other = other as PlatformAsset
-    return MessagesPigeonUtils.deepEquals(this.id, other.id) && MessagesPigeonUtils.deepEquals(this.name, other.name) && MessagesPigeonUtils.deepEquals(this.type, other.type) && MessagesPigeonUtils.deepEquals(this.createdAt, other.createdAt) && MessagesPigeonUtils.deepEquals(this.updatedAt, other.updatedAt) && MessagesPigeonUtils.deepEquals(this.width, other.width) && MessagesPigeonUtils.deepEquals(this.height, other.height) && MessagesPigeonUtils.deepEquals(this.durationMs, other.durationMs) && MessagesPigeonUtils.deepEquals(this.orientation, other.orientation) && MessagesPigeonUtils.deepEquals(this.isFavorite, other.isFavorite) && MessagesPigeonUtils.deepEquals(this.adjustmentTime, other.adjustmentTime) && MessagesPigeonUtils.deepEquals(this.latitude, other.latitude) && MessagesPigeonUtils.deepEquals(this.longitude, other.longitude) && MessagesPigeonUtils.deepEquals(this.playbackStyle, other.playbackStyle)
+    return MessagesPigeonUtils.deepEquals(this.id, other.id) && MessagesPigeonUtils.deepEquals(this.name, other.name) && MessagesPigeonUtils.deepEquals(this.type, other.type) && MessagesPigeonUtils.deepEquals(this.createdAt, other.createdAt) && MessagesPigeonUtils.deepEquals(this.updatedAt, other.updatedAt) && MessagesPigeonUtils.deepEquals(this.width, other.width) && MessagesPigeonUtils.deepEquals(this.height, other.height) && MessagesPigeonUtils.deepEquals(this.durationInSeconds, other.durationInSeconds) && MessagesPigeonUtils.deepEquals(this.orientation, other.orientation) && MessagesPigeonUtils.deepEquals(this.isFavorite, other.isFavorite) && MessagesPigeonUtils.deepEquals(this.adjustmentTime, other.adjustmentTime) && MessagesPigeonUtils.deepEquals(this.latitude, other.latitude) && MessagesPigeonUtils.deepEquals(this.longitude, other.longitude) && MessagesPigeonUtils.deepEquals(this.playbackStyle, other.playbackStyle)
  }

  override fun hashCode(): Int {
@@ -282,7 +282,7 @@ data class PlatformAsset (
    result = 31 * result + MessagesPigeonUtils.deepHash(this.updatedAt)
    result = 31 * result + MessagesPigeonUtils.deepHash(this.width)
    result = 31 * result + MessagesPigeonUtils.deepHash(this.height)
-    result = 31 * result + MessagesPigeonUtils.deepHash(this.durationMs)
+    result = 31 * result + MessagesPigeonUtils.deepHash(this.durationInSeconds)
    result = 31 * result + MessagesPigeonUtils.deepHash(this.orientation)
    result = 31 * result + MessagesPigeonUtils.deepHash(this.isFavorite)
    result = 31 * result + MessagesPigeonUtils.deepHash(this.adjustmentTime)
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
@@ -178,7 +178,7 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
          val height = c.getInt(heightColumn).toLong()
          // Duration is milliseconds
          val duration = if (rawMediaType == MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE) 0L
-          else c.getLong(durationColumn)
+          else c.getLong(durationColumn) / 1000
          val orientation = c.getInt(orientationColumn)
          val isFavorite = if (favoriteColumn == -1) false else c.getInt(favoriteColumn) != 0

--- a/mobile/drift_schemas/main/drift_schema_v23.json
+++ b/mobile/drift_schemas/main/drift_schema_v23.json
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 77;
 	objects = {

 /* Begin PBXBuildFile section */
--- a/mobile/ios/Runner/Sync/Messages.g.swift
+++ b/mobile/ios/Runner/Sync/Messages.g.swift
@@ -192,7 +192,7 @@ struct PlatformAsset: Hashable {
  var updatedAt: Int64? = nil
  var width: Int64? = nil
  var height: Int64? = nil
-  var durationMs: Int64
+  var durationInSeconds: Int64
  var orientation: Int64
  var isFavorite: Bool
  var adjustmentTime: Int64? = nil
@@ -210,7 +210,7 @@ struct PlatformAsset: Hashable {
    let updatedAt: Int64? = nilOrValue(pigeonVar_list[4])
    let width: Int64? = nilOrValue(pigeonVar_list[5])
    let height: Int64? = nilOrValue(pigeonVar_list[6])
-    let durationMs = pigeonVar_list[7] as! Int64
+    let durationInSeconds = pigeonVar_list[7] as! Int64
    let orientation = pigeonVar_list[8] as! Int64
    let isFavorite = pigeonVar_list[9] as! Bool
    let adjustmentTime: Int64? = nilOrValue(pigeonVar_list[10])
@@ -226,7 +226,7 @@ struct PlatformAsset: Hashable {
      updatedAt: updatedAt,
      width: width,
      height: height,
-      durationMs: durationMs,
+      durationInSeconds: durationInSeconds,
      orientation: orientation,
      isFavorite: isFavorite,
      adjustmentTime: adjustmentTime,
@@ -244,7 +244,7 @@ struct PlatformAsset: Hashable {
      updatedAt,
      width,
      height,
-      durationMs,
+      durationInSeconds,
      orientation,
      isFavorite,
      adjustmentTime,
@@ -257,7 +257,7 @@ struct PlatformAsset: Hashable {
    if Swift.type(of: lhs) != Swift.type(of: rhs) {
      return false
    }
-    return deepEqualsMessages(lhs.id, rhs.id) && deepEqualsMessages(lhs.name, rhs.name) && deepEqualsMessages(lhs.type, rhs.type) && deepEqualsMessages(lhs.createdAt, rhs.createdAt) && deepEqualsMessages(lhs.updatedAt, rhs.updatedAt) && deepEqualsMessages(lhs.width, rhs.width) && deepEqualsMessages(lhs.height, rhs.height) && deepEqualsMessages(lhs.durationMs, rhs.durationMs) && deepEqualsMessages(lhs.orientation, rhs.orientation) && deepEqualsMessages(lhs.isFavorite, rhs.isFavorite) && deepEqualsMessages(lhs.adjustmentTime, rhs.adjustmentTime) && deepEqualsMessages(lhs.latitude, rhs.latitude) && deepEqualsMessages(lhs.longitude, rhs.longitude) && deepEqualsMessages(lhs.playbackStyle, rhs.playbackStyle)
+    return deepEqualsMessages(lhs.id, rhs.id) && deepEqualsMessages(lhs.name, rhs.name) && deepEqualsMessages(lhs.type, rhs.type) && deepEqualsMessages(lhs.createdAt, rhs.createdAt) && deepEqualsMessages(lhs.updatedAt, rhs.updatedAt) && deepEqualsMessages(lhs.width, rhs.width) && deepEqualsMessages(lhs.height, rhs.height) && deepEqualsMessages(lhs.durationInSeconds, rhs.durationInSeconds) && deepEqualsMessages(lhs.orientation, rhs.orientation) && deepEqualsMessages(lhs.isFavorite, rhs.isFavorite) && deepEqualsMessages(lhs.adjustmentTime, rhs.adjustmentTime) && deepEqualsMessages(lhs.latitude, rhs.latitude) && deepEqualsMessages(lhs.longitude, rhs.longitude) && deepEqualsMessages(lhs.playbackStyle, rhs.playbackStyle)
  }

  func hash(into hasher: inout Hasher) {
@@ -269,7 +269,7 @@ struct PlatformAsset: Hashable {
    deepHashMessages(value: updatedAt, hasher: &hasher)
    deepHashMessages(value: width, hasher: &hasher)
    deepHashMessages(value: height, hasher: &hasher)
-    deepHashMessages(value: durationMs, hasher: &hasher)
+    deepHashMessages(value: durationInSeconds, hasher: &hasher)
    deepHashMessages(value: orientation, hasher: &hasher)
    deepHashMessages(value: isFavorite, hasher: &hasher)
    deepHashMessages(value: adjustmentTime, hasher: &hasher)
--- a/mobile/ios/Runner/Sync/MessagesImpl.swift
+++ b/mobile/ios/Runner/Sync/MessagesImpl.swift
@@ -171,7 +171,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
            id: asset.localIdentifier,
            name: "",
            type: 0,
-            durationMs: 0,
+            durationInSeconds: 0,
            orientation: 0,
            isFavorite: false,
            playbackStyle: .unknown
--- a/mobile/ios/Runner/Sync/PHAssetExtensions.swift
+++ b/mobile/ios/Runner/Sync/PHAssetExtensions.swift
@@ -21,7 +21,7 @@ extension PHAsset {
      updatedAt: modificationDate.map { Int64($0.timeIntervalSince1970) },
      width: Int64(pixelWidth),
      height: Int64(pixelHeight),
-      durationMs: Int64(duration * 1000),
+      durationInSeconds: Int64(duration),
      orientation: 0,
      isFavorite: isFavorite,
      adjustmentTime: adjustmentTimestamp,
--- a/mobile/lib/domain/models/asset/base_asset.model.dart
+++ b/mobile/lib/domain/models/asset/base_asset.model.dart
@@ -25,7 +25,7 @@ sealed class BaseAsset {
  final DateTime updatedAt;
  final int? width;
  final int? height;
-  final int? durationMs;
+  final int? durationInSeconds;
  final bool isFavorite;
  final String? livePhotoVideoId;
  final bool isEdited;
@@ -38,7 +38,7 @@ sealed class BaseAsset {
    required this.updatedAt,
    this.width,
    this.height,
-    this.durationMs,
+    this.durationInSeconds,
    this.isFavorite = false,
    this.livePhotoVideoId,
    required this.isEdited,
@@ -53,17 +53,15 @@ sealed class BaseAsset {
  AssetPlaybackStyle get playbackStyle {
    if (isVideo) return AssetPlaybackStyle.video;
    if (isMotionPhoto) return AssetPlaybackStyle.livePhoto;
-    if (isImage && durationMs != null && durationMs! > 0) {
-      return AssetPlaybackStyle.imageAnimated;
-    }
+    if (isImage && durationInSeconds != null && durationInSeconds! > 0) return AssetPlaybackStyle.imageAnimated;
    if (isImage) return AssetPlaybackStyle.image;
    return AssetPlaybackStyle.unknown;
  }

  Duration get duration {
-    final durationMs = this.durationMs;
-    if (durationMs != null) {
-      return Duration(milliseconds: durationMs);
+    final durationInSeconds = this.durationInSeconds;
+    if (durationInSeconds != null) {
+      return Duration(seconds: durationInSeconds);
    }
    return const Duration();
  }
@@ -90,7 +88,7 @@ sealed class BaseAsset {
  updatedAt: $updatedAt,
  width: ${width ?? "<NA>"},
  height: ${height ?? "<NA>"},
-  durationMs: ${durationMs ?? "<NA>"},
+  durationInSeconds: ${durationInSeconds ?? "<NA>"},
  isFavorite: $isFavorite,
  isEdited: $isEdited,
 }''';
@@ -106,7 +104,7 @@ sealed class BaseAsset {
          updatedAt == other.updatedAt &&
          width == other.width &&
          height == other.height &&
-          durationMs == other.durationMs &&
+          durationInSeconds == other.durationInSeconds &&
          isFavorite == other.isFavorite &&
          isEdited == other.isEdited;
    }
@@ -121,7 +119,7 @@ sealed class BaseAsset {
        updatedAt.hashCode ^
        width.hashCode ^
        height.hashCode ^
-        durationMs.hashCode ^
+        durationInSeconds.hashCode ^
        isFavorite.hashCode ^
        isEdited.hashCode;
  }
--- a/mobile/lib/domain/models/asset/local_asset.model.dart
+++ b/mobile/lib/domain/models/asset/local_asset.model.dart
@@ -23,7 +23,7 @@ class LocalAsset extends BaseAsset {
    required super.updatedAt,
    super.width,
    super.height,
-    super.durationMs,
+    super.durationInSeconds,
    super.isFavorite = false,
    super.livePhotoVideoId,
    this.orientation = 0,
@@ -58,7 +58,7 @@ class LocalAsset extends BaseAsset {
   updatedAt: $updatedAt,
   width: ${width ?? "<NA>"},
   height: ${height ?? "<NA>"},
-   durationMs: ${durationMs ?? "<NA>"},
+   durationInSeconds: ${durationInSeconds ?? "<NA>"},
   playbackStyle: $playbackStyle,
   remoteId: ${remoteId ?? "<NA>"},
   cloudId: ${cloudId ?? "<NA>"},
@@ -108,7 +108,7 @@ class LocalAsset extends BaseAsset {
    DateTime? updatedAt,
    int? width,
    int? height,
-    int? durationMs,
+    int? durationInSeconds,
    bool? isFavorite,
    int? orientation,
    AssetPlaybackStyle? playbackStyle,
@@ -128,7 +128,7 @@ class LocalAsset extends BaseAsset {
      updatedAt: updatedAt ?? this.updatedAt,
      width: width ?? this.width,
      height: height ?? this.height,
-      durationMs: durationMs ?? this.durationMs,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      isFavorite: isFavorite ?? this.isFavorite,
      orientation: orientation ?? this.orientation,
      playbackStyle: playbackStyle ?? this.playbackStyle,
--- a/mobile/lib/domain/models/asset/remote_asset.model.dart
+++ b/mobile/lib/domain/models/asset/remote_asset.model.dart
@@ -22,7 +22,7 @@ class RemoteAsset extends BaseAsset {
    required super.updatedAt,
    super.width,
    super.height,
-    super.durationMs,
+    super.durationInSeconds,
    super.isFavorite = false,
    this.thumbHash,
    this.visibility = AssetVisibility.timeline,
@@ -57,7 +57,7 @@ class RemoteAsset extends BaseAsset {
    updatedAt: $updatedAt,
    width: ${width ?? "<NA>"},
    height: ${height ?? "<NA>"},
-    durationMs: ${durationMs ?? "<NA>"},
+    durationInSeconds: ${durationInSeconds ?? "<NA>"},
    localId: ${localId ?? "<NA>"},
    isFavorite: $isFavorite,
    thumbHash: ${thumbHash ?? "<NA>"},
@@ -102,7 +102,7 @@ class RemoteAsset extends BaseAsset {
    DateTime? updatedAt,
    int? width,
    int? height,
-    int? durationMs,
+    int? durationInSeconds,
    bool? isFavorite,
    String? thumbHash,
    AssetVisibility? visibility,
@@ -121,7 +121,7 @@ class RemoteAsset extends BaseAsset {
      updatedAt: updatedAt ?? this.updatedAt,
      width: width ?? this.width,
      height: height ?? this.height,
-      durationMs: durationMs ?? this.durationMs,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      isFavorite: isFavorite ?? this.isFavorite,
      thumbHash: thumbHash ?? this.thumbHash,
      visibility: visibility ?? this.visibility,
@@ -146,7 +146,7 @@ class RemoteAssetExif extends RemoteAsset {
    required super.updatedAt,
    super.width,
    super.height,
-    super.durationMs,
+    super.durationInSeconds,
    super.isFavorite = false,
    super.thumbHash,
    super.visibility = AssetVisibility.timeline,
@@ -178,7 +178,7 @@ class RemoteAssetExif extends RemoteAsset {
    DateTime? updatedAt,
    int? width,
    int? height,
-    int? durationMs,
+    int? durationInSeconds,
    bool? isFavorite,
    String? thumbHash,
    AssetVisibility? visibility,
@@ -198,7 +198,7 @@ class RemoteAssetExif extends RemoteAsset {
      updatedAt: updatedAt ?? this.updatedAt,
      width: width ?? this.width,
      height: height ?? this.height,
-      durationMs: durationMs ?? this.durationMs,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      isFavorite: isFavorite ?? this.isFavorite,
      thumbHash: thumbHash ?? this.thumbHash,
      visibility: visibility ?? this.visibility,
--- a/mobile/lib/domain/models/exif.model.dart
+++ b/mobile/lib/domain/models/exif.model.dart
@@ -29,7 +29,7 @@ class ExifInfo {
  bool get hasCoordinates => latitude != null && longitude != null && latitude != 0 && longitude != 0;

  String get exposureTime {
-    if (exposureSeconds == null || exposureSeconds! <= 0 || exposureSeconds!.isNaN) {
+    if (exposureSeconds == null) {
      return "";
    }
    if (exposureSeconds! < 1) {
--- a/mobile/lib/domain/models/setting.model.dart
+++ b/mobile/lib/domain/models/setting.model.dart
@@ -4,7 +4,6 @@ enum Setting<T> {
  tilesPerRow<int>(StoreKey.tilesPerRow, 4),
  groupAssetsBy<int>(StoreKey.groupAssetsBy, 0),
  showStorageIndicator<bool>(StoreKey.storageIndicator, true),
-  loadPreview<bool>(StoreKey.loadPreview, true),
  loadOriginal<bool>(StoreKey.loadOriginal, false),
  loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, false),
  autoPlayVideo<bool>(StoreKey.autoPlayVideo, true),
--- a/mobile/lib/domain/services/local_sync.service.dart
+++ b/mobile/lib/domain/services/local_sync.service.dart
@@ -337,7 +337,7 @@ class LocalSyncService {
          a.createdAt.isAtSameMomentAs(b.createdAt) &&
          a.width == b.width &&
          a.height == b.height &&
-          a.durationMs == b.durationMs;
+          a.durationInSeconds == b.durationInSeconds;
    }

    final firstAdjustment = a.adjustmentTime?.millisecondsSinceEpoch ?? 0;
@@ -346,7 +346,7 @@ class LocalSyncService {
        a.createdAt.isAtSameMomentAs(b.createdAt) &&
        a.width == b.width &&
        a.height == b.height &&
-        a.durationMs == b.durationMs &&
+        a.durationInSeconds == b.durationInSeconds &&
        a.latitude == b.latitude &&
        a.longitude == b.longitude;
  }
@@ -432,7 +432,7 @@ extension PlatformToLocalAsset on PlatformAsset {
    updatedAt: tryFromSecondsSinceEpoch(updatedAt, isUtc: true) ?? DateTime.timestamp(),
    width: width,
    height: height,
-    durationMs: durationMs,
+    durationInSeconds: durationInSeconds,
    isFavorite: isFavorite,
    orientation: orientation,
    playbackStyle: _toPlaybackStyle(playbackStyle),
--- a/mobile/lib/extensions/asset_extensions.dart
+++ b/mobile/lib/extensions/asset_extensions.dart
@@ -14,7 +14,7 @@ extension DTOToAsset on api.AssetResponseDto {
      updatedAt: updatedAt,
      ownerId: ownerId,
      visibility: visibility.toAssetVisibility(),
-      durationMs: duration?.toDuration()?.inMilliseconds ?? 0,
+      durationInSeconds: duration?.toDuration()?.inSeconds ?? 0,
      height: height?.toInt(),
      width: width?.toInt(),
      isFavorite: isFavorite,
@@ -36,7 +36,7 @@ extension DTOToAsset on api.AssetResponseDto {
      updatedAt: updatedAt,
      ownerId: ownerId,
      visibility: visibility.toAssetVisibility(),
-      durationMs: duration?.toDuration()?.inMilliseconds ?? 0,
+      durationInSeconds: duration?.toDuration()?.inSeconds ?? 0,
      height: height?.toInt(),
      width: width?.toInt(),
      isFavorite: isFavorite,
--- a/mobile/lib/extensions/string_extensions.dart
+++ b/mobile/lib/extensions/string_extensions.dart
@@ -7,16 +7,11 @@ extension StringExtension on String {
 }

 extension DurationExtension on String {
-  /// Parses and returns the string of format HH:MM:SS.ffffff as a duration object else null
+  /// Parses and returns the string of format HH:MM:SS as a duration object else null
  Duration? toDuration() {
    try {
-      final parts = split(':');
-      final hours = double.parse(parts[0]).toInt();
-      final minutes = double.parse(parts[1]).toInt();
-      final secondsParts = parts[2].split('.');
-      final seconds = int.parse(secondsParts[0]);
-      final milliseconds = secondsParts.length > 1 ? (double.parse('0.${secondsParts[1]}') * 1000).round() : 0;
-      return Duration(hours: hours, minutes: minutes, seconds: seconds, milliseconds: milliseconds);
+      final parts = split(':').map((e) => double.parse(e).toInt()).toList(growable: false);
+      return Duration(hours: parts[0], minutes: parts[1], seconds: parts[2]);
    } catch (e) {
      return null;
    }
--- a/mobile/lib/infrastructure/entities/local_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.dart
@@ -39,7 +39,7 @@ extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
    type: type,
    createdAt: createdAt,
    updatedAt: updatedAt,
-    durationMs: durationMs,
+    durationInSeconds: durationInSeconds,
    isFavorite: isFavorite,
    height: height,
    width: width,
--- a/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/local_asset.entity.drift.dart
@@ -16,7 +16,7 @@ typedef $$LocalAssetEntityTableCreateCompanionBuilder =
      i0.Value<DateTime> updatedAt,
      i0.Value<int?> width,
      i0.Value<int?> height,
-      i0.Value<int?> durationMs,
+      i0.Value<int?> durationInSeconds,
      required String id,
      i0.Value<String?> checksum,
      i0.Value<bool> isFavorite,
@@ -35,7 +35,7 @@ typedef $$LocalAssetEntityTableUpdateCompanionBuilder =
      i0.Value<DateTime> updatedAt,
      i0.Value<int?> width,
      i0.Value<int?> height,
-      i0.Value<int?> durationMs,
+      i0.Value<int?> durationInSeconds,
      i0.Value<String> id,
      i0.Value<String?> checksum,
      i0.Value<bool> isFavorite,
@@ -87,8 +87,8 @@ class $$LocalAssetEntityTableFilterComposer
    builder: (column) => i0.ColumnFilters(column),
  );

-  i0.ColumnFilters<int> get durationMs => $composableBuilder(
-    column: $table.durationMs,
+  i0.ColumnFilters<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
    builder: (column) => i0.ColumnFilters(column),
  );

@@ -182,8 +182,8 @@ class $$LocalAssetEntityTableOrderingComposer
    builder: (column) => i0.ColumnOrderings(column),
  );

-  i0.ColumnOrderings<int> get durationMs => $composableBuilder(
-    column: $table.durationMs,
+  i0.ColumnOrderings<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
    builder: (column) => i0.ColumnOrderings(column),
  );

@@ -260,8 +260,8 @@ class $$LocalAssetEntityTableAnnotationComposer
  i0.GeneratedColumn<int> get height =>
      $composableBuilder(column: $table.height, builder: (column) => column);

-  i0.GeneratedColumn<int> get durationMs => $composableBuilder(
-    column: $table.durationMs,
+  i0.GeneratedColumn<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
    builder: (column) => column,
  );

@@ -348,7 +348,7 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
                i0.Value<int?> width = const i0.Value.absent(),
                i0.Value<int?> height = const i0.Value.absent(),
-                i0.Value<int?> durationMs = const i0.Value.absent(),
+                i0.Value<int?> durationInSeconds = const i0.Value.absent(),
                i0.Value<String> id = const i0.Value.absent(),
                i0.Value<String?> checksum = const i0.Value.absent(),
                i0.Value<bool> isFavorite = const i0.Value.absent(),
@@ -366,7 +366,7 @@ class $$LocalAssetEntityTableTableManager
                updatedAt: updatedAt,
                width: width,
                height: height,
-                durationMs: durationMs,
+                durationInSeconds: durationInSeconds,
                id: id,
                checksum: checksum,
                isFavorite: isFavorite,
@@ -385,7 +385,7 @@ class $$LocalAssetEntityTableTableManager
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
                i0.Value<int?> width = const i0.Value.absent(),
                i0.Value<int?> height = const i0.Value.absent(),
-                i0.Value<int?> durationMs = const i0.Value.absent(),
+                i0.Value<int?> durationInSeconds = const i0.Value.absent(),
                required String id,
                i0.Value<String?> checksum = const i0.Value.absent(),
                i0.Value<bool> isFavorite = const i0.Value.absent(),
@@ -403,7 +403,7 @@ class $$LocalAssetEntityTableTableManager
                updatedAt: updatedAt,
                width: width,
                height: height,
-                durationMs: durationMs,
+                durationInSeconds: durationInSeconds,
                id: id,
                checksum: checksum,
                isFavorite: isFavorite,
@@ -522,17 +522,17 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    type: i0.DriftSqlType.int,
    requiredDuringInsert: false,
  );
-  static const i0.VerificationMeta _durationMsMeta = const i0.VerificationMeta(
-    'durationMs',
-  );
+  static const i0.VerificationMeta _durationInSecondsMeta =
+      const i0.VerificationMeta('durationInSeconds');
  @override
-  late final i0.GeneratedColumn<int> durationMs = i0.GeneratedColumn<int>(
-    'duration_ms',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.int,
-    requiredDuringInsert: false,
-  );
+  late final i0.GeneratedColumn<int> durationInSeconds =
+      i0.GeneratedColumn<int>(
+        'duration_in_seconds',
+        aliasedName,
+        true,
+        type: i0.DriftSqlType.int,
+        requiredDuringInsert: false,
+      );
  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
  @override
  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
@@ -645,7 +645,7 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
    updatedAt,
    width,
    height,
-    durationMs,
+    durationInSeconds,
    id,
    checksum,
    isFavorite,
@@ -700,10 +700,13 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        height.isAcceptableOrUnknown(data['height']!, _heightMeta),
      );
    }
-    if (data.containsKey('duration_ms')) {
+    if (data.containsKey('duration_in_seconds')) {
      context.handle(
-        _durationMsMeta,
-        durationMs.isAcceptableOrUnknown(data['duration_ms']!, _durationMsMeta),
+        _durationInSecondsMeta,
+        durationInSeconds.isAcceptableOrUnknown(
+          data['duration_in_seconds']!,
+          _durationInSecondsMeta,
+        ),
      );
    }
    if (data.containsKey('id')) {
@@ -797,9 +800,9 @@ class $LocalAssetEntityTable extends i3.LocalAssetEntity
        i0.DriftSqlType.int,
        data['${effectivePrefix}height'],
      ),
-      durationMs: attachedDatabase.typeMapping.read(
+      durationInSeconds: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.int,
-        data['${effectivePrefix}duration_ms'],
+        data['${effectivePrefix}duration_in_seconds'],
      ),
      id: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.string,
@@ -867,7 +870,7 @@ class LocalAssetEntityData extends i0.DataClass
  final DateTime updatedAt;
  final int? width;
  final int? height;
-  final int? durationMs;
+  final int? durationInSeconds;
  final String id;
  final String? checksum;
  final bool isFavorite;
@@ -884,7 +887,7 @@ class LocalAssetEntityData extends i0.DataClass
    required this.updatedAt,
    this.width,
    this.height,
-    this.durationMs,
+    this.durationInSeconds,
    required this.id,
    this.checksum,
    required this.isFavorite,
@@ -912,8 +915,8 @@ class LocalAssetEntityData extends i0.DataClass
    if (!nullToAbsent || height != null) {
      map['height'] = i0.Variable<int>(height);
    }
-    if (!nullToAbsent || durationMs != null) {
-      map['duration_ms'] = i0.Variable<int>(durationMs);
+    if (!nullToAbsent || durationInSeconds != null) {
+      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds);
    }
    map['id'] = i0.Variable<String>(id);
    if (!nullToAbsent || checksum != null) {
@@ -955,7 +958,7 @@ class LocalAssetEntityData extends i0.DataClass
      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
      width: serializer.fromJson<int?>(json['width']),
      height: serializer.fromJson<int?>(json['height']),
-      durationMs: serializer.fromJson<int?>(json['durationMs']),
+      durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
      id: serializer.fromJson<String>(json['id']),
      checksum: serializer.fromJson<String?>(json['checksum']),
      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
@@ -981,7 +984,7 @@ class LocalAssetEntityData extends i0.DataClass
      'updatedAt': serializer.toJson<DateTime>(updatedAt),
      'width': serializer.toJson<int?>(width),
      'height': serializer.toJson<int?>(height),
-      'durationMs': serializer.toJson<int?>(durationMs),
+      'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
      'id': serializer.toJson<String>(id),
      'checksum': serializer.toJson<String?>(checksum),
      'isFavorite': serializer.toJson<bool>(isFavorite),
@@ -1003,7 +1006,7 @@ class LocalAssetEntityData extends i0.DataClass
    DateTime? updatedAt,
    i0.Value<int?> width = const i0.Value.absent(),
    i0.Value<int?> height = const i0.Value.absent(),
-    i0.Value<int?> durationMs = const i0.Value.absent(),
+    i0.Value<int?> durationInSeconds = const i0.Value.absent(),
    String? id,
    i0.Value<String?> checksum = const i0.Value.absent(),
    bool? isFavorite,
@@ -1020,7 +1023,9 @@ class LocalAssetEntityData extends i0.DataClass
    updatedAt: updatedAt ?? this.updatedAt,
    width: width.present ? width.value : this.width,
    height: height.present ? height.value : this.height,
-    durationMs: durationMs.present ? durationMs.value : this.durationMs,
+    durationInSeconds: durationInSeconds.present
+        ? durationInSeconds.value
+        : this.durationInSeconds,
    id: id ?? this.id,
    checksum: checksum.present ? checksum.value : this.checksum,
    isFavorite: isFavorite ?? this.isFavorite,
@@ -1041,9 +1046,9 @@ class LocalAssetEntityData extends i0.DataClass
      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
      width: data.width.present ? data.width.value : this.width,
      height: data.height.present ? data.height.value : this.height,
-      durationMs: data.durationMs.present
-          ? data.durationMs.value
-          : this.durationMs,
+      durationInSeconds: data.durationInSeconds.present
+          ? data.durationInSeconds.value
+          : this.durationInSeconds,
      id: data.id.present ? data.id.value : this.id,
      checksum: data.checksum.present ? data.checksum.value : this.checksum,
      isFavorite: data.isFavorite.present
@@ -1073,7 +1078,7 @@ class LocalAssetEntityData extends i0.DataClass
          ..write('updatedAt: $updatedAt, ')
          ..write('width: $width, ')
          ..write('height: $height, ')
-          ..write('durationMs: $durationMs, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
@@ -1095,7 +1100,7 @@ class LocalAssetEntityData extends i0.DataClass
    updatedAt,
    width,
    height,
-    durationMs,
+    durationInSeconds,
    id,
    checksum,
    isFavorite,
@@ -1116,7 +1121,7 @@ class LocalAssetEntityData extends i0.DataClass
          other.updatedAt == this.updatedAt &&
          other.width == this.width &&
          other.height == this.height &&
-          other.durationMs == this.durationMs &&
+          other.durationInSeconds == this.durationInSeconds &&
          other.id == this.id &&
          other.checksum == this.checksum &&
          other.isFavorite == this.isFavorite &&
@@ -1136,7 +1141,7 @@ class LocalAssetEntityCompanion
  final i0.Value<DateTime> updatedAt;
  final i0.Value<int?> width;
  final i0.Value<int?> height;
-  final i0.Value<int?> durationMs;
+  final i0.Value<int?> durationInSeconds;
  final i0.Value<String> id;
  final i0.Value<String?> checksum;
  final i0.Value<bool> isFavorite;
@@ -1153,7 +1158,7 @@ class LocalAssetEntityCompanion
    this.updatedAt = const i0.Value.absent(),
    this.width = const i0.Value.absent(),
    this.height = const i0.Value.absent(),
-    this.durationMs = const i0.Value.absent(),
+    this.durationInSeconds = const i0.Value.absent(),
    this.id = const i0.Value.absent(),
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
@@ -1171,7 +1176,7 @@ class LocalAssetEntityCompanion
    this.updatedAt = const i0.Value.absent(),
    this.width = const i0.Value.absent(),
    this.height = const i0.Value.absent(),
-    this.durationMs = const i0.Value.absent(),
+    this.durationInSeconds = const i0.Value.absent(),
    required String id,
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
@@ -1191,7 +1196,7 @@ class LocalAssetEntityCompanion
    i0.Expression<DateTime>? updatedAt,
    i0.Expression<int>? width,
    i0.Expression<int>? height,
-    i0.Expression<int>? durationMs,
+    i0.Expression<int>? durationInSeconds,
    i0.Expression<String>? id,
    i0.Expression<String>? checksum,
    i0.Expression<bool>? isFavorite,
@@ -1209,7 +1214,7 @@ class LocalAssetEntityCompanion
      if (updatedAt != null) 'updated_at': updatedAt,
      if (width != null) 'width': width,
      if (height != null) 'height': height,
-      if (durationMs != null) 'duration_ms': durationMs,
+      if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
      if (id != null) 'id': id,
      if (checksum != null) 'checksum': checksum,
      if (isFavorite != null) 'is_favorite': isFavorite,
@@ -1229,7 +1234,7 @@ class LocalAssetEntityCompanion
    i0.Value<DateTime>? updatedAt,
    i0.Value<int?>? width,
    i0.Value<int?>? height,
-    i0.Value<int?>? durationMs,
+    i0.Value<int?>? durationInSeconds,
    i0.Value<String>? id,
    i0.Value<String?>? checksum,
    i0.Value<bool>? isFavorite,
@@ -1247,7 +1252,7 @@ class LocalAssetEntityCompanion
      updatedAt: updatedAt ?? this.updatedAt,
      width: width ?? this.width,
      height: height ?? this.height,
-      durationMs: durationMs ?? this.durationMs,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      id: id ?? this.id,
      checksum: checksum ?? this.checksum,
      isFavorite: isFavorite ?? this.isFavorite,
@@ -1283,8 +1288,8 @@ class LocalAssetEntityCompanion
    if (height.present) {
      map['height'] = i0.Variable<int>(height.value);
    }
-    if (durationMs.present) {
-      map['duration_ms'] = i0.Variable<int>(durationMs.value);
+    if (durationInSeconds.present) {
+      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds.value);
    }
    if (id.present) {
      map['id'] = i0.Variable<String>(id.value);
@@ -1329,7 +1334,7 @@ class LocalAssetEntityCompanion
          ..write('updatedAt: $updatedAt, ')
          ..write('width: $width, ')
          ..write('height: $height, ')
-          ..write('durationMs: $durationMs, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
--- a/mobile/lib/infrastructure/entities/merged_asset.drift
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift
@@ -14,7 +14,7 @@ SELECT
 	rae.updated_at,
 	rae.width,
 	rae.height,
-	rae.duration_ms,
+	rae.duration_in_seconds,
 	rae.is_favorite,
 	rae.thumb_hash,
 	rae.checksum,
@@ -52,7 +52,7 @@ SELECT
 	lae.updated_at,
 	lae.width,
 	lae.height,
-	lae.duration_ms,
+	lae.duration_in_seconds,
 	lae.is_favorite,
 	NULL as thumb_hash,
 	lae.checksum,
--- a/mobile/lib/infrastructure/entities/merged_asset.drift.dart
+++ b/mobile/lib/infrastructure/entities/merged_asset.drift.dart
@@ -29,7 +29,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
    );
    $arrayStartIndex += generatedlimit.amountOfVariables;
    return customSelect(
-      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_ms, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime, rae.is_edited, 0 AS playback_style FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_ms, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited, lae.playback_style FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
+      'SELECT rae.id AS remote_id, (SELECT lae.id FROM local_asset_entity AS lae WHERE lae.checksum = rae.checksum LIMIT 1) AS local_id, rae.name, rae.type, rae.created_at AS created_at, rae.updated_at, rae.width, rae.height, rae.duration_in_seconds, rae.is_favorite, rae.thumb_hash, rae.checksum, rae.owner_id, rae.live_photo_video_id, 0 AS orientation, rae.stack_id, NULL AS i_cloud_id, NULL AS latitude, NULL AS longitude, NULL AS adjustmentTime, rae.is_edited, 0 AS playback_style FROM remote_asset_entity AS rae LEFT JOIN stack_entity AS se ON rae.stack_id = se.id WHERE rae.deleted_at IS NULL AND rae.visibility = 0 AND rae.owner_id IN ($expandeduserIds) AND(rae.stack_id IS NULL OR rae.id = se.primary_asset_id)UNION ALL SELECT NULL AS remote_id, lae.id AS local_id, lae.name, lae.type, lae.created_at AS created_at, lae.updated_at, lae.width, lae.height, lae.duration_in_seconds, lae.is_favorite, NULL AS thumb_hash, lae.checksum, NULL AS owner_id, NULL AS live_photo_video_id, lae.orientation, NULL AS stack_id, lae.i_cloud_id, lae.latitude, lae.longitude, lae.adjustment_time, 0 AS is_edited, lae.playback_style FROM local_asset_entity AS lae WHERE NOT EXISTS (SELECT 1 FROM remote_asset_entity AS rae WHERE rae.checksum = lae.checksum AND rae.owner_id IN ($expandeduserIds)) AND EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 0) AND NOT EXISTS (SELECT 1 FROM local_album_asset_entity AS laa INNER JOIN local_album_entity AS la ON laa.album_id = la.id WHERE laa.asset_id = lae.id AND la.backup_selection = 2) ORDER BY created_at DESC ${generatedlimit.sql}',
      variables: [
        for (var $ in userIds) i0.Variable<String>($),
        ...generatedlimit.introducedVariables,
@@ -54,7 +54,7 @@ class MergedAssetDrift extends i1.ModularAccessor {
        updatedAt: row.read<DateTime>('updated_at'),
        width: row.readNullable<int>('width'),
        height: row.readNullable<int>('height'),
-        durationMs: row.readNullable<int>('duration_ms'),
+        durationInSeconds: row.readNullable<int>('duration_in_seconds'),
        isFavorite: row.read<bool>('is_favorite'),
        thumbHash: row.readNullable<String>('thumb_hash'),
        checksum: row.readNullable<String>('checksum'),
@@ -127,7 +127,7 @@ class MergedAssetResult {
  final DateTime updatedAt;
  final int? width;
  final int? height;
-  final int? durationMs;
+  final int? durationInSeconds;
  final bool isFavorite;
  final String? thumbHash;
  final String? checksum;
@@ -150,7 +150,7 @@ class MergedAssetResult {
    required this.updatedAt,
    this.width,
    this.height,
-    this.durationMs,
+    this.durationInSeconds,
    required this.isFavorite,
    this.thumbHash,
    this.checksum,
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.dart
@@ -66,7 +66,7 @@ extension RemoteAssetEntityDataDomainEx on RemoteAssetEntityData {
    type: type,
    createdAt: createdAt,
    updatedAt: updatedAt,
-    durationMs: durationMs,
+    durationInSeconds: durationInSeconds,
    isFavorite: isFavorite,
    height: height,
    width: width,
--- a/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart
@@ -19,7 +19,7 @@ typedef $$RemoteAssetEntityTableCreateCompanionBuilder =
      i0.Value<DateTime> updatedAt,
      i0.Value<int?> width,
      i0.Value<int?> height,
-      i0.Value<int?> durationMs,
+      i0.Value<int?> durationInSeconds,
      required String id,
      required String checksum,
      i0.Value<bool> isFavorite,
@@ -41,7 +41,7 @@ typedef $$RemoteAssetEntityTableUpdateCompanionBuilder =
      i0.Value<DateTime> updatedAt,
      i0.Value<int?> width,
      i0.Value<int?> height,
-      i0.Value<int?> durationMs,
+      i0.Value<int?> durationInSeconds,
      i0.Value<String> id,
      i0.Value<String> checksum,
      i0.Value<bool> isFavorite,
@@ -142,8 +142,8 @@ class $$RemoteAssetEntityTableFilterComposer
    builder: (column) => i0.ColumnFilters(column),
  );

-  i0.ColumnFilters<int> get durationMs => $composableBuilder(
-    column: $table.durationMs,
+  i0.ColumnFilters<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
    builder: (column) => i0.ColumnFilters(column),
  );

@@ -270,8 +270,8 @@ class $$RemoteAssetEntityTableOrderingComposer
    builder: (column) => i0.ColumnOrderings(column),
  );

-  i0.ColumnOrderings<int> get durationMs => $composableBuilder(
-    column: $table.durationMs,
+  i0.ColumnOrderings<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
    builder: (column) => i0.ColumnOrderings(column),
  );

@@ -385,8 +385,8 @@ class $$RemoteAssetEntityTableAnnotationComposer
  i0.GeneratedColumn<int> get height =>
      $composableBuilder(column: $table.height, builder: (column) => column);

-  i0.GeneratedColumn<int> get durationMs => $composableBuilder(
-    column: $table.durationMs,
+  i0.GeneratedColumn<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
    builder: (column) => column,
  );

@@ -499,7 +499,7 @@ class $$RemoteAssetEntityTableTableManager
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
                i0.Value<int?> width = const i0.Value.absent(),
                i0.Value<int?> height = const i0.Value.absent(),
-                i0.Value<int?> durationMs = const i0.Value.absent(),
+                i0.Value<int?> durationInSeconds = const i0.Value.absent(),
                i0.Value<String> id = const i0.Value.absent(),
                i0.Value<String> checksum = const i0.Value.absent(),
                i0.Value<bool> isFavorite = const i0.Value.absent(),
@@ -520,7 +520,7 @@ class $$RemoteAssetEntityTableTableManager
                updatedAt: updatedAt,
                width: width,
                height: height,
-                durationMs: durationMs,
+                durationInSeconds: durationInSeconds,
                id: id,
                checksum: checksum,
                isFavorite: isFavorite,
@@ -542,7 +542,7 @@ class $$RemoteAssetEntityTableTableManager
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
                i0.Value<int?> width = const i0.Value.absent(),
                i0.Value<int?> height = const i0.Value.absent(),
-                i0.Value<int?> durationMs = const i0.Value.absent(),
+                i0.Value<int?> durationInSeconds = const i0.Value.absent(),
                required String id,
                required String checksum,
                i0.Value<bool> isFavorite = const i0.Value.absent(),
@@ -562,7 +562,7 @@ class $$RemoteAssetEntityTableTableManager
                updatedAt: updatedAt,
                width: width,
                height: height,
-                durationMs: durationMs,
+                durationInSeconds: durationInSeconds,
                id: id,
                checksum: checksum,
                isFavorite: isFavorite,
@@ -724,17 +724,17 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
    type: i0.DriftSqlType.int,
    requiredDuringInsert: false,
  );
-  static const i0.VerificationMeta _durationMsMeta = const i0.VerificationMeta(
-    'durationMs',
-  );
+  static const i0.VerificationMeta _durationInSecondsMeta =
+      const i0.VerificationMeta('durationInSeconds');
  @override
-  late final i0.GeneratedColumn<int> durationMs = i0.GeneratedColumn<int>(
-    'duration_ms',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.int,
-    requiredDuringInsert: false,
-  );
+  late final i0.GeneratedColumn<int> durationInSeconds =
+      i0.GeneratedColumn<int>(
+        'duration_in_seconds',
+        aliasedName,
+        true,
+        type: i0.DriftSqlType.int,
+        requiredDuringInsert: false,
+      );
  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
  @override
  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
@@ -886,7 +886,7 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
    updatedAt,
    width,
    height,
-    durationMs,
+    durationInSeconds,
    id,
    checksum,
    isFavorite,
@@ -944,10 +944,13 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
        height.isAcceptableOrUnknown(data['height']!, _heightMeta),
      );
    }
-    if (data.containsKey('duration_ms')) {
+    if (data.containsKey('duration_in_seconds')) {
      context.handle(
-        _durationMsMeta,
-        durationMs.isAcceptableOrUnknown(data['duration_ms']!, _durationMsMeta),
+        _durationInSecondsMeta,
+        durationInSeconds.isAcceptableOrUnknown(
+          data['duration_in_seconds']!,
+          _durationInSecondsMeta,
+        ),
      );
    }
    if (data.containsKey('id')) {
@@ -1063,9 +1066,9 @@ class $RemoteAssetEntityTable extends i3.RemoteAssetEntity
        i0.DriftSqlType.int,
        data['${effectivePrefix}height'],
      ),
-      durationMs: attachedDatabase.typeMapping.read(
+      durationInSeconds: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.int,
-        data['${effectivePrefix}duration_ms'],
+        data['${effectivePrefix}duration_in_seconds'],
      ),
      id: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.string,
@@ -1145,7 +1148,7 @@ class RemoteAssetEntityData extends i0.DataClass
  final DateTime updatedAt;
  final int? width;
  final int? height;
-  final int? durationMs;
+  final int? durationInSeconds;
  final String id;
  final String checksum;
  final bool isFavorite;
@@ -1165,7 +1168,7 @@ class RemoteAssetEntityData extends i0.DataClass
    required this.updatedAt,
    this.width,
    this.height,
-    this.durationMs,
+    this.durationInSeconds,
    required this.id,
    required this.checksum,
    required this.isFavorite,
@@ -1196,8 +1199,8 @@ class RemoteAssetEntityData extends i0.DataClass
    if (!nullToAbsent || height != null) {
      map['height'] = i0.Variable<int>(height);
    }
-    if (!nullToAbsent || durationMs != null) {
-      map['duration_ms'] = i0.Variable<int>(durationMs);
+    if (!nullToAbsent || durationInSeconds != null) {
+      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds);
    }
    map['id'] = i0.Variable<String>(id);
    map['checksum'] = i0.Variable<String>(checksum);
@@ -1244,7 +1247,7 @@ class RemoteAssetEntityData extends i0.DataClass
      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
      width: serializer.fromJson<int?>(json['width']),
      height: serializer.fromJson<int?>(json['height']),
-      durationMs: serializer.fromJson<int?>(json['durationMs']),
+      durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
      id: serializer.fromJson<String>(json['id']),
      checksum: serializer.fromJson<String>(json['checksum']),
      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
@@ -1273,7 +1276,7 @@ class RemoteAssetEntityData extends i0.DataClass
      'updatedAt': serializer.toJson<DateTime>(updatedAt),
      'width': serializer.toJson<int?>(width),
      'height': serializer.toJson<int?>(height),
-      'durationMs': serializer.toJson<int?>(durationMs),
+      'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
      'id': serializer.toJson<String>(id),
      'checksum': serializer.toJson<String>(checksum),
      'isFavorite': serializer.toJson<bool>(isFavorite),
@@ -1298,7 +1301,7 @@ class RemoteAssetEntityData extends i0.DataClass
    DateTime? updatedAt,
    i0.Value<int?> width = const i0.Value.absent(),
    i0.Value<int?> height = const i0.Value.absent(),
-    i0.Value<int?> durationMs = const i0.Value.absent(),
+    i0.Value<int?> durationInSeconds = const i0.Value.absent(),
    String? id,
    String? checksum,
    bool? isFavorite,
@@ -1318,7 +1321,9 @@ class RemoteAssetEntityData extends i0.DataClass
    updatedAt: updatedAt ?? this.updatedAt,
    width: width.present ? width.value : this.width,
    height: height.present ? height.value : this.height,
-    durationMs: durationMs.present ? durationMs.value : this.durationMs,
+    durationInSeconds: durationInSeconds.present
+        ? durationInSeconds.value
+        : this.durationInSeconds,
    id: id ?? this.id,
    checksum: checksum ?? this.checksum,
    isFavorite: isFavorite ?? this.isFavorite,
@@ -1344,9 +1349,9 @@ class RemoteAssetEntityData extends i0.DataClass
      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
      width: data.width.present ? data.width.value : this.width,
      height: data.height.present ? data.height.value : this.height,
-      durationMs: data.durationMs.present
-          ? data.durationMs.value
-          : this.durationMs,
+      durationInSeconds: data.durationInSeconds.present
+          ? data.durationInSeconds.value
+          : this.durationInSeconds,
      id: data.id.present ? data.id.value : this.id,
      checksum: data.checksum.present ? data.checksum.value : this.checksum,
      isFavorite: data.isFavorite.present
@@ -1379,7 +1384,7 @@ class RemoteAssetEntityData extends i0.DataClass
          ..write('updatedAt: $updatedAt, ')
          ..write('width: $width, ')
          ..write('height: $height, ')
-          ..write('durationMs: $durationMs, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
@@ -1404,7 +1409,7 @@ class RemoteAssetEntityData extends i0.DataClass
    updatedAt,
    width,
    height,
-    durationMs,
+    durationInSeconds,
    id,
    checksum,
    isFavorite,
@@ -1428,7 +1433,7 @@ class RemoteAssetEntityData extends i0.DataClass
          other.updatedAt == this.updatedAt &&
          other.width == this.width &&
          other.height == this.height &&
-          other.durationMs == this.durationMs &&
+          other.durationInSeconds == this.durationInSeconds &&
          other.id == this.id &&
          other.checksum == this.checksum &&
          other.isFavorite == this.isFavorite &&
@@ -1451,7 +1456,7 @@ class RemoteAssetEntityCompanion
  final i0.Value<DateTime> updatedAt;
  final i0.Value<int?> width;
  final i0.Value<int?> height;
-  final i0.Value<int?> durationMs;
+  final i0.Value<int?> durationInSeconds;
  final i0.Value<String> id;
  final i0.Value<String> checksum;
  final i0.Value<bool> isFavorite;
@@ -1471,7 +1476,7 @@ class RemoteAssetEntityCompanion
    this.updatedAt = const i0.Value.absent(),
    this.width = const i0.Value.absent(),
    this.height = const i0.Value.absent(),
-    this.durationMs = const i0.Value.absent(),
+    this.durationInSeconds = const i0.Value.absent(),
    this.id = const i0.Value.absent(),
    this.checksum = const i0.Value.absent(),
    this.isFavorite = const i0.Value.absent(),
@@ -1492,7 +1497,7 @@ class RemoteAssetEntityCompanion
    this.updatedAt = const i0.Value.absent(),
    this.width = const i0.Value.absent(),
    this.height = const i0.Value.absent(),
-    this.durationMs = const i0.Value.absent(),
+    this.durationInSeconds = const i0.Value.absent(),
    required String id,
    required String checksum,
    this.isFavorite = const i0.Value.absent(),
@@ -1518,7 +1523,7 @@ class RemoteAssetEntityCompanion
    i0.Expression<DateTime>? updatedAt,
    i0.Expression<int>? width,
    i0.Expression<int>? height,
-    i0.Expression<int>? durationMs,
+    i0.Expression<int>? durationInSeconds,
    i0.Expression<String>? id,
    i0.Expression<String>? checksum,
    i0.Expression<bool>? isFavorite,
@@ -1539,7 +1544,7 @@ class RemoteAssetEntityCompanion
      if (updatedAt != null) 'updated_at': updatedAt,
      if (width != null) 'width': width,
      if (height != null) 'height': height,
-      if (durationMs != null) 'duration_ms': durationMs,
+      if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
      if (id != null) 'id': id,
      if (checksum != null) 'checksum': checksum,
      if (isFavorite != null) 'is_favorite': isFavorite,
@@ -1562,7 +1567,7 @@ class RemoteAssetEntityCompanion
    i0.Value<DateTime>? updatedAt,
    i0.Value<int?>? width,
    i0.Value<int?>? height,
-    i0.Value<int?>? durationMs,
+    i0.Value<int?>? durationInSeconds,
    i0.Value<String>? id,
    i0.Value<String>? checksum,
    i0.Value<bool>? isFavorite,
@@ -1583,7 +1588,7 @@ class RemoteAssetEntityCompanion
      updatedAt: updatedAt ?? this.updatedAt,
      width: width ?? this.width,
      height: height ?? this.height,
-      durationMs: durationMs ?? this.durationMs,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      id: id ?? this.id,
      checksum: checksum ?? this.checksum,
      isFavorite: isFavorite ?? this.isFavorite,
@@ -1622,8 +1627,8 @@ class RemoteAssetEntityCompanion
    if (height.present) {
      map['height'] = i0.Variable<int>(height.value);
    }
-    if (durationMs.present) {
-      map['duration_ms'] = i0.Variable<int>(durationMs.value);
+    if (durationInSeconds.present) {
+      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds.value);
    }
    if (id.present) {
      map['id'] = i0.Variable<String>(id.value);
@@ -1675,7 +1680,7 @@ class RemoteAssetEntityCompanion
          ..write('updatedAt: $updatedAt, ')
          ..write('width: $width, ')
          ..write('height: $height, ')
-          ..write('durationMs: $durationMs, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
          ..write('checksum: $checksum, ')
          ..write('isFavorite: $isFavorite, ')
--- a/mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart
+++ b/mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart
@@ -42,7 +42,7 @@ extension TrashedLocalAssetEntityDataDomainExtension on TrashedLocalAssetEntityD
    type: type,
    createdAt: createdAt,
    updatedAt: updatedAt,
-    durationMs: durationMs,
+    durationInSeconds: durationInSeconds,
    isFavorite: isFavorite,
    height: height,
    width: width,
--- a/mobile/lib/infrastructure/entities/trashed_local_asset.entity.drift.dart
+++ b/mobile/lib/infrastructure/entities/trashed_local_asset.entity.drift.dart
@@ -16,7 +16,7 @@ typedef $$TrashedLocalAssetEntityTableCreateCompanionBuilder =
      i0.Value<DateTime> updatedAt,
      i0.Value<int?> width,
      i0.Value<int?> height,
-      i0.Value<int?> durationMs,
+      i0.Value<int?> durationInSeconds,
      required String id,
      required String albumId,
      i0.Value<String?> checksum,
@@ -33,7 +33,7 @@ typedef $$TrashedLocalAssetEntityTableUpdateCompanionBuilder =
      i0.Value<DateTime> updatedAt,
      i0.Value<int?> width,
      i0.Value<int?> height,
-      i0.Value<int?> durationMs,
+      i0.Value<int?> durationInSeconds,
      i0.Value<String> id,
      i0.Value<String> albumId,
      i0.Value<String?> checksum,
@@ -84,8 +84,8 @@ class $$TrashedLocalAssetEntityTableFilterComposer
    builder: (column) => i0.ColumnFilters(column),
  );

-  i0.ColumnFilters<int> get durationMs => $composableBuilder(
-    column: $table.durationMs,
+  i0.ColumnFilters<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
    builder: (column) => i0.ColumnFilters(column),
  );

@@ -171,8 +171,8 @@ class $$TrashedLocalAssetEntityTableOrderingComposer
    builder: (column) => i0.ColumnOrderings(column),
  );

-  i0.ColumnOrderings<int> get durationMs => $composableBuilder(
-    column: $table.durationMs,
+  i0.ColumnOrderings<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
    builder: (column) => i0.ColumnOrderings(column),
  );

@@ -240,8 +240,8 @@ class $$TrashedLocalAssetEntityTableAnnotationComposer
  i0.GeneratedColumn<int> get height =>
      $composableBuilder(column: $table.height, builder: (column) => column);

-  i0.GeneratedColumn<int> get durationMs => $composableBuilder(
-    column: $table.durationMs,
+  i0.GeneratedColumn<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
    builder: (column) => column,
  );

@@ -326,7 +326,7 @@ class $$TrashedLocalAssetEntityTableTableManager
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
                i0.Value<int?> width = const i0.Value.absent(),
                i0.Value<int?> height = const i0.Value.absent(),
-                i0.Value<int?> durationMs = const i0.Value.absent(),
+                i0.Value<int?> durationInSeconds = const i0.Value.absent(),
                i0.Value<String> id = const i0.Value.absent(),
                i0.Value<String> albumId = const i0.Value.absent(),
                i0.Value<String?> checksum = const i0.Value.absent(),
@@ -342,7 +342,7 @@ class $$TrashedLocalAssetEntityTableTableManager
                updatedAt: updatedAt,
                width: width,
                height: height,
-                durationMs: durationMs,
+                durationInSeconds: durationInSeconds,
                id: id,
                albumId: albumId,
                checksum: checksum,
@@ -359,7 +359,7 @@ class $$TrashedLocalAssetEntityTableTableManager
                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
                i0.Value<int?> width = const i0.Value.absent(),
                i0.Value<int?> height = const i0.Value.absent(),
-                i0.Value<int?> durationMs = const i0.Value.absent(),
+                i0.Value<int?> durationInSeconds = const i0.Value.absent(),
                required String id,
                required String albumId,
                i0.Value<String?> checksum = const i0.Value.absent(),
@@ -375,7 +375,7 @@ class $$TrashedLocalAssetEntityTableTableManager
                updatedAt: updatedAt,
                width: width,
                height: height,
-                durationMs: durationMs,
+                durationInSeconds: durationInSeconds,
                id: id,
                albumId: albumId,
                checksum: checksum,
@@ -498,17 +498,17 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
    type: i0.DriftSqlType.int,
    requiredDuringInsert: false,
  );
-  static const i0.VerificationMeta _durationMsMeta = const i0.VerificationMeta(
-    'durationMs',
-  );
+  static const i0.VerificationMeta _durationInSecondsMeta =
+      const i0.VerificationMeta('durationInSeconds');
  @override
-  late final i0.GeneratedColumn<int> durationMs = i0.GeneratedColumn<int>(
-    'duration_ms',
-    aliasedName,
-    true,
-    type: i0.DriftSqlType.int,
-    requiredDuringInsert: false,
-  );
+  late final i0.GeneratedColumn<int> durationInSeconds =
+      i0.GeneratedColumn<int>(
+        'duration_in_seconds',
+        aliasedName,
+        true,
+        type: i0.DriftSqlType.int,
+        requiredDuringInsert: false,
+      );
  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
  @override
  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
@@ -599,7 +599,7 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
    updatedAt,
    width,
    height,
-    durationMs,
+    durationInSeconds,
    id,
    albumId,
    checksum,
@@ -652,10 +652,13 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
        height.isAcceptableOrUnknown(data['height']!, _heightMeta),
      );
    }
-    if (data.containsKey('duration_ms')) {
+    if (data.containsKey('duration_in_seconds')) {
      context.handle(
-        _durationMsMeta,
-        durationMs.isAcceptableOrUnknown(data['duration_ms']!, _durationMsMeta),
+        _durationInSecondsMeta,
+        durationInSeconds.isAcceptableOrUnknown(
+          data['duration_in_seconds']!,
+          _durationInSecondsMeta,
+        ),
      );
    }
    if (data.containsKey('id')) {
@@ -730,9 +733,9 @@ class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
        i0.DriftSqlType.int,
        data['${effectivePrefix}height'],
      ),
-      durationMs: attachedDatabase.typeMapping.read(
+      durationInSeconds: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.int,
-        data['${effectivePrefix}duration_ms'],
+        data['${effectivePrefix}duration_in_seconds'],
      ),
      id: attachedDatabase.typeMapping.read(
        i0.DriftSqlType.string,
@@ -797,7 +800,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
  final DateTime updatedAt;
  final int? width;
  final int? height;
-  final int? durationMs;
+  final int? durationInSeconds;
  final String id;
  final String albumId;
  final String? checksum;
@@ -812,7 +815,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
    required this.updatedAt,
    this.width,
    this.height,
-    this.durationMs,
+    this.durationInSeconds,
    required this.id,
    required this.albumId,
    this.checksum,
@@ -838,8 +841,8 @@ class TrashedLocalAssetEntityData extends i0.DataClass
    if (!nullToAbsent || height != null) {
      map['height'] = i0.Variable<int>(height);
    }
-    if (!nullToAbsent || durationMs != null) {
-      map['duration_ms'] = i0.Variable<int>(durationMs);
+    if (!nullToAbsent || durationInSeconds != null) {
+      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds);
    }
    map['id'] = i0.Variable<String>(id);
    map['album_id'] = i0.Variable<String>(albumId);
@@ -877,7 +880,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
      width: serializer.fromJson<int?>(json['width']),
      height: serializer.fromJson<int?>(json['height']),
-      durationMs: serializer.fromJson<int?>(json['durationMs']),
+      durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
      id: serializer.fromJson<String>(json['id']),
      albumId: serializer.fromJson<String>(json['albumId']),
      checksum: serializer.fromJson<String?>(json['checksum']),
@@ -902,7 +905,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
      'updatedAt': serializer.toJson<DateTime>(updatedAt),
      'width': serializer.toJson<int?>(width),
      'height': serializer.toJson<int?>(height),
-      'durationMs': serializer.toJson<int?>(durationMs),
+      'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
      'id': serializer.toJson<String>(id),
      'albumId': serializer.toJson<String>(albumId),
      'checksum': serializer.toJson<String?>(checksum),
@@ -926,7 +929,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
    DateTime? updatedAt,
    i0.Value<int?> width = const i0.Value.absent(),
    i0.Value<int?> height = const i0.Value.absent(),
-    i0.Value<int?> durationMs = const i0.Value.absent(),
+    i0.Value<int?> durationInSeconds = const i0.Value.absent(),
    String? id,
    String? albumId,
    i0.Value<String?> checksum = const i0.Value.absent(),
@@ -941,7 +944,9 @@ class TrashedLocalAssetEntityData extends i0.DataClass
    updatedAt: updatedAt ?? this.updatedAt,
    width: width.present ? width.value : this.width,
    height: height.present ? height.value : this.height,
-    durationMs: durationMs.present ? durationMs.value : this.durationMs,
+    durationInSeconds: durationInSeconds.present
+        ? durationInSeconds.value
+        : this.durationInSeconds,
    id: id ?? this.id,
    albumId: albumId ?? this.albumId,
    checksum: checksum.present ? checksum.value : this.checksum,
@@ -960,9 +965,9 @@ class TrashedLocalAssetEntityData extends i0.DataClass
      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
      width: data.width.present ? data.width.value : this.width,
      height: data.height.present ? data.height.value : this.height,
-      durationMs: data.durationMs.present
-          ? data.durationMs.value
-          : this.durationMs,
+      durationInSeconds: data.durationInSeconds.present
+          ? data.durationInSeconds.value
+          : this.durationInSeconds,
      id: data.id.present ? data.id.value : this.id,
      albumId: data.albumId.present ? data.albumId.value : this.albumId,
      checksum: data.checksum.present ? data.checksum.value : this.checksum,
@@ -988,7 +993,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
          ..write('updatedAt: $updatedAt, ')
          ..write('width: $width, ')
          ..write('height: $height, ')
-          ..write('durationMs: $durationMs, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
          ..write('albumId: $albumId, ')
          ..write('checksum: $checksum, ')
@@ -1008,7 +1013,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
    updatedAt,
    width,
    height,
-    durationMs,
+    durationInSeconds,
    id,
    albumId,
    checksum,
@@ -1027,7 +1032,7 @@ class TrashedLocalAssetEntityData extends i0.DataClass
          other.updatedAt == this.updatedAt &&
          other.width == this.width &&
          other.height == this.height &&
-          other.durationMs == this.durationMs &&
+          other.durationInSeconds == this.durationInSeconds &&
          other.id == this.id &&
          other.albumId == this.albumId &&
          other.checksum == this.checksum &&
@@ -1045,7 +1050,7 @@ class TrashedLocalAssetEntityCompanion
  final i0.Value<DateTime> updatedAt;
  final i0.Value<int?> width;
  final i0.Value<int?> height;
-  final i0.Value<int?> durationMs;
+  final i0.Value<int?> durationInSeconds;
  final i0.Value<String> id;
  final i0.Value<String> albumId;
  final i0.Value<String?> checksum;
@@ -1060,7 +1065,7 @@ class TrashedLocalAssetEntityCompanion
    this.updatedAt = const i0.Value.absent(),
    this.width = const i0.Value.absent(),
    this.height = const i0.Value.absent(),
-    this.durationMs = const i0.Value.absent(),
+    this.durationInSeconds = const i0.Value.absent(),
    this.id = const i0.Value.absent(),
    this.albumId = const i0.Value.absent(),
    this.checksum = const i0.Value.absent(),
@@ -1076,7 +1081,7 @@ class TrashedLocalAssetEntityCompanion
    this.updatedAt = const i0.Value.absent(),
    this.width = const i0.Value.absent(),
    this.height = const i0.Value.absent(),
-    this.durationMs = const i0.Value.absent(),
+    this.durationInSeconds = const i0.Value.absent(),
    required String id,
    required String albumId,
    this.checksum = const i0.Value.absent(),
@@ -1096,7 +1101,7 @@ class TrashedLocalAssetEntityCompanion
    i0.Expression<DateTime>? updatedAt,
    i0.Expression<int>? width,
    i0.Expression<int>? height,
-    i0.Expression<int>? durationMs,
+    i0.Expression<int>? durationInSeconds,
    i0.Expression<String>? id,
    i0.Expression<String>? albumId,
    i0.Expression<String>? checksum,
@@ -1112,7 +1117,7 @@ class TrashedLocalAssetEntityCompanion
      if (updatedAt != null) 'updated_at': updatedAt,
      if (width != null) 'width': width,
      if (height != null) 'height': height,
-      if (durationMs != null) 'duration_ms': durationMs,
+      if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
      if (id != null) 'id': id,
      if (albumId != null) 'album_id': albumId,
      if (checksum != null) 'checksum': checksum,
@@ -1130,7 +1135,7 @@ class TrashedLocalAssetEntityCompanion
    i0.Value<DateTime>? updatedAt,
    i0.Value<int?>? width,
    i0.Value<int?>? height,
-    i0.Value<int?>? durationMs,
+    i0.Value<int?>? durationInSeconds,
    i0.Value<String>? id,
    i0.Value<String>? albumId,
    i0.Value<String?>? checksum,
@@ -1146,7 +1151,7 @@ class TrashedLocalAssetEntityCompanion
      updatedAt: updatedAt ?? this.updatedAt,
      width: width ?? this.width,
      height: height ?? this.height,
-      durationMs: durationMs ?? this.durationMs,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
      id: id ?? this.id,
      albumId: albumId ?? this.albumId,
      checksum: checksum ?? this.checksum,
@@ -1180,8 +1185,8 @@ class TrashedLocalAssetEntityCompanion
    if (height.present) {
      map['height'] = i0.Variable<int>(height.value);
    }
-    if (durationMs.present) {
-      map['duration_ms'] = i0.Variable<int>(durationMs.value);
+    if (durationInSeconds.present) {
+      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds.value);
    }
    if (id.present) {
      map['id'] = i0.Variable<String>(id.value);
@@ -1222,7 +1227,7 @@ class TrashedLocalAssetEntityCompanion
          ..write('updatedAt: $updatedAt, ')
          ..write('width: $width, ')
          ..write('height: $height, ')
-          ..write('durationMs: $durationMs, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
          ..write('id: $id, ')
          ..write('albumId: $albumId, ')
          ..write('checksum: $checksum, ')
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -10,7 +10,6 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
@@ -19,12 +18,10 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset_cloud_id.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/stack.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart';
-import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.drift.dart';
@@ -84,7 +81,7 @@ class Drift extends $Drift {
  }

  @override
-  int get schemaVersion => 23;
+  int get schemaVersion => 22;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -225,27 +222,6 @@ class Drift extends $Drift {
            await m.createTable(v22.assetEditEntity);
            await m.createIndex(v22.idxAssetEditAssetId);
          },
-          from22To23: (m, v23) async {
-            await m.renameColumn(v23.localAssetEntity, 'duration_in_seconds', v23.localAssetEntity.durationMs);
-            await m.renameColumn(v23.remoteAssetEntity, 'duration_in_seconds', v23.remoteAssetEntity.durationMs);
-            await m.renameColumn(
-              v23.trashedLocalAssetEntity,
-              'duration_in_seconds',
-              v23.trashedLocalAssetEntity.durationMs,
-            );
-
-            await localAssetEntity.update().write(
-              LocalAssetEntityCompanion.custom(durationMs: v23.localAssetEntity.durationMs * const Constant(1000)),
-            );
-            await remoteAssetEntity.update().write(
-              RemoteAssetEntityCompanion.custom(durationMs: v23.remoteAssetEntity.durationMs * const Constant(1000)),
-            );
-            await trashedLocalAssetEntity.update().write(
-              TrashedLocalAssetEntityCompanion.custom(
-                durationMs: v23.trashedLocalAssetEntity.durationMs * const Constant(1000),
-              ),
-            );
-          },
        ),
      );

--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart
@@ -297,7 +297,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
          updatedAt: Value(asset.updatedAt),
          width: Value(asset.width),
          height: Value(asset.height),
-          durationMs: Value(asset.durationMs),
+          durationInSeconds: Value(asset.durationInSeconds),
          id: asset.id,
          orientation: Value(asset.orientation),
          isFavorite: Value(asset.isFavorite),
@@ -329,7 +329,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
          updatedAt: Value(asset.updatedAt),
          width: Value(asset.width),
          height: Value(asset.height),
-          durationMs: Value(asset.durationMs),
+          durationInSeconds: Value(asset.durationInSeconds),
          id: asset.id,
          checksum: const Value(null),
          orientation: Value(asset.orientation),
--- a/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
+++ b/mobile/lib/infrastructure/repositories/sync_stream.repository.dart
@@ -9,7 +9,6 @@ import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/memory.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/models/user_metadata.model.dart';
-import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/auth_user.entity.drift.dart';
@@ -191,7 +190,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
            type: Value(asset.type.toAssetType()),
            createdAt: Value.absentIfNull(asset.fileCreatedAt),
            updatedAt: Value.absentIfNull(asset.fileModifiedAt),
-            durationMs: Value(asset.duration?.toDuration()?.inMilliseconds ?? 0),
+            durationInSeconds: Value(asset.duration?.toDuration()?.inSeconds ?? 0),
            checksum: Value(asset.checksum),
            isFavorite: Value(asset.isFavorite),
            ownerId: Value(asset.ownerId),
@@ -844,6 +843,18 @@ extension on api.UserMetadataKey {
  };
 }

+extension on String {
+  Duration? toDuration() {
+    try {
+      final parts = split(':').map((e) => double.parse(e).toInt()).toList(growable: false);
+
+      return Duration(hours: parts[0], minutes: parts[1], seconds: parts[2]);
+    } catch (_) {
+      return null;
+    }
+  }
+}
+
 extension on UserAvatarColor {
  AvatarColor? toAvatarColor() => AvatarColor.values.firstWhereOrNull((c) => c.name == value);
 }
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -83,7 +83,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                  width: row.width,
                  height: row.height,
                  isFavorite: row.isFavorite,
-                  durationMs: row.durationMs,
+                  durationInSeconds: row.durationInSeconds,
                  livePhotoVideoId: row.livePhotoVideoId,
                  stackId: row.stackId,
                  isEdited: row.isEdited,
@@ -99,7 +99,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
                  width: row.width,
                  height: row.height,
                  isFavorite: row.isFavorite,
-                  durationMs: row.durationMs,
+                  durationInSeconds: row.durationInSeconds,
                  orientation: row.orientation,
                  playbackStyle: AssetPlaybackStyle.values[row.playbackStyle],
                  cloudId: row.iCloudId,
--- a/mobile/lib/infrastructure/repositories/trashed_local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/trashed_local_asset.repository.dart
@@ -82,7 +82,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
            updatedAt: Value(item.asset.updatedAt),
            width: Value(item.asset.width),
            height: Value(item.asset.height),
-            durationMs: Value(item.asset.durationMs),
+            durationInSeconds: Value(item.asset.durationInSeconds),
            isFavorite: Value(item.asset.isFavorite),
            orientation: Value(item.asset.orientation),
            playbackStyle: Value(item.asset.playbackStyle),
@@ -145,7 +145,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
            type: Value(asset.type),
            width: Value(asset.width),
            height: Value(asset.height),
-            durationMs: Value(asset.durationMs),
+            durationInSeconds: Value(asset.durationInSeconds),
            isFavorite: Value(asset.isFavorite),
            orientation: Value(asset.orientation),
            playbackStyle: Value(asset.playbackStyle),
@@ -193,7 +193,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
        updatedAt: Value(e.updatedAt),
        width: Value(e.width),
        height: Value(e.height),
-        durationMs: Value(e.durationMs),
+        durationInSeconds: Value(e.durationInSeconds),
        checksum: Value(e.checksum),
        isFavorite: Value(e.isFavorite),
        orientation: Value(e.orientation),
@@ -244,7 +244,7 @@ class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
        updatedAt: Value(e.asset.updatedAt),
        width: Value(e.asset.width),
        height: Value(e.asset.height),
-        durationMs: Value(e.asset.durationMs),
+        durationInSeconds: Value(e.asset.durationInSeconds),
        checksum: Value(e.asset.checksum),
        isFavorite: Value(e.asset.isFavorite),
        orientation: Value(e.asset.orientation),
--- a/mobile/lib/infrastructure/utils/asset.mixin.dart
+++ b/mobile/lib/infrastructure/utils/asset.mixin.dart
@@ -8,5 +8,5 @@ mixin AssetEntityMixin on Table {
  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
  IntColumn get width => integer().nullable()();
  IntColumn get height => integer().nullable()();
-  IntColumn get durationMs => integer().nullable()();
+  IntColumn get durationInSeconds => integer().nullable()();
 }
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -170,19 +170,32 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve

    final isColdStart = currentRouteName == null || currentRouteName == SplashScreenRoute.name;

+    PageRouteInfo? route;
    if (deepLink.uri.scheme == "immich") {
-      final proposedRoute = await deepLinkHandler.handleScheme(deepLink, ref, isColdStart);
-
-      return proposedRoute;
+      route = await deepLinkHandler.handleScheme(deepLink, ref);
+    } else if (deepLink.uri.host == "my.immich.app") {
+      route = await deepLinkHandler.handleMyImmichApp(deepLink, ref);
+    } else {
+      return DeepLink.path(deepLink.path);
    }

-    if (deepLink.uri.host == "my.immich.app") {
-      final proposedRoute = await deepLinkHandler.handleMyImmichApp(deepLink, ref, isColdStart);
-
-      return proposedRoute;
+    if (route == null) {
+      return isColdStart ? DeepLink.defaultPath : DeepLink.none;
    }

-    return DeepLink.path(deepLink.path);
+    // We need to replace the route if the destination is the current route
+    if (!isColdStart) {
+      unawaited(
+        ref.read(appRouterProvider).pushAndPopUntil(route, predicate: (r) => r.settings.name != route!.routeName),
+      );
+      return DeepLink.none;
+    }
+
+    return DeepLink([
+      // we need something to segue back to if the app was cold started
+      if (isColdStart) const TabShellRoute(children: [MainTimelineRoute()]),
+      route,
+    ]);
  }

  @override
--- a/mobile/lib/platform/native_sync_api.g.dart
+++ b/mobile/lib/platform/native_sync_api.g.dart
@@ -97,7 +97,7 @@ class PlatformAsset {
    this.updatedAt,
    this.width,
    this.height,
-    required this.durationMs,
+    required this.durationInSeconds,
    required this.orientation,
    required this.isFavorite,
    this.adjustmentTime,
@@ -120,7 +120,7 @@ class PlatformAsset {

  int? height;

-  int durationMs;
+  int durationInSeconds;

  int orientation;

@@ -143,7 +143,7 @@ class PlatformAsset {
      updatedAt,
      width,
      height,
-      durationMs,
+      durationInSeconds,
      orientation,
      isFavorite,
      adjustmentTime,
@@ -167,7 +167,7 @@ class PlatformAsset {
      updatedAt: result[4] as int?,
      width: result[5] as int?,
      height: result[6] as int?,
-      durationMs: result[7]! as int,
+      durationInSeconds: result[7]! as int,
      orientation: result[8]! as int,
      isFavorite: result[9]! as bool,
      adjustmentTime: result[10] as int?,
@@ -193,7 +193,7 @@ class PlatformAsset {
        _deepEquals(updatedAt, other.updatedAt) &&
        _deepEquals(width, other.width) &&
        _deepEquals(height, other.height) &&
-        _deepEquals(durationMs, other.durationMs) &&
+        _deepEquals(durationInSeconds, other.durationInSeconds) &&
        _deepEquals(orientation, other.orientation) &&
        _deepEquals(isFavorite, other.isFavorite) &&
        _deepEquals(adjustmentTime, other.adjustmentTime) &&
--- a/mobile/lib/presentation/pages/drift_asset_troubleshoot.page.dart
+++ b/mobile/lib/presentation/pages/drift_asset_troubleshoot.page.dart
@@ -112,7 +112,10 @@ class _AssetPropertiesSectionState extends ConsumerState<_AssetPropertiesSection
      _PropertyItem(label: 'Updated At', value: asset.updatedAt.toString()),
      _PropertyItem(label: 'Width', value: asset.width?.toString()),
      _PropertyItem(label: 'Height', value: asset.height?.toString()),
-      _PropertyItem(label: 'Duration', value: asset.durationMs != null ? '${asset.durationMs} ms' : null),
+      _PropertyItem(
+        label: 'Duration',
+        value: asset.durationInSeconds != null ? '${asset.durationInSeconds} seconds' : null,
+      ),
      _PropertyItem(label: 'Is Favorite', value: asset.isFavorite.toString()),
      _PropertyItem(label: 'Live Photo Video ID', value: asset.livePhotoVideoId),
      _PropertyItem(label: 'Is Edited', value: asset.isEdited.toString()),
--- a/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/video_viewer.widget.dart
@@ -148,7 +148,7 @@ class _NativeVideoViewerState extends ConsumerState<NativeVideoViewer> with Widg
    if (ref.read(assetViewerProvider).showingDetails) return;

    final autoPlayVideo = AppSetting.get(Setting.autoPlayVideo);
-    if (autoPlayVideo || widget.asset.isMotionPhoto) await _notifier.play();
+    if (autoPlayVideo) await _notifier.play();
  }

  void _onPlaybackEnded() {
--- a/mobile/lib/presentation/widgets/images/image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/image_provider.dart
@@ -45,6 +45,7 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide

    completer.operation.valueOrCancellation().whenComplete(() {
      cachedStream.removeListener(listener);
+      cachedOperation = null;
    });
    cachedOperation = completer.operation;
    return null;
@@ -105,33 +106,18 @@ mixin CancellableImageProviderMixin<T extends Object> on CancellableImageProvide
    }
  }

-  Stream<ImageInfo> initialImageStream({required bool isFinal}) async* {
+  Stream<ImageInfo> initialImageStream() async* {
    final cachedOperation = this.cachedOperation;
-    if (isCancelled) {
-      return;
-    }
    if (cachedOperation == null) {
-      // image resolved synchronously
-      isFinished = isFinal;
      return;
    }

    try {
      final cachedImage = await cachedOperation.valueOrCancellation();
-      if (isCancelled || cachedImage == null) {
-        return;
+      if (cachedImage != null && !isCancelled) {
+        yield cachedImage;
      }
-      isFinished = isFinal;
-      yield cachedImage;
    } catch (e, stack) {
-      if (isCancelled) {
-        return;
-      }
-      if (isFinal) {
-        isFinished = true;
-        PaintingBinding.instance.imageCache.evict(this);
-        rethrow;
-      }
      _log.severe('Error loading initial image', e, stack);
    } finally {
      this.cachedOperation = null;
--- a/mobile/lib/presentation/widgets/images/local_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/local_image_provider.dart
@@ -1,8 +1,8 @@
 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/setting.model.dart';
-import 'package:immich_mobile/domain/services/setting.service.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/animated_image_stream_completer.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
@@ -97,55 +97,51 @@ class LocalFullImageProvider extends CancellableImageProvider<LocalFullImageProv
  }

  Stream<ImageInfo> _codec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
-    final loadOriginal = AppSetting.get(Setting.loadOriginal);
-    final loadPreview = AppSetting.get(Setting.loadPreview);
-    yield* initialImageStream(isFinal: !loadOriginal && !loadPreview);
+    yield* initialImageStream();

    if (isCancelled) {
      return;
    }

-    if (loadPreview) {
-      final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
-      final previewRequest = request = LocalImageRequest(
-        localId: key.id,
-        size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
-        assetType: key.assetType,
-      );
-      yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
-
-      if (isCancelled) {
-        return;
-      }
-    }
+    final loadOriginal = Store.get(StoreKey.loadOriginal, false);
+    final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
+    var request = this.request = LocalImageRequest(
+      localId: key.id,
+      size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
+      assetType: key.assetType,
+    );
+    yield* loadRequest(request, decode, isFinal: !loadOriginal);

    if (!loadOriginal) {
      return;
    }

-    final originalRequest = request = LocalImageRequest(localId: key.id, assetType: key.assetType, size: Size.zero);
-    yield* loadRequest(originalRequest, decode, isFinal: true);
+    if (isCancelled) {
+      return;
+    }
+
+    request = this.request = LocalImageRequest(localId: key.id, assetType: key.assetType, size: Size.zero);
+
+    yield* loadRequest(request, decode, isFinal: true);
  }

  Stream<Object> _animatedCodec(LocalFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream(isFinal: false);
+    yield* initialImageStream();

    if (isCancelled) {
      return;
    }

-    if (AppSetting.get(Setting.loadPreview)) {
-      final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
-      final previewRequest = request = LocalImageRequest(
-        localId: key.id,
-        size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
-        assetType: key.assetType,
-      );
-      yield* loadRequest(previewRequest, decode, isFinal: false);
+    final devicePixelRatio = PlatformDispatcher.instance.views.first.devicePixelRatio;
+    final previewRequest = request = LocalImageRequest(
+      localId: key.id,
+      size: Size(size.width * devicePixelRatio, size.height * devicePixelRatio),
+      assetType: key.assetType,
+    );
+    yield* loadRequest(previewRequest, decode, isFinal: false);

-      if (isCancelled) {
-        return;
-      }
+    if (isCancelled) {
+      return;
    }

    // always try original for animated, since previews don't support animation
--- a/mobile/lib/presentation/widgets/images/remote_image_provider.dart
+++ b/mobile/lib/presentation/widgets/images/remote_image_provider.dart
@@ -107,35 +107,31 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
  }

  Stream<ImageInfo> _codec(RemoteFullImageProvider key, ImageDecoderCallback decode) async* {
-    final isImage = assetType == AssetType.image;
-    final loadOriginal = isImage && AppSetting.get(Setting.loadOriginal);
-    final loadPreview = isImage && AppSetting.get(Setting.loadPreview);
-    yield* initialImageStream(isFinal: !loadOriginal && !loadPreview);
+    yield* initialImageStream();

    if (isCancelled) {
      return;
    }

-    if (loadPreview) {
-      final previewRequest = request = RemoteImageRequest(
-        uri: getThumbnailUrlForRemoteId(
-          key.assetId,
-          type: AssetMediaSize.preview,
-          thumbhash: key.thumbhash,
-          edited: key.edited,
-        ),
-      );
-      yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);
-
-      if (isCancelled) {
-        return;
-      }
-    }
+    final previewRequest = request = RemoteImageRequest(
+      uri: getThumbnailUrlForRemoteId(
+        key.assetId,
+        type: AssetMediaSize.preview,
+        thumbhash: key.thumbhash,
+        edited: key.edited,
+      ),
+    );
+    final loadOriginal = assetType == AssetType.image && AppSetting.get(Setting.loadOriginal);
+    yield* loadRequest(previewRequest, decode, isFinal: !loadOriginal);

    if (!loadOriginal) {
      return;
    }

+    if (isCancelled) {
+      return;
+    }
+
    final originalRequest = request = RemoteImageRequest(
      uri: getOriginalUrlForRemoteId(key.assetId, edited: key.edited),
    );
@@ -143,26 +139,24 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
  }

  Stream<Object> _animatedCodec(RemoteFullImageProvider key, ImageDecoderCallback decode) async* {
-    yield* initialImageStream(isFinal: false);
+    yield* initialImageStream();

    if (isCancelled) {
      return;
    }

-    if (AppSetting.get(Setting.loadPreview)) {
-      final previewRequest = request = RemoteImageRequest(
-        uri: getThumbnailUrlForRemoteId(
-          key.assetId,
-          type: AssetMediaSize.preview,
-          thumbhash: key.thumbhash,
-          edited: key.edited,
-        ),
-      );
-      yield* loadRequest(previewRequest, decode, isFinal: false);
+    final previewRequest = request = RemoteImageRequest(
+      uri: getThumbnailUrlForRemoteId(
+        key.assetId,
+        type: AssetMediaSize.preview,
+        thumbhash: key.thumbhash,
+        edited: key.edited,
+      ),
+    );
+    yield* loadRequest(previewRequest, decode, isFinal: false);

-      if (isCancelled) {
-        return;
-      }
+    if (isCancelled) {
+      return;
    }

    // always try original for animated, since previews don't support animation
--- a/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
+++ b/mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart
@@ -129,7 +129,7 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
                      }

                      animation.addStatusListener(animationStatusListener);
-                      return direction == HeroFlightDirection.push ? from.widget : to.widget;
+                      return to.widget;
                    },
                  ),
                ),
--- a/mobile/lib/routing/auth_guard.dart
+++ b/mobile/lib/routing/auth_guard.dart
@@ -7,15 +7,13 @@ import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/services/auth.service.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';

 class AuthGuard extends AutoRouteGuard {
  final ApiService _apiService;
-  final AuthService _authService;
  final _log = Logger("AuthGuard");
-  AuthGuard(this._apiService, this._authService);
+  AuthGuard(this._apiService);
  @override
  void onNavigation(NavigationResolver resolver, StackRouter router) async {
    resolver.next(true);
@@ -29,7 +27,7 @@ class AuthGuard extends AutoRouteGuard {
      if (res == null || res.authStatus != true) {
        // If the access token is invalid, take user back to login
        _log.fine('User token is invalid. Redirecting to login');
-        unawaited(router.replaceAll([const LoginRoute()]).then((_) => _authService.clearLocalData()));
+        unawaited(router.replaceAll([const LoginRoute()]));
      }
    } on StoreKeyNotFoundException catch (_) {
      // If there is no access token, take us to the login page
@@ -40,7 +38,7 @@ class AuthGuard extends AutoRouteGuard {
      // On an unauthorized request, take us to the login page
      if (e.code == HttpStatus.unauthorized) {
        _log.warning("Unauthorized access token.");
-        unawaited(router.replaceAll([const LoginRoute()]).then((_) => _authService.clearLocalData()));
+        unawaited(router.replaceAll([const LoginRoute()]));
        return;
      }
    } catch (e) {
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -73,7 +73,6 @@ import 'package:immich_mobile/routing/auth_guard.dart';
 import 'package:immich_mobile/routing/duplicate_guard.dart';
 import 'package:immich_mobile/routing/locked_guard.dart';
 import 'package:immich_mobile/services/api.service.dart';
-import 'package:immich_mobile/services/auth.service.dart';
 import 'package:immich_mobile/services/local_auth.service.dart';
 import 'package:immich_mobile/services/secure_storage.service.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
@@ -83,7 +82,6 @@ part 'router.gr.dart';
 final appRouterProvider = Provider(
  (ref) => AppRouter(
    ref.watch(apiServiceProvider),
-    ref.watch(authServiceProvider),
    ref.watch(galleryPermissionNotifier.notifier),
    ref.watch(secureStorageServiceProvider),
    ref.watch(localAuthServiceProvider),
@@ -98,12 +96,11 @@ class AppRouter extends RootStackRouter {

  AppRouter(
    ApiService apiService,
-    AuthService authService,
    GalleryPermissionNotifier galleryPermissionNotifier,
    SecureStorageService secureStorageService,
    LocalAuthService localAuthService,
  ) {
-    _authGuard = AuthGuard(apiService, authService);
+    _authGuard = AuthGuard(apiService);
    _duplicateGuard = const DuplicateGuard();
    _lockedGuard = LockedGuard(apiService, secureStorageService, localAuthService);
  }
--- a/mobile/lib/services/deep_link.service.dart
+++ b/mobile/lib/services/deep_link.service.dart
@@ -45,21 +45,12 @@ class DeepLinkService {
    this._currentUser,
  );

-  DeepLink _handleColdStart(PageRouteInfo<dynamic> route, bool isColdStart) {
-    return DeepLink([
-      // we need something to segue back to if the app was cold started
-      // TODO: use MainTimelineRoute this when beta is default
-      if (isColdStart) const TabShellRoute(),
-      route,
-    ]);
-  }
-
-  Future<DeepLink> handleScheme(PlatformDeepLink link, WidgetRef ref, bool isColdStart) async {
+  Future<PageRouteInfo?> handleScheme(PlatformDeepLink link, WidgetRef ref) async {
    // get everything after the scheme, since Uri cannot parse path
    final intent = link.uri.host;
    final queryParams = link.uri.queryParameters;

-    PageRouteInfo<dynamic>? deepLinkRoute = switch (intent) {
+    return switch (intent) {
      "memory" => await _buildMemoryDeepLink(queryParams['id'] ?? ''),
      "asset" => await _buildAssetDeepLink(queryParams['id'] ?? '', ref),
      "album" => await _buildAlbumDeepLink(queryParams['id'] ?? ''),
@@ -67,20 +58,9 @@ class DeepLinkService {
      "activity" => await _buildActivityDeepLink(queryParams['albumId'] ?? ''),
      _ => null,
    };
-
-    // Deep link resolution failed, safely handle it based on the app state
-    if (deepLinkRoute == null) {
-      if (isColdStart) {
-        return DeepLink.defaultPath;
-      }
-
-      return DeepLink.none;
-    }
-
-    return _handleColdStart(deepLinkRoute, isColdStart);
  }

-  Future<DeepLink> handleMyImmichApp(PlatformDeepLink link, WidgetRef ref, bool isColdStart) async {
+  Future<PageRouteInfo?> handleMyImmichApp(PlatformDeepLink link, WidgetRef ref) async {
    final path = link.uri.path;

    const uuidRegex = r'[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}';
@@ -88,27 +68,20 @@ class DeepLinkService {
    final albumRegex = RegExp('/albums/($uuidRegex)');
    final peopleRegex = RegExp('/people/($uuidRegex)');

-    PageRouteInfo<dynamic>? deepLinkRoute;
    if (assetRegex.hasMatch(path)) {
      final assetId = assetRegex.firstMatch(path)?.group(1) ?? '';
-      deepLinkRoute = await _buildAssetDeepLink(assetId, ref);
-    } else if (albumRegex.hasMatch(path)) {
+      return _buildAssetDeepLink(assetId, ref);
+    }
+    if (albumRegex.hasMatch(path)) {
      final albumId = albumRegex.firstMatch(path)?.group(1) ?? '';
-      deepLinkRoute = await _buildAlbumDeepLink(albumId);
-    } else if (peopleRegex.hasMatch(path)) {
+      return _buildAlbumDeepLink(albumId);
+    }
+    if (peopleRegex.hasMatch(path)) {
      final peopleId = peopleRegex.firstMatch(path)?.group(1) ?? '';
-      deepLinkRoute = await _buildPeopleDeepLink(peopleId);
-    } else if (path == "/memory") {
-      deepLinkRoute = await _buildMemoryDeepLink(null);
+      return _buildPeopleDeepLink(peopleId);
    }

-    // Deep link resolution failed, safely handle it based on the app state
-    if (deepLinkRoute == null) {
-      if (isColdStart) return DeepLink.defaultPath;
-      return DeepLink.none;
-    }
-
-    return _handleColdStart(deepLinkRoute, isColdStart);
+    return null;
  }

  Future<PageRouteInfo?> _buildMemoryDeepLink(String? memoryId) async {
--- a/mobile/mise.toml
+++ b/mobile/mise.toml
@@ -1,5 +1,5 @@
 [tools]
-flutter = "3.41.7"
+flutter = "3.41.6"

 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.30.0"
--- a/mobile/openapi/lib/model/asset_media_status.dart
+++ b/mobile/openapi/lib/model/asset_media_status.dart
@@ -24,11 +24,13 @@ class AssetMediaStatus {
  String toJson() => value;

  static const created = AssetMediaStatus._(r'created');
+  static const replaced = AssetMediaStatus._(r'replaced');
  static const duplicate = AssetMediaStatus._(r'duplicate');

  /// List of all possible values in this [enum][AssetMediaStatus].
  static const values = <AssetMediaStatus>[
    created,
+    replaced,
    duplicate,
  ];

@@ -69,6 +71,7 @@ class AssetMediaStatusTypeTransformer {
    if (data != null) {
      switch (data) {
        case r'created': return AssetMediaStatus.created;
+        case r'replaced': return AssetMediaStatus.replaced;
        case r'duplicate': return AssetMediaStatus.duplicate;
        default:
          if (!allowNull) {
--- a/mobile/pigeon/native_sync_api.dart
+++ b/mobile/pigeon/native_sync_api.dart
@@ -32,7 +32,7 @@ class PlatformAsset {
  final int? updatedAt;
  final int? width;
  final int? height;
-  final int durationMs;
+  final int durationInSeconds;
  final int orientation;
  final bool isFavorite;

@@ -50,7 +50,7 @@ class PlatformAsset {
    this.updatedAt,
    this.width,
    this.height,
-    this.durationMs = 0,
+    this.durationInSeconds = 0,
    this.orientation = 0,
    this.isFavorite = false,
    this.adjustmentTime,
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1989,4 +1989,4 @@ packages:
    version: "3.1.3"
 sdks:
  dart: ">=3.11.0 <4.0.0"
-  flutter: "3.41.7"
+  flutter: "3.41.6"
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -6,7 +6,7 @@ version: 2.7.5+3046

 environment:
  sdk: '>=3.11.0 <4.0.0'
-  flutter: 3.41.7
+  flutter: 3.41.6

 dependencies:
  async: ^2.13.1
--- a/mobile/test/domain/services/hash_service_test.dart
+++ b/mobile/test/domain/services/hash_service_test.dart
@@ -0,0 +1,194 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/domain/services/hash.service.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../../fixtures/album.stub.dart';
+import '../../fixtures/asset.stub.dart';
+import '../../infrastructure/repository.mock.dart';
+import '../service.mock.dart';
+
+void main() {
+  late HashService sut;
+  late MockLocalAlbumRepository mockAlbumRepo;
+  late MockLocalAssetRepository mockAssetRepo;
+  late MockNativeSyncApi mockNativeApi;
+  late MockTrashedLocalAssetRepository mockTrashedAssetRepo;
+
+  setUp(() {
+    mockAlbumRepo = MockLocalAlbumRepository();
+    mockAssetRepo = MockLocalAssetRepository();
+    mockNativeApi = MockNativeSyncApi();
+    mockTrashedAssetRepo = MockTrashedLocalAssetRepository();
+
+    sut = HashService(
+      localAlbumRepository: mockAlbumRepo,
+      localAssetRepository: mockAssetRepo,
+      nativeSyncApi: mockNativeApi,
+      trashedLocalAssetRepository: mockTrashedAssetRepo,
+    );
+
+    registerFallbackValue(LocalAlbumStub.recent);
+    registerFallbackValue(LocalAssetStub.image1);
+    registerFallbackValue(<String, String>{});
+
+    when(() => mockAssetRepo.reconcileHashesFromCloudId()).thenAnswer((_) async => {});
+    when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
+  });
+
+  group('HashService hashAssets', () {
+    test('skips albums with no assets to hash', () async {
+      when(
+        () => mockAlbumRepo.getBackupAlbums(),
+      ).thenAnswer((_) async => [LocalAlbumStub.recent.copyWith(assetCount: 0)]);
+      when(() => mockAlbumRepo.getAssetsToHash(LocalAlbumStub.recent.id)).thenAnswer((_) async => []);
+
+      await sut.hashAssets();
+
+      verifyNever(() => mockNativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess')));
+    });
+  });
+
+  group('HashService _hashAssets', () {
+    test('skips empty batches', () async {
+      final album = LocalAlbumStub.recent;
+      when(() => mockAlbumRepo.getBackupAlbums()).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => []);
+
+      await sut.hashAssets();
+
+      verifyNever(() => mockNativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess')));
+    });
+
+    test('processes assets when available', () async {
+      final album = LocalAlbumStub.recent;
+      final asset = LocalAssetStub.image1;
+
+      when(() => mockAlbumRepo.getBackupAlbums()).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+      when(
+        () => mockNativeApi.hashAssets([asset.id], allowNetworkAccess: false),
+      ).thenAnswer((_) async => [HashResult(assetId: asset.id, hash: 'test-hash')]);
+
+      await sut.hashAssets();
+
+      verify(() => mockNativeApi.hashAssets([asset.id], allowNetworkAccess: false)).called(1);
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as Map<String, String>;
+      expect(captured.length, 1);
+      expect(captured[asset.id], 'test-hash');
+    });
+
+    test('handles failed hashes', () async {
+      final album = LocalAlbumStub.recent;
+      final asset = LocalAssetStub.image1;
+
+      when(() => mockAlbumRepo.getBackupAlbums()).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+      when(
+        () => mockNativeApi.hashAssets([asset.id], allowNetworkAccess: false),
+      ).thenAnswer((_) async => [HashResult(assetId: asset.id, error: 'Failed to hash')]);
+
+      await sut.hashAssets();
+
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as Map<String, String>;
+      expect(captured.length, 0);
+    });
+
+    test('handles null hash results', () async {
+      final album = LocalAlbumStub.recent;
+      final asset = LocalAssetStub.image1;
+
+      when(() => mockAlbumRepo.getBackupAlbums()).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset]);
+      when(
+        () => mockNativeApi.hashAssets([asset.id], allowNetworkAccess: false),
+      ).thenAnswer((_) async => [HashResult(assetId: asset.id, hash: null)]);
+
+      await sut.hashAssets();
+
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as Map<String, String>;
+      expect(captured.length, 0);
+    });
+
+    test('batches by size limit', () async {
+      const batchSize = 2;
+      final sut = HashService(
+        localAlbumRepository: mockAlbumRepo,
+        localAssetRepository: mockAssetRepo,
+        nativeSyncApi: mockNativeApi,
+        batchSize: batchSize,
+        trashedLocalAssetRepository: mockTrashedAssetRepo,
+      );
+
+      final album = LocalAlbumStub.recent;
+      final asset1 = LocalAssetStub.image1;
+      final asset2 = LocalAssetStub.image2;
+      final asset3 = LocalAssetStub.image1.copyWith(id: 'image3', name: 'image3.jpg');
+
+      final capturedCalls = <List<String>>[];
+
+      when(() => mockAssetRepo.updateHashes(any())).thenAnswer((_) async => {});
+      when(() => mockAlbumRepo.getBackupAlbums()).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2, asset3]);
+      when(() => mockNativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess'))).thenAnswer((
+        invocation,
+      ) async {
+        final assetIds = invocation.positionalArguments[0] as List<String>;
+        capturedCalls.add(List<String>.from(assetIds));
+        return assetIds.map((id) => HashResult(assetId: id, hash: '$id-hash')).toList();
+      });
+
+      await sut.hashAssets();
+
+      expect(capturedCalls.length, 2, reason: 'Should make exactly 2 calls to hashAssets');
+      expect(capturedCalls[0], [asset1.id, asset2.id], reason: 'First call should batch the first two assets');
+      expect(capturedCalls[1], [asset3.id], reason: 'Second call should have the remaining asset');
+
+      verify(() => mockAssetRepo.updateHashes(any())).called(2);
+    });
+
+    test('handles mixed success and failure in batch', () async {
+      final album = LocalAlbumStub.recent;
+      final asset1 = LocalAssetStub.image1;
+      final asset2 = LocalAssetStub.image2;
+
+      when(() => mockAlbumRepo.getBackupAlbums()).thenAnswer((_) async => [album]);
+      when(() => mockAlbumRepo.getAssetsToHash(album.id)).thenAnswer((_) async => [asset1, asset2]);
+      when(() => mockNativeApi.hashAssets([asset1.id, asset2.id], allowNetworkAccess: false)).thenAnswer(
+        (_) async => [
+          HashResult(assetId: asset1.id, hash: 'asset1-hash'),
+          HashResult(assetId: asset2.id, error: 'Failed to hash asset2'),
+        ],
+      );
+
+      await sut.hashAssets();
+
+      final captured = verify(() => mockAssetRepo.updateHashes(captureAny())).captured.first as Map<String, String>;
+      expect(captured.length, 1);
+      expect(captured[asset1.id], 'asset1-hash');
+    });
+
+    test('uses allowNetworkAccess based on album backup selection', () async {
+      final selectedAlbum = LocalAlbumStub.recent.copyWith(backupSelection: BackupSelection.selected);
+      final nonSelectedAlbum = LocalAlbumStub.recent.copyWith(id: 'album2', backupSelection: BackupSelection.excluded);
+      final asset1 = LocalAssetStub.image1;
+      final asset2 = LocalAssetStub.image2;
+
+      when(() => mockAlbumRepo.getBackupAlbums()).thenAnswer((_) async => [selectedAlbum, nonSelectedAlbum]);
+      when(() => mockAlbumRepo.getAssetsToHash(selectedAlbum.id)).thenAnswer((_) async => [asset1]);
+      when(() => mockAlbumRepo.getAssetsToHash(nonSelectedAlbum.id)).thenAnswer((_) async => [asset2]);
+      when(() => mockNativeApi.hashAssets(any(), allowNetworkAccess: any(named: 'allowNetworkAccess'))).thenAnswer((
+        invocation,
+      ) async {
+        final assetIds = invocation.positionalArguments[0] as List<String>;
+        return assetIds.map((id) => HashResult(assetId: id, hash: '$id-hash')).toList();
+      });
+
+      await sut.hashAssets();
+
+      verify(() => mockNativeApi.hashAssets([asset1.id], allowNetworkAccess: true)).called(1);
+      verify(() => mockNativeApi.hashAssets([asset2.id], allowNetworkAccess: false)).called(1);
+    });
+  });
+}
--- a/mobile/test/domain/services/local_sync_service_test.dart
+++ b/mobile/test/domain/services/local_sync_service_test.dart
@@ -128,7 +128,7 @@ void main() {
        id: 'remote-id',
        name: 'remote.jpg',
        type: AssetType.image.index,
-        durationMs: 0,
+        durationInSeconds: 0,
        orientation: 0,
        isFavorite: false,
        playbackStyle: PlatformAssetPlaybackStyle.image
@@ -210,7 +210,7 @@ void main() {
        id: 'test-id',
        name: 'test.jpg',
        type: AssetType.image.index,
-        durationMs: 0,
+        durationInSeconds: 0,
        orientation: 0,
        isFavorite: false,
        createdAt: 1700000000,
--- a/mobile/test/drift/main/generated/schema.dart
+++ b/mobile/test/drift/main/generated/schema.dart
@@ -1,7 +1,6 @@
 // dart format width=80
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';
 import 'package:drift/internal/migrations.dart';
 import 'schema_v1.dart' as v1;
@@ -26,7 +25,6 @@ import 'schema_v19.dart' as v19;
 import 'schema_v20.dart' as v20;
 import 'schema_v21.dart' as v21;
 import 'schema_v22.dart' as v22;
-import 'schema_v23.dart' as v23;

 class GeneratedHelper implements SchemaInstantiationHelper {
  @override
@@ -76,8 +74,6 @@ class GeneratedHelper implements SchemaInstantiationHelper {
        return v21.DatabaseAtV21(db);
      case 22:
        return v22.DatabaseAtV22(db);
-      case 23:
-        return v23.DatabaseAtV23(db);
      default:
        throw MissingSchemaException(version, versions);
    }
@@ -106,6 +102,5 @@ class GeneratedHelper implements SchemaInstantiationHelper {
    20,
    21,
    22,
-    23,
  ];
 }
--- a/mobile/test/drift/main/generated/schema_v1.dart
+++ b/mobile/test/drift/main/generated/schema_v1.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -1976,14 +1974,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -2027,7 +2024,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -2038,7 +2035,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -2050,7 +2047,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -2059,14 +2056,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -2105,7 +2102,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -2114,14 +2111,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -2133,7 +2130,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -2152,7 +2149,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v10.dart
+++ b/mobile/test/drift/main/generated/schema_v10.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3432,14 +3430,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3483,7 +3480,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3494,7 +3491,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3506,7 +3503,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3515,14 +3512,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3561,7 +3558,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3570,14 +3567,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3589,7 +3586,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3608,7 +3605,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v11.dart
+++ b/mobile/test/drift/main/generated/schema_v11.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3471,14 +3469,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3522,7 +3519,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3533,7 +3530,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3545,7 +3542,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3554,14 +3551,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3600,7 +3597,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3609,14 +3606,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3628,7 +3625,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3647,7 +3644,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v12.dart
+++ b/mobile/test/drift/main/generated/schema_v12.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3471,14 +3469,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3522,7 +3519,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3533,7 +3530,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3545,7 +3542,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3554,14 +3551,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3600,7 +3597,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3609,14 +3606,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3628,7 +3625,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3647,7 +3644,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v13.dart
+++ b/mobile/test/drift/main/generated/schema_v13.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3471,14 +3469,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3522,7 +3519,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3533,7 +3530,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3545,7 +3542,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3554,14 +3551,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3600,7 +3597,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3609,14 +3606,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3628,7 +3625,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3647,7 +3644,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v14.dart
+++ b/mobile/test/drift/main/generated/schema_v14.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3584,14 +3582,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3635,7 +3632,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3646,7 +3643,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3658,7 +3655,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3667,14 +3664,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3713,7 +3710,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3722,14 +3719,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3741,7 +3738,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3760,7 +3757,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v15.dart
+++ b/mobile/test/drift/main/generated/schema_v15.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3584,14 +3582,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3635,7 +3632,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3646,7 +3643,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3658,7 +3655,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3667,14 +3664,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3713,7 +3710,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3722,14 +3719,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3741,7 +3738,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3760,7 +3757,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v16.dart
+++ b/mobile/test/drift/main/generated/schema_v16.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3620,14 +3618,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3671,7 +3668,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3682,7 +3679,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3694,7 +3691,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3703,14 +3700,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3749,7 +3746,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3758,14 +3755,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3777,7 +3774,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3796,7 +3793,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v17.dart
+++ b/mobile/test/drift/main/generated/schema_v17.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3658,14 +3656,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3709,7 +3706,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3720,7 +3717,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3732,7 +3729,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3741,14 +3738,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3787,7 +3784,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3796,14 +3793,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3815,7 +3812,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3834,7 +3831,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v18.dart
+++ b/mobile/test/drift/main/generated/schema_v18.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3658,14 +3656,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3709,7 +3706,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3720,7 +3717,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3732,7 +3729,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3741,14 +3738,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3787,7 +3784,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3796,14 +3793,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3815,7 +3812,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3834,7 +3831,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v19.dart
+++ b/mobile/test/drift/main/generated/schema_v19.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3658,14 +3656,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3709,7 +3706,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3720,7 +3717,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3732,7 +3729,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3741,14 +3738,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3787,7 +3784,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3796,14 +3793,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3815,7 +3812,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3834,7 +3831,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v2.dart
+++ b/mobile/test/drift/main/generated/schema_v2.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -1976,14 +1974,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -2027,7 +2024,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -2038,7 +2035,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -2050,7 +2047,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -2059,14 +2056,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -2105,7 +2102,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -2114,14 +2111,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -2133,7 +2130,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -2152,7 +2149,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v20.dart
+++ b/mobile/test/drift/main/generated/schema_v20.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3658,14 +3656,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3709,7 +3706,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3720,7 +3717,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3732,7 +3729,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3741,14 +3738,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3787,7 +3784,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3796,14 +3793,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3815,7 +3812,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3834,7 +3831,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v21.dart
+++ b/mobile/test/drift/main/generated/schema_v21.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3695,14 +3693,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3746,7 +3743,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3757,7 +3754,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3769,7 +3766,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3778,14 +3775,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3824,7 +3821,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3833,14 +3830,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3852,7 +3849,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3871,7 +3868,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v22.dart
+++ b/mobile/test/drift/main/generated/schema_v22.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -3695,14 +3693,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3746,7 +3743,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3757,7 +3754,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3769,7 +3766,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3778,14 +3775,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3824,7 +3821,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3833,14 +3830,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3852,7 +3849,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3871,7 +3868,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
@@ -8412,14 +8409,13 @@ class AssetEditEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> parameters =
-      GeneratedColumn<i2.Uint8List>(
-        'parameters',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> parameters = GeneratedColumn<Uint8List>(
+    'parameters',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  late final GeneratedColumn<int> sequence = GeneratedColumn<int>(
    'sequence',
    aliasedName,
@@ -8485,7 +8481,7 @@ class AssetEditEntityData extends DataClass
  final String id;
  final String assetId;
  final int action;
-  final i2.Uint8List parameters;
+  final Uint8List parameters;
  final int sequence;
  const AssetEditEntityData({
    required this.id,
@@ -8500,7 +8496,7 @@ class AssetEditEntityData extends DataClass
    map['id'] = Variable<String>(id);
    map['asset_id'] = Variable<String>(assetId);
    map['action'] = Variable<int>(action);
-    map['parameters'] = Variable<i2.Uint8List>(parameters);
+    map['parameters'] = Variable<Uint8List>(parameters);
    map['sequence'] = Variable<int>(sequence);
    return map;
  }
@@ -8514,7 +8510,7 @@ class AssetEditEntityData extends DataClass
      id: serializer.fromJson<String>(json['id']),
      assetId: serializer.fromJson<String>(json['assetId']),
      action: serializer.fromJson<int>(json['action']),
-      parameters: serializer.fromJson<i2.Uint8List>(json['parameters']),
+      parameters: serializer.fromJson<Uint8List>(json['parameters']),
      sequence: serializer.fromJson<int>(json['sequence']),
    );
  }
@@ -8525,7 +8521,7 @@ class AssetEditEntityData extends DataClass
      'id': serializer.toJson<String>(id),
      'assetId': serializer.toJson<String>(assetId),
      'action': serializer.toJson<int>(action),
-      'parameters': serializer.toJson<i2.Uint8List>(parameters),
+      'parameters': serializer.toJson<Uint8List>(parameters),
      'sequence': serializer.toJson<int>(sequence),
    };
  }
@@ -8534,7 +8530,7 @@ class AssetEditEntityData extends DataClass
    String? id,
    String? assetId,
    int? action,
-    i2.Uint8List? parameters,
+    Uint8List? parameters,
    int? sequence,
  }) => AssetEditEntityData(
    id: id ?? this.id,
@@ -8590,7 +8586,7 @@ class AssetEditEntityCompanion extends UpdateCompanion<AssetEditEntityData> {
  final Value<String> id;
  final Value<String> assetId;
  final Value<int> action;
-  final Value<i2.Uint8List> parameters;
+  final Value<Uint8List> parameters;
  final Value<int> sequence;
  const AssetEditEntityCompanion({
    this.id = const Value.absent(),
@@ -8603,7 +8599,7 @@ class AssetEditEntityCompanion extends UpdateCompanion<AssetEditEntityData> {
    required String id,
    required String assetId,
    required int action,
-    required i2.Uint8List parameters,
+    required Uint8List parameters,
    required int sequence,
  }) : id = Value(id),
       assetId = Value(assetId),
@@ -8614,7 +8610,7 @@ class AssetEditEntityCompanion extends UpdateCompanion<AssetEditEntityData> {
    Expression<String>? id,
    Expression<String>? assetId,
    Expression<int>? action,
-    Expression<i2.Uint8List>? parameters,
+    Expression<Uint8List>? parameters,
    Expression<int>? sequence,
  }) {
    return RawValuesInsertable({
@@ -8630,7 +8626,7 @@ class AssetEditEntityCompanion extends UpdateCompanion<AssetEditEntityData> {
    Value<String>? id,
    Value<String>? assetId,
    Value<int>? action,
-    Value<i2.Uint8List>? parameters,
+    Value<Uint8List>? parameters,
    Value<int>? sequence,
  }) {
    return AssetEditEntityCompanion(
@@ -8655,7 +8651,7 @@ class AssetEditEntityCompanion extends UpdateCompanion<AssetEditEntityData> {
      map['action'] = Variable<int>(action.value);
    }
    if (parameters.present) {
-      map['parameters'] = Variable<i2.Uint8List>(parameters.value);
+      map['parameters'] = Variable<Uint8List>(parameters.value);
    }
    if (sequence.present) {
      map['sequence'] = Variable<int>(sequence.value);
--- a/mobile/test/drift/main/generated/schema_v23.dart
+++ b/mobile/test/drift/main/generated/schema_v23.dart
--- a/mobile/test/drift/main/generated/schema_v3.dart
+++ b/mobile/test/drift/main/generated/schema_v3.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -1973,14 +1971,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -2024,7 +2021,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -2035,7 +2032,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -2047,7 +2044,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -2056,14 +2053,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -2102,7 +2099,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -2111,14 +2108,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -2130,7 +2127,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -2149,7 +2146,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v4.dart
+++ b/mobile/test/drift/main/generated/schema_v4.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -2494,14 +2492,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -2545,7 +2542,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -2556,7 +2553,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -2568,7 +2565,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -2577,14 +2574,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -2623,7 +2620,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -2632,14 +2629,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -2651,7 +2648,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -2670,7 +2667,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v5.dart
+++ b/mobile/test/drift/main/generated/schema_v5.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -2455,14 +2453,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -2506,7 +2503,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -2517,7 +2514,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -2529,7 +2526,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -2538,14 +2535,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -2584,7 +2581,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -2593,14 +2590,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -2612,7 +2609,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -2631,7 +2628,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v6.dart
+++ b/mobile/test/drift/main/generated/schema_v6.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -2491,14 +2489,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -2542,7 +2539,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -2553,7 +2550,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -2565,7 +2562,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -2574,14 +2571,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -2620,7 +2617,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -2629,14 +2626,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -2648,7 +2645,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -2667,7 +2664,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v7.dart
+++ b/mobile/test/drift/main/generated/schema_v7.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -2491,14 +2489,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -2542,7 +2539,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -2553,7 +2550,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -2565,7 +2562,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -2574,14 +2571,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -2620,7 +2617,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -2629,14 +2626,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -2648,7 +2645,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -2667,7 +2664,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v8.dart
+++ b/mobile/test/drift/main/generated/schema_v8.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -2491,14 +2489,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -2542,7 +2539,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -2553,7 +2550,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -2565,7 +2562,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -2574,14 +2571,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -2620,7 +2617,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -2629,14 +2626,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -2648,7 +2645,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -2667,7 +2664,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/drift/main/generated/schema_v9.dart
+++ b/mobile/test/drift/main/generated/schema_v9.dart
@@ -1,8 +1,6 @@
 // dart format width=80
-import 'dart:typed_data' as i2;
-// GENERATED BY drift_dev, DO NOT MODIFY.
-// ignore_for_file: type=lint,unused_import
-//
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
 import 'package:drift/drift.dart';

 class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
@@ -2987,14 +2985,13 @@ class UserMetadataEntity extends Table
    type: DriftSqlType.int,
    requiredDuringInsert: true,
  );
-  late final GeneratedColumn<i2.Uint8List> value =
-      GeneratedColumn<i2.Uint8List>(
-        'value',
-        aliasedName,
-        false,
-        type: DriftSqlType.blob,
-        requiredDuringInsert: true,
-      );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
  @override
  List<GeneratedColumn> get $columns => [userId, key, value];
  @override
@@ -3038,7 +3035,7 @@ class UserMetadataEntityData extends DataClass
    implements Insertable<UserMetadataEntityData> {
  final String userId;
  final int key;
-  final i2.Uint8List value;
+  final Uint8List value;
  const UserMetadataEntityData({
    required this.userId,
    required this.key,
@@ -3049,7 +3046,7 @@ class UserMetadataEntityData extends DataClass
    final map = <String, Expression>{};
    map['user_id'] = Variable<String>(userId);
    map['key'] = Variable<int>(key);
-    map['value'] = Variable<i2.Uint8List>(value);
+    map['value'] = Variable<Uint8List>(value);
    return map;
  }

@@ -3061,7 +3058,7 @@ class UserMetadataEntityData extends DataClass
    return UserMetadataEntityData(
      userId: serializer.fromJson<String>(json['userId']),
      key: serializer.fromJson<int>(json['key']),
-      value: serializer.fromJson<i2.Uint8List>(json['value']),
+      value: serializer.fromJson<Uint8List>(json['value']),
    );
  }
  @override
@@ -3070,14 +3067,14 @@ class UserMetadataEntityData extends DataClass
    return <String, dynamic>{
      'userId': serializer.toJson<String>(userId),
      'key': serializer.toJson<int>(key),
-      'value': serializer.toJson<i2.Uint8List>(value),
+      'value': serializer.toJson<Uint8List>(value),
    };
  }

  UserMetadataEntityData copyWith({
    String? userId,
    int? key,
-    i2.Uint8List? value,
+    Uint8List? value,
  }) => UserMetadataEntityData(
    userId: userId ?? this.userId,
    key: key ?? this.key,
@@ -3116,7 +3113,7 @@ class UserMetadataEntityCompanion
    extends UpdateCompanion<UserMetadataEntityData> {
  final Value<String> userId;
  final Value<int> key;
-  final Value<i2.Uint8List> value;
+  final Value<Uint8List> value;
  const UserMetadataEntityCompanion({
    this.userId = const Value.absent(),
    this.key = const Value.absent(),
@@ -3125,14 +3122,14 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion.insert({
    required String userId,
    required int key,
-    required i2.Uint8List value,
+    required Uint8List value,
  }) : userId = Value(userId),
       key = Value(key),
       value = Value(value);
  static Insertable<UserMetadataEntityData> custom({
    Expression<String>? userId,
    Expression<int>? key,
-    Expression<i2.Uint8List>? value,
+    Expression<Uint8List>? value,
  }) {
    return RawValuesInsertable({
      if (userId != null) 'user_id': userId,
@@ -3144,7 +3141,7 @@ class UserMetadataEntityCompanion
  UserMetadataEntityCompanion copyWith({
    Value<String>? userId,
    Value<int>? key,
-    Value<i2.Uint8List>? value,
+    Value<Uint8List>? value,
  }) {
    return UserMetadataEntityCompanion(
      userId: userId ?? this.userId,
@@ -3163,7 +3160,7 @@ class UserMetadataEntityCompanion
      map['key'] = Variable<int>(key.value);
    }
    if (value.present) {
-      map['value'] = Variable<i2.Uint8List>(value.value);
+      map['value'] = Variable<Uint8List>(value.value);
    }
    return map;
  }
--- a/mobile/test/infrastructure/repositories/backup_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/backup_repository_test.dart
@@ -3,7 +3,7 @@ import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/backup.repository.dart';
 import 'package:immich_mobile/utils/option.dart';

-import '../repository_context.dart';
+import '../../medium/repository_context.dart';

 void main() {
  late MediumRepositoryContext ctx;
--- a/mobile/test/infrastructure/repositories/local_asset_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/local_asset_repository_test.dart
@@ -4,7 +4,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/utils/option.dart';

-import '../repository_context.dart';
+import '../../medium/repository_context.dart';

 void main() {
  late MediumRepositoryContext ctx;
--- a/mobile/test/infrastructure/repositories/remote_album_repository_test.dart
+++ b/mobile/test/infrastructure/repositories/remote_album_repository_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';

-import '../repository_context.dart';
+import '../../medium/repository_context.dart';

 void main() {
  late MediumRepositoryContext ctx;
--- a/mobile/test/medium/repository_context.dart
+++ b/mobile/test/medium/repository_context.dart
@@ -18,8 +18,6 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/utils/option.dart';
 import 'package:uuid/uuid.dart';

-import '../utils.dart';
-
 class MediumRepositoryContext {
  final Drift db;
  final Random _random = Random();
@@ -53,7 +51,7 @@ class MediumRepositoryContext {
    DateTime? profileChangedAt,
    bool? hasProfileImage,
  }) async {
-    id = TestUtils.uuid(id);
+    id = id ?? const Uuid().v4();
    return await db
        .into(db.userEntity)
        .insertReturning(
@@ -62,7 +60,7 @@ class MediumRepositoryContext {
            email: Value(email ?? '$id@test.com'),
            name: Value(email ?? 'user_$id'),
            avatarColor: Value(avatarColor ?? AvatarColor.values[_random.nextInt(AvatarColor.values.length)]),
-            profileChangedAt: Value(TestUtils.date(profileChangedAt)),
+            profileChangedAt: Value(profileChangedAt ?? DateTime.now()),
            hasProfileImage: Value(hasProfileImage ?? false),
          ),
        );
@@ -77,7 +75,7 @@ class MediumRepositoryContext {
    DateTime? deletedAt,
    AssetType? type,
    AssetVisibility? visibility,
-    int? durationMs,
+    int? durationInSeconds,
    int? width,
    int? height,
    bool? isFavorite,
@@ -87,22 +85,22 @@ class MediumRepositoryContext {
    String? thumbHash,
    String? libraryId,
  }) async {
-    id = TestUtils.uuid(id);
-    createdAt = TestUtils.date(createdAt);
+    id = id ?? const Uuid().v4();
+    createdAt = createdAt ?? DateTime.now();
    return db
        .into(db.remoteAssetEntity)
        .insertReturning(
          RemoteAssetEntityCompanion(
            id: Value(id),
            name: Value('remote_$id.jpg'),
-            checksum: Value(TestUtils.uuid(checksum)),
+            checksum: Value(checksum ?? const Uuid().v4()),
            type: Value(type ?? AssetType.image),
            createdAt: Value(createdAt),
-            updatedAt: Value(TestUtils.date(updatedAt)),
-            ownerId: Value(TestUtils.uuid(ownerId)),
+            updatedAt: Value(updatedAt ?? DateTime.now()),
+            ownerId: Value(ownerId ?? const Uuid().v4()),
            visibility: Value(visibility ?? AssetVisibility.timeline),
            deletedAt: Value(deletedAt),
-            durationMs: Value(durationMs ?? 0),
+            durationInSeconds: Value(durationInSeconds ?? 0),
            width: Value(width ?? _random.nextInt(1000)),
            height: Value(height ?? _random.nextInt(1000)),
            isFavorite: Value(isFavorite ?? false),
@@ -110,8 +108,8 @@ class MediumRepositoryContext {
            livePhotoVideoId: Value(livePhotoVideoId),
            stackId: Value(stackId),
            localDateTime: Value(createdAt.toLocal()),
-            thumbHash: Value(TestUtils.uuid(thumbHash)),
-            libraryId: Value(TestUtils.uuid(libraryId)),
+            thumbHash: Value(thumbHash ?? const Uuid().v4()),
+            libraryId: Value(libraryId ?? const Uuid().v4()),
          ),
        );
  }
@@ -129,9 +127,9 @@ class MediumRepositoryContext {
        .into(db.remoteAssetCloudIdEntity)
        .insertReturning(
          RemoteAssetCloudIdEntityCompanion(
-            assetId: Value(TestUtils.uuid(id)),
-            cloudId: Value(TestUtils.uuid(cloudId)),
-            createdAt: Value(TestUtils.date(createdAt)),
+            assetId: Value(id ?? const Uuid().v4()),
+            cloudId: Value(cloudId ?? const Uuid().v4()),
+            createdAt: Value(createdAt ?? DateTime.now()),
            adjustmentTime: _resolveUndefined(adjustmentTime, adjustmentTimeOption, DateTime.now()),
            latitude: _resolveOption(latitude, _random.nextDouble() * 180 - 90),
            longitude: _resolveOption(longitude, _random.nextDouble() * 360 - 180),
@@ -150,16 +148,16 @@ class MediumRepositoryContext {
    AlbumAssetOrder? order,
    String? thumbnailAssetId,
  }) async {
-    id = TestUtils.uuid(id);
+    id = id ?? const Uuid().v4();
    return db
        .into(db.remoteAlbumEntity)
        .insertReturning(
          RemoteAlbumEntityCompanion(
            id: Value(id),
            name: Value(name ?? 'remote_album_$id'),
-            ownerId: Value(TestUtils.uuid(ownerId)),
-            createdAt: Value(TestUtils.date(createdAt)),
-            updatedAt: Value(TestUtils.date(updatedAt)),
+            ownerId: Value(ownerId ?? const Uuid().v4()),
+            createdAt: Value(createdAt ?? DateTime.now()),
+            updatedAt: Value(updatedAt ?? DateTime.now()),
            description: Value(description ?? 'Description for album $id'),
            isActivityEnabled: Value(isActivityEnabled ?? false),
            order: Value(order ?? AlbumAssetOrder.asc),
@@ -189,11 +187,11 @@ class MediumRepositoryContext {
    double? longitude,
    int? width,
    int? height,
-    int? durationMs,
+    int? durationInSeconds,
    int? orientation,
    DateTime? updatedAt,
  }) async {
-    id = TestUtils.uuid(id);
+    id = id ?? const Uuid().v4();
    return db
        .into(db.localAssetEntity)
        .insertReturning(
@@ -202,14 +200,14 @@ class MediumRepositoryContext {
            name: Value(name ?? 'local_$id.jpg'),
            height: Value(height ?? _random.nextInt(1000)),
            width: Value(width ?? _random.nextInt(1000)),
-            durationMs: Value(durationMs ?? 0),
+            durationInSeconds: Value(durationInSeconds ?? 0),
            orientation: Value(orientation ?? 0),
-            updatedAt: Value(TestUtils.date(updatedAt)),
+            updatedAt: Value(updatedAt ?? DateTime.now()),
            checksum: _resolveUndefined(checksum, checksumOption, const Uuid().v4()),
-            createdAt: Value(TestUtils.date(createdAt)),
+            createdAt: Value(createdAt ?? DateTime.now()),
            type: Value(type ?? AssetType.image),
            isFavorite: Value(isFavorite ?? false),
-            iCloudId: Value(TestUtils.uuid(iCloudId)),
+            iCloudId: Value(iCloudId ?? const Uuid().v4()),
            adjustmentTime: _resolveUndefined(adjustmentTime, adjustmentTimeOption, DateTime.now()),
            latitude: Value(latitude ?? _random.nextDouble() * 180 - 90),
            longitude: Value(longitude ?? _random.nextDouble() * 360 - 180),
@@ -225,14 +223,14 @@ class MediumRepositoryContext {
    bool? isIosSharedAlbum,
    String? linkedRemoteAlbumId,
  }) {
-    id = TestUtils.uuid(id);
+    id = id ?? const Uuid().v4();
    return db
        .into(db.localAlbumEntity)
        .insertReturning(
          LocalAlbumEntityCompanion(
            id: Value(id),
            name: Value(name ?? 'local_album_$id'),
-            updatedAt: Value(TestUtils.date(updatedAt)),
+            updatedAt: Value(updatedAt ?? DateTime.now()),
            backupSelection: Value(backupSelection ?? BackupSelection.none),
            isIosSharedAlbum: Value(isIosSharedAlbum ?? false),
            linkedRemoteAlbumId: Value(linkedRemoteAlbumId),
--- a/mobile/test/modules/extensions/builtin_extensions_test.dart
+++ b/mobile/test/modules/extensions/builtin_extensions_test.dart
@@ -7,11 +7,6 @@ void main() {
    test('ok', () {
      expect("1:02:33".toDuration(), const Duration(hours: 1, minutes: 2, seconds: 33));
    });
-    test('fractional seconds', () {
-      expect("0:00:00.500000".toDuration(), const Duration(milliseconds: 500));
-      expect("0:00:01.250000".toDuration(), const Duration(seconds: 1, milliseconds: 250));
-      expect("1:02:33.123456".toDuration(), const Duration(hours: 1, minutes: 2, seconds: 33, milliseconds: 123));
-    });
    test('malformed', () {
      expect("".toDuration(), isNull);
      expect("1:2".toDuration(), isNull);
--- a/mobile/test/test_utils.dart
+++ b/mobile/test/test_utils.dart
@@ -58,7 +58,7 @@ abstract final class TestUtils {
      type: domain.AssetType.image,
      createdAt: DateTime(2024, 1, 1),
      updatedAt: DateTime(2024, 1, 1),
-      durationMs: 0,
+      durationInSeconds: 0,
      isFavorite: false,
      width: width,
      height: height,
@@ -81,7 +81,7 @@ abstract final class TestUtils {
      type: domain.AssetType.image,
      createdAt: DateTime(2024, 1, 1),
      updatedAt: DateTime(2024, 1, 1),
-      durationMs: 0,
+      durationInSeconds: 0,
      isFavorite: false,
      width: width,
      height: height,
--- a/mobile/test/unit/factories/local_album_factory.dart
+++ b/mobile/test/unit/factories/local_album_factory.dart
@@ -1,28 +0,0 @@
-import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-
-import '../../utils.dart';
-
-class LocalAlbumFactory {
-  const LocalAlbumFactory();
-
-  static LocalAlbum create({
-    String? id,
-    String? name,
-    DateTime? updatedAt,
-    BackupSelection? backupSelection,
-    bool? isIosSharedAlbum,
-    String? linkedRemoteAlbumId,
-    int? assetCount,
-  }) {
-    id = TestUtils.uuid(id);
-    return LocalAlbum(
-      id: id,
-      name: name ?? 'local_album_$id',
-      updatedAt: TestUtils.date(updatedAt),
-      backupSelection: backupSelection ?? BackupSelection.none,
-      isIosSharedAlbum: isIosSharedAlbum ?? false,
-      linkedRemoteAlbumId: linkedRemoteAlbumId,
-      assetCount: assetCount ?? 10,
-    );
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bwees	14816224e9	chore: wtf isar	2026-04-19 15:57:45 -05:00
bwees	0e7cd4d639	fix: deep link for assets when asset viewer already open	2026-04-19 15:54:07 -05:00
@@ -1 +1 @@
 .15.0
 .14.1