X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fresult%2FVCardResultParser.java;fp=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fresult%2FVCardResultParser.java;h=4d53971396d504300320fa82b78a127930016319;hb=74f7636343496fbb62ddcea0ac8c9d344898d7d4;hp=4e32ba8310d58b107e12354b504fa750e87e5b76;hpb=3ca83472f1bf4b175be23ec75af8635c9963d3e7;p=zxing.git

diff --git a/core/src/com/google/zxing/client/result/VCardResultParser.java b/core/src/com/google/zxing/client/result/VCardResultParser.java
index 4e32ba83..4d539713 100644
--- a/core/src/com/google/zxing/client/result/VCardResultParser.java
+++ b/core/src/com/google/zxing/client/result/VCardResultParser.java
@@ -18,6 +18,8 @@ package com.google.zxing.client.result;
 
 import com.google.zxing.Result;
 
+import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.Vector;
 
 /**
@@ -93,6 +95,7 @@ final class VCardResultParser extends ResultParser {
       }
 
       boolean quotedPrintable = false;
+      String quotedPrintableCharset = null;
       if (i > metadataStart) {
         // There was something after the tag, before colon
         int j = metadataStart+1;
@@ -107,6 +110,8 @@ final class VCardResultParser extends ResultParser {
                 if (value.equalsIgnoreCase("QUOTED-PRINTABLE")) {
                   quotedPrintable = true;
                 }
+              } else if (key.equalsIgnoreCase("CHARSET")) {
+                quotedPrintableCharset = value;
               }
             }
             metadataStart = j;
@@ -149,7 +154,7 @@ final class VCardResultParser extends ResultParser {
           element = element.trim();
         }
         if (quotedPrintable) {
-          element = decodeQuotedPrintable(element);
+          element = decodeQuotedPrintable(element, quotedPrintableCharset);
         } else {
           element = stripContinuationCRLF(element);
         }
@@ -191,9 +196,10 @@ final class VCardResultParser extends ResultParser {
     return result.toString();
   }
 
-  private static String decodeQuotedPrintable(String value) {
+  private static String decodeQuotedPrintable(String value, String charset) {
     int length = value.length();
     StringBuffer result = new StringBuffer(length);
+    ByteArrayOutputStream fragmentBuffer = new ByteArrayOutputStream();
     for (int i = 0; i < length; i++) {
       char c = value.charAt(i);
       switch (c) {
@@ -208,8 +214,8 @@ final class VCardResultParser extends ResultParser {
             } else {
               char nextNextChar = value.charAt(i+2);
               try {
-                int encodedChar = 16 * toHexValue(nextChar) + toHexValue(nextNextChar);
-                result.append((char) encodedChar);
+                int encodedByte = 16 * toHexValue(nextChar) + toHexValue(nextNextChar);
+                fragmentBuffer.write(encodedByte);
               } catch (IllegalArgumentException iae) {
                 // continue, assume it was incorrectly encoded
               }
@@ -218,9 +224,11 @@ final class VCardResultParser extends ResultParser {
           }
           break;
         default:
+          maybeAppendFragment(fragmentBuffer, charset, result);
           result.append(c);
       }
     }
+    maybeAppendFragment(fragmentBuffer, charset, result);
     return result.toString();
   }
 
@@ -235,6 +243,27 @@ final class VCardResultParser extends ResultParser {
     throw new IllegalArgumentException();
   }
 
+  private static void maybeAppendFragment(ByteArrayOutputStream fragmentBuffer,
+                                          String charset,
+                                          StringBuffer result) {
+    if (fragmentBuffer.size() > 0) {
+      byte[] fragmentBytes = fragmentBuffer.toByteArray();
+      String fragment;
+      if (charset == null) {
+        fragment = new String(fragmentBytes);
+      } else {
+        try {
+          fragment = new String(fragmentBytes, charset);
+        } catch (UnsupportedEncodingException e) {
+          // Yikes, well try anyway:
+          fragment = new String(fragmentBytes);
+        }
+      }
+      fragmentBuffer.reset();
+      result.append(fragment);
+    }
+  }
+
   static String matchSingleVCardPrefixedField(String prefix, String rawText, boolean trim) {
     String[] values = matchVCardPrefixedField(prefix, rawText, trim);
     return values == null ? null : values[0];