From 151a0d13a49146077fe84eba2e906e8bfd161a4a Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Fri, 18 Apr 2025 14:00:14 +0530
Subject: [PATCH] Sync remote assets to local

---
 mobile/lib/services/sync/remote_sync_service.dart | 7 +++++--
 mobile/lib/services/sync/sync_service.dart        | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/services/sync/remote_sync_service.dart b/mobile/lib/services/sync/remote_sync_service.dart
index 3f4cd9c6c7..267a925103 100644
--- a/mobile/lib/services/sync/remote_sync_service.dart
+++ b/mobile/lib/services/sync/remote_sync_service.dart
@@ -100,7 +100,7 @@ class RemoteSyncService {
   }
 
   Future<void> sync({bool silently = false}) async {
-    if (!_config.hasConfiguredAccount() || true) {
+    if (!_config.hasConfiguredAccount()) {
       _logger.info("Skipping remote sync since account is not configured");
       return;
     }
@@ -130,7 +130,7 @@ class RemoteSyncService {
         await syncDeviceCollectionFilesForUpload();
       }
       await _pullDiff();
-      await trashSyncService.syncTrash();
+      // await trashSyncService.syncTrash();
       if (!hasSyncedBefore) {
         await _prefs.setBool(_isFirstRemoteSyncDone, true);
         await syncDeviceCollectionFilesForUpload();
@@ -197,6 +197,8 @@ class RemoteSyncService {
         }
       }
     } finally {
+      _existingSync?.complete();
+      _existingSync = null;
       _isExistingSyncSilent = false;
     }
   }
@@ -219,6 +221,7 @@ class RemoteSyncService {
 
   Future<void> _pullDiff() async {
     await newService.syncFromRemote();
+    return;
     _logger.info("Pulling remote diff");
     final isFirstSync = !_collectionsService.hasSyncedCollections();
     if (isFirstSync && !_isExistingSyncSilent) {
diff --git a/mobile/lib/services/sync/sync_service.dart b/mobile/lib/services/sync/sync_service.dart
index 67ec3ed09b..f8eb8f377a 100644
--- a/mobile/lib/services/sync/sync_service.dart
+++ b/mobile/lib/services/sync/sync_service.dart
@@ -195,6 +195,7 @@ class SyncService {
     if (localSyncOnly) {
       await LocalImportService.instance.incrementalSync();
       await LocalImportService.instance.fullSync();
+      await _remoteSyncService.sync();
       unawaited(LocalImportService.instance.metadataScan());
       return;
     }