From ca12899e10da6e900499b7c4b99cc700cd5b9176 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 26 Oct 2017 14:19:43 -0400
Subject: Fix some null check warnings

---
 app/src/main/kotlin/com/pitchedapps/frost/services/DownloadService.kt  | 2 +-
 app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt           | 1 +
 .../main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt   | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/DownloadService.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/DownloadService.kt
index 986467b8..fda5ebf5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/DownloadService.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/DownloadService.kt
@@ -169,7 +169,7 @@ class DownloadService : IntentService("FrostVideoDownloader") {
 
             private var totalBytesRead = 0L
 
-            override fun read(sink: Buffer?, byteCount: Long): Long {
+            override fun read(sink: Buffer, byteCount: Long): Long {
                 val bytesRead = super.read(sink, byteCount)
                 // read() returns the number of bytes read, or -1 if this source is exhausted.
                 totalBytesRead += if (bytesRead != -1L) bytesRead else 0
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 298453dd..c814ad4d 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/AdBlocker.kt
@@ -28,6 +28,7 @@ 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())
     }
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 fdec3238..f7f5666d 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostRequestInterceptor.kt
@@ -39,7 +39,8 @@ private val adWhitelistHost: Set<String> =
         )
 
 fun WebView.shouldFrostInterceptRequest(request: WebResourceRequest): WebResourceResponse? {
-    val httpUrl = HttpUrl.parse(request.url?.toString() ?: return null) ?: return null
+    request.url ?: return null
+    val httpUrl = HttpUrl.parse(request.url.toString()) ?: return null
     val host = httpUrl.host()
     val url = httpUrl.toString()
 //    if (blacklistHost.contains(host)) return blankResource
-- 
cgit v1.2.3