Misc (#614)

* Add locale log

* Add flyweight design for authenticator

* Add option to have instant messages only

* Update interceptor

* Add hd image model loader (#613)

* Launch image view for view full image

* Update changelog

* Greatly improve ImageActivity loading

* Update hashes

* Add back keyword filter

* Clean up

1 files changed, 4 insertions, 26 deletions

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 454e2a4b..0501e2e6 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt
@@ -17,35 +17,13 @@ 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> =
-        setOf(
-                //                "edge-chat.facebook.com" //todo make more specific? This is required for message responses
-        )
-
-//these hosts will return null and skip logging
-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> =
-        setOf(
-                "scontent-sea1-1.xx.fbcdn.net"
-        )
-
 fun WebView.shouldFrostInterceptRequest(request: WebResourceRequest): WebResourceResponse? {
-    request.url ?: return null
-    val httpUrl = HttpUrl.parse(request.url.toString()) ?: return null
+    val requestUrl = request.url?.toString() ?: return null
+    val httpUrl = HttpUrl.parse(requestUrl) ?: 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) && FrostPglAdBlock.isAdHost(host)) return blankResource
+    if (host.contains("facebook") || host.contains("fbcdn")) return null
+    if (FrostPglAdBlock.isAdHost(host)) return blankResource
 //    if (!shouldLoadImages && !Prefs.loadMediaOnMeteredNetwork && request.isMedia) return blankResource
     L.v { "Intercept Request: $host $url" }
     return null