make executor singleton again

2 files changed, 7 insertions, 9 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/repository/BaseRepository.java b/app/src/main/java/it/niedermann/nextcloud/deck/repository/BaseRepository.java
index d978e33e7..238195e03 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/repository/BaseRepository.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/repository/BaseRepository.java
@@ -18,7 +18,6 @@ import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 import it.niedermann.android.reactivelivedata.ReactiveLiveData;
 import it.niedermann.nextcloud.deck.database.DataBaseAdapter;
@@ -46,6 +45,7 @@ import it.niedermann.nextcloud.deck.remote.api.LastSyncUtil;
 import it.niedermann.nextcloud.deck.remote.api.ResponseCallback;
 import it.niedermann.nextcloud.deck.remote.helpers.util.ConnectivityUtil;
 import it.niedermann.nextcloud.deck.ui.upcomingcards.UpcomingCardsAdapterItem;
+import it.niedermann.nextcloud.deck.util.ExecutorServiceProvider;
 
 /**
  * Allows basic local access to the {@link DataBaseAdapter} layer but also to some app states which are stored in {@link SharedPreferences}.
@@ -71,7 +71,7 @@ public class BaseRepository {
     }
 
     protected BaseRepository(@NonNull Context context, @NonNull ConnectivityUtil connectivityUtil) {
-        this(context, connectivityUtil, new DataBaseAdapter(context.getApplicationContext()), Executors.newCachedThreadPool());
+        this(context, connectivityUtil, new DataBaseAdapter(context.getApplicationContext()), ExecutorServiceProvider.getExecutorService());
     }
 
     protected BaseRepository(@NonNull Context context,
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/ExecutorServiceProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/ExecutorServiceProvider.java
index 93575f401..dc5e30bac 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/util/ExecutorServiceProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/ExecutorServiceProvider.java
@@ -2,22 +2,20 @@ package it.niedermann.nextcloud.deck.util;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 /**
  * If we really want <strong>this</strong>, we should default to {@link Executors#newWorkStealingPool()}.
  * Though I recommend to distinguish between blocking threads and non-blocking threads (like network operations), where it does not make sense to limit it to available CPU cores.
  */
-@Deprecated(forRemoval = true)
+//@Deprecated(forRemoval = true)
 public class ExecutorServiceProvider {
 
-    private static final int NUMBER_OF_CORES = Runtime.getRuntime().availableProcessors();
+//    private static final int NUMBER_OF_CORES = Runtime.getRuntime().availableProcessors();
 
     private static final ExecutorService EXECUTOR =
-            new ThreadPoolExecutor(NUMBER_OF_CORES>>1, NUMBER_OF_CORES,
-                60L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
+            Executors.newWorkStealingPool();
+//            new ThreadPoolExecutor(NUMBER_OF_CORES>>1, NUMBER_OF_CORES,
+//                60L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
 
     private ExecutorServiceProvider() {
         // hide Constructor