From 2723abcfd0ff3d54297bd2dcc9c023a8ad33cebf Mon Sep 17 00:00:00 2001
From: anthony restaino <anthonyrestaino11@gmail.com>
Date: Thu, 20 Apr 2017 23:10:01 -0400
Subject: [PATCH] Switching from task thread to IO thread where appropriate

---
 .../browser/lightning/database/BookmarkManager.java  | 12 ++++--------
 .../java/acr/browser/lightning/utils/AdBlock.java    |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
index 82ffad8..a5d5893 100644
--- a/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
+++ b/app/src/main/java/acr/browser/lightning/database/BookmarkManager.java
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -36,6 +37,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import acr.browser.lightning.R;
+import acr.browser.lightning.app.BrowserApp;
 import acr.browser.lightning.constant.Constants;
 import acr.browser.lightning.utils.Utils;
 
@@ -54,12 +56,12 @@ public class BookmarkManager {
 
     private Map<String, HistoryItem> mBookmarksMap;
     @NonNull private String mCurrentFolder = "";
-    @NonNull private final ExecutorService mExecutor;
+    @NonNull private final Executor mExecutor;
     private File mFilesDir;
 
     @Inject
     public BookmarkManager(@NonNull Context context) {
-        mExecutor = Executors.newSingleThreadExecutor();
+        mExecutor = BrowserApp.getIOThread();
         DEFAULT_BOOKMARK_TITLE = context.getString(R.string.untitled);
         mExecutor.execute(new BookmarkInitializer(context));
     }
@@ -177,12 +179,6 @@ public class BookmarkManager {
         }
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        mExecutor.shutdownNow();
-        super.finalize();
-    }
-
     public boolean isBookmark(String url) {
         return mBookmarksMap.containsKey(url);
     }
diff --git a/app/src/main/java/acr/browser/lightning/utils/AdBlock.java b/app/src/main/java/acr/browser/lightning/utils/AdBlock.java
index 543b90a..14cd766 100644
--- a/app/src/main/java/acr/browser/lightning/utils/AdBlock.java
+++ b/app/src/main/java/acr/browser/lightning/utils/AdBlock.java
@@ -53,7 +53,7 @@ public class AdBlock {
     }
 
     private void loadBlockedDomainsList(@NonNull final Context context) {
-        BrowserApp.getTaskThread().execute(new Runnable() {
+        BrowserApp.getIOThread().execute(new Runnable() {
 
             @Override
             public void run() {
@@ -137,7 +137,7 @@ public class AdBlock {
      * @param context the context needed to read the file
      */
     private void loadHostsFile(@NonNull final Context context) {
-        BrowserApp.getTaskThread().execute(new Runnable() {
+        BrowserApp.getIOThread().execute(new Runnable() {
 
             @Override
             public void run() {