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

Merge "Close body input streams" into ub-mail-master

This commit is contained in:
Tony Mantler 2014-07-08 17:17:16 +00:00 committed by Android (Google) Code Review
parent 1d8fd9c054 a3d4117117
commit 6c15188a9e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/email/provider/EmailMessageCursor.java
View File

@ -70,7 +70,12 @@ public class EmailMessageCursor extends CursorWrapper {
if (mHtmlColumnIndex != -1) {
final Uri htmlUri = Body.getBodyHtmlUriForMessageWithId(messageId);
final InputStream in = cr.openInputStream(htmlUri);
final String underlyingHtmlString = IOUtils.toString(in);
final String underlyingHtmlString;
try {
underlyingHtmlString = IOUtils.toString(in);
} finally {
in.close();
}
final String sanitizedHtml = HtmlSanitizer.sanitizeHtml(underlyingHtmlString);
mHtmlParts.put(position, sanitizedHtml);
}
@ -81,7 +86,12 @@ public class EmailMessageCursor extends CursorWrapper {
if (mTextColumnIndex != -1) {
final Uri textUri = Body.getBodyTextUriForMessageWithId(messageId);
final InputStream in = cr.openInputStream(textUri);
final String underlyingTextString = IOUtils.toString(in);
final String underlyingTextString;
try {
underlyingTextString = IOUtils.toString(in);
} finally {
in.close();
}
mTextParts.put(position, underlyingTextString);
}
} catch (final IOException e) {