1 files changed, 70 insertions, 45 deletions

diff --git a/java/src/com/android/inputmethod/latin/ContactsDictionary.java b/java/src/com/android/inputmethod/latin/ContactsDictionary.java
index 15edb706a..95a3b5c7d 100644
--- a/java/src/com/android/inputmethod/latin/ContactsDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ContactsDictionary.java
@@ -20,9 +20,10 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.os.AsyncTask;
 import android.os.SystemClock;
 import android.provider.ContactsContract.Contacts;
+import android.text.TextUtils;
+import android.util.Log;
 
 public class ContactsDictionary extends ExpandableDictionary {
 
@@ -31,27 +32,37 @@ public class ContactsDictionary extends ExpandableDictionary {
         Contacts.DISPLAY_NAME,
     };
 
+    private static final String TAG = "ContactsDictionary";
+
+    /**
+     * Frequency for contacts information into the dictionary
+     */
+    private static final int FREQUENCY_FOR_CONTACTS = 128;
+    private static final int FREQUENCY_FOR_CONTACTS_BIGRAM = 90;
+
     private static final int INDEX_NAME = 1;
 
     private ContentObserver mObserver;
 
     private long mLastLoadedContacts;
 
-    public ContactsDictionary(Context context) {
-        super(context);
+    public ContactsDictionary(Context context, int dicTypeId) {
+        super(context, dicTypeId);
         // Perform a managed query. The Activity will handle closing and requerying the cursor
         // when needed.
         ContentResolver cres = context.getContentResolver();
 
-        cres.registerContentObserver(Contacts.CONTENT_URI, true, mObserver = new ContentObserver(null) {
-            @Override
-            public void onChange(boolean self) {
-                setRequiresReload(true);
-            }
-        });
+        cres.registerContentObserver(
+                Contacts.CONTENT_URI, true,mObserver = new ContentObserver(null) {
+                    @Override
+                    public void onChange(boolean self) {
+                        setRequiresReload(true);
+                    }
+                });
         loadDictionary();
     }
 
+    @Override
     public synchronized void close() {
         if (mObserver != null) {
             getContext().getContentResolver().unregisterContentObserver(mObserver);
@@ -71,10 +82,14 @@ public class ContactsDictionary extends ExpandableDictionary {
 
     @Override
     public void loadDictionaryAsync() {
-        Cursor cursor = getContext().getContentResolver()
-                .query(Contacts.CONTENT_URI, PROJECTION, null, null, null);
-        if (cursor != null) {
-            addWords(cursor);
+        try {
+            Cursor cursor = getContext().getContentResolver()
+                    .query(Contacts.CONTENT_URI, PROJECTION, null, null, null);
+            if (cursor != null) {
+                addWords(cursor);
+            }
+        } catch(IllegalStateException e) {
+            Log.e(TAG, "Contacts DB is having problems");
         }
         mLastLoadedContacts = SystemClock.uptimeMillis();
     }
@@ -83,45 +98,55 @@ public class ContactsDictionary extends ExpandableDictionary {
         clearDictionary();
 
         final int maxWordLength = getMaxWordLength();
-        if (cursor.moveToFirst()) {
-            while (!cursor.isAfterLast()) {
-                String name = cursor.getString(INDEX_NAME);
-
-                if (name != null) {
-                    int len = name.length();
-
-                    // TODO: Better tokenization for non-Latin writing systems
-                    for (int i = 0; i < len; i++) {
-                        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;
+        try {
+            if (cursor.moveToFirst()) {
+                while (!cursor.isAfterLast()) {
+                    String name = cursor.getString(INDEX_NAME);
+
+                    if (name != null) {
+                        int len = name.length();
+                        String prevWord = null;
+
+                        // TODO: Better tokenization for non-Latin writing systems
+                        for (int i = 0; i < len; i++) {
+                            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);
-                            i = j - 1;
 
-                            // Safeguard against adding really long words. Stack
-                            // may overflow due to recursion
-                            // Also don't add single letter words, possibly confuses
-                            // capitalization of i.
-                            final int wordLen = word.length();
-                            if (wordLen < maxWordLength && wordLen > 1) {
-                                super.addWord(word, 128);
+                                String word = name.substring(i, j);
+                                i = j - 1;
+
+                                // Safeguard against adding really long words. Stack
+                                // may overflow due to recursion
+                                // Also don't add single letter words, possibly confuses
+                                // capitalization of i.
+                                final int wordLen = word.length();
+                                if (wordLen < maxWordLength && wordLen > 1) {
+                                    super.addWord(word, FREQUENCY_FOR_CONTACTS);
+                                    if (!TextUtils.isEmpty(prevWord)) {
+                                        // TODO Do not add email address
+                                        // Not so critical
+                                        super.setBigram(prevWord, word,
+                                                FREQUENCY_FOR_CONTACTS_BIGRAM);
+                                    }
+                                    prevWord = word;
+                                }
                             }
                         }
                     }
+                    cursor.moveToNext();
                 }
-
-                cursor.moveToNext();
             }
+            cursor.close();
+        } catch(IllegalStateException e) {
+            Log.e(TAG, "Contacts DB is having problems");
         }
-        cursor.close();
     }
-
 }