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

Make sure Parser always reads UTF-8 strings

Browse Source
This commit is contained in:
Marc Blank 2009-08-18 14:19:49 -07:00
parent 2cf87e6c3c
commit 87439307ea
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/exchange/adapter/Parser.java
View File

@ -26,6 +26,7 @@ import org.kxml2.wap.Wbxml;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
@ -475,8 +476,7 @@ public abstract class Parser {
* @throws IOException * @throws IOException
*/ */
private String readInlineString() throws IOException { private String readInlineString() throws IOException {
StringBuilder sb = new StringBuilder(256); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(256);
while (true) { while (true) {
int i = read(); int i = read();
if (i == 0) { if (i == 0) {
@ -484,9 +484,11 @@ public abstract class Parser {
} else if (i == EOF_BYTE) { } else if (i == EOF_BYTE) {
throw new EofException(); throw new EofException();
} }
sb.append((char)i); outputStream.write(i);
} }
String res = sb.toString(); outputStream.flush();
String res = outputStream.toString("UTF-8");
outputStream.close();
return res; return res;
} }
} }