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

Merge "Use DatabaseUtils method instead of query()" into jb-ub-mail-ur10

This commit is contained in:
Paul Westbrook 2013-08-09 19:19:43 +00:00 committed by Android (Google) Code Review
parent 44e1603155 a674551464
commit 3b758913be
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/email/provider/EmailProvider.java
View File

@ -37,6 +37,7 @@ import android.database.MatrixCursor;
import android.database.MergeCursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.database.DatabaseUtils;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Binder;
@ -415,17 +416,13 @@ public class EmailProvider extends ContentProvider {
}
// If we have accounts, we're done
Cursor c = mainDatabase.query(Account.TABLE_NAME, EmailContent.ID_PROJECTION, null, null,
null, null, null);
try {
if (c.moveToFirst()) {
if (MailActivityEmail.DEBUG) {
LogUtils.w(TAG, "restoreIfNeeded: Account exists.");
}
return; // At least one account exists.
}
} finally {
c.close();
if (DatabaseUtils.longForQuery(mainDatabase,
"SELECT EXISTS (SELECT ? FROM " + Account.TABLE_NAME + " )",
EmailContent.ID_PROJECTION) > 0) {
if (MailActivityEmail.DEBUG) {
LogUtils.w(TAG, "restoreIfNeeded: Account exists.");
}
return;
}
restoreAccounts(context, mainDatabase);