arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-11 00:01:12 +00:00
Code Issues Releases Wiki Activity

Fetch local deleted and dirty at the beginning of sync to avoid inconsistency

Browse Source 
Without this, those values could change in the middle of the sync
and make us work on different lists at different parts of the
sync code.
This commit is contained in:
Tom Hacohen 2017-02-16 18:28:23 +00:00
parent d6864f5062
commit 2bbddd26cd
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
View File

@ -16,6 +16,7 @@ import android.os.Bundle;
import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.ListUtils;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -92,6 +93,12 @@ abstract public class SyncManager {
*/ */
protected List<JournalEntryManager.Entry> remoteEntries; protected List<JournalEntryManager.Entry> remoteEntries;
/**
* Dirty and deleted resources. We need to save them so we safely ignore ones that were added after we started.
*/
protected List<LocalResource> localDeleted;
protected LocalResource[] localDirty;
public SyncManager(Context context, Account account, AccountSettings settings, Bundle extras, String authority, SyncResult syncResult, String uniqueCollectionId, CollectionInfo.Type serviceType) throws InvalidAccountException { public SyncManager(Context context, Account account, AccountSettings settings, Bundle extras, String authority, SyncResult syncResult, String uniqueCollectionId, CollectionInfo.Type serviceType) throws InvalidAccountException {
this.context = context; this.context = context;
this.account = account; this.account = account;
@ -264,14 +271,16 @@ abstract public class SyncManager {
remoteCTag = entries.get(entries.size() - 1).getUuid(); remoteCTag = entries.get(entries.size() - 1).getUuid();
} }
for (LocalResource local : localCollection.getDirty()) { for (LocalResource local : localDirty) {
App.log.info("Added/changed resource with UUID: " + local.getUuid()); App.log.info("Added/changed resource with UUID: " + local.getUuid());
local.clearDirty(local.getUuid()); local.clearDirty(local.getUuid());
} }
localDirty = null;
for (LocalResource local : localCollection.getDeleted()) { for (LocalResource local : localDeleted) {
local.delete(); local.delete();
} }
localDeleted = null;
} }
} }
@ -281,7 +290,7 @@ abstract public class SyncManager {
// Not saving, just creating a fake one until we load it from a local db // Not saving, just creating a fake one until we load it from a local db
JournalEntryManager.Entry previousEntry = (remoteCTag != null) ? JournalEntryManager.Entry.getFakeWithUid(remoteCTag) : null; JournalEntryManager.Entry previousEntry = (remoteCTag != null) ? JournalEntryManager.Entry.getFakeWithUid(remoteCTag) : null;
for (LocalResource local : processLocallyDeleted()) { for (LocalResource local : localDeleted) {
SyncEntry entry = new SyncEntry(local.getContent(), SyncEntry.Actions.DELETE); SyncEntry entry = new SyncEntry(local.getContent(), SyncEntry.Actions.DELETE);
JournalEntryManager.Entry tmp = new JournalEntryManager.Entry(); JournalEntryManager.Entry tmp = new JournalEntryManager.Entry();
tmp.update(settings.password(), entry.toJson(), previousEntry); tmp.update(settings.password(), entry.toJson(), previousEntry);
@ -289,7 +298,7 @@ abstract public class SyncManager {
localEntries.add(previousEntry); localEntries.add(previousEntry);
} }
for (LocalResource local : localCollection.getDirty()) { for (LocalResource local : localDirty) {
SyncEntry.Actions action; SyncEntry.Actions action;
if (local.isLocalOnly()) { if (local.isLocalOnly()) {
action = SyncEntry.Actions.ADD; action = SyncEntry.Actions.ADD;
@ -307,8 +316,10 @@ abstract public class SyncManager {
/** /**
*/ */
protected void prepareLocal() throws CalendarStorageException, ContactsStorageException { protected void prepareLocal() throws CalendarStorageException, ContactsStorageException, FileNotFoundException {
prepareDirty(); prepareDirty();
localDeleted = processLocallyDeleted();
localDirty = localCollection.getDirty();
remoteCTag = localCollection.getCTag(); remoteCTag = localCollection.getCTag();
} }
@ -318,7 +329,7 @@ abstract public class SyncManager {
* Delete unpublished locally deleted, and return the rest. * Delete unpublished locally deleted, and return the rest.
* Checks Thread.interrupted() before each request to allow quick sync cancellation. * Checks Thread.interrupted() before each request to allow quick sync cancellation.
*/ */
protected List<LocalResource> processLocallyDeleted() throws CalendarStorageException, ContactsStorageException { private List<LocalResource> processLocallyDeleted() throws CalendarStorageException, ContactsStorageException {
LocalResource[] localList = localCollection.getDeleted(); LocalResource[] localList = localCollection.getDeleted();
List<LocalResource> ret = new ArrayList<>(localList.length); List<LocalResource> ret = new ArrayList<>(localList.length);