2 files changed, 7 insertions, 4 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")
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
index 3a10ed32..f8b487a2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -9,9 +9,9 @@ import android.webkit.*
 import ca.allanwang.kau.utils.fadeIn
 import ca.allanwang.kau.utils.isVisible
 import com.pitchedapps.frost.dbflow.CookieModel
+import com.pitchedapps.frost.facebook.FB_LOGIN_URL
 import com.pitchedapps.frost.facebook.FB_USER_MATCHER
 import com.pitchedapps.frost.facebook.FbCookie
-import com.pitchedapps.frost.facebook.FB_LOGIN_URL
 import com.pitchedapps.frost.injectors.CssHider
 import com.pitchedapps.frost.injectors.jsInject
 import com.pitchedapps.frost.utils.L