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

Merge "Fix sending of cancellations to uninvited guests" into froyo

This commit is contained in:
Marc Blank 2010-03-28 13:56:04 -07:00 committed by Android (Google) Code Review
parent a3ce319ed0 54585c9511
commit 02a63da3c6
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1622,7 +1622,8 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
for (String removedAttendee: originalAttendeeList) {
// Send a cancellation message to each of them
msg = CalendarUtilities.createMessageForEventId(mContext, eventId,
Message.FLAG_OUTGOING_MEETING_CANCEL, clientId, mAccount);
Message.FLAG_OUTGOING_MEETING_CANCEL, clientId, mAccount,
false);
if (msg != null) {
// Just send it to the removed attendee
msg.mTo = removedAttendee;

23
src/com/android/exchange/utility/CalendarUtilities.java
View File

@ -1210,6 +1210,12 @@ public class CalendarUtilities {
*/
static public EmailContent.Message createMessageForEntity(Context context, Entity entity,
int messageFlag, String uid, Account account) {
return createMessageForEntity(context, entity, messageFlag, uid, account,
true /*requireAddressees*/);
}
static public EmailContent.Message createMessageForEntity(Context context, Entity entity,
int messageFlag, String uid, Account account, boolean requireAddressees) {
ContentValues entityValues = entity.getEntityValues();
ArrayList<NamedContentValues> subValues = entity.getSubValues();
boolean isException = entityValues.containsKey(Events.ORIGINAL_EVENT);
@ -1466,8 +1472,9 @@ public class CalendarUtilities {
}
}
// If we have no "to" list, we're done
if (toList.isEmpty()) return null;
// If we have no "to" list and addressees are required (the default), we're done
if (toList.isEmpty() && requireAddressees) return null;
// Write out the "to" list
Address[] toArray = new Address[toList.size()];
int i = 0;
@ -1513,11 +1520,20 @@ public class CalendarUtilities {
* @param messageFlag the Message.FLAG_XXX constant indicating the type of email to be sent
* @param the unique id of this Event, or null if it can be retrieved from the Event
* @param the user's account
* @param requireAddressees if true (the default), no Message is returned if there aren't any
* addressees; if false, return the Message regardless (addressees will be filled in later)
* @return a Message with many fields pre-filled (more later)
* @throws RemoteException if there is an issue retrieving the Event from CalendarProvider
*/
static public EmailContent.Message createMessageForEventId(Context context, long eventId,
int messageFlag, String uid, Account account) throws RemoteException {
return createMessageForEventId(context, eventId, messageFlag, uid, account,
true /*requireAddressees*/);
}
static public EmailContent.Message createMessageForEventId(Context context, long eventId,
int messageFlag, String uid, Account account, boolean requireAddressees)
throws RemoteException {
ContentResolver cr = context.getContentResolver();
EntityIterator eventIterator =
EventsEntity.newEntityIterator(
@ -1527,7 +1543,8 @@ public class CalendarUtilities {
try {
while (eventIterator.hasNext()) {
Entity entity = eventIterator.next();
return createMessageForEntity(context, entity, messageFlag, uid, account);
return createMessageForEntity(context, entity, messageFlag, uid, account,
requireAddressees);
}
} finally {
eventIterator.close();