From 10116044ec3c2d1df3b6352bfe907e3cf5bf49d1 Mon Sep 17 00:00:00 2001 From: dswitkin Date: Wed, 28 Apr 2010 19:52:17 +0000 Subject: [PATCH] Added the external storage permission to fix SD card writing issues and bumped the version to 3.3 beta 1. git-svn-id: https://zxing.googlecode.com/svn/trunk@1322 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/AndroidManifest.xml | 5 ++-- android/assets/html/whatsnew.html | 25 ++++++------------- .../client/android/encode/EncodeActivity.java | 9 +++---- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 21e640fb3..03564322f 100755 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t versionName is 2.31, 2.4, or 3.0. --> + android:versionName="3.3 beta 1" + android:versionCode="49"> @@ -132,4 +132,5 @@ versionName is 2.31, 2.4, or 3.0. --> + diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html index 7b70644a6..31034134b 100644 --- a/android/assets/html/whatsnew.html +++ b/android/assets/html/whatsnew.html @@ -3,25 +3,14 @@

What's new in this version

-

New in version 3.22:

+

New in version 3.3:

-

New in version 3.21:

- -

New in version 3.2:

- diff --git a/android/src/com/google/zxing/client/android/encode/EncodeActivity.java b/android/src/com/google/zxing/client/android/encode/EncodeActivity.java index 562ebbf46..4e9013418 100755 --- a/android/src/com/google/zxing/client/android/encode/EncodeActivity.java +++ b/android/src/com/google/zxing/client/android/encode/EncodeActivity.java @@ -158,10 +158,8 @@ public final class EncodeActivity extends Activity { String contents = qrCodeEncoder.getContents(); Bitmap bitmap; try { - bitmap = QRCodeEncoder.encodeAsBitmap(contents, - BarcodeFormat.QR_CODE, - SHARE_BARCODE_DIMENSION, - SHARE_BARCODE_DIMENSION); + bitmap = QRCodeEncoder.encodeAsBitmap(contents, BarcodeFormat.QR_CODE, + SHARE_BARCODE_DIMENSION, SHARE_BARCODE_DIMENSION); } catch (WriterException we) { Log.w(TAG, we.toString()); return true; @@ -195,7 +193,8 @@ public final class EncodeActivity extends Activity { } Intent intent = new Intent(Intent.ACTION_SEND, Uri.parse("mailto:")); - intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name) + " - " + qrCodeEncoder.getTitle()); + intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name) + " - " + + qrCodeEncoder.getTitle()); intent.putExtra(Intent.EXTRA_TEXT, qrCodeEncoder.getContents()); intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + barcodeFile.getAbsolutePath())); intent.setType("image/png");