0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace when conflicts are encountered while applying remote diff

Browse source
This commit is contained in:
Vishnu Mohandas 2020-11-14 15:41:12 +05:30
parent 5d0060031a
commit ee8d1e653c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/db/files_db.dart
View file

@ -365,6 +365,7 @@ class FilesDB {
_getRowForFile(file),
where: '$columnGeneratedID = ?',
whereArgs: [file.generatedID],
conflictAlgorithm: ConflictAlgorithm.replace,
);
}

4
lib/services/sync_service.dart
View file

@ -223,10 +223,10 @@ class SyncService {
await _db.insert(file);
} else {
// File exists on device
bool wasUploadedOnAPreviousInstallation =
existingFiles.length == 1 && existingFiles[0].collectionID == null;
file.localID = existingFiles[0]
.localID; // File should ideally have the same localID
bool wasUploadedOnAPreviousInstallation =
existingFiles.length == 1 && existingFiles[0].collectionID == null;
if (wasUploadedOnAPreviousInstallation) {
file.generatedID = existingFiles[0].generatedID;
await _db.update(file);