Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protecting access to the new Contacts API with a try/catch block.

Browse Source
This commit is contained in:
Dmitri Plotnikov
2009-08-20 08:13:46 -07:00
parent 41b379da57
commit 1c1629da30
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/java/android/provider/ContactsContract.java
View File

@@ -312,23 +312,30 @@ public final class ContactsContract {
* @param contactUri the contact whose photo should be used
*/
public static Uri getPhotoUri(ContentResolver cr, Uri contactUri) {
long photoId = -1;
Cursor cursor = cr.query(contactUri, new String[]{Contacts.PHOTO_ID}, null, null, null);
// TODO remove try/catch block as soon as eclair-dev is merged in eclair
try {
if (!cursor.moveToNext()) {
return null;
long photoId = -1;
Cursor cursor = cr.query(contactUri, new String[] {Contacts.PHOTO_ID},
null, null, null);
try {
if (!cursor.moveToNext()) {
return null;
}
if (cursor.isNull(0)) {
return null;
}
photoId = cursor.getLong(0);
} finally {
cursor.close();
}
if (cursor.isNull(0)) {
return null;
}
photoId = cursor.getLong(0);
} finally {
cursor.close();
return ContentUris.withAppendedId(ContactsContract.Data.CONTENT_URI, photoId);
} catch (Exception e) {
return null;
}
return ContentUris.withAppendedId(ContactsContract.Data.CONTENT_URI, photoId);
}
/**
@@ -339,6 +346,9 @@ public final class ContactsContract {
*/
public static InputStream openContactPhotoInputStream(ContentResolver cr, Uri contactUri) {
Uri photoUri = getPhotoUri(cr, contactUri);
if (photoUri == null) {
return null;
}
Cursor cursor = cr.query(photoUri,
new String[]{ContactsContract.CommonDataKinds.Photo.PHOTO}, null, null, null);
try {