diff --git a/mobile/lib/services/local/local_sync_util.dart b/mobile/lib/services/local/local_sync_util.dart index 65b5bf2a80..c37b37e954 100644 --- a/mobile/lib/services/local/local_sync_util.dart +++ b/mobile/lib/services/local/local_sync_util.dart @@ -123,12 +123,10 @@ Future getDiffWithLocal( // current set of assets available on device Set existingIDs, // localIDs of files already imported in app Map> pathToLocalIDs, - Set invalidIDs, ) async { final Map args = {}; args['assets'] = assets; args['existingIDs'] = existingIDs; - args['invalidIDs'] = invalidIDs; args['pathToLocalIDs'] = pathToLocalIDs; final LocalDiffResult diffResult = await Computer.shared().compute( _getLocalAssetsDiff, @@ -147,7 +145,6 @@ Future getDiffWithLocal( LocalDiffResult _getLocalAssetsDiff(Map args) { final List onDeviceLocalPathAsset = args['assets']; final Set existingIDs = args['existingIDs']; - final Set invalidIDs = args['invalidIDs']; final Map> pathToLocalIDs = args['pathToLocalIDs']; final Map> newPathToLocalIDs = >{}; final Map> removedPathToLocalIDs = @@ -179,7 +176,6 @@ LocalDiffResult _getLocalAssetsDiff(Map args) { // End localPathAsset.localIDs.removeAll(existingIDs); - localPathAsset.localIDs.removeAll(invalidIDs); if (localPathAsset.localIDs.isNotEmpty) { unsyncedAssets.add(localPathAsset); } diff --git a/mobile/lib/services/local_sync_service.dart b/mobile/lib/services/local_sync_service.dart index d8237dd92a..e875ae2751 100644 --- a/mobile/lib/services/local_sync_service.dart +++ b/mobile/lib/services/local_sync_service.dart @@ -39,10 +39,6 @@ class LocalSyncService { static const kHasGrantedPermissionsKey = "has_granted_permissions"; static const kPermissionStateKey = "permission_state"; - // Adding `_2` as a suffic to pull files that were earlier ignored due to permission errors - // See https://github.com/CaiJingLong/flutter_photo_manager/issues/589 - static const kInvalidFileIDsKey = "invalid_file_ids_2"; - LocalSyncService._privateConstructor(); static final LocalSyncService instance = @@ -79,7 +75,7 @@ class LocalSyncService { } _existingSync = Completer(); final int ownerID = Configuration.instance.getUserID()!; - + // We use a lock to prevent synchronisation to occur while it is downloading // as this introduces wrong entry in FilesDB due to race condition // This is a fix for https://github.com/ente-io/ente/issues/4296 @@ -98,7 +94,8 @@ class LocalSyncService { ); } else { // Load from 0 - 01.01.2010 - Bus.instance.fire(SyncStatusUpdate(SyncStatus.startedFirstGalleryImport)); + Bus.instance + .fire(SyncStatusUpdate(SyncStatus.startedFirstGalleryImport)); var startTime = 0; var toYear = 2010; var toTime = DateTime(toYear).microsecondsSinceEpoch; @@ -170,12 +167,11 @@ class LocalSyncService { final existingLocalFileIDs = await _db.getExistingLocalFileIDs(ownerID); final Map> pathToLocalIDs = await _db.getDevicePathIDToLocalIDMap(); - final invalidIDs = _getInvalidFileIDs().toSet(); + final localDiffResult = await getDiffWithLocal( localAssets, existingLocalFileIDs, pathToLocalIDs, - invalidIDs, ); bool hasAnyMappingChanged = false; if (localDiffResult.newPathToLocalIDs?.isNotEmpty ?? false) { @@ -237,18 +233,6 @@ class LocalSyncService { await IgnoredFilesService.instance.cacheAndInsert([ignored]); } - @Deprecated( - "remove usage after few releases as we will switch to ignored files. Keeping it now to clear the invalid file ids from shared prefs", - ) - List _getInvalidFileIDs() { - if (_prefs.containsKey(kInvalidFileIDsKey)) { - _prefs.remove(kInvalidFileIDsKey); - return []; - } else { - return []; - } - } - Lock getLock() { return _lock; }