mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-01-12 19:57:27 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes #235 : Don't remove + in MECARD TEL: field

Browse source
This commit is contained in:
Sean Owen 2014-10-05 14:34:58 +01:00
parent ba90a1c617
commit a2c11d45e6
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zxing.appspot.com/src/main/java/com/google/zxing/web/generator/client/ContactInfoGenerator.java
View file

@ -92,7 +92,7 @@ public final class ContactInfoGenerator implements GeneratorSource {
output.append("MECARD:"); output.append("MECARD:");
maybeAppendMECARD(output, "N", name.replace(",", "")); maybeAppendMECARD(output, "N", name.replace(",", ""));
maybeAppendMECARD(output, "ORG", company); maybeAppendMECARD(output, "ORG", company);
maybeAppendMECARD(output, "TEL", keepOnlyDigits(tel)); maybeAppendMECARD(output, "TEL", tel == null ? null : tel.replaceAll("[^0-9+]+", ""));
maybeAppendMECARD(output, "URL", url); maybeAppendMECARD(output, "URL", url);
maybeAppendMECARD(output, "EMAIL", email); maybeAppendMECARD(output, "EMAIL", email);
maybeAppendMECARD(output, "ADR", buildAddress(address, address2)); maybeAppendMECARD(output, "ADR", buildAddress(address, address2));
@ -110,11 +110,7 @@ public final class ContactInfoGenerator implements GeneratorSource {
output.append(';'); output.append(';');
return output.toString(); return output.toString();
} }
private static String keepOnlyDigits(String s) {
return s == null ? null : s.replaceAll("[^0-9]+", "");
}
private static String buildAddress(String address, String address2) { private static String buildAddress(String address, String address2) {
if (!address.isEmpty()) { if (!address.isEmpty()) {
if (!address2.isEmpty()) { if (!address2.isEmpty()) {