soft reset

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

@@ -36,6 +36,9 @@ class SyncApiRepository {
     headers.addAll(headerParams);
 
     final shouldReset = Store.get(StoreKey.shouldResetSync, false);
+    if (shouldReset) {
+      _logger.info("Resetting sync state by client");
+    }
     final request = http.Request('POST', Uri.parse(endpoint));
     request.headers.addAll(headers);
     request.body = jsonEncode(

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

@@ -268,7 +268,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
           batch.update(
             _db.remoteAssetEntity,
             RemoteAssetEntityCompanion(width: Value(width), height: Value(height)),
-            where: (row) => row.id.equals(exif.assetId) & row.width.isNull() & row.height.isNull(),
+            where: (row) => row.id.equals(exif.assetId) & row.isEdited.equals(false),
           );
         }
       });

mobile/lib/utils/migration.dart

@@ -31,7 +31,7 @@ import 'package:isar/isar.dart';
 // ignore: import_rule_photo_manager
 import 'package:photo_manager/photo_manager.dart';
 
-const int targetVersion = 20;
+const int targetVersion = 21;
 
 Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {
   final hasVersion = Store.tryGet(StoreKey.version) != null;
@@ -88,7 +88,10 @@ Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {
 
   if (version < 20 && Store.isBetaTimelineEnabled) {
     await _syncLocalAlbumIsIosSharedAlbum(drift);
-    await _backfillAssetExifWidthHeight(drift);
+  }
+
+  if (version < 21) {
+    await Store.put(StoreKey.shouldResetSync, true);
   }
 
   if (targetVersion >= 12) {
@@ -282,22 +285,6 @@ Future<void> _syncLocalAlbumIsIosSharedAlbum(Drift db) async {
   }
 }
 
-Future<void> _backfillAssetExifWidthHeight(Drift db) async {
-  try {
-    await db.customStatement('''
-      UPDATE remote_exif_entity AS remote_exif
-      SET width = asset.width,
-          height = asset.height
-      FROM remote_asset_entity AS asset
-      WHERE remote_exif.asset_id = asset.id;
-    ''');
-
-    dPrint(() => "[MIGRATION] Successfully backfilled asset exif width and height");
-  } catch (error) {
-    dPrint(() => "[MIGRATION] Error while backfilling asset exif width and height: $error");
-  }
-}
-
 Future<void> migrateDeviceAssetToSqlite(Isar db, Drift drift) async {
   try {
     final isarDeviceAssets = await db.deviceAssetEntitys.where().findAll();

mobile/test/domain/repositories/sync_stream_repository_test.dart

@@ -24,6 +24,7 @@ SyncAssetV1 _createAsset({
   String ownerId = 'user-1',
   int? width,
   int? height,
+  bool isEdited = false,
 }) {
   return SyncAssetV1(
     id: id,
@@ -44,7 +45,7 @@ SyncAssetV1 _createAsset({
     livePhotoVideoId: null,
     stackId: null,
     thumbhash: null,
-    isEdited: false,
+    isEdited: isEdited,
   );
 }
 
@@ -154,7 +155,7 @@ void main() {
       }
     });
 
-    test('does not update dimensions if asset already has width and height', () async {
+    test('does not update dimensions if asset is edited', () async {
       const assetId = 'asset-with-dimensions';
       const existingWidth = 1920;
       const existingHeight = 1080;
@@ -169,6 +170,7 @@ void main() {
         fileName: 'with_dimensions.jpg',
         width: existingWidth,
         height: existingHeight,
+        isEdited: true,
       );
       await sut.updateAssetsV1([asset]);
 

server/src/schema/migrations/1769598833536-ResetSync.ts

@@ -0,0 +1,8 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`UPDATE "session" SET "isPendingSyncReset" = false`.execute(db);
+  await sql`TRUNCATE TABLE "session_sync_checkpoint"`.execute(db);
+}
+
+export async function down(): Promise<void> {}