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

am fc7dfddf: Merge change 25130 into eclair

Browse Source 
Merge commit 'fc7dfddf192f4875cbfcf6cd49829ccdfee1d3af' into eclair-plus-aosp

* commit 'fc7dfddf192f4875cbfcf6cd49829ccdfee1d3af':
  Support StructuredName.DISPLAY_NAME for Exchange contacts
This commit is contained in:
Marc Blank 2009-09-15 20:17:17 -07:00 committed by Android Git Automerger
commit a3a60bc1b4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,6 +311,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
public void addData(String serverId, ContactOperations ops, Entity entity) public void addData(String serverId, ContactOperations ops, Entity entity)
throws IOException { throws IOException {
String fileAs = null;
String prefix = null; String prefix = null;
String firstName = null; String firstName = null;
String lastName = null; String lastName = null;
@ -345,6 +346,9 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
case Tags.CONTACTS_MIDDLE_NAME: case Tags.CONTACTS_MIDDLE_NAME:
middleName = getValue(); middleName = getValue();
break; break;
case Tags.CONTACTS_FILE_AS:
fileAs = getValue();
break;
case Tags.CONTACTS_SUFFIX: case Tags.CONTACTS_SUFFIX:
suffix = getValue(); suffix = getValue();
break; break;
@ -504,9 +508,6 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
case Tags.CONTACTS_BIRTHDAY: case Tags.CONTACTS_BIRTHDAY:
personal.birthday = getValue(); personal.birthday = getValue();
break; break;
case Tags.CONTACTS_FILE_AS:
personal.fileAs = getValue();
break;
case Tags.CONTACTS_WEBPAGE: case Tags.CONTACTS_WEBPAGE:
ops.addWebpage(entity, getValue()); ops.addWebpage(entity, getValue());
break; break;
@ -552,7 +553,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
} }
ops.addName(entity, prefix, firstName, lastName, middleName, suffix, name, ops.addName(entity, prefix, firstName, lastName, middleName, suffix, name,
yomiFirstName, yomiLastName); yomiFirstName, yomiLastName, fileAs);
ops.addBusiness(entity, business); ops.addBusiness(entity, business);
ops.addPersonal(entity, personal); ops.addPersonal(entity, personal);
@ -1114,7 +1115,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
public void addName(Entity entity, String prefix, String givenName, String familyName, public void addName(Entity entity, String prefix, String givenName, String familyName,
String middleName, String suffix, String displayName, String yomiFirstName, String middleName, String suffix, String displayName, String yomiFirstName,
String yomiLastName) { String yomiLastName, String fileAs) {
RowBuilder builder = untypedRowBuilder(entity, StructuredName.CONTENT_ITEM_TYPE); RowBuilder builder = untypedRowBuilder(entity, StructuredName.CONTENT_ITEM_TYPE);
ContentValues cv = builder.cv; ContentValues cv = builder.cv;
if (cv != null && cvCompareString(cv, StructuredName.GIVEN_NAME, givenName) && if (cv != null && cvCompareString(cv, StructuredName.GIVEN_NAME, givenName) &&
@ -1123,6 +1124,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
cvCompareString(cv, StructuredName.PREFIX, prefix) && cvCompareString(cv, StructuredName.PREFIX, prefix) &&
cvCompareString(cv, StructuredName.PHONETIC_GIVEN_NAME, yomiFirstName) && cvCompareString(cv, StructuredName.PHONETIC_GIVEN_NAME, yomiFirstName) &&
cvCompareString(cv, StructuredName.PHONETIC_FAMILY_NAME, yomiLastName) && cvCompareString(cv, StructuredName.PHONETIC_FAMILY_NAME, yomiLastName) &&
cvCompareString(cv, StructuredName.DISPLAY_NAME, fileAs) &&
cvCompareString(cv, StructuredName.SUFFIX, suffix)) { cvCompareString(cv, StructuredName.SUFFIX, suffix)) {
return; return;
} }
@ -1133,6 +1135,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
builder.withValue(StructuredName.PHONETIC_GIVEN_NAME, yomiFirstName); builder.withValue(StructuredName.PHONETIC_GIVEN_NAME, yomiFirstName);
builder.withValue(StructuredName.PHONETIC_FAMILY_NAME, yomiLastName); builder.withValue(StructuredName.PHONETIC_FAMILY_NAME, yomiLastName);
builder.withValue(StructuredName.PREFIX, prefix); builder.withValue(StructuredName.PREFIX, prefix);
builder.withValue(StructuredName.DISPLAY_NAME, fileAs);
add(builder.build()); add(builder.build());
} }
@ -1500,6 +1503,9 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
if (cv.containsKey(StructuredName.PREFIX)) { if (cv.containsKey(StructuredName.PREFIX)) {
s.data(Tags.CONTACTS_TITLE, cv.getAsString(StructuredName.PREFIX)); s.data(Tags.CONTACTS_TITLE, cv.getAsString(StructuredName.PREFIX));
} }
if (cv.containsKey(StructuredName.DISPLAY_NAME)) {
s.data(Tags.CONTACTS_FILE_AS, cv.getAsString(StructuredName.DISPLAY_NAME));
}
} }
private void sendBusiness(Serializer s, ContentValues cv) throws IOException { private void sendBusiness(Serializer s, ContentValues cv) throws IOException {