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

Properly escape MECARD reserved chars

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1594 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-09-17 08:54:11 +00:00
parent 9e0249dfaa
commit 583a113abc
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
View file

@ -209,25 +209,25 @@ final class QRCodeEncoder {
newContents.append("MECARD:"); newContents.append("MECARD:");
String name = trim(bundle.getString(Contacts.Intents.Insert.NAME)); String name = trim(bundle.getString(Contacts.Intents.Insert.NAME));
if (name != null) { if (name != null) {
newContents.append("N:").append(name).append(';'); newContents.append("N:").append(escapeMECARD(name)).append(';');
newDisplayContents.append(name); newDisplayContents.append(name);
} }
String address = trim(bundle.getString(Contacts.Intents.Insert.POSTAL)); String address = trim(bundle.getString(Contacts.Intents.Insert.POSTAL));
if (address != null) { if (address != null) {
newContents.append("ADR:").append(address).append(';'); newContents.append("ADR:").append(escapeMECARD(address)).append(';');
newDisplayContents.append('\n').append(address); newDisplayContents.append('\n').append(address);
} }
for (int x = 0; x < Contents.PHONE_KEYS.length; x++) { for (int x = 0; x < Contents.PHONE_KEYS.length; x++) {
String phone = trim(bundle.getString(Contents.PHONE_KEYS[x])); String phone = trim(bundle.getString(Contents.PHONE_KEYS[x]));
if (phone != null) { if (phone != null) {
newContents.append("TEL:").append(phone).append(';'); newContents.append("TEL:").append(escapeMECARD(phone)).append(';');
newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone)); newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone));
} }
} }
for (int x = 0; x < Contents.EMAIL_KEYS.length; x++) { for (int x = 0; x < Contents.EMAIL_KEYS.length; x++) {
String email = trim(bundle.getString(Contents.EMAIL_KEYS[x])); String email = trim(bundle.getString(Contents.EMAIL_KEYS[x]));
if (email != null) { if (email != null) {
newContents.append("EMAIL:").append(email).append(';'); newContents.append("EMAIL:").append(escapeMECARD(email)).append(';');
newDisplayContents.append('\n').append(email); newDisplayContents.append('\n').append(email);
} }
} }
@ -265,7 +265,7 @@ final class QRCodeEncoder {
if (names != null && names.length > 0) { if (names != null && names.length > 0) {
String name = trim(names[0]); String name = trim(names[0]);
if (name != null) { if (name != null) {
newContents.append("N:").append(name).append(';'); newContents.append("N:").append(escapeMECARD(name)).append(';');
newDisplayContents.append(name); newDisplayContents.append(name);
} }
} }
@ -274,7 +274,7 @@ final class QRCodeEncoder {
for (String address : addresses) { for (String address : addresses) {
address = trim(address); address = trim(address);
if (address != null) { if (address != null) {
newContents.append("ADR:").append(address).append(';'); newContents.append("ADR:").append(escapeMECARD(address)).append(';');
newDisplayContents.append('\n').append(address); newDisplayContents.append('\n').append(address);
} }
} }
@ -284,7 +284,7 @@ final class QRCodeEncoder {
for (String phone : phoneNumbers) { for (String phone : phoneNumbers) {
phone = trim(phone); phone = trim(phone);
if (phone != null) { if (phone != null) {
newContents.append("TEL:").append(phone).append(';'); newContents.append("TEL:").append(escapeMECARD(phone)).append(';');
newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone)); newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone));
} }
} }
@ -294,14 +294,14 @@ final class QRCodeEncoder {
for (String email : emails) { for (String email : emails) {
email = trim(email); email = trim(email);
if (email != null) { if (email != null) {
newContents.append("EMAIL:").append(email).append(';'); newContents.append("EMAIL:").append(escapeMECARD(email)).append(';');
newDisplayContents.append('\n').append(email); newDisplayContents.append('\n').append(email);
} }
} }
} }
String url = trim(contact.getURL()); String url = trim(contact.getURL());
if (url != null) { if (url != null) {
newContents.append("URL:").append(url).append(';'); newContents.append("URL:").append(escapeMECARD(url)).append(';');
newDisplayContents.append('\n').append(url); newDisplayContents.append('\n').append(url);
} }
// Make sure we've encoded at least one field. // Make sure we've encoded at least one field.
@ -364,4 +364,20 @@ final class QRCodeEncoder {
return s.length() == 0 ? null : s; return s.length() == 0 ? null : s;
} }
private static String escapeMECARD(String input) {
if (input == null || (input.indexOf(':') < 0 && input.indexOf(';') < 0)) {
return input;
}
int length = input.length();
StringBuilder result = new StringBuilder(length);
for (int i = 0; i < length; i++) {
char c = input.charAt(i);
if (c == ':' || c == ';') {
result.append('\\');
}
result.append(c);
}
return result.toString();
}
} }