diff options
4 files changed, 36 insertions, 1 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java index e2e67459..f26389f7 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiRequest.java @@ -11,10 +11,20 @@ import com.google.gson.JsonElement; import java.util.HashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; public class ApiRequest implements ApiCommon.ApiCaller { - private static final ExecutorService EXECUTOR = Executors.newSingleThreadExecutor(); + private static final ExecutorService EXECUTOR = Executors.newSingleThreadExecutor(new ThreadFactory() { + private final AtomicInteger m_count = new AtomicInteger(1); + @Override + public Thread newThread(Runnable r) { + Thread t = new Thread(r, "ApiRequest-" + m_count.getAndIncrement()); + t.setDaemon(true); + return t; + } + }); private final Handler m_mainHandler = new Handler(Looper.getMainLooper()); protected final Context m_context; @@ -92,4 +102,11 @@ public class ApiRequest implements ApiCommon.ApiCaller { public ApiError getLastError() { return m_lastError; } + + /** + * Shut down the shared executor. Call once when the application is terminating. + */ + public static void shutdownExecutor() { + EXECUTOR.shutdownNow(); + } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java index 6d557635..21e96f72 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java @@ -442,4 +442,10 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle .orElse(null); } + @Override + public void onCleared() { + super.onCleared(); + m_executor.shutdownNow(); + } + } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsModel.java index d1c7c20f..bdd5068e 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsModel.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsModel.java @@ -263,4 +263,10 @@ public class FeedsModel extends AndroidViewModel implements ApiCommon.ApiCaller } } + @Override + public void onCleared() { + super.onCleared(); + m_executor.shutdownNow(); + } + } \ No newline at end of file diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryModel.java index b97472c7..c648d9ef 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryModel.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryModel.java @@ -175,4 +175,10 @@ public class GalleryModel extends AndroidViewModel { m_isChecking.postValue(false); }); } + + @Override + public void onCleared() { + super.onCleared(); + m_executor.shutdownNow(); + } } |
