Added a Google Shopper button when scanning products, and bumped the version to 3...

[zxing.git] / android / src / com / google / zxing / client / android / result / ProductResultHandler.java

diff --git a/android/src/com/google/zxing/client/android/result/ProductResultHandler.java b/android/src/com/google/zxing/client/android/result/ProductResultHandler.java
index f497d70..916d8d9 100644 (file)
--- a/android/src/com/google/zxing/client/android/result/ProductResultHandler.java
+++ b/android/src/com/google/zxing/client/android/result/ProductResultHandler.java
@@ -22,6 +22,8 @@ import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.ProductParsedResult;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
@@ -34,15 +36,19 @@ public final class ProductResultHandler extends ResultHandler {
   private static final int[] buttons = {
       R.string.button_product_search,
       R.string.button_web_search,
+      R.string.button_google_shopper,
       R.string.button_custom_product_search,
   };
 
-  private final String customProductSearch;
+  private String customProductSearch;
 
   public ProductResultHandler(Activity activity, ParsedResult result) {
     super(activity, result);
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
     customProductSearch = prefs.getString(PreferencesActivity.KEY_CUSTOM_PRODUCT_SEARCH, null);
+    if (customProductSearch != null && customProductSearch.length() == 0) {
+      customProductSearch = null;
+    }
   }
 
   @Override
@@ -56,20 +62,27 @@ public final class ProductResultHandler extends ResultHandler {
   }
 
   @Override
-  public void handleButtonPress(int index) {
-    ProductParsedResult productResult = (ProductParsedResult) result;
-    switch (index) {
-      case 0:
-        openProductSearch(productResult.getNormalizedProductID());
-        break;
-      case 1:
-        webSearch(productResult.getNormalizedProductID());
-        break;
-      case 2:
-        String url = customProductSearch.replace("%s", productResult.getNormalizedProductID());
-        openURL(url);
-        break;
-    }
+  public void handleButtonPress(final int index) {
+    showNotOurResults(index, new AlertDialog.OnClickListener() {
+      public void onClick(DialogInterface dialogInterface, int i) {
+        ProductParsedResult productResult = (ProductParsedResult) getResult();
+        switch (index) {
+          case 0:
+            openProductSearch(productResult.getNormalizedProductID());
+            break;
+          case 1:
+            webSearch(productResult.getNormalizedProductID());
+            break;
+          case 2:
+            openGoogleShopper(productResult.getNormalizedProductID());
+            break;
+          case 3:
+            String url = customProductSearch.replace("%s", productResult.getNormalizedProductID());
+            openURL(url);
+            break;
+        }
+      }
+    });
   }
 
   @Override