mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor updates to nickname / birthday result changes

Browse source
This commit is contained in:
Sean Owen 2014-05-25 14:06:13 +01:00
parent ef01dbd788
commit 4e80efd7b1
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,11 +36,6 @@ 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;
@ -231,14 +226,13 @@ public abstract class ResultHandler {
}
}
ArrayList<ContentValues> data = new ArrayList<ContentValues>();
ArrayList<ContentValues> data = new ArrayList<>();
if (urls != null) {
for (String url : urls) {
if (url != null && !url.isEmpty()) {
ContentValues row = new ContentValues();
row.put(Data.MIMETYPE, Website.CONTENT_ITEM_TYPE);
row.put(Website.TYPE, Website.TYPE_HOMEPAGE);
row.put(Website.URL, url);
ContentValues row = new ContentValues(2);
row.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE);
row.put(ContactsContract.CommonDataKinds.Website.URL, url);
data.add(row);
break;
}
@ -246,34 +240,37 @@ public abstract class ResultHandler {
}
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);
ContentValues row = new ContentValues(3);
row.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE);
row.put(ContactsContract.CommonDataKinds.Event.TYPE, ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY);
row.put(ContactsContract.CommonDataKinds.Event.START_DATE, birthday);
data.add(row);
}
if (nicknames != null) {
for (String nickname : nicknames) {
if (nickname != null && !nickname.isEmpty()) {
ContentValues row = new ContentValues();
row.put(Data.MIMETYPE, Nickname.CONTENT_ITEM_TYPE);
row.put(Nickname.TYPE, Nickname.TYPE_DEFAULT);
row.put(Nickname.NAME, nickname);
ContentValues row = new ContentValues(3);
row.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Nickname.CONTENT_ITEM_TYPE);
row.put(ContactsContract.CommonDataKinds.Nickname.TYPE,
ContactsContract.CommonDataKinds.Nickname.TYPE_DEFAULT);
row.put(ContactsContract.CommonDataKinds.Nickname.NAME, nickname);
data.add(row);
break;
}
}
}
intent.putParcelableArrayListExtra(Insert.DATA, data);
if (!data.isEmpty()) {
intent.putParcelableArrayListExtra(ContactsContract.Intents.Insert.DATA, data);
}
StringBuilder aggregatedNotes = new StringBuilder();
if (note != null) {
aggregatedNotes.append('\n').append(note);
}
if (geo != null) {
aggregatedNotes.append(geo[0]).append(',').append(geo[1]);
aggregatedNotes.append('\n').append(geo[0]).append(',').append(geo[1]);
}
if (aggregatedNotes.length() > 0) {