From 957e179e632dcf1c446cf255b5cfd48ebdf0fd12 Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Fri, 4 Nov 2011 16:31:22 +0000
Subject: [PATCH] Issue 933 handle multi-day all-day events

git-svn-id: https://zxing.googlecode.com/svn/trunk@2015 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 .../client/android/result/ResultHandler.java     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/android/src/com/google/zxing/client/android/result/ResultHandler.java b/android/src/com/google/zxing/client/android/result/ResultHandler.java
index 969835861..e194b6720 100644
--- a/android/src/com/google/zxing/client/android/result/ResultHandler.java
+++ b/android/src/com/google/zxing/client/android/result/ResultHandler.java
@@ -231,17 +231,19 @@ public abstract class ResultHandler {
                               String description) {
     Intent intent = new Intent(Intent.ACTION_EDIT);
     intent.setType("vnd.android.cursor.item/event");
-    intent.putExtra("beginTime", calculateMilliseconds(start));
+    long startMilliseconds = calculateMilliseconds(start);
+    intent.putExtra("beginTime", startMilliseconds);
     boolean allDay = start.length() == 8;
     if (allDay) {
       intent.putExtra("allDay", true);
-    } else {
-      if (end == null) {
-        end = start;
-      }
-      long endMilliseconds = calculateMilliseconds(end);
-      intent.putExtra("endTime", endMilliseconds);
     }
+    long endMilliseconds;
+    if (end == null) {
+      endMilliseconds = allDay ? startMilliseconds + 86400 : startMilliseconds;
+    } else {
+      endMilliseconds = calculateMilliseconds(end);
+    }
+    intent.putExtra("endTime", endMilliseconds);
     intent.putExtra("title", summary);
     intent.putExtra("eventLocation", location);
     intent.putExtra("description", description);