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

Fix issue with deleted entries being re-added.

Browse Source
This commit is contained in:
Tom Hacohen 2019-01-06 20:28:45 +00:00
parent b2f7cc811f
commit b88ad593d7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/etesync/syncadapter/resource/LocalAddressBook.kt
View File

@ -224,8 +224,8 @@ class LocalAddressBook(
else else
findDirtyContacts() findDirtyContacts()
fun findDirtyContacts() = queryContacts("${RawContacts.DIRTY}!=0", null) fun findDirtyContacts() = queryContacts("${RawContacts.DIRTY}!=0 AND ${RawContacts.DELETED}==0", null)
fun findDirtyGroups() = queryGroups("${Groups.DIRTY}!=0", null) fun findDirtyGroups() = queryGroups("${Groups.DIRTY}!=0 AND ${Groups.DELETED}==0", null)
/** /**
* Returns an array of local contacts which don't have a file name yet. * Returns an array of local contacts which don't have a file name yet.

2
app/src/main/java/com/etesync/syncadapter/resource/LocalCalendar.kt
View File

@ -99,7 +99,7 @@ class LocalCalendar private constructor(
val dirty = LinkedList<LocalEvent>() val dirty = LinkedList<LocalEvent>()
// get dirty events which are required to have an increased SEQUENCE value // get dirty events which are required to have an increased SEQUENCE value
for (localEvent in queryEvents("${Events.DIRTY}!=0 AND ${Events.ORIGINAL_ID} IS NULL", null)) { for (localEvent in queryEvents("${Events.DIRTY}!=0 AND ${Events.DELETED}==0 AND ${Events.ORIGINAL_ID} IS NULL", null)) {
val event = localEvent.event!! val event = localEvent.event!!
val sequence = event.sequence val sequence = event.sequence
if (event.sequence == null) // sequence has not been assigned yet (i.e. this event was just locally created) if (event.sequence == null) // sequence has not been assigned yet (i.e. this event was just locally created)

2
app/src/main/java/com/etesync/syncadapter/resource/LocalTaskList.kt
View File

@ -68,7 +68,7 @@ class LocalTaskList private constructor(
override fun findDeleted() = queryTasks("${Tasks._DELETED}!=0", null) override fun findDeleted() = queryTasks("${Tasks._DELETED}!=0", null)
override fun findDirty(): List<LocalTask> { override fun findDirty(): List<LocalTask> {
val tasks = queryTasks("${Tasks._DIRTY}!=0", null) val tasks = queryTasks("${Tasks._DIRTY}!=0 AND ${Tasks._DELETED}==0", null)
for (localTask in tasks) { for (localTask in tasks) {
val task = requireNotNull(localTask.task) val task = requireNotNull(localTask.task)
val sequence = task.sequence val sequence = task.sequence