mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Suggested fix from Android team for unofficial calendar API - all day event start must be sent in GMT

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1735 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2011-04-03 18:49:03 +00:00
parent 50277f6486
commit 69c61da1d7
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
android/src/com/google/zxing/client/android/result/ResultHandler.java
View file

@ -48,6 +48,7 @@ import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.TimeZone;
/** /**
* A base class for the Android-specific barcode handlers. These allow the app to polymorphically * A base class for the Android-specific barcode handlers. These allow the app to polymorphically
@ -63,7 +64,13 @@ public abstract class ResultHandler {
private static final String TAG = ResultHandler.class.getSimpleName(); private static final String TAG = ResultHandler.class.getSimpleName();
private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd"); private static final DateFormat DATE_FORMAT;
static {
DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
// For dates without a time, for purposes of interacting with Android, the resulting timestamp needs to
// be midnight of that day in GMT (http://code.google.com/p/android/issues/detail?id=8330)
DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
}
private static final DateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyyMMdd'T'HHmmss"); private static final DateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyyMMdd'T'HHmmss");
private static final String GOOGLE_SHOPPER_PACKAGE = "com.google.android.apps.shopper"; private static final String GOOGLE_SHOPPER_PACKAGE = "com.google.android.apps.shopper";
@ -193,16 +200,13 @@ public abstract class ResultHandler {
boolean allDay = start.length() == 8; boolean allDay = start.length() == 8;
if (allDay) { if (allDay) {
intent.putExtra("allDay", true); intent.putExtra("allDay", true);
} else {
if (end == null) {
end = start;
}
long endMilliseconds = calculateMilliseconds(end);
intent.putExtra("endTime", endMilliseconds);
} }
if (end == null) {
end = start;
}
long endMilliseconds = calculateMilliseconds(end);
if (allDay) {
// Possible workaround when allDay isn't used properly
endMilliseconds = lastSecondOfDay(endMilliseconds);
}
intent.putExtra("endTime", endMilliseconds);
intent.putExtra("title", summary); intent.putExtra("title", summary);
intent.putExtra("eventLocation", location); intent.putExtra("eventLocation", location);
intent.putExtra("description", description); intent.putExtra("description", description);
@ -216,6 +220,7 @@ public abstract class ResultHandler {
synchronized (DATE_FORMAT) { synchronized (DATE_FORMAT) {
date = DATE_FORMAT.parse(when, new ParsePosition(0)); date = DATE_FORMAT.parse(when, new ParsePosition(0));
} }
// Note this will be relative to GMT, not the local time zone
return date.getTime(); return date.getTime();
} else { } else {
// The when string can be local time, or UTC if it ends with a Z // The when string can be local time, or UTC if it ends with a Z