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

Possible help for devices that aren't understanding all-day events properly

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1680 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-12-14 10:59:20 +00:00
parent 8c172f4891
commit c7d055bb92
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@
package com.google.zxing.client.android.result; package com.google.zxing.client.android.result;
import android.util.Log;
import com.google.zxing.Result; import com.google.zxing.Result;
import com.google.zxing.client.android.Contents; import com.google.zxing.client.android.Contents;
import com.google.zxing.client.android.Intents; import com.google.zxing.client.android.Intents;
@ -59,6 +60,9 @@ import java.util.GregorianCalendar;
* @author dswitkin@google.com (Daniel Switkin) * @author dswitkin@google.com (Daniel Switkin)
*/ */
public abstract class ResultHandler { public abstract class ResultHandler {
private static final String TAG = ResultHandler.class.getSimpleName();
private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd"); private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
private static final DateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyyMMdd'T'HHmmss"); private static final DateFormat DATE_TIME_FORMAT = new SimpleDateFormat("yyyyMMdd'T'HHmmss");
@ -186,13 +190,19 @@ public abstract class ResultHandler {
Intent intent = new Intent(Intent.ACTION_EDIT); Intent intent = new Intent(Intent.ACTION_EDIT);
intent.setType("vnd.android.cursor.item/event"); intent.setType("vnd.android.cursor.item/event");
intent.putExtra("beginTime", calculateMilliseconds(start)); intent.putExtra("beginTime", calculateMilliseconds(start));
if (start.length() == 8) { boolean allDay = start.length() == 8;
if (allDay) {
intent.putExtra("allDay", true); intent.putExtra("allDay", true);
} }
if (end == null) { if (end == null) {
end = start; end = start;
} }
intent.putExtra("endTime", calculateMilliseconds(end)); 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);
@ -223,6 +233,15 @@ public abstract class ResultHandler {
} }
} }
private static long lastSecondOfDay(long time) {
Calendar timeInDay = Calendar.getInstance();
timeInDay.setTimeInMillis(time);
timeInDay.set(Calendar.HOUR_OF_DAY, timeInDay.getActualMaximum(Calendar.HOUR_OF_DAY));
timeInDay.set(Calendar.MINUTE, timeInDay.getActualMaximum(Calendar.MINUTE));
timeInDay.set(Calendar.SECOND, timeInDay.getActualMaximum(Calendar.SECOND));
return timeInDay.getTimeInMillis();
}
final void addContact(String[] names, String[] phoneNumbers, String[] emails, String note, final void addContact(String[] names, String[] phoneNumbers, String[] emails, String note,
String address, String org, String title) { String address, String org, String title) {
@ -395,6 +414,7 @@ public abstract class ResultHandler {
void launchIntent(Intent intent) { void launchIntent(Intent intent) {
if (intent != null) { if (intent != null) {
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
Log.d(TAG, "Launching intent: " + intent + " with extras: " + intent.getExtras());
try { try {
activity.startActivity(intent); activity.startActivity(intent);
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {