Don't upsync local modifications if server side event is removed

sailfishos · Jan 13, 2015 · 5b8155b · 5b8155b
1 parent 4ade9d2
commit 5b8155b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/google/google-calendars/googlecalendarsyncadaptor.cpp b/src/google/google-calendars/googlecalendarsyncadaptor.cpp
@@ -819,6 +819,9 @@ void GoogleCalendarSyncAdaptor::updateLocalCalendarNotebookEvents(int accountId,
             // delete existing event.
             remoteRemoved++;
 
+            // if modified locally and deleted on server side, don't upsync modifications
+            updatedMap.remove(eventId);
+
             m_idDb.removeEvent(accountId, eventId);
             if (allMap.contains(eventId)) {
                 m_calendar->deleteEvent(allMap.value(eventId));