From 514de35c254e1c9a40f06070ed7d9b325941adb3 Mon Sep 17 00:00:00 2001
From: Fedir <truefedex@gmail.com>
Date: Wed, 27 Oct 2021 13:51:34 +0300
Subject: [PATCH] added several try-catches; v1.6.2

---
 app/build.gradle.kts                          |  6 ++---
 .../activity/main/AdblockViewModel.kt         | 23 ++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2883c61..0a0ba7f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -23,8 +23,8 @@ android {
         applicationId = "com.phlox.tvwebbrowser"
         minSdk = 21
         targetSdk = 30
-        versionCode = 45
-        versionName = "1.6.1"
+        versionCode = 46
+        versionName = "1.6.2"
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -42,7 +42,7 @@ android {
     }
     buildTypes {
         getByName("release") {
-            isDebuggable = true
+            isDebuggable = false
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             signingConfig=signingConfigs.getByName("release")
diff --git a/app/src/main/java/com/phlox/tvwebbrowser/activity/main/AdblockViewModel.kt b/app/src/main/java/com/phlox/tvwebbrowser/activity/main/AdblockViewModel.kt
index 263b867..4fca80b 100644
--- a/app/src/main/java/com/phlox/tvwebbrowser/activity/main/AdblockViewModel.kt
+++ b/app/src/main/java/com/phlox/tvwebbrowser/activity/main/AdblockViewModel.kt
@@ -10,17 +10,13 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.brave.adblock.AdBlockClient
 import com.brave.adblock.Utils
-import com.phlox.tvwebbrowser.R
 import com.phlox.tvwebbrowser.TVBro
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.File
-import java.lang.Exception
 import java.net.URL
 import java.util.*
-import javax.net.ssl.HttpsURLConnection
-
 
 class AdblockViewModel(val app: Application) : AndroidViewModel(app) {
     companion object {
@@ -77,9 +73,14 @@ class AdblockViewModel(val app: Application) : AndroidViewModel(app) {
                 success = true
                 return@ioContext
             }
-            val easyList = URL(adBlockListURL).openConnection().inputStream.bufferedReader().use { it.readText() }
-            success = client.parse(easyList)
-            client.serialize(serializedFile.absolutePath)
+            try {
+                val easyList = URL(adBlockListURL).openConnection().inputStream.bufferedReader()
+                  .use { it.readText() }
+                success = client.parse(easyList)
+                client.serialize(serializedFile.absolutePath)
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
         }
         this@AdblockViewModel.client = client
         lastUpdateListTime = now.timeInMillis
@@ -98,6 +99,12 @@ class AdblockViewModel(val app: Application) : AndroidViewModel(app) {
         } catch (e: Exception) {
             return false
         }
-        return baseHost != null && client.matches(request.url.toString(), filterOption, baseHost)
+        val result = try {
+            baseHost != null && client.matches(request.url.toString(), filterOption, baseHost)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            false
+        }
+        return result
     }
 }
\ No newline at end of file