nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Calendar Sync: Fix inverted logic when comparing hashes from db 

Also improve debug output
This commit is contained in:
Andreas Shimokawa 2017-04-20 20:08:16 +02:00
parent 5717379aec
commit 15fb71337b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/CalendarReceiver.java
View File

@ -107,19 +107,23 @@ public class CalendarReceiver extends BroadcastReceiver {
for (CalendarEvents.CalendarEvent e : eventList) { for (CalendarEvents.CalendarEvent e : eventList) {
eventTable.put(e.getId(), e); long id = e.getId();
eventTable.put(id, e);
if (!eventState.containsKey(e.getId())) { if (!eventState.containsKey(e.getId())) {
qb = session.getCalendarSyncStateDao().queryBuilder(); qb = session.getCalendarSyncStateDao().queryBuilder();
CalendarSyncState calendarSyncState = qb.where(qb.and(CalendarSyncStateDao.Properties.DeviceId.eq(deviceId), CalendarSyncStateDao.Properties.CalendarEntryId.eq(e.getId()))) CalendarSyncState calendarSyncState = qb.where(qb.and(CalendarSyncStateDao.Properties.DeviceId.eq(deviceId), CalendarSyncStateDao.Properties.CalendarEntryId.eq(id)))
.build().unique(); .build().unique();
if (calendarSyncState == null) { if (calendarSyncState == null) {
eventState.put(e.getId(), new EventSyncState(e, EventState.NOT_SYNCED)); eventState.put(id, new EventSyncState(e, EventState.NOT_SYNCED));
} else if (calendarSyncState.getHash() == e.hashCode()) { LOG.info("event id=" + id + " is yet unknown to device id=" + deviceId);
eventState.put(e.getId(), new EventSyncState(e, EventState.NEEDS_UPDATE)); } else if (calendarSyncState.getHash() == e.hashCode()) {
eventState.put(id, new EventSyncState(e, EventState.SYNCED));
LOG.info("event id=" + id + " is up to date on device id=" + deviceId);
} }
else { else {
eventState.put(e.getId(), new EventSyncState(e, EventState.SYNCED)); eventState.put(id, new EventSyncState(e, EventState.NEEDS_UPDATE));
LOG.info("event id=" + id + " is not up to date on device id=" + deviceId);
} }
} }
} }