From 2eaad9b72746d57c187d2ded7f40d803f88dfcee Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 15 Aug 2017 19:53:57 -0700
Subject: Enhancement/url redirect manager (#182)

* Initial blacklist

* Move js checks to java

* Optimize imports and clean up request interceptor
---
 .../frost/web/FrostRequestInterceptor.kt           | 44 +++++++++++-----------
 1 file changed, 21 insertions(+), 23 deletions(-)

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

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt
index 1a907f7f..2dfdda89 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt
@@ -3,6 +3,8 @@ package com.pitchedapps.frost.web
 import android.webkit.WebResourceRequest
 import android.webkit.WebResourceResponse
 import android.webkit.WebView
+import ca.allanwang.kau.kotlin.LazyContext
+import ca.allanwang.kau.kotlin.lazyContext
 import ca.allanwang.kau.utils.use
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
@@ -19,41 +21,37 @@ import java.io.ByteArrayInputStream
 private val blankResource: WebResourceResponse by lazy { WebResourceResponse("text/plain", "utf-8", ByteArrayInputStream("".toByteArray())) }
 
 //these hosts will redirect to a blank resource
-private val blacklistHost: Set<String> by lazy {
-    setOf(
-            "edge-chat.facebook.com"
-    )
-}
+private val blacklistHost: Set<String> =
+        setOf(
+                "edge-chat.facebook.com"
+        )
 
 //these hosts will return null and skip logging
-private val whitelistHost: Set<String> by lazy {
-    setOf(
-            "static.xx.fbcdn.net",
-            "m.facebook.com",
-            "touch.facebook.com"
-    )
-}
+private val whitelistHost: Set<String> =
+        setOf(
+                "static.xx.fbcdn.net",
+                "m.facebook.com",
+                "touch.facebook.com"
+        )
 
 //these hosts will skip ad inspection
 //this list does not have to include anything from the two above
-private val adWhitelistHost: Set<String> by lazy {
-    setOf(
-            "scontent-sea1-1.xx.fbcdn.net"
-    )
-}
+private val adWhitelistHost: Set<String> =
+        setOf(
+                "scontent-sea1-1.xx.fbcdn.net"
+        )
 
-private var adblock: Set<String>? = null
+private val adblock: LazyContext<Set<String>> = lazyContext {
+    it.assets.open("adblock.txt").bufferedReader().use { it.readLines().toSet() }
+}
 
-fun shouldFrostInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? {
+fun WebView.shouldFrostInterceptRequest(request: WebResourceRequest): WebResourceResponse? {
     val httpUrl = HttpUrl.parse(request.url?.toString() ?: return null) ?: return null
     val host = httpUrl.host()
     val url = httpUrl.toString()
     if (blacklistHost.contains(host)) return blankResource
     if (whitelistHost.contains(host)) return null
-    if (!adWhitelistHost.contains(host)) {
-        if (adblock == null) adblock = view.context.assets.open("adblock.txt").bufferedReader().use { it.readLines().toSet() }
-        if (adblock?.any { url.contains(it) } ?: false) return blankResource
-    }
+    if (!adWhitelistHost.contains(host) && adblock(context).any { url.contains(it) }) return blankResource
     if (!shouldLoadImages && !Prefs.loadMediaOnMeteredNetwork && request.isMedia) return blankResource
     L.v("Intercept Request", "$host $url")
     return null
-- 
cgit v1.2.3