Small cleanup of deprecated API, simpler way to make a pref intent

git-svn-id: https://zxing.googlecode.com/svn/trunk@2818 59b500cc-1b3d-0410-9834-0bbf25fbcc57
laliv · Jun 16, 2013 · 03354c4 · 03354c4
1 parent d539107
commit 03354c4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 70 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -16,7 +16,7 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="4.4 beta 1"
+          android:versionName="4.4 beta 3"
           android:versionCode="89"
           android:installLocation="auto">
 

diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
@@ -102,8 +102,8 @@
      -->
   </PreferenceCategory>
   <PreferenceCategory android:title="@string/preferences_try_bsplus">
-    <com.google.zxing.client.android.pref.BSPlusPreference
-        android:title="@string/preferences_try_bsplus"
-        android:summary="@string/preferences_try_bsplus_summary"/>
+    <Preference android:title="@string/preferences_try_bsplus" >
+      <intent android:action="android.intent.action.VIEW" android:data="market://details?id=com.srowen.bs.android" />
+    </Preference>
   </PreferenceCategory>
 </PreferenceScreen>
diff --git a/android/src/com/google/zxing/client/android/pref/BSPlusPreference.java b/android/src/com/google/zxing/client/android/pref/BSPlusPreference.java
diff --git a/android/src/com/google/zxing/client/android/share/BookmarkPickerActivity.java b/android/src/com/google/zxing/client/android/share/BookmarkPickerActivity.java
@@ -46,21 +46,27 @@ public final class BookmarkPickerActivity extends ListActivity {
   private static final String BOOKMARK_SELECTION = 
       Browser.BookmarkColumns.BOOKMARK + " = 1 AND " + Browser.BookmarkColumns.URL + " IS NOT NULL";
 
-  private Cursor cursor = null;
+  private Cursor cursor;
 
   @Override
   protected void onCreate(Bundle icicle) {
     super.onCreate(icicle);
-
     cursor = getContentResolver().query(Browser.BOOKMARKS_URI, BOOKMARK_PROJECTION,
         BOOKMARK_SELECTION, null, null);
     if (cursor == null) {
       Log.w(TAG, "No cursor returned for bookmark query");
       finish();
-    } else {
-      startManagingCursor(cursor);
-      setListAdapter(new BookmarkAdapter(this, cursor));
+      return;
+    }
+    setListAdapter(new BookmarkAdapter(this, cursor));
+  }
+
+  @Override
+  protected void onDestroy() {
+    if (cursor != null) {
+      cursor.close();
     }
+    super.onDestroy();
   }
 
   @Override