mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 21:47:32 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improvement from issue 309

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1180 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-01-07 09:18:12 +00:00
parent 46a7febc7f
commit 1ea2e9f399
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java
View file

@ -37,7 +37,13 @@ import java.util.Date;
* @author dswitkin@google.com (Daniel Switkin)
*/
public final class AddressBookResultHandler extends ResultHandler {
private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
private static final DateFormat[] DATE_FORMATS = {
new SimpleDateFormat("yyyyMMdd"),
new SimpleDateFormat("yyyyMMdd'T'HHmmss"),
new SimpleDateFormat("yyyy-MM-dd"),
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"),
};
private final boolean[] fields;
private int buttonCount;
@ -134,6 +140,19 @@ public final class AddressBookResultHandler extends ResultHandler {
}
}
private static Date parseDate(String s) {
for (DateFormat currentFomat : DATE_FORMATS) {
synchronized (currentFomat) {
currentFomat.setLenient(false);
Date result = currentFomat.parse(s, new ParsePosition(0));
if (result != null) {
return result;
}
}
}
return null;
}
// Overriden so we can hyphenate phone numbers, format birthdays, and bold the name.
@Override
public CharSequence getDisplayContents() {
@ -163,11 +182,10 @@ public final class AddressBookResultHandler extends ResultHandler {
String birthday = result.getBirthday();
if (birthday != null && birthday.length() > 0) {
Date date;
synchronized (DATE_FORMAT) {
date = DATE_FORMAT.parse(birthday, new ParsePosition(0));
Date date = parseDate(birthday);
if (date != null) {
ParsedResult.maybeAppend(DateFormat.getDateInstance().format(date.getTime()), contents);
}
ParsedResult.maybeAppend(DateFormat.getDateInstance().format(date.getTime()), contents);
}
ParsedResult.maybeAppend(result.getNote(), contents);