Fix/bad overlay (#490)v1.6.5

* Fix intent launching

* Add some tests and update kotlin

1 files changed, 7 insertions, 7 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
index c8c7e2e7..67881ada 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -144,15 +144,15 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : BaseWebViewClient
         L.i("Url Loading", request.url?.toString())
         val path = request.url?.path ?: return super.shouldOverrideUrlLoading(view, request)
         L.v("Url Loading Path", path)
-        request.url?.toString()?.apply {
-            if (contains("intent") && contains("com.facebook")) {
-                L.i("Skip facebook intent request")
-                return true
-            }
+        val url = request.url.toString()
+        if (url.isExplicitIntent) {
+            if (!url.contains("com.facebook"))
+                view.context.resolveActivityForUri(request.url)
+            return true
         }
         if (path.startsWith("/composer/")) return launchRequest(request)
-        if (request.url.toString().contains("scontent-sea1-1.xx.fbcdn.net") && (path.endsWith(".jpg") || path.endsWith(".png")))
-            return launchImage(request.url.toString())
+        if (url.contains("scontent-sea1-1.xx.fbcdn.net") && (path.endsWith(".jpg") || path.endsWith(".png")))
+            return launchImage(url)
         if (Prefs.linksInDefaultApp && view.context.resolveActivityForUri(request.url)) return true
         return super.shouldOverrideUrlLoading(view, request)
     }