Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4623 from ByteHamster/cancel-future 

Cancel notification updater future before shutting down executor
This commit is contained in:
ByteHamster 2020-11-01 09:47:32 +01:00 committed by GitHub
parent ec7f639982 f095ca8474
commit dc98c445c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,9 +219,9 @@ public class DownloadService extends Service {
} catch (InterruptedException e) {
e.printStackTrace();
}
cancelNotificationUpdater();
syncExecutor.shutdown();
schedExecutor.shutdown();
cancelNotificationUpdater();
if (downloadPostFuture != null) {
downloadPostFuture.cancel(true);
}
@ -640,6 +640,7 @@ public class DownloadService extends Service {
if (n != null) {
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
nm.notify(R.id.notification_downloading, n);
Log.d(TAG, "Download progress notification was posted");
}
}
}

1
core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java
View File

@ -173,6 +173,7 @@ public class DownloadServiceNotification {
}
NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
nm.notify(id, builder.build());
Log.d(TAG, "Download report notification was posted");
} else {
Log.d(TAG, "No report is created");
}