Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3687 from ByteHamster/cancel-notification-updater

Browse Source 
Cancel notification after cancelling notification updater
This commit is contained in:
H. Lehmann 2019-12-15 10:26:48 +01:00 committed by GitHub
commit 72520d7ac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
View File

@ -213,10 +213,6 @@ public class DownloadService extends Service {
EventBus.getDefault().postSticky(DownloadEvent.refresh(Collections.emptyList())); EventBus.getDefault().postSticky(DownloadEvent.refresh(Collections.emptyList()));
stopForeground(true);
NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
nm.cancel(NOTIFICATION_ID);
downloadCompletionThread.interrupt(); downloadCompletionThread.interrupt();
try { try {
downloadCompletionThread.join(); downloadCompletionThread.join();
@ -231,6 +227,10 @@ public class DownloadService extends Service {
} }
unregisterReceiver(cancelDownloadReceiver); unregisterReceiver(cancelDownloadReceiver);
stopForeground(true);
NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
nm.cancel(NOTIFICATION_ID);
// if this was the initial gpodder sync, i.e. we just synced the feeds successfully, // if this was the initial gpodder sync, i.e. we just synced the feeds successfully,
// it is now time to sync the episode actions // it is now time to sync the episode actions
if (GpodnetPreferences.loggedIn() && if (GpodnetPreferences.loggedIn() &&