ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge change 24755 into eclair

Browse Source 
* changes:
  Allow download of contact w/ no name; don't accept empty note
This commit is contained in:
Android (Google) Code Review 2009-09-11 21:42:21 -04:00
commit 95bc6a6ad9
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/exchange/adapter/ContactsSyncAdapter.java
View File

@ -540,7 +540,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
} }
// We must have first name, last name, or company name // We must have first name, last name, or company name
String name; String name = null;
if (firstName != null || lastName != null) { if (firstName != null || lastName != null) {
if (firstName == null) { if (firstName == null) {
name = lastName; name = lastName;
@ -551,8 +551,6 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
} }
} else if (companyName != null) { } else if (companyName != null) {
name = companyName; name = companyName;
} else {
return;
} }
ops.addName(entity, prefix, firstName, lastName, middleName, suffix, name, ops.addName(entity, prefix, firstName, lastName, middleName, suffix, name,
@ -1342,6 +1340,19 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
if (cv != null && cvCompareString(cv, Note.NOTE, note)) { if (cv != null && cvCompareString(cv, Note.NOTE, note)) {
return; return;
} }
// Reject notes with nothing in them. Often, we get something from Outlook when
// nothing was ever entered. Sigh.
int len = note.length();
int i = 0;
for (; i < len; i++) {
char c = note.charAt(i);
if (!Character.isWhitespace(c)) {
break;
}
}
if (i == len) return;
builder.withValue(Note.NOTE, note); builder.withValue(Note.NOTE, note);
add(builder.build()); add(builder.build());
} }