Issue 1067 and more. Add "VALUE=DATE" to encoding of all-day dates. Don't pretend end was specified in original barcode if not present. However for benefit of Android Calendar apps, use +1 hour/day end time for missing end. Fix some error messages in appspot generator too.

git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2040 59b500cc-1b3d-0410-9834-0bbf25fbcc57

2 files changed, 9 insertions, 5 deletions

diff --git a/src/com/google/zxing/client/android/result/CalendarResultHandler.java b/src/com/google/zxing/client/android/result/CalendarResultHandler.java
index 646bc99f..d1e8ee97 100644
--- a/src/com/google/zxing/client/android/result/CalendarResultHandler.java
+++ b/src/com/google/zxing/client/android/result/CalendarResultHandler.java
@@ -77,12 +77,10 @@ public final class CalendarResultHandler extends ResultHandler {
     ParsedResult.maybeAppend(calResult.getSummary(), result);
     appendTime(calResult.getStart(), result);
 
-    // The end can be null if the event has no duration, so use the start time.
     String endString = calResult.getEnd();
-    if (endString == null) {
-      endString = calResult.getStart();
+    if (endString != null) {
+      appendTime(endString, result);
     }
-    appendTime(endString, result);
 
     ParsedResult.maybeAppend(calResult.getLocation(), result);
     ParsedResult.maybeAppend(calResult.getAttendee(), result);
diff --git a/src/com/google/zxing/client/android/result/ResultHandler.java b/src/com/google/zxing/client/android/result/ResultHandler.java
index 63456a71..91d018d4 100644
--- a/src/com/google/zxing/client/android/result/ResultHandler.java
+++ b/src/com/google/zxing/client/android/result/ResultHandler.java
@@ -241,7 +241,13 @@ public abstract class ResultHandler {
     }
     long endMilliseconds;
     if (end == null) {
-      endMilliseconds = allDay ? startMilliseconds + 86400 : startMilliseconds;
+      if (allDay) {
+        // + 1 day
+        endMilliseconds = startMilliseconds + 24 * 60 * 60 * 1000;
+      } else {
+        // + 1 hour
+        endMilliseconds = startMilliseconds + 60 * 60 * 1000;
+      }
     } else {
       endMilliseconds = calculateMilliseconds(end);
     }