Fix/bad overlay (#490)v1.6.5

* Fix intent launching

* Add some tests and update kotlin

4 files changed, 33 insertions, 12 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index c644499e..082f4758 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -1,5 +1,6 @@
 package com.pitchedapps.frost.utils
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
@@ -163,6 +164,7 @@ fun Activity.frostSnackbar(@StringRes text: Int, builder: Snackbar.() -> Unit =
 fun View.frostSnackbar(@StringRes text: Int, builder: Snackbar.() -> Unit = {})
         = snackbar(text, Snackbar.LENGTH_LONG, frostSnackbar(builder))
 
+@SuppressLint("RestrictedApi")
 private inline fun frostSnackbar(crossinline builder: Snackbar.() -> Unit): Snackbar.() -> Unit = {
     builder()
     //hacky workaround, but it has proper checks and shouldn't crash
@@ -191,18 +193,33 @@ fun Context.createPrivateMediaFile(extension: String) = createPrivateMediaFile("
  * @returns {@code true} if activity is resolved, {@code false} otherwise
  */
 fun Context.resolveActivityForUri(uri: Uri): Boolean {
-    if (uri.toString().isFacebookUrl && !uri.toString().contains("intent:")) return false //ignore response as we will be triggering ourself
     val intent = Intent(Intent.ACTION_VIEW, uri)
     if (intent.resolveActivity(packageManager) == null) return false
     startActivity(intent)
     return true
 }
 
+/**
+ * [true] if url contains [FACEBOOK_COM]
+ */
 inline val String?.isFacebookUrl
-    get() = this != null && this.contains(FACEBOOK_COM)
+    get() = this != null && contains(FACEBOOK_COM)
 
+/**
+ * [true] is url is a video and can be accepted by VideoViewer
+ */
 inline val String?.isVideoUrl
-    get() = this != null && (this.startsWith(VIDEO_REDIRECT) || this.startsWith("https://video-"))
+    get() = this != null && (startsWith(VIDEO_REDIRECT) || startsWith("https://video-"))
+
+/**
+ * [true] is url can be displayed in a different webview
+ */
+inline val String?.isIndependent
+    get() = this == null || (startsWith("http") && !isFacebookUrl)
+            || !contains("photoset_token")
+
+inline val String?.isExplicitIntent
+    get() = this != null && startsWith("intent://")
 
 fun Context.frostChangelog() = showChangelog(R.xml.frost_changelog, Prefs.textColor) {
     theme()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
index 9941c90c..6bdb459e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
@@ -56,6 +56,7 @@ class FrostJSI(val webView: FrostWebViewCore) {
 
     @JavascriptInterface
     fun contextMenu(url: String, text: String?) {
+        if (!text.isIndependent) return
         //url will be formatted through webcontext
         webView.post { context.showWebContextMenu(WebContext(url, text)) }
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
index e8f9fee9..d1f144a6 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
@@ -18,7 +18,7 @@ import org.jetbrains.anko.runOnUiThread
  * cannot be resolved on a new window and must instead
  * by loaded in the current page
  * This helper method will collect all known cases and launch the overlay accordingly
- * Returns {@code true} (default) if action is consumed, {@code false} otherwise
+ * Returns [true] (default) if action is consumed, [false] otherwise
  *
  * Note that this is not always called on the main thread!
  * UI related methods should always be posted or they may not be properly executed.
@@ -28,7 +28,10 @@ import org.jetbrains.anko.runOnUiThread
  * as we have no need of sending a new intent to the same activity
  */
 fun FrostWebViewCore.requestWebOverlay(url: String): Boolean {
-    if (url == "#") return false
+    if (url == "#" || !url.isIndependent) {
+        L.i("Forbid overlay switch", url)
+        return false
+    }
     if (url.isVideoUrl && context is VideoViewHolder) {
         L.i("Found video", url)
         context.runOnUiThread { (context as VideoViewHolder).showVideo(url) }
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)
     }