From 84bf883a47b956865d31b1b618d5495fcd7d4876 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 19 Aug 2017 09:47:05 -0700
Subject: v1.4.7 (#195)

* Add try catch (#179)

* Add checks before injections (#180)

* Enhancement/url redirect manager (#182)

* Initial blacklist

* Move js checks to java

* Optimize imports and clean up request interceptor

* Misc (#190)

* Update play store description

* Finalize description

* Update kotlin and bg2 for custom themes

* Update to Android Studio 3.0 beta 2

* Update test dependencies and add logging to image activity

* Rename throwable to errorRef

* Update searchview and media picker through kau

* Update themes (#183)

* Theme content now found view

* Update verified bg and bg2 for transparent themes

* Fix check in star text

* Various fixes

* Create base svg sass images

* Feature/theme accent (#192)

* Add lots of theming components

* Optimize and add

* Update accents

* Misc 2 (#191)

* Add further checks for iab and remove generic error dialog

* Theme all snackbars

* Add dynamic media action tile

* Enhancement/media-camera-picker (#194)

* Update kau

* Update changelog
---
 app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt')

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) {
-- 
cgit v1.2.3