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

am b5253606: Merge "Sync description with exceptions" into froyo

Browse Source 
Merge commit 'b5253606eeeae86938f04415553aac9f3f22daaa' into froyo-plus-aosp

* commit 'b5253606eeeae86938f04415553aac9f3f22daaa':
  Sync description with exceptions
This commit is contained in:
Marc Blank 2010-04-12 15:55:35 -07:00 committed by Android Git Automerger
commit c388bf6677
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");
}
if (!isException) {
String desc = entityValues.getAsString(Events.DESCRIPTION);
if (desc != null && desc.length() > 0) {
if (version >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
s.start(Tags.BASE_BODY);
s.data(Tags.BASE_TYPE, "1");
s.data(Tags.BASE_DATA, desc);
s.end();
} else {
// EAS 2.5 doesn't like bare line feeds
s.data(Tags.CALENDAR_BODY, Utility.replaceBareLfWithCrlf(desc));
}
String desc = entityValues.getAsString(Events.DESCRIPTION);
if (desc != null && desc.length() > 0) {
if (version >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) {
s.start(Tags.BASE_BODY);
s.data(Tags.BASE_TYPE, "1");
s.data(Tags.BASE_DATA, desc);
s.end();
} else {
// EAS 2.5 doesn't like bare line feeds
s.data(Tags.CALENDAR_BODY, Utility.replaceBareLfWithCrlf(desc));
}
}
if (!isException) {
// For Exchange 2003, only upsync if the event is new
if ((version >= Eas.SUPPORTED_PROTOCOL_EX2007_DOUBLE) || !isChange) {
s.writeStringValue(entityValues, Events.ORGANIZER, Tags.CALENDAR_ORGANIZER_EMAIL);