From 8bfbbac2b8f364bb03866712b113cd2f5de8b9d9 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Thu, 25 Jan 2018 00:23:44 -0500 Subject: Enhancement/video (#669) * Test stricter video extractor * Mess around with mutations * Revert back to strict click listener * Update theme * Update dependencies * Update theme * Create pip toggle * Add pip disabler * Update theme * Update theme --- .../main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 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 d735fd50..4a3fa2a2 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt @@ -26,17 +26,19 @@ class FrostJSI(val web: FrostWebView) { * or {@code false} otherwise, meaning the event should be propagated */ @JavascriptInterface - fun loadUrl(url: String?): Boolean - = if (url == null) false else web.requestWebOverlay(url) + fun loadUrl(url: String?): Boolean = if (url == null) false else web.requestWebOverlay(url) @JavascriptInterface - fun loadVideo(url: String?, isGif: Boolean) { - if (url != null) - web.post { - (context as? VideoViewHolder)?.showVideo(url, isGif) - ?: L.d { "Could not load video; contract not implemented" } + fun loadVideo(url: String?, isGif: Boolean): Boolean = + if (url != null && Prefs.enablePip) { + web.post { + (context as? VideoViewHolder)?.showVideo(url, isGif) + ?: L.e { "Could not load video; contract not implemented" } + } + true + } else { + false } - } @JavascriptInterface fun reloadBaseUrl(animate: Boolean) { -- cgit v1.2.3