ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Respect the RESPONSE_REQUESTED tag in meeting invite mail"

This commit is contained in:
Marc Blank 2010-10-21 08:14:44 -07:00 committed by Android (Google) Code Review
parent a44c0349fa a8bb34fd62
commit ca065c3927
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/email/mail/MeetingInfo.java
View File

@ -25,4 +25,5 @@ public class MeetingInfo {
public static final String MEETING_DTEND = "DTEND";
public static final String MEETING_TITLE = "TITLE";
public static final String MEETING_LOCATION = "LOC";
public static final String MEETING_RESPONSE_REQUESTED = "RESPONSE";
}

9
src/com/android/exchange/EasSyncService.java
View File

@ -1182,6 +1182,15 @@ public class EasSyncService extends AbstractSyncService {
InputStream is = res.getEntity().getContent();
if (len != 0) {
new MeetingResponseParser(is, this).parse();
String meetingInfo = msg.mMeetingInfo;
if (meetingInfo != null) {
String responseRequested =
new PackedString(meetingInfo).get(MeetingInfo.MEETING_RESPONSE_REQUESTED);
// If there's no tag, or a non-zero tag, we send the response mail
if ("0".equals(responseRequested)) {
return;
}
}
sendMeetingResponseMail(msg, req.mResponse);
}
} else if (isAuthError(status)) {

3
src/com/android/exchange/adapter/EmailSyncAdapter.java
View File

@ -368,6 +368,9 @@ public class EmailSyncAdapter extends AbstractSyncAdapter {
case Tags.EMAIL_RECURRENCES:
recurrencesParser();
break;
case Tags.EMAIL_RESPONSE_REQUESTED:
packedString.put(MeetingInfo.MEETING_RESPONSE_REQUESTED, getValue());
break;
default:
skipTag();
}