arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-05-28 19:58:49 +00:00
Code Issues Releases Wiki Activity

Push entries in chunks instead of all at once.

Browse Source
This commit is contained in:
Tom Hacohen 2017-02-16 16:49:46 +00:00
parent 74b0956f3b
commit 8040ee7d9f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,8 @@ import android.content.Intent;
import android.content.SyncResult; import android.content.SyncResult;
import android.os.Bundle; import android.os.Bundle;
import java.io.FileNotFoundException; import org.apache.commons.collections4.ListUtils;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@ -260,9 +261,13 @@ abstract public class SyncManager {
protected void pushEntries() throws Exceptions.HttpException, IOException, ContactsStorageException, CalendarStorageException { protected void pushEntries() throws Exceptions.HttpException, IOException, ContactsStorageException, CalendarStorageException {
// upload dirty contacts // upload dirty contacts
final int MAX_PUSH = 30;
// FIXME: Deal with failure (someone else uploaded before we go here) // FIXME: Deal with failure (someone else uploaded before we go here)
if (!localEntries.isEmpty()) { if (!localEntries.isEmpty()) {
journal.putEntries(localEntries, remoteCTag); for (List<JournalEntryManager.Entry> entries : ListUtils.partition(localEntries, MAX_PUSH)) {
journal.putEntries(entries, remoteCTag);
remoteCTag = entries.get(entries.size() - 1).getUuid();
}
for (LocalResource local : localCollection.getDirty()) { for (LocalResource local : localCollection.getDirty()) {
App.log.info("Added/changed resource with UUID: " + local.getUuid()); App.log.info("Added/changed resource with UUID: " + local.getUuid());
@ -272,8 +277,6 @@ abstract public class SyncManager {
for (LocalResource local : localCollection.getDeleted()) { for (LocalResource local : localCollection.getDeleted()) {
local.delete(); local.delete();
} }
remoteCTag = localEntries.get(localEntries.size() - 1).getUuid();
} }
} }