forked from github/cordova-android
Merge branch 'master' of git@github.com:phonegap/phonegap
This commit is contained in:
commit
ebd2b7ed4f
@ -153,7 +153,7 @@ public class ContactManager {
|
|||||||
name = cur.getString(nameColumn);
|
name = cur.getString(nameColumn);
|
||||||
phoneNumber = cur.getString(phoneColumn);
|
phoneNumber = cur.getString(phoneColumn);
|
||||||
email_id = cur.getString(emailIdColumn);
|
email_id = cur.getString(emailIdColumn);
|
||||||
if (email_id != null)
|
if (email_id != null && email_id.length() > 0)
|
||||||
email = getEmail(email_id);
|
email = getEmail(email_id);
|
||||||
else
|
else
|
||||||
email = "";
|
email = "";
|
||||||
@ -250,8 +250,7 @@ public class ContactManager {
|
|||||||
private String getEmailColumnData(Cursor cur)
|
private String getEmailColumnData(Cursor cur)
|
||||||
{
|
{
|
||||||
String email = "";
|
String email = "";
|
||||||
if (cur.moveToFirst()) {
|
if (cur != null && cur.moveToFirst()) {
|
||||||
|
|
||||||
int emailColumn = cur.getColumnIndex(ContactMethods.DATA);
|
int emailColumn = cur.getColumnIndex(ContactMethods.DATA);
|
||||||
do {
|
do {
|
||||||
// Get the field values
|
// Get the field values
|
||||||
|
Loading…
Reference in New Issue
Block a user