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

Merge "Sync description with exceptions" into froyo

Browse Source
This commit is contained in:
Marc Blank 2010-04-12 15:53:50 -07:00 committed by Android (Google) Code Review
commit b5253606ee
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1235,20 +1235,20 @@ public class CalendarSyncAdapter extends AbstractSyncAdapter {
s.data(Tags.CALENDAR_SENSITIVITY, "1"); s.data(Tags.CALENDAR_SENSITIVITY, "1");
} }
if (!isException) { String desc = entityValues.getAsString(Events.DESCRIPTION);
String desc = entityValues.getAsString(Events.DESCRIPTION); if (desc != null && desc.length() > 0) {
if (desc != null && desc.length() > 0) { if (version >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
if (version >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) { s.start(Tags.BASE_BODY);
s.start(Tags.BASE_BODY); s.data(Tags.BASE_TYPE, "1");
s.data(Tags.BASE_TYPE, "1"); s.data(Tags.BASE_DATA, desc);
s.data(Tags.BASE_DATA, desc); s.end();
s.end(); } else {
} else { // EAS 2.5 doesn't like bare line feeds
// EAS 2.5 doesn't like bare line feeds s.data(Tags.CALENDAR_BODY, Utility.replaceBareLfWithCrlf(desc));
s.data(Tags.CALENDAR_BODY, Utility.replaceBareLfWithCrlf(desc));
}
} }
}
if (!isException) {
// For Exchange 2003, only upsync if the event is new // For Exchange 2003, only upsync if the event is new
if ((version >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) || !isChange) { if ((version >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) || !isChange) {
s.writeStringValue(entityValues, Events.ORGANIZER, Tags.CALENDAR_ORGANIZER_EMAIL); s.writeStringValue(entityValues, Events.ORGANIZER, Tags.CALENDAR_ORGANIZER_EMAIL);