Address Issue 152

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

diff --git a/core/src/com/google/zxing/client/result/ResultParser.java b/core/src/com/google/zxing/client/result/ResultParser.java
index d8172b4..3b8e076 100644 (file)
--- a/core/src/com/google/zxing/client/result/ResultParser.java
+++ b/core/src/com/google/zxing/client/result/ResultParser.java
@@ -53,8 +53,6 @@ public abstract class ResultParser {
       return result;
     } else if ((result = VEventResultParser.parse(theResult)) != null) {
       return result;
-    } else if ((result = EmailAddressResultParser.parse(theResult)) != null) {
-      return result;
     } else if ((result = TelResultParser.parse(theResult)) != null) {
       return result;
     } else if ((result = SMSMMSResultParser.parse(theResult)) != null) {
@@ -65,6 +63,8 @@ public abstract class ResultParser {
       return result;
     } else if ((result = URIResultParser.parse(theResult)) != null) {
       return result;
+    } else if ((result = EmailAddressResultParser.parse(theResult)) != null) {
+      return result;
     } else if ((result = ISBNResultParser.parse(theResult)) != null) {
       // We depend on ISBN parsing coming before UPC, as it is a subset.
       return result;

diff --git a/core/test/src/com/google/zxing/client/result/URIParsedResultTestCase.java b/core/test/src/com/google/zxing/client/result/URIParsedResultTestCase.java
index 1207fbd..3da39c1 100644 (file)
--- a/core/test/src/com/google/zxing/client/result/URIParsedResultTestCase.java
+++ b/core/test/src/com/google/zxing/client/result/URIParsedResultTestCase.java
@@ -38,6 +38,9 @@ public final class URIParsedResultTestCase extends TestCase {
     doTest("http://google.com", "http://google.com", null);
     doTest("https://google.com", "https://google.com", null);
     doTest("google.com:443", "http://google.com:443", null);
+    doTest("https://www.google.com/calendar/hosted/google.com/embed?mode=AGENDA&force_login=true&src=google.com_726f6f6d5f6265707075@resource.calendar.google.com",
+           "https://www.google.com/calendar/hosted/google.com/embed?mode=AGENDA&force_login=true&src=google.com_726f6f6d5f6265707075@resource.calendar.google.com",
+           null);
   }
 
   public void testURLTO() {