From 1afa8c80d4e16f4a9f7f8f9ba7b603a4975820bc Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 29 Dec 2011 04:00:14 +0000
Subject: [PATCH] Check more directly for Shopper; saw a strange
 ActivityNotFoundException here

git-svn-id: https://zxing.googlecode.com/svn/trunk@2099 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 .../client/android/result/ResultHandler.java  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/android/src/com/google/zxing/client/android/result/ResultHandler.java b/android/src/com/google/zxing/client/android/result/ResultHandler.java
index d9ae3a3cb..f1ffa57f2 100644
--- a/android/src/com/google/zxing/client/android/result/ResultHandler.java
+++ b/android/src/com/google/zxing/client/android/result/ResultHandler.java
@@ -44,6 +44,7 @@ import java.text.DateFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Locale;
@@ -488,14 +489,20 @@ public abstract class ResultHandler {
   }
 
   final void openGoogleShopper(String query) {
-    try {
-      activity.getPackageManager().getPackageInfo(GOOGLE_SHOPPER_PACKAGE, 0);
-      // If we didn't throw, Shopper is installed, so launch it.
-      Intent intent = new Intent(Intent.ACTION_SEARCH);
-      intent.setClassName(GOOGLE_SHOPPER_PACKAGE, GOOGLE_SHOPPER_ACTIVITY);
-      intent.putExtra(SearchManager.QUERY, query);
+
+    // Construct Intent to launch Shopper
+    Intent intent = new Intent(Intent.ACTION_SEARCH);
+    intent.setClassName(GOOGLE_SHOPPER_PACKAGE, GOOGLE_SHOPPER_ACTIVITY);
+    intent.putExtra(SearchManager.QUERY, query);
+
+    // Is it available?
+    PackageManager pm = activity.getPackageManager();
+    Collection<?> availableApps = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+
+    if (availableApps != null && !availableApps.isEmpty()) {
+      // If something can handle it, start it
       activity.startActivity(intent);
-    } catch (PackageManager.NameNotFoundException e) {
+    } else {
       // Otherwise offer to install it from Market.
       AlertDialog.Builder builder = new AlertDialog.Builder(activity);
       builder.setTitle(R.string.msg_google_shopper_missing);