mirror of
https://github.com/zxing/zxing.git
synced 2024-09-20 05:27:32 -07:00
Issue #751 fix misparsing of vCard phone vs type in case of blank value or type
This commit is contained in:
Sean Owen
parent
d36a35dba5
commit
06ccbf72ae
|
|
@ -83,6 +83,15 @@ public final class AddressBookParsedResult extends ParsedResult {
|
|||
String[] urls,
|
||||
String[] geo) {
|
||||
super(ParsedResultType.ADDRESSBOOK);
|
||||
if (phoneNumbers != null && phoneTypes != null && phoneNumbers.length != phoneTypes.length) {
|
||||
throw new IllegalArgumentException("Phone numbers and types lengths differ");
|
||||
}
|
||||
if (emails != null && emailTypes != null && emails.length != emailTypes.length) {
|
||||
throw new IllegalArgumentException("Emails and types lengths differ");
|
||||
}
|
||||
if (addresses != null && addressTypes != null && addresses.length != addressTypes.length) {
|
||||
throw new IllegalArgumentException("Addresses and types lengths differ");
|
||||
}
|
||||
this.names = names;
|
||||
this.nicknames = nicknames;
|
||||
this.pronunciation = pronunciation;
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ public final class VCardResultParser extends ResultParser {
|
|||
result.add(value);
|
||||
}
|
||||
}
|
||||
return result.toArray(new String[lists.size()]);
|
||||
return result.toArray(new String[result.size()]);
|
||||
}
|
||||
|
||||
private static String[] toTypes(Collection<List<String>> lists) {
|
||||
|
|
@ -291,23 +291,26 @@ public final class VCardResultParser extends ResultParser {
|
|||
}
|
||||
List<String> result = new ArrayList<>(lists.size());
|
||||
for (List<String> list : lists) {
|
||||
String type = null;
|
||||
for (int i = 1; i < list.size(); i++) {
|
||||
String metadatum = list.get(i);
|
||||
int equals = metadatum.indexOf('=');
|
||||
if (equals < 0) {
|
||||
// take the whole thing as a usable label
|
||||
type = metadatum;
|
||||
break;
|
||||
}
|
||||
if ("TYPE".equalsIgnoreCase(metadatum.substring(0, equals))) {
|
||||
type = metadatum.substring(equals + 1);
|
||||
break;
|
||||
String value = list.get(0);
|
||||
if (value != null && !value.isEmpty()) {
|
||||
String type = null;
|
||||
for (int i = 1; i < list.size(); i++) {
|
||||
String metadatum = list.get(i);
|
||||
int equals = metadatum.indexOf('=');
|
||||
if (equals < 0) {
|
||||
// take the whole thing as a usable label
|
||||
type = metadatum;
|
||||
break;
|
||||
}
|
||||
if ("TYPE".equalsIgnoreCase(metadatum.substring(0, equals))) {
|
||||
type = metadatum.substring(equals + 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
result.add(type);
|
||||
}
|
||||
result.add(type);
|
||||
}
|
||||
return result.toArray(new String[lists.size()]);
|
||||
return result.toArray(new String[result.size()]);
|
||||
}
|
||||
|
||||
private static boolean isLikeVCardDate(CharSequence value) {
|
||||
|
|
|
|||
|
|
@ -30,59 +30,59 @@ public final class AddressBookParsedResultTestCase extends Assert {
|
|||
|
||||
@Test
|
||||
public void testAddressBookDocomo() {
|
||||
doTest("MECARD:N:Sean Owen;;", null, new String[] {"Sean Owen"}, null, null, null, null, null, null, null, null);
|
||||
doTest("MECARD:N:Sean Owen;;", null, new String[] {"Sean Owen"}, null, null, null, null, null, null, null, null, null);
|
||||
doTest("MECARD:NOTE:ZXing Team;N:Sean Owen;URL:google.com;EMAIL:srowen@example.org;;",
|
||||
null, new String[] {"Sean Owen"}, null, null, new String[] {"srowen@example.org"}, null, null,
|
||||
null, new String[] {"Sean Owen"}, null, null, new String[] {"srowen@example.org"}, null, null, null,
|
||||
new String[] {"google.com"}, null, "ZXing Team");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddressBookAU() {
|
||||
doTest("MEMORY:foo\r\nNAME1:Sean\r\nTEL1:+12125551212\r\n",
|
||||
null, new String[] {"Sean"}, null, null, null, new String[] {"+12125551212"}, null, null, null, "foo");
|
||||
null, new String[] {"Sean"}, null, null, null, new String[] {"+12125551212"}, null, null, null, null, "foo");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVCard() {
|
||||
doTest("BEGIN:VCARD\r\nADR;HOME:123 Main St\r\nVERSION:2.1\r\nN:Owen;Sean\r\nEND:VCARD",
|
||||
null, new String[] {"Sean Owen"}, null, new String[] {"123 Main St"}, null, null, null, null, null, null);
|
||||
null, new String[] {"Sean Owen"}, null, new String[] {"123 Main St"}, null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVCardFullN() {
|
||||
doTest("BEGIN:VCARD\r\nVERSION:2.1\r\nN:Owen;Sean;T;Mr.;Esq.\r\nEND:VCARD",
|
||||
null, new String[] {"Mr. Sean T Owen Esq."}, null, null, null, null, null, null, null, null);
|
||||
null, new String[] {"Mr. Sean T Owen Esq."}, null, null, null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVCardFullN2() {
|
||||
doTest("BEGIN:VCARD\r\nVERSION:2.1\r\nN:Owen;Sean;;;\r\nEND:VCARD",
|
||||
null, new String[] {"Sean Owen"}, null, null, null, null, null, null, null, null);
|
||||
null, new String[] {"Sean Owen"}, null, null, null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVCardFullN3() {
|
||||
doTest("BEGIN:VCARD\r\nVERSION:2.1\r\nN:;Sean;;;\r\nEND:VCARD",
|
||||
null, new String[] {"Sean"}, null, null, null, null, null, null, null, null);
|
||||
null, new String[] {"Sean"}, null, null, null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVCardCaseInsensitive() {
|
||||
doTest("begin:vcard\r\nadr;HOME:123 Main St\r\nVersion:2.1\r\nn:Owen;Sean\r\nEND:VCARD",
|
||||
null, new String[] {"Sean Owen"}, null, new String[] {"123 Main St"}, null, null, null, null, null, null);
|
||||
null, new String[] {"Sean Owen"}, null, new String[] {"123 Main St"}, null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testEscapedVCard() {
|
||||
doTest("BEGIN:VCARD\r\nADR;HOME:123\\;\\\\ Main\\, St\\nHome\r\nVERSION:2.1\r\nN:Owen;Sean\r\nEND:VCARD",
|
||||
null, new String[] {"Sean Owen"}, null, new String[] {"123;\\ Main, St\nHome"}, null, null, null, null, null, null);
|
||||
null, new String[] {"Sean Owen"}, null, new String[] {"123;\\ Main, St\nHome"}, null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBizcard() {
|
||||
doTest("BIZCARD:N:Sean;X:Owen;C:Google;A:123 Main St;M:+12125551212;E:srowen@example.org;",
|
||||
null, new String[] {"Sean Owen"}, null, new String[] {"123 Main St"}, new String[] {"srowen@example.org"},
|
||||
new String[] {"+12125551212"}, "Google", null, null, null);
|
||||
new String[] {"+12125551212"}, null, "Google", null, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -91,7 +91,7 @@ public final class AddressBookParsedResultTestCase extends Assert {
|
|||
"ADR:City, 10001;NOTE:This is the memo.;;",
|
||||
null, new String[] {"Foo Bar"}, null, new String[] {"City, 10001", "City, 10001"},
|
||||
new String[] {"foo.bar@xyz.com"},
|
||||
new String[] {"5555555555" }, "Company", null, null, "This is the memo.");
|
||||
new String[] {"5555555555" }, null, "Company", null, null, "This is the memo.");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -101,19 +101,26 @@ public final class AddressBookParsedResultTestCase extends Assert {
|
|||
"=4F=20=36=39=39=\r\n" +
|
||||
"=39=39;;;\r\nEND:VCARD",
|
||||
null, null, null, new String[] {"88 Lynbrook\r\nCO 69999"},
|
||||
null, null, null, null, null, null);
|
||||
null, null, null, null, null, null, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVCardEscape() {
|
||||
doTest("BEGIN:VCARD\r\nNOTE:foo\\nbar\r\nEND:VCARD",
|
||||
null, null, null, null, null, null, null, null, null, "foo\nbar");
|
||||
null, null, null, null, null, null, null, null, null, null, "foo\nbar");
|
||||
doTest("BEGIN:VCARD\r\nNOTE:foo\\;bar\r\nEND:VCARD",
|
||||
null, null, null, null, null, null, null, null, null, "foo;bar");
|
||||
null, null, null, null, null, null, null, null, null, null, "foo;bar");
|
||||
doTest("BEGIN:VCARD\r\nNOTE:foo\\\\bar\r\nEND:VCARD",
|
||||
null, null, null, null, null, null, null, null, null, "foo\\bar");
|
||||
null, null, null, null, null, null, null, null, null, null, "foo\\bar");
|
||||
doTest("BEGIN:VCARD\r\nNOTE:foo\\,bar\r\nEND:VCARD",
|
||||
null, null, null, null, null, null, null, null, null, "foo,bar");
|
||||
null, null, null, null, null, null, null, null, null, null, "foo,bar");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVCardTypes() {
|
||||
doTest("BEGIN:VCARD\r\nTEL;HOME:\r\nTEL;WORK:10\r\nTEL:20\r\nTEL;CELL:30\r\nEND:VCARD",
|
||||
null, null, null, null, null, new String[] { "10", "20", "30" },
|
||||
new String[] { "WORK", null, "CELL" }, null, null, null, null);
|
||||
}
|
||||
|
||||
private static void doTest(String contents,
|
||||
|
|
@ -123,6 +130,7 @@ public final class AddressBookParsedResultTestCase extends Assert {
|
|||
String[] addresses,
|
||||
String[] emails,
|
||||
String[] phoneNumbers,
|
||||
String[] phoneTypes,
|
||||
String org,
|
||||
String[] urls,
|
||||
String birthday,
|
||||
|
|
@ -137,6 +145,7 @@ public final class AddressBookParsedResultTestCase extends Assert {
|
|||
assertArrayEquals(addresses, addressResult.getAddresses());
|
||||
assertArrayEquals(emails, addressResult.getEmails());
|
||||
assertArrayEquals(phoneNumbers, addressResult.getPhoneNumbers());
|
||||
assertArrayEquals(phoneTypes, addressResult.getPhoneTypes());
|
||||
assertEquals(org, addressResult.getOrg());
|
||||
assertArrayEquals(urls, addressResult.getURLs());
|
||||
assertEquals(birthday, addressResult.getBirthday());
|
||||
|
|
|
|||
Loading…
Reference in a new issue