From a972947252b03c326b9a2835a423c6041f33ac11 Mon Sep 17 00:00:00 2001 From: srowen Date: Sun, 22 Aug 2010 21:58:11 +0000 Subject: [PATCH] Issue 521, avoid an NPE git-svn-id: http://zxing.googlecode.com/svn/trunk@1552 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../google/zxing/client/android/share/ShareActivity.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/android/src/com/google/zxing/client/android/share/ShareActivity.java b/android/src/com/google/zxing/client/android/share/ShareActivity.java index a116f745..696b389b 100755 --- a/android/src/com/google/zxing/client/android/share/ShareActivity.java +++ b/android/src/com/google/zxing/client/android/share/ShareActivity.java @@ -151,6 +151,10 @@ public final class ShareActivity extends Activity { } private void showTextAsBarcode(String text) { + Log.i(TAG, "Showing text as barcode: " + text); + if (text == null) { + return; // Show error? + } Intent intent = new Intent(Intents.Encode.ACTION); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); intent.putExtra(Intents.Encode.TYPE, Contents.Type.TEXT); @@ -167,6 +171,9 @@ public final class ShareActivity extends Activity { */ private void showContactAsBarcode(Uri contactUri) { Log.i(TAG, "Showing contact URI as barcode: " + contactUri); + if (contactUri == null) { + return; // Show error? + } ContentResolver resolver = getContentResolver(); Cursor contactCursor = resolver.query(contactUri, null, null, null, null); Bundle bundle = new Bundle(); -- 2.20.1