X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fcoroutines%2FPopulateBlocklistsCoroutine.kt;h=32a4b3b3d170cd8a884d3962f01fed1daf5bd852;hb=5dc78bb8db242a068ec38565ef2a9e635224487a;hp=4311ef5ea50a2434543497fbd63b23c38b758c5c;hpb=c2b5bdf009503f6761dc830fb65502ad2910c284;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/java/com/stoutner/privacybrowser/coroutines/PopulateBlocklistsCoroutine.kt b/app/src/main/java/com/stoutner/privacybrowser/coroutines/PopulateBlocklistsCoroutine.kt
index 4311ef5e..32a4b3b3 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/coroutines/PopulateBlocklistsCoroutine.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/coroutines/PopulateBlocklistsCoroutine.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019,2021-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2019,2021-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -27,7 +27,7 @@ import android.widget.TextView
 import androidx.drawerlayout.widget.DrawerLayout
 
 import com.stoutner.privacybrowser.R
-import com.stoutner.privacybrowser.helpers.BlocklistHelper
+import com.stoutner.privacybrowser.helpers.ParseBlocklistHelper
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -69,7 +69,7 @@ class PopulateBlocklistsCoroutine(context: Context) {
             loadingBlocklistsRelativeLayout.visibility = View.VISIBLE
 
             // Instantiate the blocklist helper.
-            val blocklistHelper = BlocklistHelper()
+            val parseBlocklistHelper = ParseBlocklistHelper()
 
             // Create a combined array list.
             val combinedBlocklists = ArrayList<ArrayList<List<Array<String>>>>()
@@ -77,9 +77,10 @@ class PopulateBlocklistsCoroutine(context: Context) {
             // Advertise the loading of EasyList.
             loadingBlocklistTextView.text = context.getString(R.string.loading_easylist)
 
+            // Populate the blocklists on the IO thread.
             withContext(Dispatchers.IO) {
                 // Populate EasyList.
-                val easyList = blocklistHelper.parseBlocklist(context.assets, "blocklists/easylist.txt")
+                val easyList = parseBlocklistHelper.parseBlocklist(context.assets, "blocklists/easylist.txt")
 
                 // Advertise the loading of EasyPrivacy.
                 withContext(Dispatchers.Main) {
@@ -87,7 +88,7 @@ class PopulateBlocklistsCoroutine(context: Context) {
                 }
 
                 // Populate EasyPrivacy.
-                val easyPrivacy = blocklistHelper.parseBlocklist(context.assets, "blocklists/easyprivacy.txt")
+                val easyPrivacy = parseBlocklistHelper.parseBlocklist(context.assets, "blocklists/easyprivacy.txt")
 
                 // Advertise the loading of Fanboy's Annoyance List.
                 withContext(Dispatchers.Main) {
@@ -95,7 +96,7 @@ class PopulateBlocklistsCoroutine(context: Context) {
                 }
 
                 // Populate Fanboy's Annoyance List.
-                val fanboysAnnoyanceList = blocklistHelper.parseBlocklist(context.assets, "blocklists/fanboy-annoyance.txt")
+                val fanboysAnnoyanceList = parseBlocklistHelper.parseBlocklist(context.assets, "blocklists/fanboy-annoyance.txt")
 
                 // Advertise the loading of Fanboy's social blocking list.
                 withContext(Dispatchers.Main) {
@@ -103,7 +104,7 @@ class PopulateBlocklistsCoroutine(context: Context) {
                 }
 
                 // Populate Fanboy's Social Blocking List.
-                val fanboysSocialList = blocklistHelper.parseBlocklist(context.assets, "blocklists/fanboy-social.txt")
+                val fanboysSocialList = parseBlocklistHelper.parseBlocklist(context.assets, "blocklists/fanboy-social.txt")
 
                 // Advertise the loading of UltraList
                 withContext(Dispatchers.Main) {
@@ -111,7 +112,7 @@ class PopulateBlocklistsCoroutine(context: Context) {
                 }
 
                 // Populate UltraList.
-                val ultraList = blocklistHelper.parseBlocklist(context.assets, "blocklists/ultralist.txt")
+                val ultraList = parseBlocklistHelper.parseBlocklist(context.assets, "blocklists/ultralist.txt")
 
                 // Advertise the loading of UltraPrivacy.
                 withContext(Dispatchers.Main) {
@@ -119,7 +120,7 @@ class PopulateBlocklistsCoroutine(context: Context) {
                 }
 
                 // Populate UltraPrivacy.
-                val ultraPrivacy = blocklistHelper.parseBlocklist(context.assets, "blocklists/ultraprivacy.txt")
+                val ultraPrivacy = parseBlocklistHelper.parseBlocklist(context.assets, "blocklists/ultraprivacy.txt")
 
                 // Populate the combined array list.
                 combinedBlocklists.add(easyList)