mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid NPE in case of strange query failure for bookmarks; log it and quit

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2263 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-04-26 16:41:26 +00:00
parent 6573f932a1
commit b81971bf74
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/src/com/google/zxing/client/android/share/BookmarkPickerActivity.java
View file

@ -21,6 +21,7 @@ import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Browser; import android.provider.Browser;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ListView; import android.widget.ListView;
@ -31,6 +32,9 @@ import android.widget.ListView;
* @author dswitkin@google.com (Daniel Switkin) * @author dswitkin@google.com (Daniel Switkin)
*/ */
public final class BookmarkPickerActivity extends ListActivity { public final class BookmarkPickerActivity extends ListActivity {
private static final String TAG = BookmarkPickerActivity.class.getSimpleName();
private static final String[] BOOKMARK_PROJECTION = { private static final String[] BOOKMARK_PROJECTION = {
Browser.BookmarkColumns.TITLE, Browser.BookmarkColumns.TITLE,
Browser.BookmarkColumns.URL Browser.BookmarkColumns.URL
@ -50,8 +54,13 @@ public final class BookmarkPickerActivity extends ListActivity {
cursor = getContentResolver().query(Browser.BOOKMARKS_URI, BOOKMARK_PROJECTION, cursor = getContentResolver().query(Browser.BOOKMARKS_URI, BOOKMARK_PROJECTION,
BOOKMARK_SELECTION, null, null); BOOKMARK_SELECTION, null, null);
startManagingCursor(cursor); if (cursor == null) {
setListAdapter(new BookmarkAdapter(this, cursor)); Log.w(TAG, "No cursor returned for bookmark query");
finish();
} else {
startManagingCursor(cursor);
setListAdapter(new BookmarkAdapter(this, cursor));
}
} }
@Override @Override