Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"

Browse Source 
* commit '9b1b64399502af0a08beac3014f2294644753602':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
This commit is contained in:
Brad Fitzpatrick
2011-04-04 15:25:33 -07:00
committed by Android Git Automerger
parent 8f7aad147d 9b1b643995
commit e511fb33d3
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/text/util/Rfc822Tokenizer.java
View File

@@ -256,7 +256,7 @@ public class Rfc822Tokenizer implements MultiAutoCompleteTextView.Tokenizer {
if (c == '"') { if (c == '"') {
i++; i++;
break; break;
} else if (c == '\\') { } else if (c == '\\' && i + 1 < len) {
i += 2; i += 2;
} else { } else {
i++; i++;
@@ -275,7 +275,7 @@ public class Rfc822Tokenizer implements MultiAutoCompleteTextView.Tokenizer {
} else if (c == '(') { } else if (c == '(') {
level++; level++;
i++; i++;
} else if (c == '\\') { } else if (c == '\\' && i + 1 < len) {
i += 2; i += 2;
} else { } else {
i++; i++;

17
core/tests/coretests/src/android/text/TextUtilsTest.java
View File

@@ -255,6 +255,23 @@ public class TextUtilsTest extends TestCase {
assertEquals("Foo Bar", tokens[0].getAddress()); assertEquals("Foo Bar", tokens[0].getAddress());
} }
@SmallTest
public void testRfc822FindToken() {
Rfc822Tokenizer tokenizer = new Rfc822Tokenizer();
// 0 1 2 3 4
// 0 1234 56789012345678901234 5678 90123456789012345
String address = "\"Foo\" <foo@google.com>, \"Bar\" <bar@google.com>";
assertEquals(0, tokenizer.findTokenStart(address, 21));
assertEquals(22, tokenizer.findTokenEnd(address, 21));
assertEquals(24, tokenizer.findTokenStart(address, 25));
assertEquals(46, tokenizer.findTokenEnd(address, 25));
}
@SmallTest
public void testRfc822FindTokenWithError() {
assertEquals(9, new Rfc822Tokenizer().findTokenEnd("\"Foo Bar\\", 0));
}
@LargeTest @LargeTest
public void testEllipsize() { public void testEllipsize() {
CharSequence s1 = "The quick brown fox jumps over \u00FEhe lazy dog."; CharSequence s1 = "The quick brown fox jumps over \u00FEhe lazy dog.";