aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-08-15 19:53:57 -0700
committerGitHub <noreply@github.com>2017-08-15 19:53:57 -0700
commit2eaad9b72746d57c187d2ded7f40d803f88dfcee (patch)
treebab40fa1cd7e9fd4bba8fd59b562207010fc58ba /app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
parent19ec9b543e15fe453b576f1b38994b3f8692054f (diff)
downloadfrost-2eaad9b72746d57c187d2ded7f40d803f88dfcee.tar.gz
frost-2eaad9b72746d57c187d2ded7f40d803f88dfcee.tar.bz2
frost-2eaad9b72746d57c187d2ded7f40d803f88dfcee.zip
Enhancement/url redirect manager (#182)
* Initial blacklist * Move js checks to java * Optimize imports and clean up request interceptor
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt10
1 files changed, 7 insertions, 3 deletions
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 f24a7a51..2abc9b25 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
@@ -25,10 +25,14 @@ class FrostJSI(val webView: FrostWebViewCore) {
val cookies: ArrayList<CookieModel>
get() = activity?.cookies() ?: arrayListOf()
+ /**
+ * Attempts to load the url in an overlay
+ * Returns {@code true} if successful, meaning the event is consumed,
+ * or {@code false} otherwise, meaning the event should be propagated
+ */
@JavascriptInterface
- fun loadUrl(url: String) {
- context.launchWebOverlay(url)
- }
+ fun loadUrl(url: String?): Boolean
+ = if (url == null) false else context.requestWebOverlay(url)
@JavascriptInterface
fun reloadBaseUrl(animate: Boolean) {