Do not notify cancelled downloads

This commit is contained in:
ByteHamster 2019-09-28 13:04:40 +02:00
parent 3e01d66cbd
commit 3041336b92
1 changed files with 10 additions and 1 deletions

View File

@ -1058,7 +1058,13 @@ public class DownloadService extends Service {
private final Runnable postDownloaderTask = new Runnable() { private final Runnable postDownloaderTask = new Runnable() {
@Override @Override
public void run() { public void run() {
List<Downloader> list = Collections.unmodifiableList(downloads); List<Downloader> runningDownloads = new ArrayList<>();
for (Downloader downloader : downloads) {
if (!downloader.cancelled) {
runningDownloads.add(downloader);
}
}
List<Downloader> list = Collections.unmodifiableList(runningDownloads);
EventBus.getDefault().postSticky(DownloadEvent.refresh(list)); EventBus.getDefault().postSticky(DownloadEvent.refresh(list));
postHandler.postDelayed(postDownloaderTask, 1500); postHandler.postDelayed(postDownloaderTask, 1500);
} }
@ -1076,6 +1082,9 @@ public class DownloadService extends Service {
private static String compileNotificationString(List<Downloader> downloads) { private static String compileNotificationString(List<Downloader> downloads) {
List<String> lines = new ArrayList<>(downloads.size()); List<String> lines = new ArrayList<>(downloads.size());
for (Downloader downloader : downloads) { for (Downloader downloader : downloads) {
if (downloader.cancelled) {
continue;
}
StringBuilder line = new StringBuilder(""); StringBuilder line = new StringBuilder("");
DownloadRequest request = downloader.getDownloadRequest(); DownloadRequest request = downloader.getDownloadRequest();
switch (request.getFeedfileType()) { switch (request.getFeedfileType()) {