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

Added support for encoding multiple email addresses and phone numbers using the new constants I added to the Contacts app for Android 1.1.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@750 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin 2008-11-20 19:58:33 +00:00
parent dab0c22347
commit 960a169da7
3 changed files with 39 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
android/src/com/google/zxing/client/android/Contents.java
View file

@ -16,6 +16,7 @@
package com.google.zxing.client.android; package com.google.zxing.client.android;
import android.provider.Contacts;
public final class Contents { public final class Contents {
@ -80,4 +81,24 @@ public final class Contents {
public static final String LOCATION = "LOCATION_TYPE"; public static final String LOCATION = "LOCATION_TYPE";
} }
// These are new constants in Contacts.Intents.Insert for Android 1.1.
// TODO: Remove these constants once we can build against the 1.1 SDK.
private static final String SECONDARY_PHONE = "secondary_phone";
private static final String TERTIARY_PHONE = "tertiary_phone";
private static final String SECONDARY_EMAIL = "secondary_email";
private static final String TERTIARY_EMAIL = "tertiary_email";
/**
* When using Type.CONTACT, these arrays provide the keys for adding or retrieving multiple
* phone numbers and addresses.
*/
public static final String[] PHONE_KEYS = {
Contacts.Intents.Insert.PHONE, SECONDARY_PHONE, TERTIARY_PHONE
};
public static final String[] EMAIL_KEYS = {
Contacts.Intents.Insert.EMAIL, SECONDARY_EMAIL, TERTIARY_EMAIL
};
} }

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

@ -108,16 +108,20 @@ public final class QRCodeEncoder {
mContents += "ADR:" + address + ";"; mContents += "ADR:" + address + ";";
mDisplayContents += "\n" + address; mDisplayContents += "\n" + address;
} }
String phone = bundle.getString(Contacts.Intents.Insert.PHONE); for (int x = 0; x < Contents.PHONE_KEYS.length; x++) {
String phone = bundle.getString(Contents.PHONE_KEYS[x]);
if (phone != null && phone.length() > 0) { if (phone != null && phone.length() > 0) {
mContents += "TEL:" + phone + ";"; mContents += "TEL:" + phone + ";";
mDisplayContents += "\n" + phone; mDisplayContents += "\n" + phone;
} }
String email = bundle.getString(Contacts.Intents.Insert.EMAIL); }
for (int x = 0; x < Contents.EMAIL_KEYS.length; x++) {
String email = bundle.getString(Contents.EMAIL_KEYS[x]);
if (email != null && email.length() > 0) { if (email != null && email.length() > 0) {
mContents += "EMAIL:" + email + ";"; mContents += "EMAIL:" + email + ";";
mDisplayContents += "\n" + email; mDisplayContents += "\n" + email;
} }
}
mContents += ";"; mContents += ";";
mTitle = mActivity.getString(R.string.contents_contact); mTitle = mActivity.getString(R.string.contents_contact);
} }

25
android/src/com/google/zxing/client/android/result/ResultHandler.java
View file

@ -24,6 +24,7 @@ import com.google.zxing.client.android.Intents;
import com.google.zxing.client.android.R; import com.google.zxing.client.android.R;
import com.google.zxing.client.android.SearchBookContentsActivity; import com.google.zxing.client.android.SearchBookContentsActivity;
import com.google.zxing.client.android.LocaleManager; import com.google.zxing.client.android.LocaleManager;
import com.google.zxing.client.android.Contents;
import com.google.zxing.client.result.ParsedResult; import com.google.zxing.client.result.ParsedResult;
import com.google.zxing.client.result.ParsedResultType; import com.google.zxing.client.result.ParsedResultType;
@ -38,21 +39,6 @@ public abstract class ResultHandler {
public static final int MAX_BUTTON_COUNT = 4; public static final int MAX_BUTTON_COUNT = 4;
// These are new constants in Contacts.Intents.Insert for Android 1.1.
// TODO: Remove these constants once we can build against the 1.1 SDK.
private static final String SECONDARY_PHONE = "secondary_phone";
private static final String TERTIARY_PHONE = "tertiary_phone";
private static final String SECONDARY_EMAIL = "secondary_email";
private static final String TERTIARY_EMAIL = "tertiary_email";
private static final String[] PHONE_INTENTS = {
Contacts.Intents.Insert.PHONE, SECONDARY_PHONE, TERTIARY_PHONE
};
private static final String[] EMAIL_INTENTS = {
Contacts.Intents.Insert.EMAIL, SECONDARY_EMAIL, TERTIARY_EMAIL
};
protected final ParsedResult mResult; protected final ParsedResult mResult;
private final Activity mActivity; private final Activity mActivity;
@ -157,14 +143,15 @@ public abstract class ResultHandler {
Intent intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI); Intent intent = new Intent(Contacts.Intents.Insert.ACTION, Contacts.People.CONTENT_URI);
putExtra(intent, Contacts.Intents.Insert.NAME, names); putExtra(intent, Contacts.Intents.Insert.NAME, names);
int phoneCount = Math.min((phoneNumbers != null) ? phoneNumbers.length : 0, PHONE_INTENTS.length); int phoneCount = Math.min((phoneNumbers != null) ? phoneNumbers.length : 0,
Contents.PHONE_KEYS.length);
for (int x = 0; x < phoneCount; x++) { for (int x = 0; x < phoneCount; x++) {
putExtra(intent, PHONE_INTENTS[x], phoneNumbers[x]); putExtra(intent, Contents.PHONE_KEYS[x], phoneNumbers[x]);
} }
int emailCount = Math.min((emails != null) ? emails.length : 0, EMAIL_INTENTS.length); int emailCount = Math.min((emails != null) ? emails.length : 0, Contents.EMAIL_KEYS.length);
for (int x = 0; x < emailCount; x++) { for (int x = 0; x < emailCount; x++) {
putExtra(intent, EMAIL_INTENTS[x], emails[x]); putExtra(intent, Contents.EMAIL_KEYS[x], emails[x]);
} }
putExtra(intent, Contacts.Intents.Insert.NOTES, note); putExtra(intent, Contacts.Intents.Insert.NOTES, note);