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

Merge "Strip content of the "head" tag" into honeycomb

Browse Source
This commit is contained in:
Marc Blank 2011-01-20 14:38:26 -08:00 committed by Android (Google) Code Review
commit 6c9911e3fb
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/email/Snippet.java
View File

@ -42,7 +42,9 @@ public class Snippet {
/*package*/ static final char NON_BREAKING_SPACE_CHARACTER = (char)160; /*package*/ static final char NON_BREAKING_SPACE_CHARACTER = (char)160;
// Tags whose content must be stripped as well // Tags whose content must be stripped as well
static final String[] STRIP_TAGS = new String[] {"title ", "script", "style ", "applet"}; static final String[] STRIP_TAGS =
new String[] {"title", "script", "style", "applet", "head"};
// The number of characters we peel off for testing against STRIP_TAGS
static final int STRIP_TAG_LENGTH = 6; static final int STRIP_TAG_LENGTH = 6;
static final Map<String, Character> ESCAPE_STRINGS; static final Map<String, Character> ESCAPE_STRINGS;
@ -373,8 +375,9 @@ public class Snippet {
String tagLowerCase = tag.toLowerCase(); String tagLowerCase = tag.toLowerCase();
boolean stripContent = false; boolean stripContent = false;
for (String stripTag: STRIP_TAGS) { for (String stripTag: STRIP_TAGS) {
if (stripTag.equals(tagLowerCase)) { if (tagLowerCase.startsWith(stripTag)) {
stripContent = true; stripContent = true;
tag = tag.substring(0, stripTag.length());
break; break;
} }
} }

20
tests/src/com/android/email/SnippetTests.java
View File

@ -128,6 +128,8 @@ public class SnippetTests extends AndroidTestCase {
"<html>Visible<style foo=\"bar\">Not</style>AgainVisible")); "<html>Visible<style foo=\"bar\">Not</style>AgainVisible"));
assertEquals("VisibleAgainVisible", Snippet.fromHtmlText( assertEquals("VisibleAgainVisible", Snippet.fromHtmlText(
"<html>Visible<style foo=\"bar\"/>AgainVisible")); "<html>Visible<style foo=\"bar\"/>AgainVisible"));
assertEquals("VisibleAgainVisible", Snippet.fromHtmlText(
"<html>Visible<style foo=\"bar\"/><head><//blah<style>Not</head>AgainVisible"));
} }
/** /**
@ -158,4 +160,22 @@ public class SnippetTests extends AndroidTestCase {
// Test with space at end of tag // Test with space at end of tag
findTagEnd("<tag foo=\"bar\">some more text but no end tag", "tag "); findTagEnd("<tag foo=\"bar\">some more text but no end tag", "tag ");
} }
// For debugging large HTML samples
// private String readLargeSnippet(String fn) {
// File file = mContext.getFileStreamPath(fn);
// StringBuffer sb = new StringBuffer();
// BufferedReader reader = null;
// try {
// String text;
// reader = new BufferedReader(new FileReader(file));
// while ((text = reader.readLine()) != null) {
// sb.append(text);
// sb.append(" ");
// }
// } catch (IOException e) {
// }
// return sb.toString();
// }
} }