Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e922751e: am 6a942dbe: Merge change Ifd754059 into eclair-mr2

Browse Source 
Merge commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808'

* commit 'e922751eb6d5e19a4c85dc92d57fddb7ccff7808':
  Make vCard code refrain from using NEIGHBORHOOD field when importing.
This commit is contained in:
Daisuke Miyakawa
2009-11-18 18:30:40 -08:00
committed by Android Git Automerger
parent 5a1b8da7df e922751eb6
commit b0a12a151f
4 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/pim/vcard/VCardComposer.java
View File

@@ -58,10 +58,8 @@ import java.nio.charset.UnsupportedCharsetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* <p>

17
core/java/android/pim/vcard/VCardUtils.java
View File

@@ -256,9 +256,22 @@ public class VCardUtils {
builder.withValue(StructuredPostal.LABEL, postalData.label);
}
final String streetString;
if (TextUtils.isEmpty(postalData.street)) {
if (TextUtils.isEmpty(postalData.extendedAddress)) {
streetString = null;
} else {
streetString = postalData.extendedAddress;
}
} else {
if (TextUtils.isEmpty(postalData.extendedAddress)) {
streetString = postalData.street;
} else {
streetString = postalData.street + " " + postalData.extendedAddress;
}
}
builder.withValue(StructuredPostal.POBOX, postalData.pobox);
builder.withValue(StructuredPostal.NEIGHBORHOOD, postalData.extendedAddress);
builder.withValue(StructuredPostal.STREET, postalData.street);
builder.withValue(StructuredPostal.STREET, streetString);
builder.withValue(StructuredPostal.CITY, postalData.localty);
builder.withValue(StructuredPostal.REGION, postalData.region);
builder.withValue(StructuredPostal.POSTCODE, postalData.postalCode);