diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2009-09-29 10:54:56 -0700 |
|---|---|---|
| committer | Dmitri Plotnikov <dplotnikov@google.com> | 2009-09-29 10:55:05 -0700 |
| commit | b38ed2c5ffeb20efc677b4a9229db4a00603aa8d (patch) | |
| tree | 32ef6c351808d61d8e3b74b23accbc5093577599 | |
| parent | bae94ada3546ed32182f50303a733752d5ef7178 (diff) | |
| download | ContactsProvider-b38ed2c5ffeb20efc677b4a9229db4a00603aa8d.tar.gz | |
Renaming OpenHelper to ContactsDatabaseHelper
Change-Id: Iccdf1ebcd8a3ab430941c957f712bb9e7dd2706c
17 files changed, 277 insertions, 272 deletions
diff --git a/src/com/android/providers/contacts/CallLogProvider.java b/src/com/android/providers/contacts/CallLogProvider.java index 240eb414..ec4bf445 100644 --- a/src/com/android/providers/contacts/CallLogProvider.java +++ b/src/com/android/providers/contacts/CallLogProvider.java @@ -16,7 +16,7 @@ package com.android.providers.contacts; -import com.android.providers.contacts.OpenHelper.Tables; +import com.android.providers.contacts.ContactsDatabaseHelper.Tables; import android.content.ContentProvider; import android.content.ContentUris; @@ -67,7 +67,7 @@ public class CallLogProvider extends ContentProvider { sCallsProjectionMap.put(Calls.CACHED_NUMBER_LABEL, Calls.CACHED_NUMBER_LABEL); } - private OpenHelper mOpenHelper; + private ContactsDatabaseHelper mDbHelper; private DatabaseUtils.InsertHelper mCallsInserter; private boolean mUseStrictPhoneNumberComparation; @@ -75,8 +75,8 @@ public class CallLogProvider extends ContentProvider { public boolean onCreate() { final Context context = getContext(); - mOpenHelper = getOpenHelper(context); - SQLiteDatabase db = mOpenHelper.getWritableDatabase(); + mDbHelper = getDatabaseHelper(context); + SQLiteDatabase db = mDbHelper.getWritableDatabase(); mCallsInserter = new DatabaseUtils.InsertHelper(db, Tables.CALLS); mUseStrictPhoneNumberComparation = @@ -87,8 +87,8 @@ public class CallLogProvider extends ContentProvider { } /* Visible for testing */ - protected OpenHelper getOpenHelper(final Context context) { - return OpenHelper.getInstance(context); + protected ContactsDatabaseHelper getDatabaseHelper(final Context context) { + return ContactsDatabaseHelper.getInstance(context); } @Override @@ -125,7 +125,7 @@ public class CallLogProvider extends ContentProvider { throw new IllegalArgumentException("Unknown URL " + uri); } - final SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + final SQLiteDatabase db = mDbHelper.getReadableDatabase(); Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, sortOrder, null); if (c != null) { c.setNotificationUri(getContext().getContentResolver(), CallLog.CONTENT_URI); @@ -160,7 +160,7 @@ public class CallLogProvider extends ContentProvider { @Override public int update(Uri url, ContentValues values, String selection, String[] selectionArgs) { - final SQLiteDatabase db = mOpenHelper.getWritableDatabase(); + final SQLiteDatabase db = mDbHelper.getWritableDatabase(); String where; final int matchedUriId = sURIMatcher.match(url); switch (matchedUriId) { @@ -184,7 +184,7 @@ public class CallLogProvider extends ContentProvider { @Override public int delete(Uri uri, String selection, String[] selectionArgs) { - final SQLiteDatabase db = mOpenHelper.getWritableDatabase(); + final SQLiteDatabase db = mDbHelper.getWritableDatabase(); final int matchedUriId = sURIMatcher.match(uri); switch (matchedUriId) { diff --git a/src/com/android/providers/contacts/ContactAggregator.java b/src/com/android/providers/contacts/ContactAggregator.java index 2fa8d116..7e18fd9a 100644 --- a/src/com/android/providers/contacts/ContactAggregator.java +++ b/src/com/android/providers/contacts/ContactAggregator.java @@ -17,16 +17,16 @@ package com.android.providers.contacts; import com.android.providers.contacts.ContactMatcher.MatchScore; -import com.android.providers.contacts.OpenHelper.AggregatedPresenceColumns; -import com.android.providers.contacts.OpenHelper.ContactsColumns; -import com.android.providers.contacts.OpenHelper.DataColumns; -import com.android.providers.contacts.OpenHelper.DisplayNameSources; -import com.android.providers.contacts.OpenHelper.MimetypesColumns; -import com.android.providers.contacts.OpenHelper.NameLookupColumns; -import com.android.providers.contacts.OpenHelper.NameLookupType; -import com.android.providers.contacts.OpenHelper.PresenceColumns; -import com.android.providers.contacts.OpenHelper.RawContactsColumns; -import com.android.providers.contacts.OpenHelper.Tables; +import com.android.providers.contacts.ContactsDatabaseHelper.AggregatedPresenceColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.ContactsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.DataColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.DisplayNameSources; +import com.android.providers.contacts.ContactsDatabaseHelper.MimetypesColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.NameLookupColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.NameLookupType; +import com.android.providers.contacts.ContactsDatabaseHelper.PresenceColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.RawContactsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.Tables; import android.content.ContentValues; import android.database.Cursor; @@ -166,7 +166,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator private static final int FIRST_LETTER_SUGGESTION_HIT_LIMIT = 100; private final ContactsProvider2 mContactsProvider; - private final OpenHelper mOpenHelper; + private final ContactsDatabaseHelper mDbHelper; private final ContactAggregationScheduler mScheduler; private boolean mEnabled = true; @@ -259,12 +259,12 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator * aggregation thread. Call {@link #schedule} to kick off the aggregation process after * a delay of {@link ContactAggregationScheduler#AGGREGATION_DELAY} milliseconds. */ - public ContactAggregator(ContactsProvider2 contactsProvider, OpenHelper openHelper, - ContactAggregationScheduler scheduler) { + public ContactAggregator(ContactsProvider2 contactsProvider, + ContactsDatabaseHelper contactsDatabaseHelper, ContactAggregationScheduler scheduler) { mContactsProvider = contactsProvider; - mOpenHelper = openHelper; + mDbHelper = contactsDatabaseHelper; - SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + SQLiteDatabase db = mDbHelper.getReadableDatabase(); // Since we have no way of determining which custom status was set last, // we'll just pick one randomly. We are using MAX as an approximation of randomness @@ -417,7 +417,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator mCancel = false; - SQLiteDatabase db = mOpenHelper.getWritableDatabase(); + SQLiteDatabase db = mDbHelper.getWritableDatabase(); MatchCandidateList candidates = new MatchCandidateList(); ContactMatcher matcher = new ContactMatcher(); ContentValues values = new ContentValues(); @@ -601,7 +601,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator RawContactsColumns.CONCRETE_ID + "=" + rawContactId, contactValues); long contactId = db.insert(Tables.CONTACTS, Contacts.DISPLAY_NAME, contactValues); setContactId(rawContactId, contactId); - mOpenHelper.updateContactVisible(contactId); + mDbHelper.updateContactVisible(contactId); } /** @@ -624,12 +624,12 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator return; } - final SQLiteDatabase db = mOpenHelper.getWritableDatabase(); + final SQLiteDatabase db = mDbHelper.getWritableDatabase(); final ContentValues values = new ContentValues(); computeAggregateData(db, contactId, values); db.update(Tables.CONTACTS, values, Contacts._ID + "=" + contactId, null); - mOpenHelper.updateContactVisible(contactId); + mDbHelper.updateContactVisible(contactId); updateAggregatedPresence(contactId); } @@ -681,7 +681,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator RawContactsColumns.CONCRETE_ID + "=" + rawContactId, contactValues); contactId = db.insert(Tables.CONTACTS, Contacts.DISPLAY_NAME, contactValues); setContactIdAndMarkAggregated(rawContactId, contactId); - mOpenHelper.updateContactVisible(contactId); + mDbHelper.updateContactVisible(contactId); setPresenceContactId(rawContactId, contactId); @@ -704,7 +704,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator setContactIdAndMarkAggregated(rawContactId, contactId); computeAggregateData(db, contactId, values); db.update(Tables.CONTACTS, values, Contacts._ID + "=" + contactId, null); - mOpenHelper.updateContactVisible(contactId); + mDbHelper.updateContactVisible(contactId); updateAggregatedPresence(contactId); } } @@ -1066,7 +1066,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator private void lookupPhoneMatches(SQLiteDatabase db, String phoneNumber, ContactMatcher matcher) { SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); - mOpenHelper.buildPhoneLookupAndRawContactQuery(qb, phoneNumber); + mDbHelper.buildPhoneLookupAndRawContactQuery(qb, phoneNumber); Cursor c = qb.query(db, CONTACT_ID_COLUMNS, RawContactsColumns.AGGREGATION_NEEDED + "=0", null, null, null, null, String.valueOf(SECONDARY_HIT_LIMIT)); try { @@ -1083,7 +1083,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator * Finds exact email matches and updates their match scores. */ private void lookupEmailMatches(SQLiteDatabase db, String address, ContactMatcher matcher) { - long mimetypeId = mOpenHelper.getMimeTypeId(Email.CONTENT_ITEM_TYPE); + long mimetypeId = mDbHelper.getMimeTypeId(Email.CONTENT_ITEM_TYPE); Cursor c = db.query(EmailLookupQuery.TABLE, EmailLookupQuery.COLUMNS, DataColumns.MIMETYPE_ID + "=" + mimetypeId + " AND " + Email.DATA + "=?" @@ -1181,8 +1181,8 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator int hasPhoneNumber = 0; StringBuilder lookupKey = new StringBuilder(); - long photoMimeType = mOpenHelper.getMimeTypeId(Photo.CONTENT_ITEM_TYPE); - long phoneMimeType = mOpenHelper.getMimeTypeId(Phone.CONTENT_ITEM_TYPE); + long photoMimeType = mDbHelper.getMimeTypeId(Photo.CONTENT_ITEM_TYPE); + long phoneMimeType = mDbHelper.getMimeTypeId(Phone.CONTENT_ITEM_TYPE); String isPhotoSql = "(" + DataColumns.MIMETYPE_ID + "=" + photoMimeType + " AND " + Photo.PHOTO + " NOT NULL)"; @@ -1328,7 +1328,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator public void updatePhotoId(SQLiteDatabase db, long rawContactId) { - long contactId = mOpenHelper.getContactId(rawContactId); + long contactId = mDbHelper.getContactId(rawContactId); if (contactId == 0) { return; } @@ -1336,7 +1336,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator long bestPhotoId = -1; String photoAccount = null; - long photoMimeType = mOpenHelper.getMimeTypeId(Photo.CONTENT_ITEM_TYPE); + long photoMimeType = mDbHelper.getMimeTypeId(Photo.CONTENT_ITEM_TYPE); String tables = Tables.RAW_CONTACTS + " JOIN " + Tables.DATA + " ON(" + DataColumns.CONCRETE_RAW_CONTACT_ID + "=" + RawContactsColumns.CONCRETE_ID @@ -1386,7 +1386,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator public void updateDisplayName(SQLiteDatabase db, long rawContactId) { - long contactId = mOpenHelper.getContactId(rawContactId); + long contactId = mDbHelper.getContactId(rawContactId); if (contactId == 0) { return; } @@ -1435,12 +1435,12 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator */ public void updateHasPhoneNumber(SQLiteDatabase db, long rawContactId) { - long contactId = mOpenHelper.getContactId(rawContactId); + long contactId = mDbHelper.getContactId(rawContactId); if (contactId == 0) { return; } - mHasPhoneNumberUpdate.bindLong(1, mOpenHelper.getMimeTypeId(Phone.CONTENT_ITEM_TYPE)); + mHasPhoneNumberUpdate.bindLong(1, mDbHelper.getMimeTypeId(Phone.CONTENT_ITEM_TYPE)); mHasPhoneNumberUpdate.bindLong(2, contactId); mHasPhoneNumberUpdate.bindLong(3, contactId); mHasPhoneNumberUpdate.execute(); @@ -1461,7 +1461,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator } public void updateLookupKey(SQLiteDatabase db, long rawContactId) { - long contactId = mOpenHelper.getContactId(rawContactId); + long contactId = mDbHelper.getContactId(rawContactId); if (contactId == 0) { return; } @@ -1504,7 +1504,7 @@ public class ContactAggregator implements ContactAggregationScheduler.Aggregator */ public Cursor queryAggregationSuggestions(SQLiteQueryBuilder qb, String[] projection, long contactId, int maxSuggestions, String filter) { - final SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + final SQLiteDatabase db = mDbHelper.getReadableDatabase(); List<MatchScore> bestMatches = findMatchingContacts(db, contactId); return queryMatchingContacts(qb, db, contactId, projection, bestMatches, maxSuggestions, diff --git a/src/com/android/providers/contacts/ContactMatcher.java b/src/com/android/providers/contacts/ContactMatcher.java index 4ad36d9c..c314d5ea 100644 --- a/src/com/android/providers/contacts/ContactMatcher.java +++ b/src/com/android/providers/contacts/ContactMatcher.java @@ -15,7 +15,7 @@ */ package com.android.providers.contacts; -import com.android.providers.contacts.OpenHelper.NameLookupType; +import com.android.providers.contacts.ContactsDatabaseHelper.NameLookupType; import java.util.ArrayList; import java.util.Collections; diff --git a/src/com/android/providers/contacts/OpenHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index 755484c7..d84fe0ea 100644 --- a/src/com/android/providers/contacts/OpenHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -37,7 +37,6 @@ import android.os.Bundle; import android.provider.BaseColumns; import android.provider.ContactsContract; import android.provider.CallLog.Calls; -import android.provider.Contacts.People; import android.provider.ContactsContract.AggregationExceptions; import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Data; @@ -54,13 +53,12 @@ import android.util.Log; import java.util.HashMap; /** - * Database open helper for contacts and social activity data. Designed as a - * singleton to make sure that all {@link android.content.ContentProvider} users get the same - * reference. Provides handy methods for maintaining package and mime-type - * lookup tables. + * Database helper for contacts. Designed as a singleton to make sure that all + * {@link android.content.ContentProvider} users get the same reference. + * Provides handy methods for maintaining package and mime-type lookup tables. */ -/* package */ class OpenHelper extends SQLiteOpenHelper { - private static final String TAG = "OpenHelper"; +/* package */ class ContactsDatabaseHelper extends SQLiteOpenHelper { + private static final String TAG = "ContactsDatabaseHelper"; private static final int DATABASE_VERSION = 98; @@ -472,13 +470,13 @@ import java.util.HashMap; private boolean mReopenDatabase = false; - private static OpenHelper sSingleton = null; + private static ContactsDatabaseHelper sSingleton = null; private boolean mUseStrictPhoneNumberComparation; - public static synchronized OpenHelper getInstance(Context context) { + public static synchronized ContactsDatabaseHelper getInstance(Context context) { if (sSingleton == null) { - sSingleton = new OpenHelper(context); + sSingleton = new ContactsDatabaseHelper(context); } return sSingleton; } @@ -487,7 +485,7 @@ import java.util.HashMap; * Private constructor, callers except unit tests should obtain an instance through * {@link #getInstance(android.content.Context)} instead. */ - /* package */ OpenHelper(Context context) { + ContactsDatabaseHelper(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); Log.i(TAG, "Creating OpenHelper"); diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index 953fa9d6..8a26565d 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -18,24 +18,24 @@ package com.android.providers.contacts; import com.android.internal.content.SyncStateContentProviderHelper; import com.android.providers.contacts.ContactLookupKey.LookupKeySegment; -import com.android.providers.contacts.OpenHelper.AggregatedPresenceColumns; -import com.android.providers.contacts.OpenHelper.AggregationExceptionColumns; -import com.android.providers.contacts.OpenHelper.Clauses; -import com.android.providers.contacts.OpenHelper.ContactsColumns; -import com.android.providers.contacts.OpenHelper.DataColumns; -import com.android.providers.contacts.OpenHelper.DisplayNameSources; -import com.android.providers.contacts.OpenHelper.GroupsColumns; -import com.android.providers.contacts.OpenHelper.MimetypesColumns; -import com.android.providers.contacts.OpenHelper.NameLookupColumns; -import com.android.providers.contacts.OpenHelper.NameLookupType; -import com.android.providers.contacts.OpenHelper.NicknameLookupColumns; -import com.android.providers.contacts.OpenHelper.PhoneColumns; -import com.android.providers.contacts.OpenHelper.PhoneLookupColumns; -import com.android.providers.contacts.OpenHelper.PresenceColumns; -import com.android.providers.contacts.OpenHelper.RawContactsColumns; -import com.android.providers.contacts.OpenHelper.SettingsColumns; -import com.android.providers.contacts.OpenHelper.StatusUpdatesColumns; -import com.android.providers.contacts.OpenHelper.Tables; +import com.android.providers.contacts.ContactsDatabaseHelper.AggregatedPresenceColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.AggregationExceptionColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.Clauses; +import com.android.providers.contacts.ContactsDatabaseHelper.ContactsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.DataColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.DisplayNameSources; +import com.android.providers.contacts.ContactsDatabaseHelper.GroupsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.MimetypesColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.NameLookupColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.NameLookupType; +import com.android.providers.contacts.ContactsDatabaseHelper.NicknameLookupColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PhoneColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PhoneLookupColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PresenceColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.RawContactsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.SettingsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.StatusUpdatesColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.Tables; import com.google.android.collect.Lists; import com.google.android.collect.Maps; import com.google.android.collect.Sets; @@ -771,7 +771,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun protected long getMimeTypeId() { if (mMimetypeId == 0) { - mMimetypeId = mOpenHelper.getMimeTypeId(mMimetype); + mMimetypeId = mDbHelper.getMimeTypeId(mMimetype); } return mMimetypeId; } @@ -1419,9 +1419,9 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } private void updateVisibility(long rawContactId) { - long contactId = mOpenHelper.getContactId(rawContactId); + long contactId = mDbHelper.getContactId(rawContactId); if (contactId != 0) { - mOpenHelper.updateContactVisible(contactId); + mDbHelper.updateContactVisible(contactId); } } @@ -1499,7 +1499,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun private HashMap<String, DataRowHandler> mDataRowHandlers; private final ContactAggregationScheduler mAggregationScheduler; - private OpenHelper mOpenHelper; + private ContactsDatabaseHelper mDbHelper; private NameSplitter mNameSplitter; private NameLookupBuilder mNameLookupBuilder; @@ -1540,13 +1540,13 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun super.onCreate(); final Context context = getContext(); - mOpenHelper = (OpenHelper)getOpenHelper(); + mDbHelper = (ContactsDatabaseHelper)getDatabaseHelper(); mGlobalSearchSupport = new GlobalSearchSupport(this); - mLegacyApiSupport = new LegacyApiSupport(context, mOpenHelper, this, mGlobalSearchSupport); - mContactAggregator = new ContactAggregator(this, mOpenHelper, mAggregationScheduler); + mLegacyApiSupport = new LegacyApiSupport(context, mDbHelper, this, mGlobalSearchSupport); + mContactAggregator = new ContactAggregator(this, mDbHelper, mAggregationScheduler); mContactAggregator.setEnabled(SystemProperties.getBoolean(AGGREGATE_CONTACTS, true)); - final SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + final SQLiteDatabase db = mDbHelper.getReadableDatabase(); mSetPrimaryStatement = db.compileStatement( "UPDATE " + Tables.DATA + @@ -1684,8 +1684,8 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun /* Visible for testing */ @Override - protected OpenHelper getOpenHelper(final Context context) { - return OpenHelper.getInstance(context); + protected ContactsDatabaseHelper getDatabaseHelper(final Context context) { + return ContactsDatabaseHelper.getInstance(context); } /* package */ ContactAggregationScheduler getContactAggregationScheduler() { @@ -1774,7 +1774,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun * Wipes all data from the contacts database. */ /* package */ void wipeData() { - mOpenHelper.wipeData(); + mDbHelper.wipeData(); } /** @@ -1850,7 +1850,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun mContactAggregator.aggregateInTransaction(mDb); if (mVisibleTouched) { mVisibleTouched = false; - mOpenHelper.updateAllVisible(); + mDbHelper.updateAllVisible(); } } @@ -1871,7 +1871,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun for (Map.Entry<Long, Object> entry : mUpdatedSyncStates.entrySet()) { long id = entry.getKey(); - mOpenHelper.getSyncState().update(mDb, id, entry.getValue()); + mDbHelper.getSyncState().update(mDb, id, entry.getValue()); } clearTransactionalChanges(); @@ -1934,7 +1934,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun switch (match) { case SYNCSTATE: - id = mOpenHelper.getSyncState().insert(mDb, values); + id = mDbHelper.getSyncState().insert(mDb, values); break; case CONTACTS: { @@ -2072,7 +2072,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun // Replace package with internal mapping final String packageName = mValues.getAsString(Data.RES_PACKAGE); if (packageName != null) { - mValues.put(DataColumns.PACKAGE_ID, mOpenHelper.getPackageId(packageName)); + mValues.put(DataColumns.PACKAGE_ID, mDbHelper.getPackageId(packageName)); } mValues.remove(Data.RES_PACKAGE); @@ -2082,7 +2082,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun throw new IllegalArgumentException(Data.MIMETYPE + " is required"); } - mValues.put(DataColumns.MIMETYPE_ID, mOpenHelper.getMimeTypeId(mimeType)); + mValues.put(DataColumns.MIMETYPE_ID, mDbHelper.getMimeTypeId(mimeType)); mValues.remove(Data.MIMETYPE); DataRowHandler rowHandler = getDataRowHandler(mimeType); @@ -2103,7 +2103,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun return; } - int aggregationMode = mOpenHelper.getAggregationMode(rawContactId); + int aggregationMode = mDbHelper.getAggregationMode(rawContactId); switch (aggregationMode) { case RawContacts.AGGREGATION_MODE_DISABLED: break; @@ -2114,7 +2114,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } case RawContacts.AGGREGATION_MODE_SUSPENDED: { - long contactId = mOpenHelper.getContactId(rawContactId); + long contactId = mDbHelper.getContactId(rawContactId); if (contactId != 0) { mContactAggregator.updateAggregateData(contactId); @@ -2123,7 +2123,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } case RawContacts.AGGREGATION_MODE_IMMEDIATE: { - long contactId = mOpenHelper.getContactId(rawContactId); + long contactId = mDbHelper.getContactId(rawContactId); mContactAggregator.aggregateContact(mDb, rawContactId, contactId); break; } @@ -2259,7 +2259,8 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun /** * Inserts an item in the groups table */ - private long insertGroup(Uri uri, ContentValues values, Account account, boolean callerIsSyncAdapter) { + private long insertGroup(Uri uri, ContentValues values, Account account, + boolean callerIsSyncAdapter) { ContentValues overriddenValues = new ContentValues(values); if (!resolveAccount(overriddenValues, account)) { return -1; @@ -2268,7 +2269,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun // Replace package with internal mapping final String packageName = overriddenValues.getAsString(Groups.RES_PACKAGE); if (packageName != null) { - overriddenValues.put(GroupsColumns.PACKAGE_ID, mOpenHelper.getPackageId(packageName)); + overriddenValues.put(GroupsColumns.PACKAGE_ID, mDbHelper.getPackageId(packageName)); } overriddenValues.remove(Groups.RES_PACKAGE); @@ -2483,13 +2484,13 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun final int match = sUriMatcher.match(uri); switch (match) { case SYNCSTATE: - return mOpenHelper.getSyncState().delete(mDb, selection, selectionArgs); + return mDbHelper.getSyncState().delete(mDb, selection, selectionArgs); case SYNCSTATE_ID: String selectionWithId = (SyncStateContract.Columns._ID + "=" + ContentUris.parseId(uri) + " ") + (selection == null ? "" : " AND (" + selection + ")"); - return mOpenHelper.getSyncState().delete(mDb, selectionWithId, selectionArgs); + return mDbHelper.getSyncState().delete(mDb, selectionWithId, selectionArgs); case CONTACTS: { // TODO @@ -2594,7 +2595,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } private int deleteGroup(Uri uri, long groupId, boolean callerIsSyncAdapter) { - final long groupMembershipMimetypeId = mOpenHelper + final long groupMembershipMimetypeId = mDbHelper .getMimeTypeId(GroupMembership.CONTENT_ITEM_TYPE); mDb.delete(Tables.DATA, DataColumns.MIMETYPE_ID + "=" + groupMembershipMimetypeId + " AND " + GroupMembership.GROUP_ROW_ID + "=" @@ -2640,7 +2641,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun mDb.delete(Tables.PRESENCE, PresenceColumns.RAW_CONTACT_ID + "=" + rawContactId, null); return mDb.delete(Tables.RAW_CONTACTS, RawContacts._ID + "=" + rawContactId, null); } else { - mOpenHelper.removeContactIfSingleton(rawContactId); + mDbHelper.removeContactIfSingleton(rawContactId); return markRawContactAsDeleted(rawContactId); } } @@ -2683,7 +2684,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun readBooleanQueryParameter(uri, ContactsContract.CALLER_IS_SYNCADAPTER, false); switch(match) { case SYNCSTATE: - return mOpenHelper.getSyncState().update(mDb, values, + return mDbHelper.getSyncState().update(mDb, values, appendAccountToSelection(uri, selection), selectionArgs); case SYNCSTATE_ID: { @@ -2691,7 +2692,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun String selectionWithId = (SyncStateContract.Columns._ID + "=" + ContentUris.parseId(uri) + " ") + (selection == null ? "" : " AND (" + selection + ")"); - return mOpenHelper.getSyncState().update(mDb, values, + return mDbHelper.getSyncState().update(mDb, values, selectionWithId, selectionArgs); } @@ -2826,7 +2827,8 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun return count; } - private int updateSettings(Uri uri, ContentValues values, String selection, String[] selectionArgs) { + private int updateSettings(Uri uri, ContentValues values, String selection, + String[] selectionArgs) { final int count = mDb.update(Tables.SETTINGS, values, selection, selectionArgs); if (values.containsKey(Settings.UNGROUPED_VISIBLE)) { mVisibleTouched = true; @@ -2841,7 +2843,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } int count = 0; - Cursor cursor = mDb.query(mOpenHelper.getRawContactView(), + Cursor cursor = mDb.query(mDbHelper.getRawContactView(), new String[] { RawContacts._ID }, selection, selectionArgs, null, null, null); try { @@ -2902,7 +2904,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun String packageName = values.getAsString(Data.RES_PACKAGE); if (packageName != null) { mValues.remove(Data.RES_PACKAGE); - mValues.put(DataColumns.PACKAGE_ID, mOpenHelper.getPackageId(packageName)); + mValues.put(DataColumns.PACKAGE_ID, mDbHelper.getPackageId(packageName)); } boolean containsIsSuperPrimary = mValues.containsKey(Data.IS_SUPER_PRIMARY); @@ -2954,7 +2956,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun private int updateContactOptions(ContentValues values, String selection, String[] selectionArgs) { int count = 0; - Cursor cursor = mDb.query(mOpenHelper.getContactView(), + Cursor cursor = mDb.query(mDbHelper.getContactView(), new String[] { Contacts._ID }, selection, selectionArgs, null, null, null); try { @@ -2973,15 +2975,15 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun private int updateContactOptions(long contactId, ContentValues values) { mValues.clear(); - OpenHelper.copyStringValue(mValues, RawContacts.CUSTOM_RINGTONE, + ContactsDatabaseHelper.copyStringValue(mValues, RawContacts.CUSTOM_RINGTONE, values, Contacts.CUSTOM_RINGTONE); - OpenHelper.copyLongValue(mValues, RawContacts.SEND_TO_VOICEMAIL, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.SEND_TO_VOICEMAIL, values, Contacts.SEND_TO_VOICEMAIL); - OpenHelper.copyLongValue(mValues, RawContacts.LAST_TIME_CONTACTED, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.LAST_TIME_CONTACTED, values, Contacts.LAST_TIME_CONTACTED); - OpenHelper.copyLongValue(mValues, RawContacts.TIMES_CONTACTED, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.TIMES_CONTACTED, values, Contacts.TIMES_CONTACTED); - OpenHelper.copyLongValue(mValues, RawContacts.STARRED, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.STARRED, values, Contacts.STARRED); // Nothing to update - just return @@ -2999,15 +3001,15 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun // Copy changeable values to prevent automatically managed fields from // being explicitly updated by clients. mValues.clear(); - OpenHelper.copyStringValue(mValues, RawContacts.CUSTOM_RINGTONE, + ContactsDatabaseHelper.copyStringValue(mValues, RawContacts.CUSTOM_RINGTONE, values, Contacts.CUSTOM_RINGTONE); - OpenHelper.copyLongValue(mValues, RawContacts.SEND_TO_VOICEMAIL, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.SEND_TO_VOICEMAIL, values, Contacts.SEND_TO_VOICEMAIL); - OpenHelper.copyLongValue(mValues, RawContacts.LAST_TIME_CONTACTED, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.LAST_TIME_CONTACTED, values, Contacts.LAST_TIME_CONTACTED); - OpenHelper.copyLongValue(mValues, RawContacts.TIMES_CONTACTED, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.TIMES_CONTACTED, values, Contacts.TIMES_CONTACTED); - OpenHelper.copyLongValue(mValues, RawContacts.STARRED, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.STARRED, values, Contacts.STARRED); return mDb.update(Tables.CONTACTS, mValues, Contacts._ID + "=" + contactId, null); @@ -3049,10 +3051,10 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun mContactAggregator.markForAggregation(rawContactId1); mContactAggregator.markForAggregation(rawContactId2); - long contactId1 = mOpenHelper.getContactId(rawContactId1); + long contactId1 = mDbHelper.getContactId(rawContactId1); mContactAggregator.aggregateContact(db, rawContactId1, contactId1); - long contactId2 = mOpenHelper.getContactId(rawContactId2); + long contactId2 = mDbHelper.getContactId(rawContactId2); mContactAggregator.aggregateContact(db, rawContactId2, contactId2); // The return value is fake - we just confirm that we made a change, not count actual @@ -3061,7 +3063,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } public void onAccountsUpdated(Account[] accounts) { - mDb = mOpenHelper.getWritableDatabase(); + mDb = mDbHelper.getWritableDatabase(); if (mDb == null) return; Set<Account> validAccounts = Sets.newHashSet(); @@ -3103,7 +3105,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun mDb.execSQL("DELETE FROM " + Tables.SETTINGS + " WHERE account_name = ? AND account_type = ?", params); } - mOpenHelper.getSyncState().onAccountsChanged(mDb, accounts); + mDbHelper.getSyncState().onAccountsChanged(mDb, accounts); mDb.setTransactionSuccessful(); } finally { mDb.endTransaction(); @@ -3129,7 +3131,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun Log.v(TAG, "query: " + uri); } - final SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + final SQLiteDatabase db = mDbHelper.getReadableDatabase(); SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); String groupBy = null; @@ -3140,7 +3142,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun final int match = sUriMatcher.match(uri); switch (match) { case SYNCSTATE: - return mOpenHelper.getSyncState().query(db, projection, selection, selectionArgs, + return mDbHelper.getSyncState().query(db, projection, selection, selectionArgs, sortOrder); case CONTACTS: { @@ -3187,7 +3189,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun case CONTACTS_AS_VCARD: { // When reading as vCard always use restricted view final String lookupKey = uri.getPathSegments().get(2); - qb.setTables(mOpenHelper.getRestrictedContactView()); + qb.setTables(mDbHelper.getRestrictedContactView()); qb.setProjectionMap(sContactsVCardProjectionMap); qb.appendWhere(Contacts._ID + "=" + lookupContactIdByLookupKey(db, lookupKey)); break; @@ -3384,7 +3386,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } case RAW_CONTACTS: { - qb.setTables(mOpenHelper.getRawContactView()); + qb.setTables(mDbHelper.getRawContactView()); qb.setProjectionMap(sRawContactsProjectionMap); appendAccountFromParameter(qb, uri); break; @@ -3392,7 +3394,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun case RAW_CONTACTS_ID: { long rawContactId = ContentUris.parseId(uri); - qb.setTables(mOpenHelper.getRawContactView()); + qb.setTables(mDbHelper.getRawContactView()); qb.setProjectionMap(sRawContactsProjectionMap); appendAccountFromParameter(qb, uri); qb.appendWhere(" AND " + RawContacts._ID + "=" + rawContactId); @@ -3426,7 +3428,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } String number = uri.getPathSegments().size() > 1 ? uri.getLastPathSegment() : ""; - mOpenHelper.buildPhoneLookupAndContactQuery(qb, number); + mDbHelper.buildPhoneLookupAndContactQuery(qb, number); qb.setProjectionMap(sPhoneLookupProjectionMap); // Phone lookup cannot be combined with a selection @@ -3436,7 +3438,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } case GROUPS: { - qb.setTables(mOpenHelper.getGroupView()); + qb.setTables(mDbHelper.getGroupView()); qb.setProjectionMap(sGroupsProjectionMap); appendAccountFromParameter(qb, uri); break; @@ -3444,14 +3446,14 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun case GROUPS_ID: { long groupId = ContentUris.parseId(uri); - qb.setTables(mOpenHelper.getGroupView()); + qb.setTables(mDbHelper.getGroupView()); qb.setProjectionMap(sGroupsProjectionMap); qb.appendWhere(Groups._ID + "=" + groupId); break; } case GROUPS_SUMMARY: { - qb.setTables(mOpenHelper.getGroupView() + " AS groups"); + qb.setTables(mDbHelper.getGroupView() + " AS groups"); qb.setProjectionMap(sGroupsSummaryProjectionMap); appendAccountFromParameter(qb, uri); groupBy = Groups._ID; @@ -3490,14 +3492,14 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun // When requesting specific columns, this query requires // late-binding of the GroupMembership MIME-type. - final String groupMembershipMimetypeId = Long.toString(mOpenHelper + final String groupMembershipMimetypeId = Long.toString(mDbHelper .getMimeTypeId(GroupMembership.CONTENT_ITEM_TYPE)); if (projection != null && projection.length != 0 && - mOpenHelper.isInProjection(projection, Settings.UNGROUPED_COUNT)) { + mDbHelper.isInProjection(projection, Settings.UNGROUPED_COUNT)) { selectionArgs = insertSelectionArg(selectionArgs, groupMembershipMimetypeId); } if (projection != null && projection.length != 0 && - mOpenHelper.isInProjection(projection, Settings.UNGROUPED_WITH_PHONES)) { + mDbHelper.isInProjection(projection, Settings.UNGROUPED_WITH_PHONES)) { selectionArgs = insertSelectionArg(selectionArgs, groupMembershipMimetypeId); } @@ -3525,24 +3527,24 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } case LIVE_FOLDERS_CONTACTS: - qb.setTables(mOpenHelper.getContactView()); + qb.setTables(mDbHelper.getContactView()); qb.setProjectionMap(sLiveFoldersProjectionMap); break; case LIVE_FOLDERS_CONTACTS_WITH_PHONES: - qb.setTables(mOpenHelper.getContactView()); + qb.setTables(mDbHelper.getContactView()); qb.setProjectionMap(sLiveFoldersProjectionMap); qb.appendWhere(Contacts.HAS_PHONE_NUMBER + "=1"); break; case LIVE_FOLDERS_CONTACTS_FAVORITES: - qb.setTables(mOpenHelper.getContactView()); + qb.setTables(mDbHelper.getContactView()); qb.setProjectionMap(sLiveFoldersProjectionMap); qb.appendWhere(Contacts.STARRED + "=1"); break; case LIVE_FOLDERS_CONTACTS_GROUP_NAME: - qb.setTables(mOpenHelper.getContactView()); + qb.setTables(mDbHelper.getContactView()); qb.setProjectionMap(sLiveFoldersProjectionMap); qb.appendWhere(CONTACTS_IN_GROUP_SELECT); selectionArgs = insertSelectionArg(selectionArgs, uri.getLastPathSegment()); @@ -3757,13 +3759,13 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun private void setTablesAndProjectionMapForContacts(SQLiteQueryBuilder qb, String[] projection) { StringBuilder sb = new StringBuilder(); - sb.append(mOpenHelper.getContactView()); - if (mOpenHelper.isInProjection(projection, + sb.append(mDbHelper.getContactView()); + if (mDbHelper.isInProjection(projection, Contacts.CONTACT_PRESENCE)) { sb.append(" LEFT OUTER JOIN " + Tables.AGGREGATED_PRESENCE + " ON (" + Contacts._ID + " = " + AggregatedPresenceColumns.CONTACT_ID + ")"); } - if (mOpenHelper.isInProjection(projection, + if (mDbHelper.isInProjection(projection, Contacts.CONTACT_STATUS, Contacts.CONTACT_STATUS_RES_PACKAGE, Contacts.CONTACT_STATUS_ICON, @@ -3783,16 +3785,16 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun // Note: currently, "export only" equals to "restricted", but may not in the future. boolean requireRestrictedData = readBooleanQueryParameter(uri, Data.FOR_EXPORT_ONLY, false); - sb.append(mOpenHelper.getDataView(requireRestrictedData)); + sb.append(mDbHelper.getDataView(requireRestrictedData)); sb.append(" data"); - if (mOpenHelper.isInProjection(projection, Data.CONTACT_PRESENCE)) { + if (mDbHelper.isInProjection(projection, Data.CONTACT_PRESENCE)) { sb.append(" LEFT OUTER JOIN " + Tables.AGGREGATED_PRESENCE + " ON (" + AggregatedPresenceColumns.CONTACT_ID + "=" + RawContacts.CONTACT_ID + ")"); } - if (mOpenHelper.isInProjection(projection, + if (mDbHelper.isInProjection(projection, Data.CONTACT_STATUS, Data.CONTACT_STATUS_RES_PACKAGE, Data.CONTACT_STATUS_ICON, @@ -3810,16 +3812,16 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun private void setTableAndProjectionMapForStatusUpdates(SQLiteQueryBuilder qb, String[] projection) { StringBuilder sb = new StringBuilder(); - sb.append(mOpenHelper.getDataView()); + sb.append(mDbHelper.getDataView()); sb.append(" data"); - if (mOpenHelper.isInProjection(projection, StatusUpdates.PRESENCE)) { + if (mDbHelper.isInProjection(projection, StatusUpdates.PRESENCE)) { sb.append(" LEFT OUTER JOIN " + Tables.PRESENCE + " ON(" + Tables.PRESENCE + "." + StatusUpdates.DATA_ID + "=" + DataColumns.CONCRETE_ID + ")"); } - if (mOpenHelper.isInProjection(projection, + if (mDbHelper.isInProjection(projection, StatusUpdates.STATUS, StatusUpdates.STATUS_RES_PACKAGE, StatusUpdates.STATUS_ICON, @@ -3921,7 +3923,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } String getContactsRestrictions() { - if (mOpenHelper.hasRestrictedAccess()) { + if (mDbHelper.hasRestrictedAccess()) { return "1"; } else { return RawContacts.IS_RESTRICTED + "=0"; @@ -3929,7 +3931,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } public String getContactsRestrictionExceptionAsNestedQuery(String contactIdColumn) { - if (mOpenHelper.hasRestrictedAccess()) { + if (mDbHelper.hasRestrictedAccess()) { return "1"; } else { return "(SELECT " + RawContacts.IS_RESTRICTED + " FROM " + Tables.RAW_CONTACTS @@ -3949,10 +3951,10 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun long contactId = Long.parseLong(uri.getPathSegments().get(1)); String sql = - "SELECT " + Photo.PHOTO + " FROM " + mOpenHelper.getDataView() + + "SELECT " + Photo.PHOTO + " FROM " + mDbHelper.getDataView() + " WHERE " + Data._ID + "=" + Contacts.PHOTO_ID + " AND " + RawContacts.CONTACT_ID + "=" + contactId; - SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + SQLiteDatabase db = mDbHelper.getReadableDatabase(); return SQLiteContentHelper.getBlobColumnAsAssetFile(db, sql, null); } @@ -4126,19 +4128,19 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun private static final int COLUMN_CONTACT_ID = 37; private static final int COLUMN_STARRED = 38; - public RawContactsEntityIterator(ContactsProvider2 provider, String contactsIdString, Uri uri, - String selection, String[] selectionArgs, String sortOrder) { + public RawContactsEntityIterator(ContactsProvider2 provider, String contactsIdString, + Uri uri, String selection, String[] selectionArgs, String sortOrder) { mIsClosed = false; final String updatedSortOrder = (sortOrder == null) ? Data.RAW_CONTACT_ID : (Data.RAW_CONTACT_ID + "," + sortOrder); - final SQLiteDatabase db = provider.mOpenHelper.getReadableDatabase(); + final SQLiteDatabase db = provider.mDbHelper.getReadableDatabase(); final SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); final boolean requireRestrictedView = provider.readBooleanQueryParameter(uri, Data.FOR_EXPORT_ONLY, false); - qb.setTables(provider.mOpenHelper.getContactEntitiesView(requireRestrictedView)); + qb.setTables(provider.mDbHelper.getContactEntitiesView(requireRestrictedView)); if (contactsIdString != null) { qb.appendWhere(Data.RAW_CONTACT_ID + "=" + contactsIdString); } @@ -4308,9 +4310,9 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun ? Groups._ID : (Groups._ID + "," + sortOrder); - final SQLiteDatabase db = provider.mOpenHelper.getReadableDatabase(); + final SQLiteDatabase db = provider.mDbHelper.getReadableDatabase(); final SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); - qb.setTables(provider.mOpenHelper.getGroupView()); + qb.setTables(provider.mDbHelper.getGroupView()); qb.setProjectionMap(sGroupsProjectionMap); if (groupIdString != null) { qb.appendWhere(Groups._ID + "=" + groupIdString); @@ -4438,7 +4440,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun case RAW_CONTACTS_ID: return RawContacts.CONTENT_ITEM_TYPE; case DATA_ID: - return mOpenHelper.getDataMimeType(ContentUris.parseId(uri)); + return mDbHelper.getDataMimeType(ContentUris.parseId(uri)); case PHONES: return Phone.CONTENT_TYPE; case PHONES_ID: @@ -4588,7 +4590,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun } protected String[] loadNicknameClusters(String normalizedName) { - SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + SQLiteDatabase db = mDbHelper.getReadableDatabase(); String[] clusters = null; Cursor cursor = db.query(NicknameLookupQuery.TABLE, NicknameLookupQuery.COLUMNS, NicknameLookupColumns.NAME + "=?", new String[] { normalizedName }, diff --git a/src/com/android/providers/contacts/GlobalSearchSupport.java b/src/com/android/providers/contacts/GlobalSearchSupport.java index d2f674ad..13ead671 100644 --- a/src/com/android/providers/contacts/GlobalSearchSupport.java +++ b/src/com/android/providers/contacts/GlobalSearchSupport.java @@ -17,11 +17,11 @@ package com.android.providers.contacts; import com.android.internal.database.ArrayListCursor; -import com.android.providers.contacts.OpenHelper.AggregatedPresenceColumns; -import com.android.providers.contacts.OpenHelper.ContactsColumns; -import com.android.providers.contacts.OpenHelper.DataColumns; -import com.android.providers.contacts.OpenHelper.MimetypesColumns; -import com.android.providers.contacts.OpenHelper.Tables; +import com.android.providers.contacts.ContactsDatabaseHelper.AggregatedPresenceColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.ContactsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.DataColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.MimetypesColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.Tables; import android.app.SearchManager; import android.content.ContentUris; diff --git a/src/com/android/providers/contacts/LegacyApiSupport.java b/src/com/android/providers/contacts/LegacyApiSupport.java index 3bee37be..6e02a22f 100644 --- a/src/com/android/providers/contacts/LegacyApiSupport.java +++ b/src/com/android/providers/contacts/LegacyApiSupport.java @@ -15,15 +15,15 @@ */ package com.android.providers.contacts; -import com.android.providers.contacts.OpenHelper.DataColumns; -import com.android.providers.contacts.OpenHelper.ExtensionsColumns; -import com.android.providers.contacts.OpenHelper.GroupsColumns; -import com.android.providers.contacts.OpenHelper.MimetypesColumns; -import com.android.providers.contacts.OpenHelper.PhoneColumns; -import com.android.providers.contacts.OpenHelper.PresenceColumns; -import com.android.providers.contacts.OpenHelper.RawContactsColumns; -import com.android.providers.contacts.OpenHelper.StatusUpdatesColumns; -import com.android.providers.contacts.OpenHelper.Tables; +import com.android.providers.contacts.ContactsDatabaseHelper.DataColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.ExtensionsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.GroupsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.MimetypesColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PhoneColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PresenceColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.RawContactsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.StatusUpdatesColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.Tables; import android.accounts.Account; import android.app.SearchManager; @@ -460,7 +460,7 @@ public class LegacyApiSupport { } private final Context mContext; - private final OpenHelper mOpenHelper; + private final ContactsDatabaseHelper mDbHelper; private final ContactsProvider2 mContactsProvider; private final NameSplitter mPhoneticNameSplitter; private final GlobalSearchSupport mGlobalSearchSupport; @@ -479,18 +479,18 @@ public class LegacyApiSupport { private long mMimetypeIm; private long mMimetypePostal; - public LegacyApiSupport(Context context, OpenHelper openHelper, + public LegacyApiSupport(Context context, ContactsDatabaseHelper contactsDatabaseHelper, ContactsProvider2 contactsProvider, GlobalSearchSupport globalSearchSupport) { mContext = context; mContactsProvider = contactsProvider; - mOpenHelper = openHelper; + mDbHelper = contactsDatabaseHelper; mGlobalSearchSupport = globalSearchSupport; mPhoneticNameSplitter = new NameSplitter("", "", "", context .getString(com.android.internal.R.string.common_name_conjunctions), Locale .getDefault()); - SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + SQLiteDatabase db = mDbHelper.getReadableDatabase(); mLastTimeContactedUpdate = db.compileStatement("UPDATE " + Tables.RAW_CONTACTS + " SET " + RawContacts.LAST_TIME_CONTACTED + "=? WHERE " + RawContacts._ID + "=?"); @@ -505,9 +505,9 @@ public class LegacyApiSupport { " FROM " + Tables.DATA + " WHERE " + Data._ID + "=?"); - mMimetypeEmail = mOpenHelper.getMimeTypeId(Email.CONTENT_ITEM_TYPE); - mMimetypeIm = mOpenHelper.getMimeTypeId(Im.CONTENT_ITEM_TYPE); - mMimetypePostal = mOpenHelper.getMimeTypeId(StructuredPostal.CONTENT_ITEM_TYPE); + mMimetypeEmail = mDbHelper.getMimeTypeId(Email.CONTENT_ITEM_TYPE); + mMimetypeIm = mDbHelper.getMimeTypeId(Im.CONTENT_ITEM_TYPE); + mMimetypePostal = mDbHelper.getMimeTypeId(StructuredPostal.CONTENT_ITEM_TYPE); } private void ensureDefaultAccount() { @@ -823,7 +823,7 @@ public class LegacyApiSupport { private long insertOrganization(ContentValues values) { parseOrganizationValues(values); - OpenHelper.copyLongValue(mValues, Data.RAW_CONTACT_ID, + ContactsDatabaseHelper.copyLongValue(mValues, Data.RAW_CONTACT_ID, values, android.provider.Contacts.Organizations.PERSON_ID); Uri uri = mContactsProvider.insertInTransaction(Data.CONTENT_URI, mValues); @@ -1089,7 +1089,7 @@ public class LegacyApiSupport { } long rawContactId = Long.parseLong(uri.getPathSegments().get(1)); - long contactId = mOpenHelper.getContactId(rawContactId); + long contactId = mDbHelper.getContactId(rawContactId); if (contactId != 0) { mContactsProvider.updateContactLastContactedTime(contactId, lastTimeContacted); } @@ -1156,13 +1156,13 @@ public class LegacyApiSupport { private void updateLegacyPhotoData(long rawContactId, long dataId, ContentValues values) { mValues.clear(); - OpenHelper.copyStringValue(mValues, LegacyPhotoData.LOCAL_VERSION, + ContactsDatabaseHelper.copyStringValue(mValues, LegacyPhotoData.LOCAL_VERSION, values, android.provider.Contacts.Photos.LOCAL_VERSION); - OpenHelper.copyStringValue(mValues, LegacyPhotoData.DOWNLOAD_REQUIRED, + ContactsDatabaseHelper.copyStringValue(mValues, LegacyPhotoData.DOWNLOAD_REQUIRED, values, android.provider.Contacts.Photos.DOWNLOAD_REQUIRED); - OpenHelper.copyStringValue(mValues, LegacyPhotoData.EXISTS_ON_SERVER, + ContactsDatabaseHelper.copyStringValue(mValues, LegacyPhotoData.EXISTS_ON_SERVER, values, android.provider.Contacts.Photos.EXISTS_ON_SERVER); - OpenHelper.copyStringValue(mValues, LegacyPhotoData.SYNC_ERROR, + ContactsDatabaseHelper.copyStringValue(mValues, LegacyPhotoData.SYNC_ERROR, values, android.provider.Contacts.Photos.SYNC_ERROR); int updated = mContactsProvider.updateInTransaction(Data.CONTENT_URI, mValues, @@ -1182,22 +1182,22 @@ public class LegacyApiSupport { mValues2.clear(); mValues3.clear(); - OpenHelper.copyStringValue(mValues, RawContacts.CUSTOM_RINGTONE, + ContactsDatabaseHelper.copyStringValue(mValues, RawContacts.CUSTOM_RINGTONE, values, People.CUSTOM_RINGTONE); - OpenHelper.copyLongValue(mValues, RawContacts.SEND_TO_VOICEMAIL, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.SEND_TO_VOICEMAIL, values, People.SEND_TO_VOICEMAIL); - OpenHelper.copyLongValue(mValues, RawContacts.LAST_TIME_CONTACTED, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.LAST_TIME_CONTACTED, values, People.LAST_TIME_CONTACTED); - OpenHelper.copyLongValue(mValues, RawContacts.TIMES_CONTACTED, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.TIMES_CONTACTED, values, People.TIMES_CONTACTED); - OpenHelper.copyLongValue(mValues, RawContacts.STARRED, + ContactsDatabaseHelper.copyLongValue(mValues, RawContacts.STARRED, values, People.STARRED); mValues.put(RawContacts.ACCOUNT_NAME, mAccount.name); mValues.put(RawContacts.ACCOUNT_TYPE, mAccount.type); if (values.containsKey(People.NAME) || values.containsKey(People.PHONETIC_NAME)) { mValues2.put(Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE); - OpenHelper.copyStringValue(mValues2, StructuredName.DISPLAY_NAME, + ContactsDatabaseHelper.copyStringValue(mValues2, StructuredName.DISPLAY_NAME, values, People.NAME); if (values.containsKey(People.PHONETIC_NAME)) { String phoneticName = values.getAsString(People.PHONETIC_NAME); @@ -1211,7 +1211,7 @@ public class LegacyApiSupport { if (values.containsKey(People.NOTES)) { mValues3.put(Data.MIMETYPE, Note.CONTENT_ITEM_TYPE); - OpenHelper.copyStringValue(mValues3, Note.NOTE, values, People.NOTES); + ContactsDatabaseHelper.copyStringValue(mValues3, Note.NOTE, values, People.NOTES); } } @@ -1220,19 +1220,19 @@ public class LegacyApiSupport { mValues.put(Data.MIMETYPE, Organization.CONTENT_ITEM_TYPE); - OpenHelper.copyLongValue(mValues, Data.IS_PRIMARY, + ContactsDatabaseHelper.copyLongValue(mValues, Data.IS_PRIMARY, values, android.provider.Contacts.Organizations.ISPRIMARY); - OpenHelper.copyStringValue(mValues, Organization.COMPANY, + ContactsDatabaseHelper.copyStringValue(mValues, Organization.COMPANY, values, android.provider.Contacts.Organizations.COMPANY); // TYPE values happen to remain the same between V1 and V2 - can just copy the value - OpenHelper.copyLongValue(mValues, Organization.TYPE, + ContactsDatabaseHelper.copyLongValue(mValues, Organization.TYPE, values, android.provider.Contacts.Organizations.TYPE); - OpenHelper.copyStringValue(mValues, Organization.LABEL, + ContactsDatabaseHelper.copyStringValue(mValues, Organization.LABEL, values, android.provider.Contacts.Organizations.LABEL); - OpenHelper.copyStringValue(mValues, Organization.TITLE, + ContactsDatabaseHelper.copyStringValue(mValues, Organization.TITLE, values, android.provider.Contacts.Organizations.TITLE); } @@ -1241,30 +1241,32 @@ public class LegacyApiSupport { mValues.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE); - OpenHelper.copyLongValue(mValues, Data.IS_PRIMARY, + ContactsDatabaseHelper.copyLongValue(mValues, Data.IS_PRIMARY, values, android.provider.Contacts.Phones.ISPRIMARY); - OpenHelper.copyStringValue(mValues, Phone.NUMBER, + ContactsDatabaseHelper.copyStringValue(mValues, Phone.NUMBER, values, android.provider.Contacts.Phones.NUMBER); // TYPE values happen to remain the same between V1 and V2 - can just copy the value - OpenHelper.copyLongValue(mValues, Phone.TYPE, + ContactsDatabaseHelper.copyLongValue(mValues, Phone.TYPE, values, android.provider.Contacts.Phones.TYPE); - OpenHelper.copyStringValue(mValues, Phone.LABEL, + ContactsDatabaseHelper.copyStringValue(mValues, Phone.LABEL, values, android.provider.Contacts.Phones.LABEL); } private void parseContactMethodValues(int kind, ContentValues values) { mValues.clear(); - OpenHelper.copyLongValue(mValues, Data.IS_PRIMARY, values, ContactMethods.ISPRIMARY); + ContactsDatabaseHelper.copyLongValue(mValues, Data.IS_PRIMARY, values, + ContactMethods.ISPRIMARY); switch (kind) { case android.provider.Contacts.KIND_EMAIL: { copyCommonFields(values, Email.CONTENT_ITEM_TYPE, Email.TYPE, Email.LABEL, Data.DATA14); - OpenHelper.copyStringValue(mValues, Email.DATA, values, ContactMethods.DATA); + ContactsDatabaseHelper.copyStringValue(mValues, Email.DATA, values, + ContactMethods.DATA); break; } @@ -1284,8 +1286,8 @@ public class LegacyApiSupport { case android.provider.Contacts.KIND_POSTAL: { copyCommonFields(values, StructuredPostal.CONTENT_ITEM_TYPE, StructuredPostal.TYPE, StructuredPostal.LABEL, Data.DATA14); - OpenHelper.copyStringValue(mValues, StructuredPostal.FORMATTED_ADDRESS, values, - ContactMethods.DATA); + ContactsDatabaseHelper.copyStringValue(mValues, StructuredPostal.FORMATTED_ADDRESS, + values, ContactMethods.DATA); break; } } @@ -1294,26 +1296,29 @@ public class LegacyApiSupport { private void copyCommonFields(ContentValues values, String mimeType, String typeColumn, String labelColumn, String auxDataColumn) { mValues.put(Data.MIMETYPE, mimeType); - OpenHelper.copyLongValue(mValues, typeColumn, values, ContactMethods.TYPE); - OpenHelper.copyStringValue(mValues, labelColumn, values, ContactMethods.LABEL); - OpenHelper.copyStringValue(mValues, auxDataColumn, values, ContactMethods.AUX_DATA); + ContactsDatabaseHelper.copyLongValue(mValues, typeColumn, values, + ContactMethods.TYPE); + ContactsDatabaseHelper.copyStringValue(mValues, labelColumn, values, + ContactMethods.LABEL); + ContactsDatabaseHelper.copyStringValue(mValues, auxDataColumn, values, + ContactMethods.AUX_DATA); } private void parseGroupValues(ContentValues values) { mValues.clear(); - OpenHelper.copyStringValue(mValues, Groups.TITLE, + ContactsDatabaseHelper.copyStringValue(mValues, Groups.TITLE, values, android.provider.Contacts.Groups.NAME); - OpenHelper.copyStringValue(mValues, Groups.NOTES, + ContactsDatabaseHelper.copyStringValue(mValues, Groups.NOTES, values, android.provider.Contacts.Groups.NOTES); - OpenHelper.copyStringValue(mValues, Groups.SYSTEM_ID, + ContactsDatabaseHelper.copyStringValue(mValues, Groups.SYSTEM_ID, values, android.provider.Contacts.Groups.SYSTEM_ID); } private void parseExtensionValues(ContentValues values) { - OpenHelper.copyStringValue(mValues, ExtensionsColumns.NAME, + ContactsDatabaseHelper.copyStringValue(mValues, ExtensionsColumns.NAME, values, android.provider.Contacts.People.Extensions.NAME); - OpenHelper.copyStringValue(mValues, ExtensionsColumns.VALUE, + ContactsDatabaseHelper.copyStringValue(mValues, ExtensionsColumns.VALUE, values, android.provider.Contacts.People.Extensions.VALUE); } @@ -1420,7 +1425,7 @@ public class LegacyApiSupport { String sortOrder, String limit) { ensureDefaultAccount(); - final SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + final SQLiteDatabase db = mDbHelper.getReadableDatabase(); SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); String groupBy = null; @@ -1536,7 +1541,7 @@ public class LegacyApiSupport { if (uri.getPathSegments().size() > 2) { String filterParam = uri.getLastPathSegment(); qb.appendWhere(" AND person ="); - qb.appendWhere(mOpenHelper.buildPhoneLookupAsNestedQuery(filterParam)); + qb.appendWhere(mDbHelper.buildPhoneLookupAsNestedQuery(filterParam)); } break; diff --git a/src/com/android/providers/contacts/LegacyContactImporter.java b/src/com/android/providers/contacts/LegacyContactImporter.java index 458096d9..47bc233e 100644 --- a/src/com/android/providers/contacts/LegacyContactImporter.java +++ b/src/com/android/providers/contacts/LegacyContactImporter.java @@ -16,11 +16,11 @@ package com.android.providers.contacts; -import com.android.providers.contacts.OpenHelper.DataColumns; -import com.android.providers.contacts.OpenHelper.PhoneColumns; -import com.android.providers.contacts.OpenHelper.PhoneLookupColumns; -import com.android.providers.contacts.OpenHelper.RawContactsColumns; -import com.android.providers.contacts.OpenHelper.Tables; +import com.android.providers.contacts.ContactsDatabaseHelper.DataColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PhoneColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PhoneLookupColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.RawContactsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.Tables; import android.content.ContentResolver; import android.content.ContentUris; @@ -65,7 +65,7 @@ public class LegacyContactImporter { private final Context mContext; private final ContactsProvider2 mContactsProvider; - private OpenHelper mOpenHelper; + private ContactsDatabaseHelper mDbHelper; private ContentValues mValues = new ContentValues(); private ContentResolver mResolver; private boolean mPhoneticNameAvailable = true; @@ -141,8 +141,8 @@ public class LegacyContactImporter { mPhoneticNameAvailable = false; } - mOpenHelper = (OpenHelper)mContactsProvider.getOpenHelper(); - mTargetDb = mOpenHelper.getWritableDatabase(); + mDbHelper = (ContactsDatabaseHelper)mContactsProvider.getDatabaseHelper(); + mTargetDb = mDbHelper.getWritableDatabase(); /* * At this point there should be no data in the contacts provider, but in case @@ -152,16 +152,16 @@ public class LegacyContactImporter { */ mContactsProvider.wipeData(); - mStructuredNameMimetypeId = mOpenHelper.getMimeTypeId(StructuredName.CONTENT_ITEM_TYPE); - mNoteMimetypeId = mOpenHelper.getMimeTypeId(Note.CONTENT_ITEM_TYPE); - mOrganizationMimetypeId = mOpenHelper.getMimeTypeId(Organization.CONTENT_ITEM_TYPE); - mPhoneMimetypeId = mOpenHelper.getMimeTypeId(Phone.CONTENT_ITEM_TYPE); - mEmailMimetypeId = mOpenHelper.getMimeTypeId(Email.CONTENT_ITEM_TYPE); - mImMimetypeId = mOpenHelper.getMimeTypeId(Im.CONTENT_ITEM_TYPE); - mPostalMimetypeId = mOpenHelper.getMimeTypeId(StructuredPostal.CONTENT_ITEM_TYPE); - mPhotoMimetypeId = mOpenHelper.getMimeTypeId(Photo.CONTENT_ITEM_TYPE); + mStructuredNameMimetypeId = mDbHelper.getMimeTypeId(StructuredName.CONTENT_ITEM_TYPE); + mNoteMimetypeId = mDbHelper.getMimeTypeId(Note.CONTENT_ITEM_TYPE); + mOrganizationMimetypeId = mDbHelper.getMimeTypeId(Organization.CONTENT_ITEM_TYPE); + mPhoneMimetypeId = mDbHelper.getMimeTypeId(Phone.CONTENT_ITEM_TYPE); + mEmailMimetypeId = mDbHelper.getMimeTypeId(Email.CONTENT_ITEM_TYPE); + mImMimetypeId = mDbHelper.getMimeTypeId(Im.CONTENT_ITEM_TYPE); + mPostalMimetypeId = mDbHelper.getMimeTypeId(StructuredPostal.CONTENT_ITEM_TYPE); + mPhotoMimetypeId = mDbHelper.getMimeTypeId(Photo.CONTENT_ITEM_TYPE); mGroupMembershipMimetypeId = - mOpenHelper.getMimeTypeId(GroupMembership.CONTENT_ITEM_TYPE); + mDbHelper.getMimeTypeId(GroupMembership.CONTENT_ITEM_TYPE); mNameSplitter = mContactsProvider.getNameSplitter(); @@ -179,7 +179,7 @@ public class LegacyContactImporter { // will be autoincremented importDeletedPeople(); - mOpenHelper.updateAllVisible(); + mDbHelper.updateAllVisible(); mTargetDb.setTransactionSuccessful(); mTargetDb.endTransaction(); diff --git a/src/com/android/providers/contacts/NameLookupBuilder.java b/src/com/android/providers/contacts/NameLookupBuilder.java index 9229a047..d1588b5d 100644 --- a/src/com/android/providers/contacts/NameLookupBuilder.java +++ b/src/com/android/providers/contacts/NameLookupBuilder.java @@ -16,7 +16,7 @@ package com.android.providers.contacts; -import com.android.providers.contacts.OpenHelper.NameLookupType; +import com.android.providers.contacts.ContactsDatabaseHelper.NameLookupType; import java.util.Arrays; import java.util.Comparator; diff --git a/src/com/android/providers/contacts/SQLiteContentProvider.java b/src/com/android/providers/contacts/SQLiteContentProvider.java index 5608dcc2..4d1ec901 100644 --- a/src/com/android/providers/contacts/SQLiteContentProvider.java +++ b/src/com/android/providers/contacts/SQLiteContentProvider.java @@ -47,11 +47,11 @@ public abstract class SQLiteContentProvider extends ContentProvider @Override public boolean onCreate() { Context context = getContext(); - mOpenHelper = getOpenHelper(context); + mOpenHelper = getDatabaseHelper(context); return true; } - protected abstract SQLiteOpenHelper getOpenHelper(Context context); + protected abstract SQLiteOpenHelper getDatabaseHelper(Context context); /** * The equivalent of the {@link #insert} method, but invoked within a transaction. @@ -71,7 +71,7 @@ public abstract class SQLiteContentProvider extends ContentProvider protected abstract void notifyChange(); - protected SQLiteOpenHelper getOpenHelper() { + protected SQLiteOpenHelper getDatabaseHelper() { return mOpenHelper; } diff --git a/src/com/android/providers/contacts/SocialProvider.java b/src/com/android/providers/contacts/SocialProvider.java index a4e68d75..349e1fc5 100644 --- a/src/com/android/providers/contacts/SocialProvider.java +++ b/src/com/android/providers/contacts/SocialProvider.java @@ -16,10 +16,10 @@ package com.android.providers.contacts; -import com.android.providers.contacts.OpenHelper.ActivitiesColumns; -import com.android.providers.contacts.OpenHelper.ContactsColumns; -import com.android.providers.contacts.OpenHelper.PackagesColumns; -import com.android.providers.contacts.OpenHelper.Tables; +import com.android.providers.contacts.ContactsDatabaseHelper.ActivitiesColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.ContactsColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PackagesColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.Tables; import android.content.ContentProvider; import android.content.ContentUris; @@ -121,16 +121,16 @@ public class SocialProvider extends ContentProvider { } - private OpenHelper mOpenHelper; + private ContactsDatabaseHelper mDbHelper; /** {@inheritDoc} */ @Override public boolean onCreate() { final Context context = getContext(); - mOpenHelper = OpenHelper.getInstance(context); + mDbHelper = ContactsDatabaseHelper.getInstance(context); // TODO remove this, it's here to force opening the database on boot for testing - mOpenHelper.getReadableDatabase(); + mDbHelper.getReadableDatabase(); return true; } @@ -180,7 +180,7 @@ public class SocialProvider extends ContentProvider { // TODO verify that IN_REPLY_TO != RAW_ID - final SQLiteDatabase db = mOpenHelper.getWritableDatabase(); + final SQLiteDatabase db = mDbHelper.getWritableDatabase(); long id = 0; db.beginTransaction(); try { @@ -190,12 +190,12 @@ public class SocialProvider extends ContentProvider { // Replace package name and mime-type with internal mappings final String packageName = values.getAsString(Activities.RES_PACKAGE); if (packageName != null) { - values.put(ActivitiesColumns.PACKAGE_ID, mOpenHelper.getPackageId(packageName)); + values.put(ActivitiesColumns.PACKAGE_ID, mDbHelper.getPackageId(packageName)); } values.remove(Activities.RES_PACKAGE); final String mimeType = values.getAsString(Activities.MIMETYPE); - values.put(ActivitiesColumns.MIMETYPE_ID, mOpenHelper.getMimeTypeId(mimeType)); + values.put(ActivitiesColumns.MIMETYPE_ID, mDbHelper.getMimeTypeId(mimeType)); values.remove(Activities.MIMETYPE); long published = values.getAsLong(Activities.PUBLISHED); @@ -296,7 +296,7 @@ public class SocialProvider extends ContentProvider { /** {@inheritDoc} */ @Override public int delete(Uri uri, String selection, String[] selectionArgs) { - final SQLiteDatabase db = mOpenHelper.getWritableDatabase(); + final SQLiteDatabase db = mDbHelper.getWritableDatabase(); final int match = sUriMatcher.match(uri); switch (match) { @@ -325,7 +325,7 @@ public class SocialProvider extends ContentProvider { @Override public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { - final SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + final SQLiteDatabase db = mDbHelper.getReadableDatabase(); final SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); String limit = null; @@ -395,9 +395,9 @@ public class SocialProvider extends ContentProvider { case ACTIVITIES_AUTHORED_BY: return Activities.CONTENT_TYPE; case ACTIVITIES_ID: - final SQLiteDatabase db = mOpenHelper.getReadableDatabase(); + final SQLiteDatabase db = mDbHelper.getReadableDatabase(); long activityId = ContentUris.parseId(uri); - return mOpenHelper.getActivityMimeType(activityId); + return mDbHelper.getActivityMimeType(activityId); case CONTACT_STATUS_ID: return Contacts.CONTENT_ITEM_TYPE; } diff --git a/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java b/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java index b2ee8a53..7c9f9d8d 100644 --- a/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java +++ b/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java @@ -96,7 +96,7 @@ public abstract class BaseContactsProvider2Test extends AndroidTestCase { mResolver = mActor.resolver; if (mActor.provider instanceof SynchronousContactsProvider2) { ((SynchronousContactsProvider2) mActor.provider) - .getOpenHelper(mActor.context).wipeData(); + .getDatabaseHelper(mActor.context).wipeData(); } } diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java index a46dbee9..bc38c8b1 100644 --- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java +++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java @@ -154,14 +154,14 @@ public class CallLogProviderTest extends BaseContactsProvider2Test { } public static class TestCallLogProvider extends CallLogProvider { - private static OpenHelper mOpenHelper; + private static ContactsDatabaseHelper mDbHelper; @Override - protected OpenHelper getOpenHelper(final Context context) { - if (mOpenHelper == null) { - mOpenHelper = new OpenHelper(context); + protected ContactsDatabaseHelper getDatabaseHelper(final Context context) { + if (mDbHelper == null) { + mDbHelper = new ContactsDatabaseHelper(context); } - return mOpenHelper; + return mDbHelper; } } } diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java index b9d9ca99..27b786cf 100644 --- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java +++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java @@ -16,7 +16,7 @@ package com.android.providers.contacts; import com.android.internal.util.ArrayUtils; -import com.android.providers.contacts.OpenHelper.PresenceColumns; +import com.android.providers.contacts.ContactsDatabaseHelper.PresenceColumns; import android.accounts.Account; import android.content.ContentUris; diff --git a/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java b/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java index 4cc6911b..f5bc354b 100644 --- a/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java +++ b/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java @@ -92,14 +92,14 @@ public class LegacyContactImporterPerformanceTest extends AndroidTestCase { } public static class TestCallLogProvider extends CallLogProvider { - private static OpenHelper mOpenHelper; + private static ContactsDatabaseHelper mDbHelper; @Override - protected OpenHelper getOpenHelper(final Context context) { - if (mOpenHelper == null) { - mOpenHelper = new OpenHelper(context); + protected ContactsDatabaseHelper getDatabaseHelper(final Context context) { + if (mDbHelper == null) { + mDbHelper = new ContactsDatabaseHelper(context); } - return mOpenHelper; + return mDbHelper; } } diff --git a/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java b/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java index cab463d9..89887201 100644 --- a/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java +++ b/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java @@ -235,14 +235,14 @@ public class LegacyContactImporterTest extends BaseContactsProvider2Test { public static class TestCallLogProvider extends CallLogProvider { - private static OpenHelper mOpenHelper; + private static ContactsDatabaseHelper mDbHelper; @Override - protected OpenHelper getOpenHelper(final Context context) { - if (mOpenHelper == null) { - mOpenHelper = new OpenHelper(context); + protected ContactsDatabaseHelper getDatabaseHelper(final Context context) { + if (mDbHelper == null) { + mDbHelper = new ContactsDatabaseHelper(context); } - return mOpenHelper; + return mDbHelper; } } } diff --git a/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java b/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java index a175a54a..59859f97 100644 --- a/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java +++ b/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java @@ -26,7 +26,7 @@ import android.database.sqlite.SQLiteDatabase; */ public class SynchronousContactsProvider2 extends ContactsProvider2 { private static Boolean sDataWiped = false; - private static OpenHelper mOpenHelper; + private static ContactsDatabaseHelper mDbHelper; private boolean mDataWipeEnabled = true; private Account mAccount; private boolean mNetworkNotified; @@ -40,15 +40,15 @@ public class SynchronousContactsProvider2 extends ContactsProvider2 { } @Override - protected OpenHelper getOpenHelper(final Context context) { - if (mOpenHelper == null) { - mOpenHelper = new OpenHelper(context); + protected ContactsDatabaseHelper getDatabaseHelper(final Context context) { + if (mDbHelper == null) { + mDbHelper = new ContactsDatabaseHelper(context); } - return mOpenHelper; + return mDbHelper; } public static void resetOpenHelper() { - mOpenHelper = null; + mDbHelper = null; } public void setDataWipeEnabled(boolean flag) { @@ -97,7 +97,7 @@ public class SynchronousContactsProvider2 extends ContactsProvider2 { } public void prepareForFullAggregation(int maxContact) { - SQLiteDatabase db = getOpenHelper().getWritableDatabase(); + SQLiteDatabase db = getDatabaseHelper().getWritableDatabase(); db.execSQL("UPDATE raw_contacts SET aggregation_mode=0,aggregation_needed=1;"); long rowId = db.compileStatement("SELECT _id FROM raw_contacts LIMIT 1 OFFSET " + maxContact) @@ -106,12 +106,12 @@ public class SynchronousContactsProvider2 extends ContactsProvider2 { } public long getRawContactCount() { - SQLiteDatabase db = getOpenHelper().getReadableDatabase(); + SQLiteDatabase db = getDatabaseHelper().getReadableDatabase(); return db.compileStatement("SELECT COUNT(*) FROM raw_contacts").simpleQueryForLong(); } public long getContactCount() { - SQLiteDatabase db = getOpenHelper().getReadableDatabase(); + SQLiteDatabase db = getDatabaseHelper().getReadableDatabase(); return db.compileStatement("SELECT COUNT(*) FROM contacts").simpleQueryForLong(); } |