Merge branch 'feature/site_parameter' of https://github.com/fylmr/Android into fylmr-feature/site_parameter

subsymbolic · subsymbolic · commit 2f448e34da12 · 2019-06-12T22:53:34.000+01:00
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/SpecialUrlDetectorImplTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/SpecialUrlDetectorImplTest.kt
@@ -127,4 +127,16 @@ class SpecialUrlDetectorImplTest {
         val type = testee.determineType("smsto:123-555-12323") as Sms
         assertEquals("123-555-12323", type.telephoneNumber)
     }
+
+    @Test
+    fun whenUrlIsCustomUriSchemeThenIntentTypeDetected() {
+        val type = testee.determineType("myapp:foo bar") as IntentType
+        assertEquals("myapp:foo bar", type.url)
+    }
+
+    @Test
+    fun whenUrlIsParametrizedQueryThenSearchQueryTypeDetected() {
+        val type = testee.determineType("foo site:duckduckgo.com") as SearchQuery
+        assertEquals("foo site:duckduckgo.com", type.query)
+    }
 }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/SpecialUrlDetector.kt b/app/src/main/java/com/duckduckgo/app/browser/SpecialUrlDetector.kt
@@ -52,7 +52,7 @@ class SpecialUrlDetectorImpl : SpecialUrlDetector {
             HTTP_SCHEME, HTTPS_SCHEME, DATA_SCHEME -> UrlType.Web(uriString)
             ABOUT_SCHEME -> UrlType.Unknown(uriString)
             null -> UrlType.SearchQuery(uriString)
-            else -> buildIntent(uriString)
+            else -> checkForIntent(scheme, uriString)
         }
     }
 
@@ -66,6 +66,15 @@ class SpecialUrlDetectorImpl : SpecialUrlDetector {
 
     private fun buildSmsTo(uriString: String) = UrlType.Sms(uriString.removePrefix("$SMSTO_SCHEME:"))
 
+    private fun checkForIntent(scheme: String, uriString: String): UrlType {
+        val validUriSchemeRegex = Regex("[a-z][a-zA-Z\\d+.-]+")
+        if (scheme.matches(validUriSchemeRegex)){
+            return buildIntent(uriString)
+        }
+
+        return UrlType.SearchQuery(uriString)
+    }
+
     private fun buildIntent(uriString: String): UrlType {
         return try {
             val intent = Intent.parseUri(uriString, 0)
