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

am 052eefe4: changed to use the new EntityIterator interface

Browse Source 
Merge commit '052eefe406c7cedad65ed497f2f1137a1a210a42' into eclair-mr2-plus-aosp

* commit '052eefe406c7cedad65ed497f2f1137a1a210a42':
  changed to use the new EntityIterator interface
This commit is contained in:
Fred Quintana 2009-12-09 16:00:12 -08:00 committed by Android Git Automerger
commit e3362a3163
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/exchange/adapter/ContactsSyncAdapter.java
View File

@ -41,6 +41,7 @@ import android.provider.SyncStateContract;
import android.provider.ContactsContract.Data; import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.Groups; import android.provider.ContactsContract.Groups;
import android.provider.ContactsContract.RawContacts; import android.provider.ContactsContract.RawContacts;
import android.provider.ContactsContract.RawContactsEntity;
import android.provider.ContactsContract.Settings; import android.provider.ContactsContract.Settings;
import android.provider.ContactsContract.SyncState; import android.provider.ContactsContract.SyncState;
import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Email;
@ -741,16 +742,19 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
try { try {
if (c.moveToFirst()) { if (c.moveToFirst()) {
// TODO Handle deleted individual rows... // TODO Handle deleted individual rows...
Uri uri = ContentUris.withAppendedId(
RawContacts.CONTENT_URI, c.getLong(0));
uri = Uri.withAppendedPath(
uri, RawContacts.Entity.CONTENT_DIRECTORY);
EntityIterator entityIterator = RawContacts.newEntityIterator(
mContentResolver.query(uri, null, null, null, null));
try { try {
EntityIterator entityIterator =
mContentResolver.queryEntities(ContentUris
.withAppendedId(RawContacts.CONTENT_URI, c.getLong(0)),
null, null, null);
if (entityIterator.hasNext()) { if (entityIterator.hasNext()) {
entity = entityIterator.next(); entity = entityIterator.next();
} }
userLog("Changing contact ", serverId); userLog("Changing contact ", serverId);
} catch (RemoteException e) { } catch (RemoteException e) {
// TODO: log the fact that we failed to read the entity
} }
} }
} finally { } finally {
@ -1765,7 +1769,7 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
public boolean sendLocalChanges(Serializer s) throws IOException { public boolean sendLocalChanges(Serializer s) throws IOException {
// First, let's find Contacts that have changed. // First, let's find Contacts that have changed.
ContentResolver cr = mService.mContentResolver; ContentResolver cr = mService.mContentResolver;
Uri uri = RawContacts.CONTENT_URI.buildUpon() Uri uri = RawContactsEntity.CONTENT_URI.buildUpon()
.appendQueryParameter(RawContacts.ACCOUNT_NAME, mAccount.mEmailAddress) .appendQueryParameter(RawContacts.ACCOUNT_NAME, mAccount.mEmailAddress)
.appendQueryParameter(RawContacts.ACCOUNT_TYPE, Eas.ACCOUNT_MANAGER_TYPE) .appendQueryParameter(RawContacts.ACCOUNT_TYPE, Eas.ACCOUNT_MANAGER_TYPE)
.appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true") .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
@ -1777,7 +1781,8 @@ public class ContactsSyncAdapter extends AbstractSyncAdapter {
try { try {
// Get them all atomically // Get them all atomically
EntityIterator ei = cr.queryEntities(uri, RawContacts.DIRTY + "=1", null, null); EntityIterator ei = RawContacts.newEntityIterator(
cr.query(uri, null, RawContacts.DIRTY + "=1", null, null));
ContentValues cidValues = new ContentValues(); ContentValues cidValues = new ContentValues();
try { try {
boolean first = true; boolean first = true;