feat: album info sync (#21103)

* wip

* album creation

* fix: album api repository no invalidating after logging out

* add linkedRemoteAlbumId column and migration

* link/unlink remote album

* logic to find and add new assets to album

* pr feedback

* add toggle option to backup option page

* refactor: provider > service

* rename

* Handle page pop manually

* UI feedback for user creation and sync linked album

* uncomment migration

* remove unused method

i18n/en.json

@@ -1417,6 +1417,8 @@
   "open_the_search_filters": "Open the search filters",
   "options": "Options",
   "or": "or",
+  "organize_into_albums": "Organize into albums",
+  "organize_into_albums_description": "Put existing photos into albums using current sync settings",
   "organize_your_library": "Organize your library",
   "original": "original",
   "other": "Other",

mobile/lib/domain/models/album/local_album.model.dart

@@ -15,6 +15,7 @@ class LocalAlbum {
 
   final int assetCount;
   final BackupSelection backupSelection;
+  final String? linkedRemoteAlbumId;
 
   const LocalAlbum({
     required this.id,
@@ -23,6 +24,7 @@ class LocalAlbum {
     this.assetCount = 0,
     this.backupSelection = BackupSelection.none,
     this.isIosSharedAlbum = false,
+    this.linkedRemoteAlbumId,
   });
 
   LocalAlbum copyWith({
@@ -32,6 +34,7 @@ class LocalAlbum {
     int? assetCount,
     BackupSelection? backupSelection,
     bool? isIosSharedAlbum,
+    String? linkedRemoteAlbumId,
   }) {
     return LocalAlbum(
       id: id ?? this.id,
@@ -40,6 +43,7 @@ class LocalAlbum {
       assetCount: assetCount ?? this.assetCount,
       backupSelection: backupSelection ?? this.backupSelection,
       isIosSharedAlbum: isIosSharedAlbum ?? this.isIosSharedAlbum,
+      linkedRemoteAlbumId: linkedRemoteAlbumId ?? this.linkedRemoteAlbumId,
     );
   }
 
@@ -53,7 +57,8 @@ class LocalAlbum {
         other.updatedAt == updatedAt &&
         other.assetCount == assetCount &&
         other.backupSelection == backupSelection &&
-        other.isIosSharedAlbum == isIosSharedAlbum;
+        other.isIosSharedAlbum == isIosSharedAlbum &&
+        other.linkedRemoteAlbumId == linkedRemoteAlbumId;
   }
 
   @override
@@ -63,7 +68,8 @@ class LocalAlbum {
         updatedAt.hashCode ^
         assetCount.hashCode ^
         backupSelection.hashCode ^
-        isIosSharedAlbum.hashCode;
+        isIosSharedAlbum.hashCode ^
+        linkedRemoteAlbumId.hashCode;
   }
 
   @override
@@ -75,6 +81,7 @@ updatedAt: $updatedAt,
 assetCount: $assetCount,
 backupSelection: $backupSelection,
 isIosSharedAlbum: $isIosSharedAlbum
+linkedRemoteAlbumId: $linkedRemoteAlbumId,
 }''';
   }
 }

mobile/lib/domain/services/local_album.service.dart

@@ -22,4 +22,16 @@ class LocalAlbumService {
   Future<int> getCount() {
     return _repository.getCount();
   }
+
+  Future<void> unlinkRemoteAlbum(String id) async {
+    return _repository.unlinkRemoteAlbum(id);
+  }
+
+  Future<void> linkRemoteAlbum(String localAlbumId, String remoteAlbumId) async {
+    return _repository.linkRemoteAlbum(localAlbumId, remoteAlbumId);
+  }
+
+  Future<List<LocalAlbum>> getBackupAlbums() {
+    return _repository.getBackupAlbums();
+  }
 }

mobile/lib/domain/services/remote_album.service.dart

@@ -26,6 +26,10 @@ class RemoteAlbumService {
     return _repository.get(albumId);
   }
 
+  Future<RemoteAlbum?> getByName(String albumName, String ownerId) {
+    return _repository.getByName(albumName, ownerId);
+  }
+
   Future<List<RemoteAlbum>> sortAlbums(
     List<RemoteAlbum> albums,
     RemoteAlbumSortMode sortMode, {
@@ -80,7 +84,6 @@ class RemoteAlbumService {
 
   Future<RemoteAlbum> createAlbum({required String title, required List<String> assetIds, String? description}) async {
     final album = await _albumApiRepository.createDriftAlbum(title, description: description, assetIds: assetIds);
-
     await _repository.create(album, assetIds);
 
     return album;

mobile/lib/domain/services/sync_linked_album.service.dart

@@ -0,0 +1,101 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
+
+final syncLinkedAlbumServiceProvider = Provider(
+  (ref) => SyncLinkedAlbumService(
+    ref.watch(localAlbumRepository),
+    ref.watch(remoteAlbumRepository),
+    ref.watch(driftAlbumApiRepositoryProvider),
+  ),
+);
+
+class SyncLinkedAlbumService {
+  final DriftLocalAlbumRepository _localAlbumRepository;
+  final DriftRemoteAlbumRepository _remoteAlbumRepository;
+  final DriftAlbumApiRepository _albumApiRepository;
+
+  const SyncLinkedAlbumService(this._localAlbumRepository, this._remoteAlbumRepository, this._albumApiRepository);
+
+  Future<void> syncLinkedAlbums(String userId) async {
+    final selectedAlbums = await _localAlbumRepository.getBackupAlbums();
+
+    await Future.wait(
+      selectedAlbums.map((localAlbum) async {
+        final linkedRemoteAlbumId = localAlbum.linkedRemoteAlbumId;
+        if (linkedRemoteAlbumId == null) {
+          return;
+        }
+
+        final remoteAlbum = await _remoteAlbumRepository.get(linkedRemoteAlbumId);
+        if (remoteAlbum == null) {
+          return;
+        }
+
+        // get assets that are uploaded but not in the remote album
+        final assetIds = await _remoteAlbumRepository.getLinkedAssetIds(userId, localAlbum.id, linkedRemoteAlbumId);
+
+        if (assetIds.isNotEmpty) {
+          final album = await _albumApiRepository.addAssets(remoteAlbum.id, assetIds);
+          await _remoteAlbumRepository.addAssets(remoteAlbum.id, album.added);
+        }
+      }),
+    );
+  }
+
+  Future<void> manageLinkedAlbums(List<LocalAlbum> localAlbums, String ownerId) async {
+    for (final album in localAlbums) {
+      await _processLocalAlbum(album, ownerId);
+    }
+  }
+
+  /// Processes a single local album to ensure proper linking with remote albums
+  Future<void> _processLocalAlbum(LocalAlbum localAlbum, String ownerId) {
+    final hasLinkedRemoteAlbum = localAlbum.linkedRemoteAlbumId != null;
+
+    if (hasLinkedRemoteAlbum) {
+      return _handleLinkedAlbum(localAlbum);
+    } else {
+      return _handleUnlinkedAlbum(localAlbum, ownerId);
+    }
+  }
+
+  /// Handles albums that are already linked to a remote album
+  Future<void> _handleLinkedAlbum(LocalAlbum localAlbum) async {
+    final remoteAlbumId = localAlbum.linkedRemoteAlbumId!;
+    final remoteAlbum = await _remoteAlbumRepository.get(remoteAlbumId);
+
+    final remoteAlbumExists = remoteAlbum != null;
+    if (!remoteAlbumExists) {
+      return _localAlbumRepository.unlinkRemoteAlbum(localAlbum.id);
+    }
+  }
+
+  /// Handles albums that are not linked to any remote album
+  Future<void> _handleUnlinkedAlbum(LocalAlbum localAlbum, String ownerId) async {
+    final existingRemoteAlbum = await _remoteAlbumRepository.getByName(localAlbum.name, ownerId);
+
+    if (existingRemoteAlbum != null) {
+      return _linkToExistingRemoteAlbum(localAlbum, existingRemoteAlbum);
+    } else {
+      return _createAndLinkNewRemoteAlbum(localAlbum);
+    }
+  }
+
+  /// Links a local album to an existing remote album
+  Future<void> _linkToExistingRemoteAlbum(LocalAlbum localAlbum, dynamic existingRemoteAlbum) {
+    return _localAlbumRepository.linkRemoteAlbum(localAlbum.id, existingRemoteAlbum.id);
+  }
+
+  /// Creates a new remote album and links it to the local album
+  Future<void> _createAndLinkNewRemoteAlbum(LocalAlbum localAlbum) async {
+    debugPrint("Creating new remote album for local album: ${localAlbum.name}");
+    final newRemoteAlbum = await _albumApiRepository.createDriftAlbum(localAlbum.name, assetIds: []);
+    await _remoteAlbumRepository.create(newRemoteAlbum, []);
+    return _localAlbumRepository.linkRemoteAlbum(localAlbum.id, newRemoteAlbum.id);
+  }
+}

mobile/lib/domain/utils/background_sync.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:immich_mobile/domain/utils/sync_linked_album.dart';
 import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/utils/isolate.dart';
 import 'package:worker_manager/worker_manager.dart';
@@ -155,6 +156,11 @@ class BackgroundSyncManager {
       _syncWebsocketTask = null;
     });
   }
+
+  Future<void> syncLinkedAlbum() {
+    final task = runInIsolateGentle(computation: syncLinkedAlbumsIsolated);
+    return task.future;
+  }
 }
 
 Cancelable<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(

mobile/lib/domain/utils/sync_linked_album.dart

@@ -0,0 +1,11 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+
+Future<void> syncLinkedAlbumsIsolated(ProviderContainer ref) {
+  final user = ref.read(currentUserProvider);
+  if (user == null) {
+    return Future.value();
+  }
+  return ref.read(syncLinkedAlbumServiceProvider).syncLinkedAlbums(user.id);
+}

mobile/lib/infrastructure/entities/local_album.entity.dart

@@ -1,5 +1,7 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
 import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
 
 class LocalAlbumEntity extends Table with DriftDefaultsMixin {
@@ -11,9 +13,26 @@ class LocalAlbumEntity extends Table with DriftDefaultsMixin {
   IntColumn get backupSelection => intEnum<BackupSelection>()();
   BoolColumn get isIosSharedAlbum => boolean().withDefault(const Constant(false))();
 
+  // // Linked album for putting assets to the remote album after finished uploading
+  TextColumn get linkedRemoteAlbumId =>
+      text().references(RemoteAlbumEntity, #id, onDelete: KeyAction.setNull).nullable()();
+
   // Used for mark & sweep
   BoolColumn get marker_ => boolean().nullable()();
 
   @override
   Set<Column> get primaryKey => {id};
 }
+
+extension LocalAlbumEntityDataHelper on LocalAlbumEntityData {
+  LocalAlbum toDto({int assetCount = 0}) {
+    return LocalAlbum(
+      id: id,
+      name: name,
+      updatedAt: updatedAt,
+      assetCount: assetCount,
+      backupSelection: backupSelection,
+      linkedRemoteAlbumId: linkedRemoteAlbumId,
+    );
+  }
+}

mobile/lib/infrastructure/entities/local_album.entity.drift.dart

@@ -7,6 +7,9 @@ import 'package:immich_mobile/domain/models/album/local_album.model.dart' as i2;
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart'
     as i3;
 import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
+import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
+    as i5;
+import 'package:drift/internal/modular.dart' as i6;
 
 typedef $$LocalAlbumEntityTableCreateCompanionBuilder =
     i1.LocalAlbumEntityCompanion Function({
@@ -15,6 +18,7 @@ typedef $$LocalAlbumEntityTableCreateCompanionBuilder =
       i0.Value<DateTime> updatedAt,
       required i2.BackupSelection backupSelection,
       i0.Value<bool> isIosSharedAlbum,
+      i0.Value<String?> linkedRemoteAlbumId,
       i0.Value<bool?> marker_,
     });
 typedef $$LocalAlbumEntityTableUpdateCompanionBuilder =
@@ -24,9 +28,57 @@ typedef $$LocalAlbumEntityTableUpdateCompanionBuilder =
       i0.Value<DateTime> updatedAt,
       i0.Value<i2.BackupSelection> backupSelection,
       i0.Value<bool> isIosSharedAlbum,
+      i0.Value<String?> linkedRemoteAlbumId,
       i0.Value<bool?> marker_,
     });
 
+final class $$LocalAlbumEntityTableReferences
+    extends
+        i0.BaseReferences<
+          i0.GeneratedDatabase,
+          i1.$LocalAlbumEntityTable,
+          i1.LocalAlbumEntityData
+        > {
+  $$LocalAlbumEntityTableReferences(
+    super.$_db,
+    super.$_table,
+    super.$_typedResult,
+  );
+
+  static i5.$RemoteAlbumEntityTable _linkedRemoteAlbumIdTable(
+    i0.GeneratedDatabase db,
+  ) => i6.ReadDatabaseContainer(db)
+      .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity')
+      .createAlias(
+        i0.$_aliasNameGenerator(
+          i6.ReadDatabaseContainer(db)
+              .resultSet<i1.$LocalAlbumEntityTable>('local_album_entity')
+              .linkedRemoteAlbumId,
+          i6.ReadDatabaseContainer(
+            db,
+          ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity').id,
+        ),
+      );
+
+  i5.$$RemoteAlbumEntityTableProcessedTableManager? get linkedRemoteAlbumId {
+    final $_column = $_itemColumn<String>('linked_remote_album_id');
+    if ($_column == null) return null;
+    final manager = i5
+        .$$RemoteAlbumEntityTableTableManager(
+          $_db,
+          i6.ReadDatabaseContainer(
+            $_db,
+          ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+        )
+        .filter((f) => f.id.sqlEquals($_column));
+    final item = $_typedResult.readTableOrNull(_linkedRemoteAlbumIdTable($_db));
+    if (item == null) return manager;
+    return i0.ProcessedTableManager(
+      manager.$state.copyWith(prefetchedData: [item]),
+    );
+  }
+}
+
 class $$LocalAlbumEntityTableFilterComposer
     extends i0.Composer<i0.GeneratedDatabase, i1.$LocalAlbumEntityTable> {
   $$LocalAlbumEntityTableFilterComposer({
@@ -66,6 +118,33 @@ class $$LocalAlbumEntityTableFilterComposer
     column: $table.marker_,
     builder: (column) => i0.ColumnFilters(column),
   );
+
+  i5.$$RemoteAlbumEntityTableFilterComposer get linkedRemoteAlbumId {
+    final i5.$$RemoteAlbumEntityTableFilterComposer composer = $composerBuilder(
+      composer: this,
+      getCurrentColumn: (t) => t.linkedRemoteAlbumId,
+      referencedTable: i6.ReadDatabaseContainer(
+        $db,
+      ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+      getReferencedColumn: (t) => t.id,
+      builder:
+          (
+            joinBuilder, {
+            $addJoinBuilderToRootComposer,
+            $removeJoinBuilderFromRootComposer,
+          }) => i5.$$RemoteAlbumEntityTableFilterComposer(
+            $db: $db,
+            $table: i6.ReadDatabaseContainer(
+              $db,
+            ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+            $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+            joinBuilder: joinBuilder,
+            $removeJoinBuilderFromRootComposer:
+                $removeJoinBuilderFromRootComposer,
+          ),
+    );
+    return composer;
+  }
 }
 
 class $$LocalAlbumEntityTableOrderingComposer
@@ -106,6 +185,34 @@ class $$LocalAlbumEntityTableOrderingComposer
     column: $table.marker_,
     builder: (column) => i0.ColumnOrderings(column),
   );
+
+  i5.$$RemoteAlbumEntityTableOrderingComposer get linkedRemoteAlbumId {
+    final i5.$$RemoteAlbumEntityTableOrderingComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.linkedRemoteAlbumId,
+          referencedTable: i6.ReadDatabaseContainer(
+            $db,
+          ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+          getReferencedColumn: (t) => t.id,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => i5.$$RemoteAlbumEntityTableOrderingComposer(
+                $db: $db,
+                $table: i6.ReadDatabaseContainer(
+                  $db,
+                ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return composer;
+  }
 }
 
 class $$LocalAlbumEntityTableAnnotationComposer
@@ -139,6 +246,34 @@ class $$LocalAlbumEntityTableAnnotationComposer
 
   i0.GeneratedColumn<bool> get marker_ =>
       $composableBuilder(column: $table.marker_, builder: (column) => column);
+
+  i5.$$RemoteAlbumEntityTableAnnotationComposer get linkedRemoteAlbumId {
+    final i5.$$RemoteAlbumEntityTableAnnotationComposer composer =
+        $composerBuilder(
+          composer: this,
+          getCurrentColumn: (t) => t.linkedRemoteAlbumId,
+          referencedTable: i6.ReadDatabaseContainer(
+            $db,
+          ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+          getReferencedColumn: (t) => t.id,
+          builder:
+              (
+                joinBuilder, {
+                $addJoinBuilderToRootComposer,
+                $removeJoinBuilderFromRootComposer,
+              }) => i5.$$RemoteAlbumEntityTableAnnotationComposer(
+                $db: $db,
+                $table: i6.ReadDatabaseContainer(
+                  $db,
+                ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity'),
+                $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
+                joinBuilder: joinBuilder,
+                $removeJoinBuilderFromRootComposer:
+                    $removeJoinBuilderFromRootComposer,
+              ),
+        );
+    return composer;
+  }
 }
 
 class $$LocalAlbumEntityTableTableManager
@@ -152,16 +287,9 @@ class $$LocalAlbumEntityTableTableManager
           i1.$$LocalAlbumEntityTableAnnotationComposer,
           $$LocalAlbumEntityTableCreateCompanionBuilder,
           $$LocalAlbumEntityTableUpdateCompanionBuilder,
-          (
+          (i1.LocalAlbumEntityData, i1.$$LocalAlbumEntityTableReferences),
-            i1.LocalAlbumEntityData,
-            i0.BaseReferences<
-              i0.GeneratedDatabase,
-              i1.$LocalAlbumEntityTable,
-              i1.LocalAlbumEntityData
-            >,
-          ),
           i1.LocalAlbumEntityData,
-          i0.PrefetchHooks Function()
+          i0.PrefetchHooks Function({bool linkedRemoteAlbumId})
         > {
   $$LocalAlbumEntityTableTableManager(
     i0.GeneratedDatabase db,
@@ -187,6 +315,7 @@ class $$LocalAlbumEntityTableTableManager
                 i0.Value<i2.BackupSelection> backupSelection =
                     const i0.Value.absent(),
                 i0.Value<bool> isIosSharedAlbum = const i0.Value.absent(),
+                i0.Value<String?> linkedRemoteAlbumId = const i0.Value.absent(),
                 i0.Value<bool?> marker_ = const i0.Value.absent(),
               }) => i1.LocalAlbumEntityCompanion(
                 id: id,
@@ -194,6 +323,7 @@ class $$LocalAlbumEntityTableTableManager
                 updatedAt: updatedAt,
                 backupSelection: backupSelection,
                 isIosSharedAlbum: isIosSharedAlbum,
+                linkedRemoteAlbumId: linkedRemoteAlbumId,
                 marker_: marker_,
               ),
           createCompanionCallback:
@@ -203,6 +333,7 @@ class $$LocalAlbumEntityTableTableManager
                 i0.Value<DateTime> updatedAt = const i0.Value.absent(),
                 required i2.BackupSelection backupSelection,
                 i0.Value<bool> isIosSharedAlbum = const i0.Value.absent(),
+                i0.Value<String?> linkedRemoteAlbumId = const i0.Value.absent(),
                 i0.Value<bool?> marker_ = const i0.Value.absent(),
               }) => i1.LocalAlbumEntityCompanion.insert(
                 id: id,
@@ -210,12 +341,60 @@ class $$LocalAlbumEntityTableTableManager
                 updatedAt: updatedAt,
                 backupSelection: backupSelection,
                 isIosSharedAlbum: isIosSharedAlbum,
+                linkedRemoteAlbumId: linkedRemoteAlbumId,
                 marker_: marker_,
               ),
           withReferenceMapper: (p0) => p0
-              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .map(
+                (e) => (
+                  e.readTable(table),
+                  i1.$$LocalAlbumEntityTableReferences(db, table, e),
+                ),
+              )
               .toList(),
-          prefetchHooksCallback: null,
+          prefetchHooksCallback: ({linkedRemoteAlbumId = false}) {
+            return i0.PrefetchHooks(
+              db: db,
+              explicitlyWatchedTables: [],
+              addJoins:
+                  <
+                    T extends i0.TableManagerState<
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic,
+                      dynamic
+                    >
+                  >(state) {
+                    if (linkedRemoteAlbumId) {
+                      state =
+                          state.withJoin(
+                                currentTable: table,
+                                currentColumn: table.linkedRemoteAlbumId,
+                                referencedTable: i1
+                                    .$$LocalAlbumEntityTableReferences
+                                    ._linkedRemoteAlbumIdTable(db),
+                                referencedColumn: i1
+                                    .$$LocalAlbumEntityTableReferences
+                                    ._linkedRemoteAlbumIdTable(db)
+                                    .id,
+                              )
+                              as T;
+                    }
+
+                    return state;
+                  },
+              getPrefetchedDataCallback: (items) async {
+                return [];
+              },
+            );
+          },
         ),
       );
 }
@@ -230,16 +409,9 @@ typedef $$LocalAlbumEntityTableProcessedTableManager =
       i1.$$LocalAlbumEntityTableAnnotationComposer,
       $$LocalAlbumEntityTableCreateCompanionBuilder,
       $$LocalAlbumEntityTableUpdateCompanionBuilder,
-      (
+      (i1.LocalAlbumEntityData, i1.$$LocalAlbumEntityTableReferences),
-        i1.LocalAlbumEntityData,
-        i0.BaseReferences<
-          i0.GeneratedDatabase,
-          i1.$LocalAlbumEntityTable,
-          i1.LocalAlbumEntityData
-        >,
-      ),
       i1.LocalAlbumEntityData,
-      i0.PrefetchHooks Function()
+      i0.PrefetchHooks Function({bool linkedRemoteAlbumId})
     >;
 
 class $LocalAlbumEntityTable extends i3.LocalAlbumEntity
@@ -308,6 +480,20 @@ class $LocalAlbumEntityTable extends i3.LocalAlbumEntity
         ),
         defaultValue: const i4.Constant(false),
       );
+  static const i0.VerificationMeta _linkedRemoteAlbumIdMeta =
+      const i0.VerificationMeta('linkedRemoteAlbumId');
+  @override
+  late final i0.GeneratedColumn<String> linkedRemoteAlbumId =
+      i0.GeneratedColumn<String>(
+        'linked_remote_album_id',
+        aliasedName,
+        true,
+        type: i0.DriftSqlType.string,
+        requiredDuringInsert: false,
+        defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_album_entity (id) ON DELETE SET NULL',
+        ),
+      );
   static const i0.VerificationMeta _marker_Meta = const i0.VerificationMeta(
     'marker_',
   );
@@ -329,6 +515,7 @@ class $LocalAlbumEntityTable extends i3.LocalAlbumEntity
     updatedAt,
     backupSelection,
     isIosSharedAlbum,
+    linkedRemoteAlbumId,
     marker_,
   ];
   @override
@@ -371,6 +558,15 @@ class $LocalAlbumEntityTable extends i3.LocalAlbumEntity
         ),
       );
     }
+    if (data.containsKey('linked_remote_album_id')) {
+      context.handle(
+        _linkedRemoteAlbumIdMeta,
+        linkedRemoteAlbumId.isAcceptableOrUnknown(
+          data['linked_remote_album_id']!,
+          _linkedRemoteAlbumIdMeta,
+        ),
+      );
+    }
     if (data.containsKey('marker')) {
       context.handle(
         _marker_Meta,
@@ -412,6 +608,10 @@ class $LocalAlbumEntityTable extends i3.LocalAlbumEntity
         i0.DriftSqlType.bool,
         data['${effectivePrefix}is_ios_shared_album'],
       )!,
+      linkedRemoteAlbumId: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}linked_remote_album_id'],
+      ),
       marker_: attachedDatabase.typeMapping.read(
         i0.DriftSqlType.bool,
         data['${effectivePrefix}marker'],
@@ -441,6 +641,7 @@ class LocalAlbumEntityData extends i0.DataClass
   final DateTime updatedAt;
   final i2.BackupSelection backupSelection;
   final bool isIosSharedAlbum;
+  final String? linkedRemoteAlbumId;
   final bool? marker_;
   const LocalAlbumEntityData({
     required this.id,
@@ -448,6 +649,7 @@ class LocalAlbumEntityData extends i0.DataClass
     required this.updatedAt,
     required this.backupSelection,
     required this.isIosSharedAlbum,
+    this.linkedRemoteAlbumId,
     this.marker_,
   });
   @override
@@ -464,6 +666,9 @@ class LocalAlbumEntityData extends i0.DataClass
       );
     }
     map['is_ios_shared_album'] = i0.Variable<bool>(isIosSharedAlbum);
+    if (!nullToAbsent || linkedRemoteAlbumId != null) {
+      map['linked_remote_album_id'] = i0.Variable<String>(linkedRemoteAlbumId);
+    }
     if (!nullToAbsent || marker_ != null) {
       map['marker'] = i0.Variable<bool>(marker_);
     }
@@ -482,6 +687,9 @@ class LocalAlbumEntityData extends i0.DataClass
       backupSelection: i1.$LocalAlbumEntityTable.$converterbackupSelection
           .fromJson(serializer.fromJson<int>(json['backupSelection'])),
       isIosSharedAlbum: serializer.fromJson<bool>(json['isIosSharedAlbum']),
+      linkedRemoteAlbumId: serializer.fromJson<String?>(
+        json['linkedRemoteAlbumId'],
+      ),
       marker_: serializer.fromJson<bool?>(json['marker_']),
     );
   }
@@ -498,6 +706,7 @@ class LocalAlbumEntityData extends i0.DataClass
         ),
       ),
       'isIosSharedAlbum': serializer.toJson<bool>(isIosSharedAlbum),
+      'linkedRemoteAlbumId': serializer.toJson<String?>(linkedRemoteAlbumId),
       'marker_': serializer.toJson<bool?>(marker_),
     };
   }
@@ -508,6 +717,7 @@ class LocalAlbumEntityData extends i0.DataClass
     DateTime? updatedAt,
     i2.BackupSelection? backupSelection,
     bool? isIosSharedAlbum,
+    i0.Value<String?> linkedRemoteAlbumId = const i0.Value.absent(),
     i0.Value<bool?> marker_ = const i0.Value.absent(),
   }) => i1.LocalAlbumEntityData(
     id: id ?? this.id,
@@ -515,6 +725,9 @@ class LocalAlbumEntityData extends i0.DataClass
     updatedAt: updatedAt ?? this.updatedAt,
     backupSelection: backupSelection ?? this.backupSelection,
     isIosSharedAlbum: isIosSharedAlbum ?? this.isIosSharedAlbum,
+    linkedRemoteAlbumId: linkedRemoteAlbumId.present
+        ? linkedRemoteAlbumId.value
+        : this.linkedRemoteAlbumId,
     marker_: marker_.present ? marker_.value : this.marker_,
   );
   LocalAlbumEntityData copyWithCompanion(i1.LocalAlbumEntityCompanion data) {
@@ -528,6 +741,9 @@ class LocalAlbumEntityData extends i0.DataClass
       isIosSharedAlbum: data.isIosSharedAlbum.present
           ? data.isIosSharedAlbum.value
           : this.isIosSharedAlbum,
+      linkedRemoteAlbumId: data.linkedRemoteAlbumId.present
+          ? data.linkedRemoteAlbumId.value
+          : this.linkedRemoteAlbumId,
       marker_: data.marker_.present ? data.marker_.value : this.marker_,
     );
   }
@@ -540,6 +756,7 @@ class LocalAlbumEntityData extends i0.DataClass
           ..write('updatedAt: $updatedAt, ')
           ..write('backupSelection: $backupSelection, ')
           ..write('isIosSharedAlbum: $isIosSharedAlbum, ')
+          ..write('linkedRemoteAlbumId: $linkedRemoteAlbumId, ')
           ..write('marker_: $marker_')
           ..write(')'))
         .toString();
@@ -552,6 +769,7 @@ class LocalAlbumEntityData extends i0.DataClass
     updatedAt,
     backupSelection,
     isIosSharedAlbum,
+    linkedRemoteAlbumId,
     marker_,
   );
   @override
@@ -563,6 +781,7 @@ class LocalAlbumEntityData extends i0.DataClass
           other.updatedAt == this.updatedAt &&
           other.backupSelection == this.backupSelection &&
           other.isIosSharedAlbum == this.isIosSharedAlbum &&
+          other.linkedRemoteAlbumId == this.linkedRemoteAlbumId &&
           other.marker_ == this.marker_);
 }
 
@@ -573,6 +792,7 @@ class LocalAlbumEntityCompanion
   final i0.Value<DateTime> updatedAt;
   final i0.Value<i2.BackupSelection> backupSelection;
   final i0.Value<bool> isIosSharedAlbum;
+  final i0.Value<String?> linkedRemoteAlbumId;
   final i0.Value<bool?> marker_;
   const LocalAlbumEntityCompanion({
     this.id = const i0.Value.absent(),
@@ -580,6 +800,7 @@ class LocalAlbumEntityCompanion
     this.updatedAt = const i0.Value.absent(),
     this.backupSelection = const i0.Value.absent(),
     this.isIosSharedAlbum = const i0.Value.absent(),
+    this.linkedRemoteAlbumId = const i0.Value.absent(),
     this.marker_ = const i0.Value.absent(),
   });
   LocalAlbumEntityCompanion.insert({
@@ -588,6 +809,7 @@ class LocalAlbumEntityCompanion
     this.updatedAt = const i0.Value.absent(),
     required i2.BackupSelection backupSelection,
     this.isIosSharedAlbum = const i0.Value.absent(),
+    this.linkedRemoteAlbumId = const i0.Value.absent(),
     this.marker_ = const i0.Value.absent(),
   }) : id = i0.Value(id),
        name = i0.Value(name),
@@ -598,6 +820,7 @@ class LocalAlbumEntityCompanion
     i0.Expression<DateTime>? updatedAt,
     i0.Expression<int>? backupSelection,
     i0.Expression<bool>? isIosSharedAlbum,
+    i0.Expression<String>? linkedRemoteAlbumId,
     i0.Expression<bool>? marker_,
   }) {
     return i0.RawValuesInsertable({
@@ -606,6 +829,8 @@ class LocalAlbumEntityCompanion
       if (updatedAt != null) 'updated_at': updatedAt,
       if (backupSelection != null) 'backup_selection': backupSelection,
       if (isIosSharedAlbum != null) 'is_ios_shared_album': isIosSharedAlbum,
+      if (linkedRemoteAlbumId != null)
+        'linked_remote_album_id': linkedRemoteAlbumId,
       if (marker_ != null) 'marker': marker_,
     });
   }
@@ -616,6 +841,7 @@ class LocalAlbumEntityCompanion
     i0.Value<DateTime>? updatedAt,
     i0.Value<i2.BackupSelection>? backupSelection,
     i0.Value<bool>? isIosSharedAlbum,
+    i0.Value<String?>? linkedRemoteAlbumId,
     i0.Value<bool?>? marker_,
   }) {
     return i1.LocalAlbumEntityCompanion(
@@ -624,6 +850,7 @@ class LocalAlbumEntityCompanion
       updatedAt: updatedAt ?? this.updatedAt,
       backupSelection: backupSelection ?? this.backupSelection,
       isIosSharedAlbum: isIosSharedAlbum ?? this.isIosSharedAlbum,
+      linkedRemoteAlbumId: linkedRemoteAlbumId ?? this.linkedRemoteAlbumId,
       marker_: marker_ ?? this.marker_,
     );
   }
@@ -650,6 +877,11 @@ class LocalAlbumEntityCompanion
     if (isIosSharedAlbum.present) {
       map['is_ios_shared_album'] = i0.Variable<bool>(isIosSharedAlbum.value);
     }
+    if (linkedRemoteAlbumId.present) {
+      map['linked_remote_album_id'] = i0.Variable<String>(
+        linkedRemoteAlbumId.value,
+      );
+    }
     if (marker_.present) {
       map['marker'] = i0.Variable<bool>(marker_.value);
     }
@@ -664,6 +896,7 @@ class LocalAlbumEntityCompanion
           ..write('updatedAt: $updatedAt, ')
           ..write('backupSelection: $backupSelection, ')
           ..write('isIosSharedAlbum: $isIosSharedAlbum, ')
+          ..write('linkedRemoteAlbumId: $linkedRemoteAlbumId, ')
           ..write('marker_: $marker_')
           ..write(')'))
         .toString();

mobile/lib/infrastructure/entities/local_asset.entity.dart

@@ -20,7 +20,7 @@ class LocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
   Set<Column> get primaryKey => {id};
 }
 
-extension LocalAssetEntityDataDomainEx on LocalAssetEntityData {
+extension LocalAssetEntityDataDomainExtension on LocalAssetEntityData {
   LocalAsset toDto() => LocalAsset(
     id: id,
     name: name,

mobile/lib/infrastructure/repositories/backup.repository.dart

@@ -4,9 +4,10 @@ import 'package:drift/drift.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import "package:immich_mobile/utils/database.utils.dart";
 
 final backupRepositoryProvider = Provider<DriftBackupRepository>(
   (ref) => DriftBackupRepository(ref.watch(driftProvider)),

mobile/lib/infrastructure/repositories/db.repository.dart

@@ -68,7 +68,7 @@ class Drift extends $Drift implements IDatabaseRepository {
     : super(executor ?? driftDatabase(name: 'immich', native: const DriftNativeOptions(shareAcrossIsolates: true)));
 
   @override
-  int get schemaVersion => 8;
+  int get schemaVersion => 9;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -123,6 +123,9 @@ class Drift extends $Drift implements IDatabaseRepository {
           from7To8: (m, v8) async {
             await m.create(v8.storeEntity);
           },
+          from8To9: (m, v9) async {
+            await m.addColumn(v9.localAlbumEntity, v9.localAlbumEntity.linkedRemoteAlbumId);
+          },
         ),
       );
 

mobile/lib/infrastructure/repositories/db.repository.drift.dart

@@ -9,17 +9,17 @@ import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart'
     as i3;
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart'
     as i4;
-import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
-    as i5;
-import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart'
-    as i6;
-import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
-    as i7;
-import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
-    as i8;
-import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
-    as i9;
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.dart'
+    as i5;
+import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart'
+    as i6;
+import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart'
+    as i7;
+import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart'
+    as i8;
+import 'package:immich_mobile/infrastructure/entities/partner.entity.drift.dart'
+    as i9;
+import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart'
     as i10;
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart'
     as i11;
@@ -48,19 +48,19 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i3.$StackEntityTable stackEntity = i3.$StackEntityTable(this);
   late final i4.$LocalAssetEntityTable localAssetEntity = i4
       .$LocalAssetEntityTable(this);
-  late final i5.$LocalAlbumEntityTable localAlbumEntity = i5
+  late final i5.$RemoteAlbumEntityTable remoteAlbumEntity = i5
+      .$RemoteAlbumEntityTable(this);
+  late final i6.$LocalAlbumEntityTable localAlbumEntity = i6
       .$LocalAlbumEntityTable(this);
-  late final i6.$LocalAlbumAssetEntityTable localAlbumAssetEntity = i6
+  late final i7.$LocalAlbumAssetEntityTable localAlbumAssetEntity = i7
       .$LocalAlbumAssetEntityTable(this);
-  late final i7.$UserMetadataEntityTable userMetadataEntity = i7
+  late final i8.$UserMetadataEntityTable userMetadataEntity = i8
       .$UserMetadataEntityTable(this);
-  late final i8.$PartnerEntityTable partnerEntity = i8.$PartnerEntityTable(
+  late final i9.$PartnerEntityTable partnerEntity = i9.$PartnerEntityTable(
     this,
   );
-  late final i9.$RemoteExifEntityTable remoteExifEntity = i9
+  late final i10.$RemoteExifEntityTable remoteExifEntity = i10
       .$RemoteExifEntityTable(this);
-  late final i10.$RemoteAlbumEntityTable remoteAlbumEntity = i10
-      .$RemoteAlbumEntityTable(this);
   late final i11.$RemoteAlbumAssetEntityTable remoteAlbumAssetEntity = i11
       .$RemoteAlbumAssetEntityTable(this);
   late final i12.$RemoteAlbumUserEntityTable remoteAlbumUserEntity = i12
@@ -84,6 +84,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
     remoteAssetEntity,
     stackEntity,
     localAssetEntity,
+    remoteAlbumEntity,
     localAlbumEntity,
     localAlbumAssetEntity,
     i4.idxLocalAssetChecksum,
@@ -94,7 +95,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
     userMetadataEntity,
     partnerEntity,
     remoteExifEntity,
-    remoteAlbumEntity,
     remoteAlbumAssetEntity,
     remoteAlbumUserEntity,
     memoryEntity,
@@ -102,7 +102,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
     personEntity,
     assetFaceEntity,
     storeEntity,
-    i9.idxLatLng,
+    i10.idxLatLng,
   ];
   @override
   i0.StreamQueryUpdateRules
@@ -123,6 +123,33 @@ abstract class $Drift extends i0.GeneratedDatabase {
       ),
       result: [i0.TableUpdate('stack_entity', kind: i0.UpdateKind.delete)],
     ),
+    i0.WritePropagation(
+      on: i0.TableUpdateQuery.onTableName(
+        'user_entity',
+        limitUpdateKind: i0.UpdateKind.delete,
+      ),
+      result: [
+        i0.TableUpdate('remote_album_entity', kind: i0.UpdateKind.delete),
+      ],
+    ),
+    i0.WritePropagation(
+      on: i0.TableUpdateQuery.onTableName(
+        'remote_asset_entity',
+        limitUpdateKind: i0.UpdateKind.delete,
+      ),
+      result: [
+        i0.TableUpdate('remote_album_entity', kind: i0.UpdateKind.update),
+      ],
+    ),
+    i0.WritePropagation(
+      on: i0.TableUpdateQuery.onTableName(
+        'remote_album_entity',
+        limitUpdateKind: i0.UpdateKind.delete,
+      ),
+      result: [
+        i0.TableUpdate('local_album_entity', kind: i0.UpdateKind.update),
+      ],
+    ),
     i0.WritePropagation(
       on: i0.TableUpdateQuery.onTableName(
         'local_asset_entity',
@@ -173,24 +200,6 @@ abstract class $Drift extends i0.GeneratedDatabase {
         i0.TableUpdate('remote_exif_entity', kind: i0.UpdateKind.delete),
       ],
     ),
-    i0.WritePropagation(
-      on: i0.TableUpdateQuery.onTableName(
-        'user_entity',
-        limitUpdateKind: i0.UpdateKind.delete,
-      ),
-      result: [
-        i0.TableUpdate('remote_album_entity', kind: i0.UpdateKind.delete),
-      ],
-    ),
-    i0.WritePropagation(
-      on: i0.TableUpdateQuery.onTableName(
-        'remote_asset_entity',
-        limitUpdateKind: i0.UpdateKind.delete,
-      ),
-      result: [
-        i0.TableUpdate('remote_album_entity', kind: i0.UpdateKind.update),
-      ],
-    ),
     i0.WritePropagation(
       on: i0.TableUpdateQuery.onTableName(
         'remote_asset_entity',
@@ -290,18 +299,18 @@ class $DriftManager {
       i3.$$StackEntityTableTableManager(_db, _db.stackEntity);
   i4.$$LocalAssetEntityTableTableManager get localAssetEntity =>
       i4.$$LocalAssetEntityTableTableManager(_db, _db.localAssetEntity);
-  i5.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
+  i5.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
-      i5.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
+      i5.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity);
-  i6.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i6
+  i6.$$LocalAlbumEntityTableTableManager get localAlbumEntity =>
+      i6.$$LocalAlbumEntityTableTableManager(_db, _db.localAlbumEntity);
+  i7.$$LocalAlbumAssetEntityTableTableManager get localAlbumAssetEntity => i7
       .$$LocalAlbumAssetEntityTableTableManager(_db, _db.localAlbumAssetEntity);
-  i7.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
+  i8.$$UserMetadataEntityTableTableManager get userMetadataEntity =>
-      i7.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
+      i8.$$UserMetadataEntityTableTableManager(_db, _db.userMetadataEntity);
-  i8.$$PartnerEntityTableTableManager get partnerEntity =>
+  i9.$$PartnerEntityTableTableManager get partnerEntity =>
-      i8.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
+      i9.$$PartnerEntityTableTableManager(_db, _db.partnerEntity);
-  i9.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
+  i10.$$RemoteExifEntityTableTableManager get remoteExifEntity =>
-      i9.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
+      i10.$$RemoteExifEntityTableTableManager(_db, _db.remoteExifEntity);
-  i10.$$RemoteAlbumEntityTableTableManager get remoteAlbumEntity =>
-      i10.$$RemoteAlbumEntityTableTableManager(_db, _db.remoteAlbumEntity);
   i11.$$RemoteAlbumAssetEntityTableTableManager get remoteAlbumAssetEntity =>
       i11.$$RemoteAlbumAssetEntityTableTableManager(
         _db,

mobile/lib/infrastructure/repositories/db.repository.steps.dart

@@ -3435,6 +3435,391 @@ i1.GeneratedColumn<int> _column_89(String aliasedName) =>
       true,
       type: i1.DriftSqlType.int,
     );
+
+final class Schema9 extends i0.VersionedSchema {
+  Schema9({required super.database}) : super(version: 9);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAssetChecksum,
+    idxRemoteAssetOwnerChecksum,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    idxLatLng,
+  ];
+  late final Shape16 userEntity = Shape16(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_2,
+        _column_3,
+        _column_84,
+        _column_85,
+        _column_5,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape17 remoteAssetEntity = Shape17(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_13,
+        _column_14,
+        _column_15,
+        _column_16,
+        _column_17,
+        _column_18,
+        _column_19,
+        _column_20,
+        _column_21,
+        _column_86,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape3 stackEntity = Shape3(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape2 localAssetEntity = Shape2(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_22,
+        _column_14,
+        _column_23,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape9 remoteAlbumEntity = Shape9(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_56,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_57,
+        _column_58,
+        _column_59,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape19 localAlbumEntity = Shape19(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_5,
+        _column_31,
+        _column_32,
+        _column_90,
+        _column_33,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 localAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_34, _column_35],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_25, _column_26, _column_27],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape5 partnerEntity = Shape5(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_28, _column_29, _column_30],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape8 remoteExifEntity = Shape8(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_36,
+        _column_37,
+        _column_38,
+        _column_39,
+        _column_40,
+        _column_41,
+        _column_11,
+        _column_10,
+        _column_42,
+        _column_43,
+        _column_44,
+        _column_45,
+        _column_46,
+        _column_47,
+        _column_48,
+        _column_49,
+        _column_50,
+        _column_51,
+        _column_52,
+        _column_53,
+        _column_54,
+        _column_55,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_36, _column_60],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_60, _column_25, _column_61],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape11 memoryEntity = Shape11(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_18,
+        _column_15,
+        _column_8,
+        _column_62,
+        _column_63,
+        _column_64,
+        _column_65,
+        _column_66,
+        _column_67,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_36, _column_68],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape14 personEntity = Shape14(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_1,
+        _column_69,
+        _column_71,
+        _column_72,
+        _column_73,
+        _column_74,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape15 assetFaceEntity = Shape15(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_36,
+        _column_76,
+        _column_77,
+        _column_78,
+        _column_79,
+        _column_80,
+        _column_81,
+        _column_82,
+        _column_83,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_87, _column_88, _column_89],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+}
+
+class Shape19 extends i0.VersionedTable {
+  Shape19({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get backupSelection =>
+      columnsByName['backup_selection']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<bool> get isIosSharedAlbum =>
+      columnsByName['is_ios_shared_album']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<String> get linkedRemoteAlbumId =>
+      columnsByName['linked_remote_album_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get marker_ =>
+      columnsByName['marker']! as i1.GeneratedColumn<bool>;
+}
+
+i1.GeneratedColumn<String> _column_90(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'linked_remote_album_id',
+      aliasedName,
+      true,
+      type: i1.DriftSqlType.string,
+      defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+        'REFERENCES remote_album_entity (id) ON DELETE SET NULL',
+      ),
+    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -3443,6 +3828,7 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema6 schema) from5To6,
   required Future<void> Function(i1.Migrator m, Schema7 schema) from6To7,
   required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
+  required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -3481,6 +3867,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from7To8(migrator, schema);
         return 8;
+      case 8:
+        final schema = Schema9(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from8To9(migrator, schema);
+        return 9;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -3495,6 +3886,7 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema6 schema) from5To6,
   required Future<void> Function(i1.Migrator m, Schema7 schema) from6To7,
   required Future<void> Function(i1.Migrator m, Schema8 schema) from7To8,
+  required Future<void> Function(i1.Migrator m, Schema9 schema) from8To9,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -3504,5 +3896,6 @@ i1.OnUpgrade stepByStep({
     from5To6: from5To6,
     from6To7: from6To7,
     from7To8: from7To8,
+    from8To9: from8To9,
   ),
 );

mobile/lib/infrastructure/repositories/local_album.repository.dart

@@ -1,11 +1,12 @@
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.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/repositories/db.repository.dart';
-import 'package:immich_mobile/utils/database.utils.dart';
 import 'package:platform/platform.dart';
 
 enum SortLocalAlbumsBy { id, backupSelection, isIosSharedAlbum, name, assetCount, newestAsset }
@@ -49,6 +50,13 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
     return query.map((row) => row.readTable(_db.localAlbumEntity).toDto(assetCount: row.read(assetCount) ?? 0)).get();
   }
 
+  Future<List<LocalAlbum>> getBackupAlbums() async {
+    final query = _db.localAlbumEntity.select()
+      ..where((row) => row.backupSelection.equalsValue(BackupSelection.selected));
+
+    return query.map((row) => row.toDto()).get();
+  }
+
   Future<void> delete(String albumId) => transaction(() async {
     // Remove all assets that are only in this particular album
     // We cannot remove all assets in the album because they might be in other albums in iOS
@@ -335,4 +343,16 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
   Future<int> getCount() {
     return _db.managers.localAlbumEntity.count();
   }
+
+  Future unlinkRemoteAlbum(String id) async {
+    return _db.localAlbumEntity.update()
+      ..where((row) => row.id.equals(id))
+      ..write(const LocalAlbumEntityCompanion(linkedRemoteAlbumId: Value(null)));
+  }
+
+  Future linkRemoteAlbum(String localAlbumId, String remoteAlbumId) async {
+    return _db.localAlbumEntity.update()
+      ..where((row) => row.id.equals(localAlbumId))
+      ..write(LocalAlbumEntityCompanion(linkedRemoteAlbumId: Value(remoteAlbumId)));
+  }
 }

mobile/lib/infrastructure/repositories/remote_album.repository.dart

@@ -113,6 +113,15 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
         .getSingleOrNull();
   }
 
+  Future<RemoteAlbum?> getByName(String albumName, String ownerId) {
+    final query = _db.remoteAlbumEntity.select()
+      ..where((row) => row.name.equals(albumName) & row.ownerId.equals(ownerId))
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(1);
+
+    return query.map((row) => row.toDto(ownerName: '', isShared: false)).getSingleOrNull();
+  }
+
   Future<void> create(RemoteAlbum album, List<String> assetIds) async {
     await _db.transaction(() async {
       final entity = RemoteAlbumEntityCompanion(
@@ -321,6 +330,42 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
   Future<int> getCount() {
     return _db.managers.remoteAlbumEntity.count();
   }
+
+  Future<List<String>> getLinkedAssetIds(String userId, String localAlbumId, String remoteAlbumId) async {
+    // Find remote asset ids that:
+    // 1. Belong to the provided local album (via local_album_asset_entity)
+    // 2. Have been uploaded (i.e. a matching remote asset exists for the same checksum & owner)
+    // 3. Are NOT already in the remote album (remote_album_asset_entity)
+    final query = _db.remoteAssetEntity.selectOnly()
+      ..addColumns([_db.remoteAssetEntity.id])
+      ..join([
+        innerJoin(
+          _db.localAssetEntity,
+          _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
+          useColumns: false,
+        ),
+        innerJoin(
+          _db.localAlbumAssetEntity,
+          _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id),
+          useColumns: false,
+        ),
+        // Left join remote album assets to exclude those already in the remote album
+        leftOuterJoin(
+          _db.remoteAlbumAssetEntity,
+          _db.remoteAlbumAssetEntity.assetId.equalsExp(_db.remoteAssetEntity.id) &
+              _db.remoteAlbumAssetEntity.albumId.equals(remoteAlbumId),
+          useColumns: false,
+        ),
+      ])
+      ..where(
+        _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteAssetEntity.deletedAt.isNull() &
+            _db.localAlbumAssetEntity.albumId.equals(localAlbumId) &
+            _db.remoteAlbumAssetEntity.assetId.isNull(), // only those not yet linked
+      );
+
+    return query.map((row) => row.read(_db.remoteAssetEntity.id)!).get();
+  }
 }
 
 extension on RemoteAlbumEntityData {

mobile/lib/pages/backup/drift_backup_album_selection.page.dart

@@ -7,6 +7,7 @@ import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
@@ -26,10 +27,10 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
   String _searchQuery = '';
   bool _isSearchMode = false;
   int _initialTotalAssetCount = 0;
-  bool _hasPopped = false;
   late ValueNotifier<bool> _enableSyncUploadAlbum;
   late TextEditingController _searchController;
   late FocusNode _searchFocusNode;
+  Future? _handleLinkedAlbumFuture;
 
   @override
   void initState() {
@@ -44,6 +45,36 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
     _initialTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
   }
 
+  Future<void> _handlePagePopped() async {
+    final user = ref.read(currentUserProvider);
+    if (user == null) {
+      return;
+    }
+
+    final enableSyncUploadAlbum = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
+    final selectedAlbums = ref
+        .read(backupAlbumProvider)
+        .where((a) => a.backupSelection == BackupSelection.selected)
+        .toList();
+
+    if (enableSyncUploadAlbum && selectedAlbums.isNotEmpty) {
+      setState(() {
+        _handleLinkedAlbumFuture = ref.read(syncLinkedAlbumServiceProvider).manageLinkedAlbums(selectedAlbums, user.id);
+      });
+      await _handleLinkedAlbumFuture;
+    }
+
+    // Restart backup if total count changed and backup is enabled
+    final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
+    final totalChanged = currentTotalAssetCount != _initialTotalAssetCount;
+    final isBackupEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
+
+    if (totalChanged && isBackupEnabled) {
+      await ref.read(driftBackupProvider.notifier).cancel();
+      await ref.read(driftBackupProvider.notifier).startBackup(user.id);
+    }
+  }
+
   @override
   void dispose() {
     _enableSyncUploadAlbum.dispose();
@@ -65,42 +96,12 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
     final selectedBackupAlbums = albums.where((album) => album.backupSelection == BackupSelection.selected).toList();
     final excludedBackupAlbums = albums.where((album) => album.backupSelection == BackupSelection.excluded).toList();
 
-    // handleSyncAlbumToggle(bool isEnable) async {
-    //   if (isEnable) {
-    //     await ref.read(albumProvider.notifier).refreshRemoteAlbums();
-    //     for (final album in selectedBackupAlbums) {
-    //       await ref.read(albumProvider.notifier).createSyncAlbum(album.name);
-    //     }
-    //   }
-    // }
-
     return PopScope(
-      onPopInvokedWithResult: (didPop, result) async {
+      canPop: false,
-        // There is an issue with Flutter where the pop event
+      onPopInvokedWithResult: (didPop, _) async {
-        // can be triggered multiple times, so we guard it with _hasPopped
+        if (!didPop) {
-        if (didPop && !_hasPopped) {
+          await _handlePagePopped();
-          _hasPopped = true;
+          Navigator.of(context).pop();
-
-          final currentUser = ref.read(currentUserProvider);
-          if (currentUser == null) {
-            return;
-          }
-
-          await ref.read(driftBackupProvider.notifier).getBackupStatus(currentUser.id);
-          final currentTotalAssetCount = ref.read(driftBackupProvider.select((p) => p.totalCount));
-
-          if (currentTotalAssetCount != _initialTotalAssetCount) {
-            final isBackupEnabled = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
-
-            if (!isBackupEnabled) {
-              return;
-            }
-            final backupNotifier = ref.read(driftBackupProvider.notifier);
-
-            backupNotifier.cancel().then((_) {
-              backupNotifier.startBackup(currentUser.id);
-            });
-          }
         }
       },
       child: Scaffold(
@@ -139,103 +140,123 @@ class _DriftBackupAlbumSelectionPageState extends ConsumerState<DriftBackupAlbum
           ],
           elevation: 0,
         ),
-        body: CustomScrollView(
+        body: Stack(
-          physics: const ClampingScrollPhysics(),
+          children: [
-          slivers: [
+            CustomScrollView(
-            SliverToBoxAdapter(
+              physics: const ClampingScrollPhysics(),
-              child: Column(
+              slivers: [
-                crossAxisAlignment: CrossAxisAlignment.start,
+                SliverToBoxAdapter(
-                children: [
+                  child: Column(
-                  Padding(
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                    padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
+                    children: [
-                    child: Text(
+                      Padding(
-                      "backup_album_selection_page_selection_info",
+                        padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
-                      style: context.textTheme.titleSmall,
+                        child: Text(
-                    ).t(context: context),
+                          "backup_album_selection_page_selection_info",
-                  ),
+                          style: context.textTheme.titleSmall,
+                        ).t(context: context),
+                      ),
 
-                  // Selected Album Chips
+                      // Selected Album Chips
-                  Padding(
+                      Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                        padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                    child: Wrap(
+                        child: Wrap(
-                      children: [
+                          children: [
-                        _SelectedAlbumNameChips(selectedBackupAlbums: selectedBackupAlbums),
+                            _SelectedAlbumNameChips(selectedBackupAlbums: selectedBackupAlbums),
-                        _ExcludedAlbumNameChips(excludedBackupAlbums: excludedBackupAlbums),
+                            _ExcludedAlbumNameChips(excludedBackupAlbums: excludedBackupAlbums),
-                      ],
+                          ],
-                    ),
+                        ),
-                  ),
+                      ),
-
+                      ListTile(
-                  // SettingsSwitchListTile(
+                        title: Text(
-                  //   valueNotifier: _enableSyncUploadAlbum,
+                          "albums_on_device_count".t(context: context, args: {'count': albumCount.toString()}),
-                  //   title: "sync_albums".t(context: context),
+                          style: context.textTheme.titleSmall,
-                  //   subtitle: "sync_upload_album_setting_subtitle".t(context: context),
+                        ),
-                  //   contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+                        subtitle: Padding(
-                  //   titleStyle: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.bold),
+                          padding: const EdgeInsets.symmetric(vertical: 8.0),
-                  //   subtitleStyle: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.primary),
+                          child: Text(
-                  //   onChanged: handleSyncAlbumToggle,
+                            "backup_album_selection_page_albums_tap",
-                  // ),
+                            style: context.textTheme.labelLarge?.copyWith(color: context.primaryColor),
-                  ListTile(
+                          ).t(context: context),
-                    title: Text(
+                        ),
-                      "albums_on_device_count".t(context: context, args: {'count': albumCount.toString()}),
+                        trailing: IconButton(
-                      style: context.textTheme.titleSmall,
+                          splashRadius: 16,
-                    ),
+                          icon: Icon(Icons.info, size: 20, color: context.primaryColor),
-                    subtitle: Padding(
+                          onPressed: () {
-                      padding: const EdgeInsets.symmetric(vertical: 8.0),
+                            showDialog(
-                      child: Text(
+                              context: context,
-                        "backup_album_selection_page_albums_tap",
+                              builder: (BuildContext context) {
-                        style: context.textTheme.labelLarge?.copyWith(color: context.primaryColor),
+                                return AlertDialog(
-                      ).t(context: context),
+                                  shape: const RoundedRectangleBorder(
-                    ),
+                                    borderRadius: BorderRadius.all(Radius.circular(10)),
-                    trailing: IconButton(
+                                  ),
-                      splashRadius: 16,
+                                  elevation: 5,
-                      icon: Icon(Icons.info, size: 20, color: context.primaryColor),
+                                  title: Text(
-                      onPressed: () {
+                                    'backup_album_selection_page_selection_info',
-                        // show the dialog
+                                    style: TextStyle(
-                        showDialog(
+                                      fontSize: 16,
-                          context: context,
+                                      fontWeight: FontWeight.bold,
-                          builder: (BuildContext context) {
+                                      color: context.primaryColor,
-                            return AlertDialog(
+                                    ),
-                              shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
+                                  ).t(context: context),
-                              elevation: 5,
+                                  content: SingleChildScrollView(
-                              title: Text(
+                                    child: ListBody(
-                                'backup_album_selection_page_selection_info',
+                                      children: [
-                                style: TextStyle(
+                                        const Text(
-                                  fontSize: 16,
+                                          'backup_album_selection_page_assets_scatter',
-                                  fontWeight: FontWeight.bold,
+                                          style: TextStyle(fontSize: 14),
-                                  color: context.primaryColor,
+                                        ).t(context: context),
-                                ),
+                                      ],
-                              ).t(context: context),
+                                    ),
-                              content: SingleChildScrollView(
+                                  ),
-                                child: ListBody(
+                                );
-                                  children: [
+                              },
-                                    const Text(
-                                      'backup_album_selection_page_assets_scatter',
-                                      style: TextStyle(fontSize: 14),
-                                    ).t(context: context),
-                                  ],
-                                ),
-                              ),
                             );
                           },
-                        );
+                        ),
-                      },
+                      ),
-                    ),
-                  ),
 
-                  if (Platform.isAndroid)
+                      if (Platform.isAndroid)
-                    _SelectAllButton(filteredAlbums: filteredAlbums, selectedBackupAlbums: selectedBackupAlbums),
+                        _SelectAllButton(filteredAlbums: filteredAlbums, selectedBackupAlbums: selectedBackupAlbums),
-                ],
+                    ],
+                  ),
+                ),
+                SliverLayoutBuilder(
+                  builder: (context, constraints) {
+                    if (constraints.crossAxisExtent > 600) {
+                      return _AlbumSelectionGrid(filteredAlbums: filteredAlbums, searchQuery: _searchQuery);
+                    } else {
+                      return _AlbumSelectionList(filteredAlbums: filteredAlbums, searchQuery: _searchQuery);
+                    }
+                  },
+                ),
+              ],
+            ),
+            if (_handleLinkedAlbumFuture != null)
+              FutureBuilder(
+                future: _handleLinkedAlbumFuture,
+                builder: (context, snapshot) {
+                  return SizedBox(
+                    height: double.infinity,
+                    width: double.infinity,
+                    child: Container(
+                      color: context.scaffoldBackgroundColor.withValues(alpha: 0.8),
+                      child: Center(
+                        child: Column(
+                          spacing: 16,
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          mainAxisSize: MainAxisSize.max,
+                          children: [
+                            const CircularProgressIndicator(strokeWidth: 4),
+                            Text("Creating linked albums...", style: context.textTheme.labelLarge),
+                          ],
+                        ),
+                      ),
+                    ),
+                  );
+                },
               ),
-            ),
-            SliverLayoutBuilder(
-              builder: (context, constraints) {
-                if (constraints.crossAxisExtent > 600) {
-                  return _AlbumSelectionGrid(filteredAlbums: filteredAlbums, searchQuery: _searchQuery);
-                } else {
-                  return _AlbumSelectionList(filteredAlbums: filteredAlbums, searchQuery: _searchQuery);
-                }
-              },
-            ),
           ],
         ),
       ),

mobile/lib/providers/app_life_cycle.provider.dart

@@ -105,6 +105,8 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
         ]).then((_) async {
           final isEnableBackup = _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.enableBackup);
 
+          final isAlbumLinkedSyncEnable = _ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
+
           if (isEnableBackup) {
             final currentUser = _ref.read(currentUserProvider);
             if (currentUser == null) {
@@ -113,6 +115,10 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
 
             await _ref.read(driftBackupProvider.notifier).handleBackupResume(currentUser.id);
           }
+
+          if (isAlbumLinkedSyncEnable) {
+            await backgroundManager.syncLinkedAlbum();
+          }
         });
       } catch (e, stackTrace) {
         Logger("AppLifeCycleNotifier").severe("Error during background sync", e, stackTrace);

mobile/lib/providers/websocket.provider.dart

@@ -12,7 +12,6 @@ import 'package:immich_mobile/models/server_info/server_version.model.dart';
 import 'package:immich_mobile/providers/asset.provider.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
-// import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/services/api.service.dart';
@@ -323,7 +322,11 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
     }
 
     try {
-      unawaited(_ref.read(backgroundSyncProvider).syncWebsocketBatch(_batchedAssetUploadReady.toList()));
+      unawaited(
+        _ref.read(backgroundSyncProvider).syncWebsocketBatch(_batchedAssetUploadReady.toList()).then((_) {
+          return _ref.read(backgroundSyncProvider).syncLinkedAlbum();
+        }),
+      );
     } catch (error) {
       _log.severe("Error processing batched AssetUploadReadyV1 events: $error");
     }

mobile/lib/utils/database.utils.dart

@@ -1,31 +0,0 @@
-import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
-
-extension LocalAlbumEntityDataHelper on LocalAlbumEntityData {
-  LocalAlbum toDto({int assetCount = 0}) {
-    return LocalAlbum(
-      id: id,
-      name: name,
-      updatedAt: updatedAt,
-      assetCount: assetCount,
-      backupSelection: backupSelection,
-    );
-  }
-}
-
-extension LocalAssetEntityDataHelper on LocalAssetEntityData {
-  LocalAsset toDto() {
-    return LocalAsset(
-      id: id,
-      name: name,
-      checksum: checksum,
-      type: type,
-      createdAt: createdAt,
-      updatedAt: updatedAt,
-      durationInSeconds: durationInSeconds,
-      isFavorite: isFavorite,
-    );
-  }
-}

mobile/lib/utils/migration.dart

@@ -23,8 +23,10 @@ import 'package:immich_mobile/infrastructure/entities/store.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
@@ -268,11 +270,17 @@ Future<List<void>> runNewSync(WidgetRef ref, {bool full = false}) {
   ref.read(backupProvider.notifier).cancelBackup();
 
   final backgroundManager = ref.read(backgroundSyncProvider);
+  final isAlbumLinkedSyncEnable = ref.read(appSettingsServiceProvider).getSetting(AppSettingsEnum.syncAlbums);
+
   return Future.wait([
     backgroundManager.syncLocal(full: full).then((_) {
       Logger("runNewSync").fine("Hashing assets after syncLocal");
       return backgroundManager.hashAssets();
     }),
-    backgroundManager.syncRemote(),
+    backgroundManager.syncRemote().then((_) {
+      if (isAlbumLinkedSyncEnable) {
+        return backgroundManager.syncLinkedAlbum();
+      }
+    }),
   ]);
 }

mobile/lib/widgets/settings/backup_settings/drift_backup_settings.dart

@@ -1,19 +1,153 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/domain/services/sync_linked_album.service.dart';
+import 'package:immich_mobile/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
 
-class DriftBackupSettings extends StatelessWidget {
+class DriftBackupSettings extends ConsumerWidget {
   const DriftBackupSettings({super.key});
 
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const SettingsSubPageScaffold(
+      settings: [
+        _UseWifiForUploadVideosButton(),
+        _UseWifiForUploadPhotosButton(),
+        Divider(indent: 16, endIndent: 16),
+        _AlbumSyncActionButton(),
+      ],
+    );
+  }
+}
+
+class _AlbumSyncActionButton extends ConsumerStatefulWidget {
+  const _AlbumSyncActionButton();
+
+  @override
+  ConsumerState<_AlbumSyncActionButton> createState() => _AlbumSyncActionButtonState();
+}
+
+class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton> {
+  bool isAlbumSyncInProgress = false;
+
+  Future<void> _manualSyncAlbums() async {
+    setState(() {
+      isAlbumSyncInProgress = true;
+    });
+
+    try {
+      await ref.read(backgroundSyncProvider).syncLinkedAlbum();
+      await ref.read(backgroundSyncProvider).syncRemote();
+    } catch (_) {
+    } finally {
+      Future.delayed(const Duration(seconds: 1), () {
+        setState(() {
+          isAlbumSyncInProgress = false;
+        });
+      });
+    }
+  }
+
+  Future<void> _manageLinkedAlbums() async {
+    final currentUser = ref.read(currentUserProvider);
+    if (currentUser == null) {
+      return;
+    }
+    final localAlbums = ref.read(backupAlbumProvider);
+    final selectedBackupAlbums = localAlbums
+        .where((album) => album.backupSelection == BackupSelection.selected)
+        .toList();
+
+    await ref.read(syncLinkedAlbumServiceProvider).manageLinkedAlbums(selectedBackupAlbums, currentUser.id);
+  }
+
   @override
   Widget build(BuildContext context) {
-    return const SettingsSubPageScaffold(settings: [_UseWifiForUploadVideosButton(), _UseWifiForUploadPhotosButton()]);
+    return ListView(
+      shrinkWrap: true,
+      children: [
+        StreamBuilder(
+          stream: Store.watch(StoreKey.syncAlbums),
+          initialData: Store.tryGet(StoreKey.syncAlbums) ?? false,
+          builder: (context, snapshot) {
+            final albumSyncEnable = snapshot.data ?? false;
+            return Column(
+              children: [
+                ListTile(
+                  title: Text(
+                    "sync_albums".t(context: context),
+                    style: context.textTheme.titleMedium?.copyWith(color: context.primaryColor),
+                  ),
+                  subtitle: Text(
+                    "sync_upload_album_setting_subtitle".t(context: context),
+                    style: context.textTheme.labelLarge,
+                  ),
+                  trailing: Switch(
+                    value: albumSyncEnable,
+                    onChanged: (bool newValue) async {
+                      await ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.syncAlbums, newValue);
+
+                      if (newValue == true) {
+                        await _manageLinkedAlbums();
+                      }
+                    },
+                  ),
+                ),
+                AnimatedSize(
+                  duration: const Duration(milliseconds: 300),
+                  curve: Curves.easeInOut,
+                  child: AnimatedOpacity(
+                    duration: const Duration(milliseconds: 200),
+                    opacity: albumSyncEnable ? 1.0 : 0.0,
+                    child: albumSyncEnable
+                        ? ListTile(
+                            onTap: _manualSyncAlbums,
+                            contentPadding: const EdgeInsets.only(left: 32, right: 16),
+                            title: Text(
+                              "organize_into_albums".t(context: context),
+                              style: context.textTheme.titleSmall?.copyWith(
+                                color: context.colorScheme.onSurface,
+                                fontWeight: FontWeight.normal,
+                              ),
+                            ),
+                            subtitle: Text(
+                              "organize_into_albums_description".t(context: context),
+                              style: context.textTheme.bodyMedium?.copyWith(
+                                color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+                              ),
+                            ),
+                            trailing: isAlbumSyncInProgress
+                                ? const SizedBox(
+                                    width: 32,
+                                    height: 32,
+                                    child: CircularProgressIndicator.adaptive(strokeWidth: 2),
+                                  )
+                                : IconButton(
+                                    onPressed: _manualSyncAlbums,
+                                    icon: const Icon(Icons.sync_rounded),
+                                    color: context.colorScheme.onSurface.withValues(alpha: 0.7),
+                                    iconSize: 20,
+                                    constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
+                                  ),
+                          )
+                        : const SizedBox.shrink(),
+                  ),
+                ),
+              ],
+            );
+          },
+        ),
+      ],
+    );
   }
 }
 

mobile/lib/widgets/settings/beta_sync_settings/beta_sync_settings.dart

@@ -109,6 +109,37 @@ class BetaSyncSettings extends HookConsumerWidget {
       await ref.read(storageRepositoryProvider).clearCache();
     }
 
+    Future<void> resetSqliteDb(BuildContext context, Future<void> Function() resetDatabase) {
+      return showDialog(
+        context: context,
+        builder: (context) {
+          return AlertDialog(
+            title: Text("reset_sqlite".t(context: context)),
+            content: Text("reset_sqlite_confirmation".t(context: context)),
+            actions: [
+              TextButton(
+                onPressed: () => context.pop(),
+                child: Text("cancel".t(context: context)),
+              ),
+              TextButton(
+                onPressed: () async {
+                  await resetDatabase();
+                  context.pop();
+                  context.scaffoldMessenger.showSnackBar(
+                    SnackBar(content: Text("reset_sqlite_success".t(context: context))),
+                  );
+                },
+                child: Text(
+                  "confirm".t(context: context),
+                  style: TextStyle(color: context.colorScheme.error),
+                ),
+              ),
+            ],
+          );
+        },
+      );
+    }
+
     return FutureBuilder<List<dynamic>>(
       future: loadCounts(),
       builder: (context, snapshot) {
@@ -116,6 +147,33 @@ class BetaSyncSettings extends HookConsumerWidget {
           return const CircularProgressIndicator();
         }
 
+        if (snapshot.hasError) {
+          return ListView(
+            children: [
+              Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Center(
+                  child: Text(
+                    "Error occur, reset the local database by tapping the button below",
+                    style: context.textTheme.bodyLarge,
+                  ),
+                ),
+              ),
+
+              ListTile(
+                title: Text(
+                  "reset_sqlite".t(context: context),
+                  style: TextStyle(color: context.colorScheme.error, fontWeight: FontWeight.w500),
+                ),
+                leading: Icon(Icons.settings_backup_restore_rounded, color: context.colorScheme.error),
+                onTap: () async {
+                  await resetSqliteDb(context, resetDatabase);
+                },
+              ),
+            ],
+          );
+        }
+
         final assetCounts = snapshot.data![0]! as (int, int);
         final localAssetCount = assetCounts.$1;
         final remoteAssetCount = assetCounts.$2;
@@ -270,34 +328,7 @@ class BetaSyncSettings extends HookConsumerWidget {
                 ),
                 leading: Icon(Icons.settings_backup_restore_rounded, color: context.colorScheme.error),
                 onTap: () async {
-                  showDialog(
+                  await resetSqliteDb(context, resetDatabase);
-                    context: context,
-                    builder: (context) {
-                      return AlertDialog(
-                        title: Text("reset_sqlite".t(context: context)),
-                        content: Text("reset_sqlite_confirmation".t(context: context)),
-                        actions: [
-                          TextButton(
-                            onPressed: () => context.pop(),
-                            child: Text("cancel".t(context: context)),
-                          ),
-                          TextButton(
-                            onPressed: () async {
-                              await resetDatabase();
-                              context.pop();
-                              context.scaffoldMessenger.showSnackBar(
-                                SnackBar(content: Text("reset_sqlite_success".t(context: context))),
-                              );
-                            },
-                            child: Text(
-                              "confirm".t(context: context),
-                              style: TextStyle(color: context.colorScheme.error),
-                            ),
-                          ),
-                        ],
-                      );
-                    },
-                  );
                 },
               ),
             ],

mobile/test/drift/main/generated/schema.dart

@@ -11,6 +11,7 @@ import 'schema_v5.dart' as v5;
 import 'schema_v6.dart' as v6;
 import 'schema_v7.dart' as v7;
 import 'schema_v8.dart' as v8;
+import 'schema_v9.dart' as v9;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -32,10 +33,12 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v7.DatabaseAtV7(db);
       case 8:
         return v8.DatabaseAtV8(db);
+      case 9:
+        return v9.DatabaseAtV9(db);
       default:
         throw MissingSchemaException(version, versions);
     }
   }
 
-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8];
+  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9];
 }