commit 73966c4d1d8738830f5ba9085f24e6b4bab40768
author Andrew Stadler <stadler@android.com> Tue Mar 16 12:00:23 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 16 12:00:23 2010 -0700
tree f93e7522b620f5ac46ce912c8460ae6d9268e413
parent f4f58611e66c935654ac7247208dc1e683071179
parent a6bcdcbd31fc4a07ccba54e74ac4ca7e476262fe

Merge "GAL (continued)"

src/com/android/exchange/adapter/CalendarSyncAdapter.java

diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
index 8085eeb..e8f2aab 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -1149,20 +1149,22 @@
                     CalendarUtilities.millisToEasDateTime(allDayCal.getTimeInMillis()));
          } else {
             s.data(Tags.CALENDAR_START_TIME, CalendarUtilities.millisToEasDateTime(startTime));
-            if (!entityValues.containsKey(Events.DURATION)) {
-                if (entityValues.containsKey(Events.DTEND)) {
-                    s.data(Tags.CALENDAR_END_TIME, CalendarUtilities.millisToEasDateTime(
-                            entityValues.getAsLong(Events.DTEND)));
-                }
+            // If we've got DTEND, we use it
+            if (entityValues.containsKey(Events.DTEND)) {
+                s.data(Tags.CALENDAR_END_TIME, CalendarUtilities.millisToEasDateTime(
+                        entityValues.getAsLong(Events.DTEND)));
             } else {
-                // Convert this into millis and add it to DTSTART for DTEND
-                // We'll use 1 hour as a default
+                // Convert duration into millis and add it to DTSTART for DTEND
+                // We'll use 1 hour as a default (if there's no duration specified or if the parse
+                // of the duration fails)
                 long durationMillis = HOURS;
-                Duration duration = new Duration();
-                try {
-                    duration.parse(entityValues.getAsString(Events.DURATION));
-                } catch (ParseException e) {
-                    // Can't do much about this; use the default (1 hour)
+                if (entityValues.containsKey(Events.DURATION)) {
+                    Duration duration = new Duration();
+                    try {
+                        duration.parse(entityValues.getAsString(Events.DURATION));
+                    } catch (ParseException e) {
+                        // Can't do much about this; use the default (1 hour)
+                    }
                 }
                 s.data(Tags.CALENDAR_END_TIME,
                         CalendarUtilities.millisToEasDateTime(startTime + durationMillis));