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

Merge "Handle query with an id of -1 more gracefully"

This commit is contained in:
Marc Blank 2011-01-04 11:17:42 -08:00 committed by Android (Google) Code Review
parent 8b5cd2beff d306ba3438
commit 99de346ed3
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ import android.content.Context;
import android.content.OperationApplicationException;
import android.content.UriMatcher;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
@ -1258,7 +1259,30 @@ public class EmailProvider extends ContentProvider {
time = System.nanoTime();
}
Cursor c = null;
int match = findMatch(uri, "query");
int match;
try {
match = findMatch(uri, "query");
} catch (IllegalArgumentException e) {
String uriString = uri.toString();
// If we were passed an illegal uri, see if it ends in /-1
// if so, and if substituting 0 for -1 results in a valid uri, return an empty cursor
if (uriString != null && uriString.endsWith("/-1")) {
uri = Uri.parse(uriString.substring(0, uriString.length() - 2) + "0");
match = findMatch(uri, "query");
switch (match) {
case BODY_ID:
case MESSAGE_ID:
case DELETED_MESSAGE_ID:
case UPDATED_MESSAGE_ID:
case ATTACHMENT_ID:
case MAILBOX_ID:
case ACCOUNT_ID:
case HOSTAUTH_ID:
return new MatrixCursor(projection, 0);
}
}
throw e;
}
Context context = getContext();
// See the comment at delete(), above
SQLiteDatabase db = getDatabase(context);

42
tests/src/com/android/email/provider/ProviderTests.java
View File

@ -2370,4 +2370,46 @@ public class ProviderTests extends ProviderTestCase2<EmailProvider> {
// Check
assertEquals(start + 1, Mailbox.restoreMailboxWithId(c, b1.mId).mSyncInterval);
}
/**
* Check that we're handling illegal uri's properly (by throwing an exception unless it's a
* query for an id of -1, in which case we return a zero-length cursor)
*/
public void testIllegalUri() {
final ContentResolver cr = mMockContext.getContentResolver();
ContentValues cv = new ContentValues();
Uri uri = Uri.parse("content://" + EmailContent.AUTHORITY + "/fooble");
try {
cr.insert(uri, cv);
fail("Insert should have thrown exception");
} catch (IllegalArgumentException e) {
}
try {
cr.update(uri, cv, null, null);
fail("Update should have thrown exception");
} catch (IllegalArgumentException e) {
}
try {
cr.delete(uri, null, null);
fail("Delete should have thrown exception");
} catch (IllegalArgumentException e) {
}
try {
cr.query(uri, EmailContent.ID_PROJECTION, null, null, null);
fail("Query should have thrown exception");
} catch (IllegalArgumentException e) {
}
uri = Uri.parse("content://" + EmailContent.AUTHORITY + "/mailbox/fred");
try {
cr.query(uri, EmailContent.ID_PROJECTION, null, null, null);
fail("Query should have thrown exception");
} catch (IllegalArgumentException e) {
}
uri = Uri.parse("content://" + EmailContent.AUTHORITY + "/mailbox/-1");
Cursor c = cr.query(uri, EmailContent.ID_PROJECTION, null, null, null);
assertNotNull(c);
assertEquals(0, c.getCount());
c.close();
}
}