From ef24f6d1f4468faadb514611292a2e84266b0be3 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 6 Mar 2021 20:59:16 +0100
Subject: [PATCH 1/2] Fixed local folders ending up in DownloadService

---
 .../main/java/de/danoeh/antennapod/core/storage/DBTasks.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
index 596ab624e..2d3294284 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
@@ -222,7 +222,7 @@ public final class DBTasks {
             }).start();
         }
         if (!normalFeeds.isEmpty()) {
-            DownloadRequester.getInstance().downloadFeeds(context, feeds, loadAllPages, force, initiatedByUser);
+            DownloadRequester.getInstance().downloadFeeds(context, normalFeeds, loadAllPages, force, initiatedByUser);
         }
     }
 

From d3bf107363f9195e70ab0315f77afb0093aa6718 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 6 Mar 2021 21:00:26 +0100
Subject: [PATCH 2/2] Fixed download service notification not being updated to
 'Stopping service'

---
 .../antennapod/core/service/download/DownloadService.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 2e0cb705b..e8e85602b 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
@@ -643,8 +643,10 @@ public class DownloadService extends Service {
         if (notificationUpdater != null) {
             notificationUpdater.run();
         }
-        cancelNotificationUpdater();
-        stopForeground(true);
-        stopSelf();
+        handler.post(() -> {
+            cancelNotificationUpdater();
+            stopForeground(true);
+            stopSelf();
+        });
     }
 }