aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/web/HeadlessHtmlExtractor.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-12-22 01:51:43 -0500
committerGitHub <noreply@github.com>2017-12-22 01:51:43 -0500
commitbd96905dbfa6c1d4bde4257d61f381d4ee8e1fd0 (patch)
treee28732e64f6fc0bba715ae2b0a0383ea780d3a22 /app/src/main/kotlin/com/pitchedapps/frost/web/HeadlessHtmlExtractor.kt
parentbd99aebf4388515273dfd720eb5c59b6e45da44f (diff)
downloadfrost-bd96905dbfa6c1d4bde4257d61f381d4ee8e1fd0.tar.gz
frost-bd96905dbfa6c1d4bde4257d61f381d4ee8e1fd0.tar.bz2
frost-bd96905dbfa6c1d4bde4257d61f381d4ee8e1fd0.zip
Update webview components (#571)
* Add volume binding * Remove key override * Add pause timers to webview
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/HeadlessHtmlExtractor.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/HeadlessHtmlExtractor.kt9
1 files changed, 6 insertions, 3 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/HeadlessHtmlExtractor.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/HeadlessHtmlExtractor.kt
index 471731dd..2c7735a4 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/HeadlessHtmlExtractor.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/HeadlessHtmlExtractor.kt
@@ -29,8 +29,12 @@ import java.util.concurrent.TimeUnit
fun Context.launchHeadlessHtmlExtractor(url: String, injector: InjectorContract, action: (Single<Pair<String, Int>>) -> Unit) {
val single = Single.create<Pair<String, Int>> { e: SingleEmitter<Pair<String, Int>> ->
val extractor = HeadlessHtmlExtractor(this, url, injector, e)
+ extractor.resumeTimers()
e.setCancellable {
- runOnUiThread { extractor.destroy() }
+ runOnUiThread {
+ extractor.pauseTimers()
+ extractor.destroy()
+ }
e.onSuccess("" to R.string.html_extraction_cancelled)
}
}.subscribeOn(AndroidSchedulers.mainThread())
@@ -74,14 +78,13 @@ private class HeadlessHtmlExtractor(
emitter.onSuccess((html ?: "") to -1)
post {
L.d("HeadlessHtmlExtractor fetched $url in $time ms")
- settings.javaScriptEnabled = false
- settings.blockNetworkLoads = true
destroy()
}
}
}
override fun destroy() {
+ pauseTimers()
super.destroy()
L.d("HeadlessHtmlExtractor destroyed")
}