aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/utils
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-12-08 00:29:40 -0800
committerGitHub <noreply@github.com>2019-12-08 00:29:40 -0800
commit15494d3b42315fa6fa7ae5daeb5ddf1f964b3932 (patch)
treec53221689ddeef3619572276fa530e8368abbde0 /app/src/main/kotlin/com/pitchedapps/frost/utils
parentf9129dd7b59b4b3119805a49c21315e1f5a5e336 (diff)
downloadfrost-15494d3b42315fa6fa7ae5daeb5ddf1f964b3932.tar.gz
frost-15494d3b42315fa6fa7ae5daeb5ddf1f964b3932.tar.bz2
frost-15494d3b42315fa6fa7ae5daeb5ddf1f964b3932.zip
Update versions (#1591)
* Update versions * Update travis android sdk * Fix api updates * Update dex plugin version
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt
index d14c6cd3..92b44ffd 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt
@@ -22,6 +22,7 @@ import ca.allanwang.kau.utils.use
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
/**
* Created by Allan Wang on 2017-09-24.
@@ -50,8 +51,8 @@ open class AdBlocker(val assetPath: String) {
fun isAd(url: String?): Boolean {
url ?: return false
- val httpUrl = HttpUrl.parse(url) ?: return false
- return isAdHost(httpUrl.host())
+ val httpUrl = url.toHttpUrlOrNull() ?: return false
+ return isAdHost(httpUrl.host)
}
tailrec fun isAdHost(host: String): Boolean {