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

Issue 924 avoid encoding duplicate fields

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1868 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2011-07-27 12:09:02 +00:00
parent 0fe6737a76
commit 71953aee21
1 changed files with 53 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,6 +40,9 @@ import android.util.Log;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Hashtable; import java.util.Hashtable;
/** /**
@ -230,35 +233,51 @@ final class QRCodeEncoder {
title = activity.getString(R.string.contents_sms); title = activity.getString(R.string.contents_sms);
} }
} else if (type.equals(Contents.Type.CONTACT)) { } else if (type.equals(Contents.Type.CONTACT)) {
Bundle bundle = intent.getBundleExtra(Intents.Encode.DATA); Bundle bundle = intent.getBundleExtra(Intents.Encode.DATA);
if (bundle != null) { if (bundle != null) {
StringBuilder newContents = new StringBuilder(100); StringBuilder newContents = new StringBuilder(100);
StringBuilder newDisplayContents = new StringBuilder(100); StringBuilder newDisplayContents = new StringBuilder(100);
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(escapeMECARD(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(escapeMECARD(address)).append(';'); newContents.append("ADR:").append(escapeMECARD(address)).append(';');
newDisplayContents.append('\n').append(address); newDisplayContents.append('\n').append(address);
} }
Collection<String> uniquePhones = new HashSet<String>(Contents.PHONE_KEYS.length);
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(escapeMECARD(phone)).append(';'); uniquePhones.add(phone);
newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone));
} }
} }
for (String phone : uniquePhones) {
newContents.append("TEL:").append(escapeMECARD(phone)).append(';');
newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone));
}
Collection<String> uniqueEmails = new HashSet<String>(Contents.EMAIL_KEYS.length);
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(escapeMECARD(email)).append(';'); uniqueEmails.add(email);
newDisplayContents.append('\n').append(email);
} }
} }
for (String email : uniqueEmails) {
newContents.append("EMAIL:").append(escapeMECARD(email)).append(';');
newDisplayContents.append('\n').append(email);
}
// Make sure we've encoded at least one field. // Make sure we've encoded at least one field.
if (newDisplayContents.length() > 0) { if (newDisplayContents.length() > 0) {
newContents.append(';'); newContents.append(';');
@ -269,7 +288,9 @@ final class QRCodeEncoder {
contents = null; contents = null;
displayContents = null; displayContents = null;
} }
} }
} else if (type.equals(Contents.Type.LOCATION)) { } else if (type.equals(Contents.Type.LOCATION)) {
Bundle bundle = intent.getBundleExtra(Intents.Encode.DATA); Bundle bundle = intent.getBundleExtra(Intents.Encode.DATA);
if (bundle != null) { if (bundle != null) {
@ -286,9 +307,12 @@ final class QRCodeEncoder {
} }
private boolean encodeQRCodeContents(AddressBookParsedResult contact) { private boolean encodeQRCodeContents(AddressBookParsedResult contact) {
StringBuilder newContents = new StringBuilder(100); StringBuilder newContents = new StringBuilder(100);
StringBuilder newDisplayContents = new StringBuilder(100); StringBuilder newDisplayContents = new StringBuilder(100);
newContents.append("MECARD:"); newContents.append("MECARD:");
String[] names = contact.getNames(); String[] names = contact.getNames();
if (names != null && names.length > 0) { if (names != null && names.length > 0) {
String name = trim(names[0]); String name = trim(names[0]);
@ -297,41 +321,28 @@ final class QRCodeEncoder {
newDisplayContents.append(name); newDisplayContents.append(name);
} }
} }
String[] addresses = contact.getAddresses();
if (addresses != null) { for (String address : trimAndDeduplicate(contact.getAddresses())) {
for (String address : addresses) { newContents.append("ADR:").append(escapeMECARD(address)).append(';');
address = trim(address); newDisplayContents.append('\n').append(address);
if (address != null) {
newContents.append("ADR:").append(escapeMECARD(address)).append(';');
newDisplayContents.append('\n').append(address);
}
}
} }
String[] phoneNumbers = contact.getPhoneNumbers();
if (phoneNumbers != null) { for (String phone : trimAndDeduplicate(contact.getPhoneNumbers())) {
for (String phone : phoneNumbers) { newContents.append("TEL:").append(escapeMECARD(phone)).append(';');
phone = trim(phone); newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone));
if (phone != null) {
newContents.append("TEL:").append(escapeMECARD(phone)).append(';');
newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone));
}
}
} }
String[] emails = contact.getEmails();
if (emails != null) { for (String email : trimAndDeduplicate(contact.getEmails())) {
for (String email : emails) { newContents.append("EMAIL:").append(escapeMECARD(email)).append(';');
email = trim(email); newDisplayContents.append('\n').append(email);
if (email != null) {
newContents.append("EMAIL:").append(escapeMECARD(email)).append(';');
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(escapeMECARD(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.
if (newDisplayContents.length() > 0) { if (newDisplayContents.length() > 0) {
newContents.append(';'); newContents.append(';');
@ -346,6 +357,17 @@ final class QRCodeEncoder {
} }
} }
private static Iterable<String> trimAndDeduplicate(String[] values) {
if (values == null || values.length == 0) {
return Collections.emptySet();
}
Collection<String> uniqueValues = new HashSet<String>(values.length);
for (String value : values) {
uniqueValues.add(trim(value));
}
return uniqueValues;
}
Bitmap encodeAsBitmap() throws WriterException { Bitmap encodeAsBitmap() throws WriterException {
Hashtable<EncodeHintType,Object> hints = null; Hashtable<EncodeHintType,Object> hints = null;
String encoding = guessAppropriateEncoding(contents); String encoding = guessAppropriateEncoding(contents);