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

am f61dcf23: Merge change I718e813f into eclair 

Merge commit 'f61dcf234e056cc3452341f1e505e77f55cc0bce' into eclair-mr2

* commit 'f61dcf234e056cc3452341f1e505e77f55cc0bce':
  Fix for #2244624 : Keyboard freezes up sometimes
main
Amith Yamasani 2009-11-11 19:17:41 -08:00 committed by Android Git Automerger
parent 044bc302ba f61dcf234e
commit 850d68b923
1 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,8 @@ import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.database.Cursor; import android.database.Cursor;
import android.os.AsyncTask;
import android.os.SystemClock;
import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Contacts;
public class ContactsDictionary extends ExpandableDictionary { public class ContactsDictionary extends ExpandableDictionary {
@ -37,6 +39,11 @@ public class ContactsDictionary extends ExpandableDictionary {
private long mLastLoadedContacts; private long mLastLoadedContacts;
private boolean mUpdatingContacts;
// Use this lock before touching mUpdatingContacts & mRequiresDownload
private Object mUpdatingLock = new Object();
public ContactsDictionary(Context context) { public ContactsDictionary(Context context) {
super(context); super(context);
// Perform a managed query. The Activity will handle closing and requerying the cursor // Perform a managed query. The Activity will handle closing and requerying the cursor
@ -46,11 +53,15 @@ public class ContactsDictionary extends ExpandableDictionary {
cres.registerContentObserver(Contacts.CONTENT_URI, true, mObserver = new ContentObserver(null) { cres.registerContentObserver(Contacts.CONTENT_URI, true, mObserver = new ContentObserver(null) {
@Override @Override
public void onChange(boolean self) { public void onChange(boolean self) {
mRequiresReload = true; synchronized (mUpdatingLock) {
mRequiresReload = true;
}
} }
}); });
loadDictionary(); synchronized (mUpdatingLock) {
loadDictionaryAsyncLocked();
}
} }
public synchronized void close() { public synchronized void close() {
@ -60,29 +71,37 @@ public class ContactsDictionary extends ExpandableDictionary {
} }
} }
private synchronized void loadDictionary() { private synchronized void loadDictionaryAsyncLocked() {
long now = android.os.SystemClock.uptimeMillis(); long now = SystemClock.uptimeMillis();
if (mLastLoadedContacts == 0 if (mLastLoadedContacts == 0
|| now - mLastLoadedContacts > 30 * 60 * 1000 /* 30 minutes */) { || now - mLastLoadedContacts > 30 * 60 * 1000 /* 30 minutes */) {
Cursor cursor = getContext().getContentResolver() if (!mUpdatingContacts) {
.query(Contacts.CONTENT_URI, PROJECTION, null, null, null); mUpdatingContacts = true;
if (cursor != null) { mRequiresReload = false;
addWords(cursor); new LoadContactsTask().execute();
} }
mRequiresReload = false;
mLastLoadedContacts = now;
} }
} }
@Override @Override
public synchronized void getWords(final WordComposer codes, final WordCallback callback) { public synchronized void getWords(final WordComposer codes, final WordCallback callback) {
if (mRequiresReload) loadDictionary(); synchronized (mUpdatingLock) {
// If we need to update, start off a background task
if (mRequiresReload) loadDictionaryAsyncLocked();
// Currently updating contacts, don't return any results.
if (mUpdatingContacts) return;
}
super.getWords(codes, callback); super.getWords(codes, callback);
} }
@Override @Override
public synchronized boolean isValidWord(CharSequence word) { public synchronized boolean isValidWord(CharSequence word) {
if (mRequiresReload) loadDictionary(); synchronized (mUpdatingLock) {
// If we need to update, start off a background task
if (mRequiresReload) loadDictionaryAsyncLocked();
if (mUpdatingContacts) return false;
}
return super.isValidWord(word); return super.isValidWord(word);
} }
@ -115,7 +134,10 @@ public class ContactsDictionary extends ExpandableDictionary {
// 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) { // 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); super.addWord(word, 128);
} }
} }
@ -127,4 +149,27 @@ public class ContactsDictionary extends ExpandableDictionary {
} }
cursor.close(); cursor.close();
} }
private class LoadContactsTask extends AsyncTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... v) {
Cursor cursor = getContext().getContentResolver()
.query(Contacts.CONTENT_URI, PROJECTION, null, null, null);
if (cursor != null) {
addWords(cursor);
}
mLastLoadedContacts = SystemClock.uptimeMillis();
return null;
}
@Override
protected void onPostExecute(Void result) {
// TODO Auto-generated method stub
synchronized (mUpdatingLock) {
mUpdatingContacts = false;
}
super.onPostExecute(result);
}
}
} }