moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-02-28 09:21:49 -05:00
Code Issues Releases Wiki Activity

Caldav: only include attendees with RSVP=TRUE or PARTSTAT=NEEDS-ACTION for notifications (avoid iCal additional notifications)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@602 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-06-24 23:14:25 +00:00
parent 32e5ed9342
commit a919bf7354
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java/davmail/exchange/ExchangeSession.java
View File

@ -1482,7 +1482,15 @@ public class ExchangeSession {
String organizer; String organizer;
} }
protected Participants getParticipants(String icsBody) throws IOException { /**
* Parse ics event for attendees and organizer.
* For notifications, only include attendees with RSVP=TRUE or PARTSTAT=NEEDS-ACTION
* @param icsBody ics event
* @param isNotification get only notified attendees
* @return participants
* @throws IOException on error
*/
protected Participants getParticipants(String icsBody, boolean isNotification) throws IOException {
HashSet<String> attendees = new HashSet<String>(); HashSet<String> attendees = new HashSet<String>();
String organizer = null; String organizer = null;
BufferedReader reader = null; BufferedReader reader = null;
@ -1506,9 +1514,11 @@ public class ExchangeSession {
if ("ORGANIZER".equals(key)) { if ("ORGANIZER".equals(key)) {
organizer = value; organizer = value;
// exclude current user and invalid values from recipients // exclude current user and invalid values from recipients
// also exclude RSVP=FALSE attendees // also exclude no action attendees
} else if (!email.equalsIgnoreCase(value) && value.indexOf('@') >= 0 } else if (!email.equalsIgnoreCase(value) && value.indexOf('@') >= 0
&& line.indexOf("RSVP=FALSE") < 0) { && (!isNotification
|| line.indexOf("RSVP=TRUE") >= 0)
|| line.indexOf("PARTSTAT=NEEDS-ACTION") >=0) {
attendees.add(value); attendees.add(value);
} }
} }
@ -1553,9 +1563,9 @@ public class ExchangeSession {
"Content-class: "); "Content-class: ");
writer.write(contentClass); writer.write(contentClass);
writer.write("\r\n"); writer.write("\r\n");
// need to parse attendees and organizer to build recipients
Participants participants = getParticipants(icsBody);
if ("urn:content-classes:calendarmessage".equals(contentClass)) { if ("urn:content-classes:calendarmessage".equals(contentClass)) {
// need to parse attendees and organizer to build recipients
Participants participants = getParticipants(icsBody, true);
String recipients; String recipients;
if (email.equalsIgnoreCase(participants.organizer)) { if (email.equalsIgnoreCase(participants.organizer)) {
// current user is organizer => notify all // current user is organizer => notify all
@ -1573,6 +1583,8 @@ public class ExchangeSession {
status = HttpStatus.SC_NO_CONTENT; status = HttpStatus.SC_NO_CONTENT;
} }
} else { } else {
// need to parse attendees and organizer to build recipients
Participants participants = getParticipants(icsBody, false);
// storing appointment, full recipients header // storing appointment, full recipients header
if (participants.attendees != null) { if (participants.attendees != null) {
writer.write("To: "); writer.write("To: ");