Skip to content

Commit ac874ff

Browse files
committed
Graph: switch to isOrganizer to detect invites
git-svn-id: https://svn.code.sf.net/p/davmail/code/trunk@4102 3d1905a2-6b24-0410-a738-b14d5a86fcbd
1 parent 2ecd819 commit ac874ff

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/java/davmail/exchange/graph/GraphExchangeSession.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,8 @@ public ItemResult createOrUpdate() throws IOException {
551551
boolean isMozSendInvitations = false;
552552
boolean isMozDismiss = false;
553553

554+
boolean isOrganizer = false;
555+
554556
JSONObject existingJsonEvent = getEventIfExists(folderId, itemName);
555557
if (existingJsonEvent != null) {
556558
GraphObject currentItem = new GraphObject(existingJsonEvent);
@@ -562,7 +564,9 @@ public ItemResult createOrUpdate() throws IOException {
562564
String currentAttendeeStatus = responseTypeToPartstatMap.get(myResponseType);
563565
String newAttendeeStatus = vCalendar.getAttendeeStatus();
564566

565-
isMeetingResponse = vCalendar.isMeeting() && !vCalendar.isMeetingOrganizer()
567+
isOrganizer = currentItem.optBoolean("isOrganizer");
568+
569+
isMeetingResponse = vCalendar.isMeeting() && !isOrganizer
566570
&& newAttendeeStatus != null
567571
&& !newAttendeeStatus.equals(currentAttendeeStatus)
568572
// avoid nullpointerexception on unknown status
@@ -1767,6 +1771,7 @@ public enum WellKnownFolderName {
17671771
EVENT_ATTRIBUTES.add(GraphField.get("organizer"));
17681772
EVENT_ATTRIBUTES.add(GraphField.get("originalStartTimeZone"));
17691773
EVENT_ATTRIBUTES.add(GraphField.get("originalStart"));
1774+
EVENT_ATTRIBUTES.add(GraphField.get("originalEndTimeZone"));
17701775
EVENT_ATTRIBUTES.add(GraphField.get("recurrence"));
17711776
EVENT_ATTRIBUTES.add(GraphField.get("reminderMinutesBeforeStart"));
17721777
EVENT_ATTRIBUTES.add(GraphField.get("responseRequested"));

src/java/davmail/exchange/graph/GraphField.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ public enum DistinguishedPropertySetType {
136136
addFieldMap("location");
137137
addFieldMap("organizer");
138138
addFieldMap("originalStart");
139-
addFieldMap("originalEnd");
140139
addFieldMap("recurrence");
141140
addFieldMap("reminderMinutesBeforeStart");
142141
addFieldMap("start");

0 commit comments

Comments
 (0)