arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-12-23 15:18:14 +00:00
Code Issues Releases Wiki Activity

SyncManager: Restrict access to private variables.

Browse Source
This commit is contained in:
Tom Hacohen 2017-02-17 00:27:49 +00:00
parent f5c413069e
commit fa52270420
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,23 +81,23 @@ abstract public class SyncManager {
/** /**
* remote CTag (uuid of the last entry on the server). We update it when we fetch/push and save when everything works. * remote CTag (uuid of the last entry on the server). We update it when we fetch/push and save when everything works.
*/ */
protected String remoteCTag = null; private String remoteCTag = null;
/** /**
* Syncable local journal entries. * Syncable local journal entries.
*/ */
protected List<JournalEntryManager.Entry> localEntries; private List<JournalEntryManager.Entry> localEntries;
/** /**
* Syncable remote journal entries (fetch from server). * Syncable remote journal entries (fetch from server).
*/ */
protected List<JournalEntryManager.Entry> remoteEntries; private List<JournalEntryManager.Entry> remoteEntries;
/** /**
* Dirty and deleted resources. We need to save them so we safely ignore ones that were added after we started. * Dirty and deleted resources. We need to save them so we safely ignore ones that were added after we started.
*/ */
protected List<LocalResource> localDeleted; private List<LocalResource> localDeleted;
protected LocalResource[] localDirty; private 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;
@ -277,6 +277,7 @@ abstract public class SyncManager {
for (List<JournalEntryManager.Entry> entries : ListUtils.partition(localEntries, MAX_PUSH)) { for (List<JournalEntryManager.Entry> entries : ListUtils.partition(localEntries, MAX_PUSH)) {
journal.putEntries(entries, remoteCTag); journal.putEntries(entries, remoteCTag);
remoteCTag = entries.get(entries.size() - 1).getUuid(); remoteCTag = entries.get(entries.size() - 1).getUuid();
saveSyncTag();
} }
for (LocalResource local : localDirty) { for (LocalResource local : localDirty) {
@ -379,7 +380,7 @@ abstract public class SyncManager {
protected void postProcess() throws CalendarStorageException, ContactsStorageException { protected void postProcess() throws CalendarStorageException, ContactsStorageException {
} }
protected void saveSyncTag() throws CalendarStorageException, ContactsStorageException { private void saveSyncTag() throws CalendarStorageException, ContactsStorageException {
App.log.info("Saving CTag=" + remoteCTag); App.log.info("Saving CTag=" + remoteCTag);
localCollection.setCTag(remoteCTag); localCollection.setCTag(remoteCTag);
} }