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

Closes #557 : Remove refs to Browser.BookmarkColumns which isn't in API 23 / 6.0

Browse source
This commit is contained in:
Sean Owen 2016-02-15 14:02:48 +00:00
parent 1fbefcac31
commit 715be9a1a9
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/AndroidManifest.xml
View file

@ -25,6 +25,7 @@
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.FLASHLIGHT"/> <uses-permission android:name="android.permission.FLASHLIGHT"/>
<uses-permission android:name="android.permission.READ_CONTACTS"/> <uses-permission android:name="android.permission.READ_CONTACTS"/>
<!-- unavailable in API 23 -->
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/> <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

3
android/src/com/google/zxing/client/android/share/AppPickerActivity.java
View file

@ -19,7 +19,6 @@ package com.google.zxing.client.android.share;
import android.app.ListActivity; import android.app.ListActivity;
import android.content.Intent; import android.content.Intent;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.provider.Browser;
import android.view.View; import android.view.View;
import android.widget.Adapter; import android.widget.Adapter;
import android.widget.ListView; import android.widget.ListView;
@ -54,7 +53,7 @@ public final class AppPickerActivity extends ListActivity {
String packageName = ((AppInfo) adapter.getItem(position)).getPackageName(); String packageName = ((AppInfo) adapter.getItem(position)).getPackageName();
Intent intent = new Intent(); Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
intent.putExtra(Browser.BookmarkColumns.URL, "market://details?id=" + packageName); intent.putExtra("url", "market://details?id=" + packageName); // Browser.BookmarkColumns.URL
setResult(RESULT_OK, intent); setResult(RESULT_OK, intent);
} else { } else {
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);

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

@ -35,15 +35,14 @@ public final class BookmarkPickerActivity extends ListActivity {
private static final String TAG = BookmarkPickerActivity.class.getSimpleName(); private static final String TAG = BookmarkPickerActivity.class.getSimpleName();
private static final String[] BOOKMARK_PROJECTION = { private static final String[] BOOKMARK_PROJECTION = {
Browser.BookmarkColumns.TITLE, "title", // Browser.BookmarkColumns.TITLE
Browser.BookmarkColumns.URL "url", // Browser.BookmarkColumns.URL
}; };
static final int TITLE_COLUMN = 0; static final int TITLE_COLUMN = 0;
static final int URL_COLUMN = 1; static final int URL_COLUMN = 1;
private static final String BOOKMARK_SELECTION = private static final String BOOKMARK_SELECTION = "bookmark = 1 AND url IS NOT NULL";
Browser.BookmarkColumns.BOOKMARK + " = 1 AND " + Browser.BookmarkColumns.URL + " IS NOT NULL";
private Cursor cursor; private Cursor cursor;
@ -74,8 +73,8 @@ public final class BookmarkPickerActivity extends ListActivity {
if (!cursor.isClosed() && cursor.moveToPosition(position)) { if (!cursor.isClosed() && cursor.moveToPosition(position)) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
intent.putExtra(Browser.BookmarkColumns.TITLE, cursor.getString(TITLE_COLUMN)); intent.putExtra("title", cursor.getString(TITLE_COLUMN)); // Browser.BookmarkColumns.TITLE
intent.putExtra(Browser.BookmarkColumns.URL, cursor.getString(URL_COLUMN)); intent.putExtra("url", cursor.getString(URL_COLUMN)); // Browser.BookmarkColumns.URL
setResult(RESULT_OK, intent); setResult(RESULT_OK, intent);
} else { } else {
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);

11
android/src/com/google/zxing/client/android/share/ShareActivity.java
View file

@ -16,6 +16,7 @@
package com.google.zxing.client.android.share; package com.google.zxing.client.android.share;
import android.os.Build;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.client.android.Contents; import com.google.zxing.client.android.Contents;
@ -29,7 +30,6 @@ import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.provider.BaseColumns; import android.provider.BaseColumns;
import android.provider.Browser;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
@ -121,7 +121,12 @@ public final class ShareActivity extends Activity {
setContentView(R.layout.share); setContentView(R.layout.share);
findViewById(R.id.share_contact_button).setOnClickListener(contactListener); findViewById(R.id.share_contact_button).setOnClickListener(contactListener);
findViewById(R.id.share_bookmark_button).setOnClickListener(bookmarkListener); if (Build.VERSION.SDK_INT >= 23) { // Marshmallow / 6.0
// Can't access bookmarks in 6.0+
findViewById(R.id.share_bookmark_button).setEnabled(false);
} else {
findViewById(R.id.share_bookmark_button).setOnClickListener(bookmarkListener);
}
findViewById(R.id.share_app_button).setOnClickListener(appListener); findViewById(R.id.share_app_button).setOnClickListener(appListener);
clipboardButton = findViewById(R.id.share_clipboard_button); clipboardButton = findViewById(R.id.share_clipboard_button);
clipboardButton.setOnClickListener(clipboardListener); clipboardButton.setOnClickListener(clipboardListener);
@ -140,7 +145,7 @@ public final class ShareActivity extends Activity {
switch (requestCode) { switch (requestCode) {
case PICK_BOOKMARK: case PICK_BOOKMARK:
case PICK_APP: case PICK_APP:
showTextAsBarcode(intent.getStringExtra(Browser.BookmarkColumns.URL)); showTextAsBarcode(intent.getStringExtra("url")); // Browser.BookmarkColumns.URL
break; break;
case PICK_CONTACT: case PICK_CONTACT:
// Data field is content://contacts/people/984 // Data field is content://contacts/people/984