mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 21:47:32 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #153 from t-8ch/android_contact_fields

Browse source 
Android contact fields
This commit is contained in:
Sean Owen 2014-05-24 10:22:49 +01:00
parent 90cc0b8b13 28b5326397
commit 17c1191db0
4 changed files with 39 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/pom.xml
View file

@ -39,7 +39,7 @@
<parent>
<groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId>
<version>3.0.2-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</parent>
<build>

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

@ -30,16 +30,23 @@ import com.google.zxing.client.result.ResultParser;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ActivityNotFoundException;
import android.content.ContentValues;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.preference.PreferenceManager;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Nickname;
import android.provider.ContactsContract.CommonDataKinds.Event;
import android.provider.ContactsContract.CommonDataKinds.Website;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Intents.Insert;
import android.util.Log;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Locale;
import java.util.ArrayList;
/**
* A base class for the Android-specific barcode handlers. These allow the app to polymorphically
@ -224,29 +231,49 @@ public abstract class ResultHandler {
}
}
// No field for URL, birthday; use notes
StringBuilder aggregatedNotes = new StringBuilder();
ArrayList<ContentValues> data = new ArrayList<ContentValues>();
if (urls != null) {
for (String url : urls) {
if (url != null && !url.isEmpty()) {
aggregatedNotes.append('\n').append(url);
ContentValues row = new ContentValues();
row.put(Data.MIMETYPE, Website.CONTENT_ITEM_TYPE);
row.put(Website.TYPE, Website.TYPE_HOMEPAGE);
row.put(Website.URL, url);
data.add(row);
break;
}
}
}
for (String aNote : new String[] { birthday, note }) {
if (aNote != null) {
aggregatedNotes.append('\n').append(aNote);
}
if (birthday != null) {
ContentValues row = new ContentValues();
row.put(Data.MIMETYPE, Event.CONTENT_ITEM_TYPE);
row.put(Event.TYPE, Event.TYPE_BIRTHDAY);
row.put(Event.START_DATE, birthday);
data.add(row);
}
if (nicknames != null) {
for (String nickname : nicknames) {
if (nickname != null && !nickname.isEmpty()) {
aggregatedNotes.append('\n').append(nickname);
ContentValues row = new ContentValues();
row.put(Data.MIMETYPE, Nickname.CONTENT_ITEM_TYPE);
row.put(Nickname.TYPE, Nickname.TYPE_DEFAULT);
row.put(Nickname.NAME, nickname);
data.add(row);
break;
}
}
}
intent.putParcelableArrayListExtra(Insert.DATA, data);
StringBuilder aggregatedNotes = new StringBuilder();
if (note != null) {
aggregatedNotes.append('\n').append(note);
}
if (geo != null) {
aggregatedNotes.append('\n').append(geo[0]).append(',').append(geo[1]);
aggregatedNotes.append(geo[0]).append(',').append(geo[1]);
}
if (aggregatedNotes.length() > 0) {

2
androidtest/pom.xml
View file

@ -43,7 +43,7 @@
<parent>
<groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId>
<version>3.0.2-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</parent>
<build>

2
glass/pom.xml
View file

@ -39,7 +39,7 @@
<parent>
<groupId>com.google.zxing</groupId>
<artifactId>zxing-parent</artifactId>
<version>3.0.2-SNAPSHOT</version>
<version>3.1.1-SNAPSHOT</version>
</parent>
<build>