diff options
author | Chiao Cheng <chiaocheng@google.com> | 2012-11-14 17:30:04 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-14 17:30:04 -0800 |
commit | 5f55ee296e26d5278fd0d91657edddc92766459e (patch) | |
tree | 833a5ed251b19dcabd4a8ecae289d31944f3d970 | |
parent | b8ffa88e46b84390a0758e1b0d63204a1cd89395 (diff) | |
parent | 7a2ac0405decebde94bb4e3a139d62162e6e15a0 (diff) | |
download | vcard-kitkat-dev.tar.gz |
am 7a2ac040: Store encoding in upper case.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-dev
* commit '7a2ac0405decebde94bb4e3a139d62162e6e15a0':
Store encoding in upper case.
-rw-r--r-- | java/com/android/vcard/VCardParserImpl_V21.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/java/com/android/vcard/VCardParserImpl_V21.java b/java/com/android/vcard/VCardParserImpl_V21.java index 401335f..34dc6a3 100644 --- a/java/com/android/vcard/VCardParserImpl_V21.java +++ b/java/com/android/vcard/VCardParserImpl_V21.java @@ -508,7 +508,7 @@ import java.util.Set; pencodingval.startsWith("X-")) { propertyData.addParameter(VCardConstants.PARAM_ENCODING, pencodingval); // Update encoding right away, as this is needed to understanding other params. - mCurrentEncoding = pencodingval; + mCurrentEncoding = pencodingval.toUpperCase(); } else { throw new VCardException("Unknown encoding \"" + pencodingval + "\""); } @@ -588,8 +588,7 @@ import java.util.Set; return; } - final String upperEncoding = mCurrentEncoding.toUpperCase(); - if (upperEncoding.equals(VCardConstants.PARAM_ENCODING_QP) || + if (mCurrentEncoding.equals(VCardConstants.PARAM_ENCODING_QP) || // If encoding attribute is missing, then attempt to detect QP encoding. // This is to handle a bug where the android exporter was creating FN properties // with missing encoding. b/7292017 @@ -606,8 +605,8 @@ import java.util.Set; for (VCardInterpreter interpreter : mInterpreterList) { interpreter.onPropertyCreated(property); } - } else if (upperEncoding.equals(VCardConstants.PARAM_ENCODING_BASE64) - || upperEncoding.equals(VCardConstants.PARAM_ENCODING_B)) { + } else if (mCurrentEncoding.equals(VCardConstants.PARAM_ENCODING_BASE64) + || mCurrentEncoding.equals(VCardConstants.PARAM_ENCODING_B)) { // It is very rare, but some BASE64 data may be so big that // OutOfMemoryError occurs. To ignore such cases, use try-catch. try { @@ -627,8 +626,8 @@ import java.util.Set; } } } else { - if (!(upperEncoding.equals("7BIT") || upperEncoding.equals("8BIT") || - upperEncoding.startsWith("X-"))) { + if (!(mCurrentEncoding.equals("7BIT") || mCurrentEncoding.equals("8BIT") || + mCurrentEncoding.startsWith("X-"))) { Log.w(LOG_TAG, String.format("The encoding \"%s\" is unsupported by vCard %s", mCurrentEncoding, getVersionString())); @@ -702,7 +701,7 @@ import java.util.Set; // vCard 2.1 does not allow QUOTED-PRINTABLE here, but some softwares/devices emit // such data. - if (mCurrentEncoding.equalsIgnoreCase(VCardConstants.PARAM_ENCODING_QP)) { + if (mCurrentEncoding.equals(VCardConstants.PARAM_ENCODING_QP)) { // First we retrieve Quoted-Printable String from vCard entry, which may include // multiple lines. final String quotedPrintablePart = getQuotedPrintablePart(propertyRawValue); |