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

Merge change 21777 into eclair

Browse Source 
* changes:
  Make sure Parser always reads UTF-8 strings
This commit is contained in:
Android (Google) Code Review 2009-08-19 12:02:01 -07:00
commit fc92a6c9d8
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.util.Log;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
@ -475,8 +476,7 @@ public abstract class Parser {
* @throws IOException
*/
private String readInlineString() throws IOException {
StringBuilder sb = new StringBuilder(256);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(256);
while (true) {
int i = read();
if (i == 0) {
@ -484,9 +484,11 @@ public abstract class Parser {
} else if (i == EOF_BYTE) {
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;
}
}