Completed basic support for NFC / NDEF formats applicable to 2D barcodes. Not yet...

[zxing.git] / core / src / com / google / zxing / client / result / URIParsedResult.java

diff --git a/core/src/com/google/zxing/client/result/URIParsedResult.java b/core/src/com/google/zxing/client/result/URIParsedResult.java
index c237aaa..52c93cb 100644 (file)
--- a/core/src/com/google/zxing/client/result/URIParsedResult.java
+++ b/core/src/com/google/zxing/client/result/URIParsedResult.java
@@ -16,6 +16,8 @@
 
 package com.google.zxing.client.result;
 
+import com.google.zxing.Result;
+
 /**
  * @author srowen@google.com (Sean Owen)
  */
@@ -28,7 +30,8 @@ public final class URIParsedResult extends ParsedReaderResult {
     this.uri = uri;
   }
 
-  public static URIParsedResult parse(String rawText) {
+  public static URIParsedResult parse(Result result) {
+    String rawText = result.getText();
     if (!isBasicallyValidURI(rawText)) {
       return null;
     }
@@ -71,7 +74,7 @@ public final class URIParsedResult extends ParsedReaderResult {
    * need to know when a string is obviously not a URI.
    */
   static boolean isBasicallyValidURI(String uri) {
-    return uri.indexOf(' ') < 0 && (uri.indexOf(':') >= 0 || uri.indexOf('.') >= 0);
+    return uri != null && uri.indexOf(' ') < 0 && (uri.indexOf(':') >= 0 || uri.indexOf('.') >= 0);
   }
 
 }
\ No newline at end of file