From 5a2f8260c7d2b9827187f19a3db9a43e9e922a3e Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Wed, 24 Jan 2018 15:19:50 +0000
Subject: [PATCH] Sync: don't re-apply local entries.

We were doing it to make sure we don't get overridden by
server changes. But we already changed this behaviour in
the past, so this call was just doing nothing and slowing
down the sync.
---
 .../java/com/etesync/syncadapter/syncadapter/SyncManager.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.java b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.java
index 9803fa96..a9356c14 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.java
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.java
@@ -184,7 +184,9 @@ abstract public class SyncManager {
                 throw new InterruptedException();
             syncPhase = R.string.sync_phase_apply_local_entries;
             App.log.info("Sync phase: " + context.getString(syncPhase));
+            /* FIXME: Skipping this now, because we already override with remote.
             applyLocalEntries();
+            */
 
             if (Thread.interrupted())
                 throw new InterruptedException();