From e3df9f95ea267c2a6d19386f45ba849a91905902 Mon Sep 17 00:00:00 2001 From: Marc Blank Date: Mon, 12 Apr 2010 14:22:11 -0700 Subject: [PATCH] Sync description with exceptions * We weren't sending up the event description with exceptions, so changes to description were being lost on upload * Move the code uploading description so that it happens with exceptions as well as top-level events Bug: 2590020 Change-Id: Ifab556bed68671f3ee8cab02b657adbd8ba9c50c --- .../exchange/adapter/CalendarSyncAdapter.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java index 389e82b65..595b5dcd5 100644 --- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java +++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java @@ -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);