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

am 6a942dbe: Merge change Ifd754059 into eclair-mr2

Browse Source 
Merge commit '6a942dbe51b52ce41903e236d5db294274bb0dd2' into eclair-mr2-plus-aosp

* commit '6a942dbe51b52ce41903e236d5db294274bb0dd2':
  Make vCard code refrain from using NEIGHBORHOOD field when importing.
This commit is contained in:
Daisuke Miyakawa
2009-11-18 18:26:24 -08:00
committed by Android Git Automerger
parent efe676074b 6a942dbe51
commit e922751eb6
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);

3
tests/AndroidTests/src/com/android/unit_tests/vcard/VCardImporterTests.java
View File

@@ -18,7 +18,6 @@ package com.android.unit_tests.vcard;
import android.content.ContentValues;
import android.pim.vcard.VCardConfig;
import android.pim.vcard.VCardParser;
import android.pim.vcard.VCardParser_V21;
import android.pim.vcard.exception.VCardException;
import android.provider.ContactsContract.Data;
@@ -869,7 +868,7 @@ public class VCardImporterTests extends VCardTestsBase {
elem.addExpected(StructuredPostal.CONTENT_ITEM_TYPE)
.put(StructuredPostal.POSTCODE, "150-8512")
.put(StructuredPostal.NEIGHBORHOOD,
.put(StructuredPostal.STREET,
"\u6771\u4EAC\u90FD\u6E0B\u8C37\u533A\u685C" +
"\u4E18\u753A\u0032\u0036\u002D\u0031\u30BB" +
"\u30EB\u30EA\u30A2\u30F3\u30BF\u30EF\u30FC" +

18
tests/AndroidTests/src/com/android/unit_tests/vcard/VCardJapanizationTests.java
View File

@@ -211,7 +211,7 @@ public class VCardJapanizationTests extends VCardTestsBase {
entry.buildData(StructuredPostal.CONTENT_ITEM_TYPE)
.put(StructuredPostal.POBOX, "\u79C1\u66F8\u7BB107")
.put(StructuredPostal.NEIGHBORHOOD,
"\u30A2\u30D1\u30FC\u30C8\u0020\u0033\u0034\u53F7\u5BA4")
"\u30A2\u30D1\u30FC\u30C8\u0020\u0033\u0034\u53F7\u5BA4")
.put(StructuredPostal.STREET, "\u96DB\u898B\u6CA2\u6751")
.put(StructuredPostal.CITY, "\u9E7F\u9AA8\u5E02")
.put(StructuredPostal.REGION, "\u00D7\u00D7\u770C")
@@ -237,6 +237,22 @@ public class VCardJapanizationTests extends VCardTestsBase {
"\u96DB\u898B\u6CA2\u6751", "\u9E7F\u9AA8\u5E02", "\u00D7\u00D7\u770C",
"494-1313", "\u65E5\u672C"),
contentValues);
// NEIGHBORHOOD is "not" used. Instead, "Extended address" is appended into the
// other field with a space.
verifier.addImportVerifier().addExpected(StructuredPostal.CONTENT_ITEM_TYPE)
.put(StructuredPostal.POBOX, "\u79C1\u66F8\u7BB107")
.put(StructuredPostal.STREET, "\u96DB\u898B\u6CA2\u6751 "
+ "\u30A2\u30D1\u30FC\u30C8\u0020\u0033\u0034\u53F7\u5BA4")
.put(StructuredPostal.CITY, "\u9E7F\u9AA8\u5E02")
.put(StructuredPostal.REGION, "\u00D7\u00D7\u770C")
.put(StructuredPostal.POSTCODE, "494-1313")
.put(StructuredPostal.COUNTRY, "\u65E5\u672C")
.put(StructuredPostal.FORMATTED_ADDRESS,
"\u65E5\u672C 494-1313 \u00D7\u00D7\u770C \u9E7F\u9AA8\u5E02 " +
"\u96DB\u898B\u6CA2\u6751 "
+ "\u30A2\u30D1\u30FC\u30C8\u0020\u0033\u0034\u53F7\u5BA4 " +
"\u79C1\u66F8\u7BB107")
.put(StructuredPostal.TYPE, StructuredPostal.TYPE_HOME);
verifier.verify();
}