From 6e0ff29e7b52f1138397ef62e75d331f33029f02 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 22 Jan 2022 19:49:20 +0100
Subject: Unregister receiver before stopping the executor that is called from
 there

---
 .../danoeh/antennapod/core/service/download/DownloadService.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index dd445258e..982800b1c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -257,6 +257,11 @@ public class DownloadService extends Service {
             reportQueue.clear();
         }
 
+        unregisterReceiver(cancelDownloadReceiver);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            connectionMonitor.disable(getApplicationContext());
+        }
+
         EventBus.getDefault().postSticky(DownloadEvent.refresh(Collections.emptyList()));
         cancelNotificationUpdater();
         downloadHandleExecutor.shutdown();
@@ -266,10 +271,6 @@ public class DownloadService extends Service {
             downloadPostFuture.cancel(true);
         }
         downloads.clear();
-        unregisterReceiver(cancelDownloadReceiver);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            connectionMonitor.disable(getApplicationContext());
-        }
 
         // start auto download in case anything new has shown up
         DBTasks.autodownloadUndownloadedItems(getApplicationContext());
-- 
cgit v1.2.3