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

am 7093746d: Don\'t modify content URI to non-email providers

Browse Source 
* commit '7093746dd5017b1dacb726eb7b083922de15612e':
  Don't modify content URI to non-email providers
This commit is contained in:
Makoto Onuki 2011-01-20 17:14:23 -08:00 committed by Android Git Automerger
commit 71349b64dc
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/email/Utility.java
View File

@ -16,7 +16,6 @@
package com.android.email;
import com.android.email.activity.Welcome;
import com.android.email.provider.EmailContent;
import com.android.email.provider.EmailContent.Account;
import com.android.email.provider.EmailContent.AccountColumns;
@ -851,6 +850,21 @@ public class Utility {
}
};
/**
* @return if {@code original} is to the EmailProvider, add "?limit=1". Otherwise just returns
* {@code original}.
*
* Other providers don't support the limit param. Also, changing URI passed from other apps
* can cause permission errors.
*/
/* package */ static Uri buildLimitOneUri(Uri original) {
if ("content".equals(original.getScheme()) &&
EmailContent.AUTHORITY.equals(original.getAuthority())) {
return EmailContent.uriWithLimit(original, 1);
}
return original;
}
/**
* @return a generic in column {@code column} of the first result row, if the query returns at
* least 1 row. Otherwise returns {@code defaultValue}.
@ -859,7 +873,7 @@ public class Utility {
String[] projection, String selection, String[] selectionArgs, String sortOrder,
int column, T defaultValue, CursorGetter<T> getter) {
// Use PARAMETER_LIMIT to restrict the query to the single row we need
uri = uri.buildUpon().appendQueryParameter(EmailContent.PARAMETER_LIMIT, "1").build();
uri = buildLimitOneUri(uri);
Cursor c = context.getContentResolver().query(uri, projection, selection, selectionArgs,
sortOrder);
if (c != null) {

15
tests/src/com/android/email/UtilityMediumTests.java
View File

@ -26,6 +26,7 @@ import com.android.email.provider.EmailProvider;
import com.android.email.provider.ProviderTestUtils;
import android.content.Context;
import android.net.Uri;
import android.test.ProviderTestCase2;
import android.test.suitebuilder.annotation.MediumTest;
@ -121,6 +122,20 @@ public class UtilityMediumTests extends ProviderTestCase2<EmailProvider> {
assertTrue(Utility.attachmentExists(mMockContext, attachment));
}
public void testBuildLimitOneUri() {
// EmailProvider supports "?limit="
assertEquals(Uri.parse("content://com.android.email.provider?limit=1"),
Utility.buildLimitOneUri(Uri.parse("content://com.android.email.provider")));
// Others don't -- so don't add it.
assertEquals(Uri.parse("content://com.android.email.attachmentprovider"),
Utility.buildLimitOneUri(Uri.parse("content://com.android.email.attachmentprovider"
)));
assertEquals(Uri.parse("content://gmail-ls/android@gmail.com"),
Utility.buildLimitOneUri(Uri.parse("content://gmail-ls/android@gmail.com"
)));
}
public void testGetFirstRowLong() {
Account account1 = ProviderTestUtils.setupAccount("1", true, mMockContext);
Account account2 = ProviderTestUtils.setupAccount("X1", true, mMockContext);

2
tests/src/com/android/email/activity/ContactStatusLoaderTest.java
View File

@ -113,7 +113,7 @@ public class ContactStatusLoaderTest
assertTrue(mProvider.mUris.size() >= 2);
assertEquals("content://com.android.contacts/data/emails/lookup/a%40b.c",
mProvider.mUris.get(0));
assertEquals("content://com.android.contacts/data/12345?limit=1",
assertEquals("content://com.android.contacts/data/12345",
mProvider.mUris.get(1));
// Check result