Some refactoring to remove small disconnect between how Results are handled and whether the client thinks it can do anything meaningful with a Result

git-svn-id: https://zxing.googlecode.com/svn/trunk@288 59b500cc-1b3d-0410-9834-0bbf25fbcc57

android/src/com/google/zxing/client/android/BarcodeReaderCaptureActivity.java

@@ -158,8 +158,8 @@ public final class BarcodeReaderCaptureActivity extends Activity {
 
     Context context = getApplication();
     ParsedReaderResult readerResult = parseReaderResult(rawResult);
-    Handler handler = new ResultHandler(this, readerResult);
+    ResultHandler handler = new ResultHandler(this, readerResult);
-    if (canBeHandled(readerResult.getType())) {
+    if (handler.getIntent() != null) {
       // Can be handled by some external app; ask if the user wants to
       // proceed first though
       Message yesMessage = handler.obtainMessage(R.string.button_yes);
@@ -193,10 +193,6 @@ public final class BarcodeReaderCaptureActivity extends Activity {
     return readerResult;
   }
 
-  private static boolean canBeHandled(ParsedReaderResultType type) {
-    return !type.equals(ParsedReaderResultType.TEXT);
-  }
-
   private static int getDialogTitleID(ParsedReaderResultType type) {
     if (type.equals(ParsedReaderResultType.ADDRESSBOOK)) {
       return R.string.title_add_contact;

android/src/com/google/zxing/client/android/ResultHandler.java

@@ -43,17 +43,15 @@ import java.net.URISyntaxException;
  */
 final class ResultHandler extends Handler {
 
-  private final ParsedReaderResult result;
+  private final Intent intent;
   private final BarcodeReaderCaptureActivity captureActivity;
 
   ResultHandler(BarcodeReaderCaptureActivity captureActivity, ParsedReaderResult result) {
     this.captureActivity = captureActivity;
-    this.result = result;
+    this.intent = resultToIntent(result);
   }
 
-  @Override
+  private static Intent resultToIntent(ParsedReaderResult result) {
-  public void handleMessage(Message message) {
-    if (message.what == R.string.button_yes) {
     Intent intent = null;
     ParsedReaderResultType type = result.getType();
     if (type.equals(ParsedReaderResultType.ADDRESSBOOK)) {
@@ -75,24 +73,19 @@ final class ResultHandler extends Handler {
     } else if (type.equals(ParsedReaderResultType.BOOKMARK)) {
       // For now, we can only open the browser, and not actually add a bookmark
       try {
-          intent = new Intent(Intent.VIEW_ACTION,
+        intent = new Intent(Intent.VIEW_ACTION, new ContentURI(((BookmarkDoCoMoResult) result).getURI()));
-              new ContentURI(((BookmarkDoCoMoResult) result).getURI()));
       } catch (URISyntaxException e) {
-          return;
       }
     } else if (type.equals(ParsedReaderResultType.URLTO)) {
       try {
-          intent = new Intent(Intent.VIEW_ACTION,
+        intent = new Intent(Intent.VIEW_ACTION, new ContentURI(((URLTOResult) result).getURI()));
-              new ContentURI(((URLTOResult) result).getURI()));
       } catch (URISyntaxException e) {
-          return;
       }
     } else if (type.equals(ParsedReaderResultType.EMAIL)) {
       EmailDoCoMoResult emailResult = (EmailDoCoMoResult) result;
       try {
         intent = new Intent(Intent.SENDTO_ACTION, new ContentURI(emailResult.getTo()));
       } catch (URISyntaxException e) {
-          return;
       }
       putExtra(intent, "subject", emailResult.getSubject());
       putExtra(intent, "body", emailResult.getBody());
@@ -101,7 +94,6 @@ final class ResultHandler extends Handler {
       try {
         intent = new Intent(Intent.SENDTO_ACTION, new ContentURI(emailResult.getEmailAddress()));
       } catch (URISyntaxException e) {
-          return;
       }
     //} else if (type.equals(ParsedReaderResultType.GEO)) {
     //  GeoParsedResult geoResult = (GeoParsedResult) result;
@@ -115,22 +107,25 @@ final class ResultHandler extends Handler {
     } else if (type.equals(ParsedReaderResultType.UPC)) {
       UPCParsedResult upcResult = (UPCParsedResult) result;
       try {
-          ContentURI uri = new ContentURI("http://www.upcdatabase.com/item.asp?upc=" +
+        ContentURI uri = new ContentURI("http://www.upcdatabase.com/item.asp?upc=" + upcResult.getUPC());
-              upcResult.getUPC());
         intent = new Intent(Intent.VIEW_ACTION, uri);
       } catch (URISyntaxException e) {
-          return;
       }
     } else if (type.equals(ParsedReaderResultType.URI)) {
       URIParsedResult uriResult = (URIParsedResult) result;
       try {
         intent = new Intent(Intent.VIEW_ACTION, new ContentURI(uriResult.getURI()));
       } catch (URISyntaxException e) {
-          return;
       }
     } else if (type.equals(ParsedReaderResultType.ANDROID_INTENT)) {
       intent = ((AndroidIntentParsedResult) result).getIntent();
     }
+    return intent;
+  }
+
+  @Override
+  public void handleMessage(Message message) {
+    if (message.what == R.string.button_yes) {
       if (intent != null) {
         captureActivity.startActivity(intent);
       }
@@ -139,6 +134,10 @@ final class ResultHandler extends Handler {
     }
   }
 
+  Intent getIntent() {
+    return intent;
+  }
+
   private static void putExtra(Intent intent, String key, String value) {
     if (value != null && value.length() > 0) {
       intent.putExtra(key, value);