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

update to adhere to applyBatch changes

This commit is contained in:
Fred Quintana 2009-06-01 12:55:50 -07:00
parent 0cb7ddfc27
commit 84969fb580
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,8 @@ import android.net.Uri;
import android.util.Config;
import android.util.Log;
import java.util.ArrayList;
/*
* TODO
*
@ -428,12 +430,12 @@ public class EmailProvider extends ContentProvider {
}
/* (non-Javadoc)
* @see android.content.ContentProvider#applyBatch(android.content.ContentProviderOperation[])
* @see android.content.ContentProvider#applyBatch(android.content.ContentProviderOperation)
*
* TODO: How do we call notifyChange() or do we need to - does this call the various
* update/insert/delete calls?
*/
public ContentProviderResult[] applyBatch(ContentProviderOperation[] operations)
public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations)
throws OperationApplicationException {
SQLiteDatabase db = getDatabase(getContext());
db.beginTransaction();

17
src/com/android/email/provider/EmailStore.java
View File

@ -616,16 +616,16 @@ public class EmailStore {
* @return true if succeeds; false otherwise
*/
static public boolean setDefaultAccount(Context context, long id) {
ContentProviderOperation[] opArray = new ContentProviderOperation[2];
ArrayList<ContentProviderOperation> opArray = new ArrayList<ContentProviderOperation>();
ContentValues cv1 = new ContentValues();
cv1.put(AccountColumns.IS_DEFAULT, 0);
opArray[0] = ContentProviderOperation.newUpdate(CONTENT_URI).withValues(cv1).build();
opArray.add(ContentProviderOperation.newUpdate(CONTENT_URI).withValues(cv1).build());
ContentValues cv2 = new ContentValues();
cv2.put(AccountColumns.IS_DEFAULT, 1);
opArray[1] = ContentProviderOperation.newUpdate(CONTENT_URI)
opArray.add(ContentProviderOperation.newUpdate(CONTENT_URI)
.withValues(cv2)
.withSelection("_id=" + id, null)
.build();
.build());
try {
context.getContentResolver().applyBatch(EmailProvider.EMAIL_AUTHORITY, opArray);
return true;
@ -713,16 +713,9 @@ public class EmailStore {
}
ops.add(b.build());
// Load these into an array
ContentProviderOperation[] opArray = new ContentProviderOperation[ops.size()];
int cnt = 0;
for (ContentProviderOperation op: ops) {
opArray[cnt++] = op;
}
try {
ContentProviderResult[] res =
context.getContentResolver().applyBatch(EmailProvider.EMAIL_AUTHORITY, opArray);
context.getContentResolver().applyBatch(EmailProvider.EMAIL_AUTHORITY, ops);
// Set the mId's of the various saved objects
if (recvIndex >= 0) {
mHostAuthRecv.mId = getId(res[recvIndex].uri);