Remove remotely deleted task from local change set

pull/898/head
Alex Baker 6 years ago
parent 8b6af51d1e
commit 339e5c87f0

@ -33,7 +33,6 @@ import com.todoroo.astrid.helper.UUIDHelper;
import com.todoroo.astrid.service.TaskCreator; import com.todoroo.astrid.service.TaskCreator;
import com.todoroo.astrid.service.TaskDeleter; import com.todoroo.astrid.service.TaskDeleter;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.security.KeyManagementException; import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
@ -121,7 +120,6 @@ public class EteSynchronizer {
| NoSuchAlgorithmException | NoSuchAlgorithmException
| HttpException | HttpException
| IntegrityException | IntegrityException
| IOException
| VersionTooNewException e) { | VersionTooNewException e) {
setError(account, e.getMessage()); setError(account, e.getMessage());
} }
@ -129,7 +127,7 @@ public class EteSynchronizer {
private void synchronize(CaldavAccount account) private void synchronize(CaldavAccount account)
throws KeyManagementException, NoSuchAlgorithmException, Exceptions.HttpException, throws KeyManagementException, NoSuchAlgorithmException, Exceptions.HttpException,
IntegrityException, IOException, VersionTooNewException { IntegrityException, VersionTooNewException {
EteSyncClient client = this.client.forAccount(account); EteSyncClient client = this.client.forAccount(account);
Map<Journal, CollectionInfo> resources = client.getCalendars(); Map<Journal, CollectionInfo> resources = client.getCalendars();
@ -174,7 +172,7 @@ public class EteSynchronizer {
} }
private void sync(EteSyncClient client, CaldavCalendar caldavCalendar, Journal journal) private void sync(EteSyncClient client, CaldavCalendar caldavCalendar, Journal journal)
throws IntegrityException, Exceptions.HttpException, IOException, VersionTooNewException { throws IntegrityException, Exceptions.HttpException, VersionTooNewException {
Timber.d("sync(%s)", caldavCalendar); Timber.d("sync(%s)", caldavCalendar);
Map<String, CaldavTaskContainer> localChanges = newHashMap(); Map<String, CaldavTaskContainer> localChanges = newHashMap();
@ -242,6 +240,7 @@ public class EteSynchronizer {
} }
break; break;
case DELETE: case DELETE:
dirty.remove(remoteId);
if (caldavTask != null) { if (caldavTask != null) {
taskDeleter.delete(caldavTask.getTask()); taskDeleter.delete(caldavTask.getTask());
} }
@ -252,11 +251,7 @@ public class EteSynchronizer {
} }
} }
private JournalEntryManager.Entry getSyncEntry(Entry previous, CaldavTaskContainer task) { private String getVtodo(CaldavTaskContainer container) {
return null;
}
private String getVtodo(CaldavTaskContainer container) throws IOException {
Task task = container.getTask(); Task task = container.getTask();
CaldavTask caldavTask = container.getCaldavTask(); CaldavTask caldavTask = container.getCaldavTask();

Loading…
Cancel
Save