From 68781fd96e250b60866a7a2d76c636f233fe3ac0 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sat, 24 Sep 2016 22:23:25 +0200 Subject: [PATCH] Increase SEQUENCE only when we're ORGANIZER --- .../main/java/at/bitfire/davdroid/resource/LocalCalendar.java | 2 +- .../main/java/at/bitfire/davdroid/resource/LocalEvent.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java index ee28f9aa..714b274e 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java +++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java @@ -139,7 +139,7 @@ public class LocalCalendar extends AndroidCalendar implements LocalCollection { for (LocalEvent event : (LocalEvent[])queryEvents(Events.DIRTY + "!=0 AND " + Events.ORIGINAL_ID + " IS NULL", null)) { if (event.getEvent().sequence == null) // sequence has not been assigned yet (i.e. this event was just locally created) event.getEvent().sequence = 0; - else + else if (event.weAreOrganizer) event.getEvent().sequence++; dirty.add(event); } diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.java index 6616251d..d2617c72 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.java +++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.java @@ -41,6 +41,8 @@ public class LocalEvent extends AndroidEvent implements LocalResource { @Getter protected String fileName; @Getter @Setter protected String eTag; + public boolean weAreOrganizer = true; + public LocalEvent(@NonNull AndroidCalendar calendar, Event event, String fileName, String eTag) { super(calendar, event); this.fileName = fileName; @@ -66,6 +68,8 @@ public class LocalEvent extends AndroidEvent implements LocalResource { event.uid = values.getAsString(COLUMN_UID); event.sequence = values.getAsInteger(COLUMN_SEQUENCE); + if (values.getAsInteger(Events.IS_ORGANIZER) == 0) + weAreOrganizer = false; } @Override