Add support for Android Intent URIs encoded in a barcode

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

diff --git a/android/src/com/google/zxing/client/android/AndroidIntentParsedResult.java b/android/src/com/google/zxing/client/android/AndroidIntentParsedResult.java
new file mode 100644 (file)
index 0000000..40f4fec
--- /dev/null
+++ b/android/src/com/google/zxing/client/android/AndroidIntentParsedResult.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.content.Intent;
+import com.google.zxing.client.result.ParsedReaderResult;
+import com.google.zxing.client.result.ParsedReaderResultType;
+
+import java.net.URISyntaxException;
+
+/**
+ * A {@link ParsedReaderResult} derived from a URI that encodes an Android
+ * {@link Intent}, and which should presumably trigger that intent on Android.
+ *
+ * @author srowen@google.com (Sean Owen)
+ */
+public final class AndroidIntentParsedResult extends ParsedReaderResult {
+
+  private final Intent intent;
+
+  private AndroidIntentParsedResult(Intent intent) {
+    super(ParsedReaderResultType.ANDROID_INTENT);
+    this.intent = intent;
+  }
+
+  public static AndroidIntentParsedResult parse(String rawText) {
+    try {
+      return new AndroidIntentParsedResult(Intent.getIntent(rawText));
+    } catch (URISyntaxException urise) {
+      return null;
+    }
+  }
+
+  public Intent getIntent() {
+    return intent;
+  }
+
+  @Override
+  public String getDisplayResult() {
+    return intent.toString();
+  }
+
+}
\ No newline at end of file

diff --git a/android/src/com/google/zxing/client/android/BarcodeReaderCaptureActivity.java b/android/src/com/google/zxing/client/android/BarcodeReaderCaptureActivity.java
index 11ba96a..f8d1a97 100644 (file)
--- a/android/src/com/google/zxing/client/android/BarcodeReaderCaptureActivity.java
+++ b/android/src/com/google/zxing/client/android/BarcodeReaderCaptureActivity.java
@@ -156,7 +156,7 @@ public final class BarcodeReaderCaptureActivity extends Activity {
     }
 
     Context context = getApplication();
-    ParsedReaderResult readerResult = ParsedReaderResult.parseReaderResult(rawResult.getText());
+    ParsedReaderResult readerResult = parseReaderResult(rawResult);
     Handler handler = new ResultHandler(this, readerResult);
     if (canBeHandled(readerResult.getType())) {
       // Can be handled by some external app; ask if the user wants to
@@ -175,6 +175,18 @@ public final class BarcodeReaderCaptureActivity extends Activity {
     }
   }
 
+  private static ParsedReaderResult parseReaderResult(Result rawResult) {
+    String rawText = rawResult.getText();
+    ParsedReaderResult readerResult = ParsedReaderResult.parseReaderResult(rawText);
+    if (readerResult.getType().equals(ParsedReaderResultType.TEXT)) {
+      ParsedReaderResult androidResult = AndroidIntentParsedResult.parse(rawText);
+      if (androidResult != null) {
+        readerResult = androidResult;
+      }
+    }
+    return readerResult;
+  }
+
   private static boolean canBeHandled(ParsedReaderResultType type) {
     return !type.equals(ParsedReaderResultType.TEXT);
   }