mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 07:05:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Safe blanket to clean DB if wrong conflicts keep stored

Browse source
This commit is contained in:
David A. Velasco 2015-08-21 14:20:50 +02:00
parent 95bebe9382
commit b8a3dc71e4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/com/owncloud/android/operations/SynchronizeFileOperation.java
View file

@ -263,7 +263,11 @@ public class SynchronizeFileOperation extends SyncOperation {
result = new RemoteOperationResult(ResultCode.OK);
}
}
// safe blanket: sync'ing a not in-conflict file will clean wrong conflict markers in ancestors
if (result.getCode() != ResultCode.SYNC_CONFLICT) {
getStorageManager().saveConflict(mLocalFile, false);
}
}
}