nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add check for null contact name when setting up dictionary. 

Bug 2021966
main
Eric Fischer 2009-07-29 17:02:20 -07:00 committed by Jean-Baptiste Queru
parent 2bed1531c2
commit e5c7f0981d
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/inputmethod/latin/ContactsDictionary.java
View File

@ -90,28 +90,31 @@ public class ContactsDictionary extends ExpandableDictionary {
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
while (!cursor.isAfterLast()) { while (!cursor.isAfterLast()) {
String name = cursor.getString(INDEX_NAME); String name = cursor.getString(INDEX_NAME);
int len = name.length();
// TODO: Better tokenization for non-Latin writing systems if (name != null) {
for (int i = 0; i < len; i++) { int len = name.length();
if (Character.isLetter(name.charAt(i))) {
int j;
for (j = i + 1; j < len; j++) {
char c = name.charAt(j);
if (!(c == '-' || c == '\'' || // TODO: Better tokenization for non-Latin writing systems
Character.isLetter(c))) { for (int i = 0; i < len; i++) {
break; if (Character.isLetter(name.charAt(i))) {
int j;
for (j = i + 1; j < len; j++) {
char c = name.charAt(j);
if (!(c == '-' || c == '\'' ||
Character.isLetter(c))) {
break;
}
} }
}
String word = name.substring(i, j); String word = name.substring(i, j);
i = j - 1; i = j - 1;
// Safeguard against adding really long words. Stack // Safeguard against adding really long words. Stack
// may overflow due to recursion // may overflow due to recursion
if (word.length() < maxWordLength) { if (word.length() < maxWordLength) {
super.addWord(word, 128); super.addWord(word, 128);
}
} }
} }
} }