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

Only crash debug version when trying to enqueue too many downloads at once

Browse Source
This commit is contained in:
ByteHamster 2022-04-09 16:28:06 +02:00
parent 52809976a0
commit 8ea814cfdb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import androidx.annotation.VisibleForTesting;
import androidx.core.app.ServiceCompat; import androidx.core.app.ServiceCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import de.danoeh.antennapod.core.BuildConfig;
import de.danoeh.antennapod.core.R; import de.danoeh.antennapod.core.R;
import de.danoeh.antennapod.core.feed.LocalFeedUpdater; import de.danoeh.antennapod.core.feed.LocalFeedUpdater;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
@ -139,9 +140,6 @@ public class DownloadService extends Service {
} }
public static void download(Context context, boolean cleanupMedia, DownloadRequest... requests) { public static void download(Context context, boolean cleanupMedia, DownloadRequest... requests) {
if (requests.length > 100) {
throw new IllegalArgumentException("Android silently drops intent payloads that are too large");
}
ArrayList<DownloadRequest> requestsToSend = new ArrayList<>(); ArrayList<DownloadRequest> requestsToSend = new ArrayList<>();
for (DownloadRequest request : requests) { for (DownloadRequest request : requests) {
if (!isDownloadingFile(request.getSource())) { if (!isDownloadingFile(request.getSource())) {
@ -150,7 +148,15 @@ public class DownloadService extends Service {
} }
if (requestsToSend.isEmpty()) { if (requestsToSend.isEmpty()) {
return; return;
} else if (requestsToSend.size() > 100) {
if (BuildConfig.DEBUG) {
throw new IllegalArgumentException("Android silently drops intent payloads that are too large");
} else {
Log.d(TAG, "Too many download requests. Dropping some to avoid Android dropping all.");
requestsToSend = new ArrayList<>(requestsToSend.subList(0, 100));
}
} }
Intent launchIntent = new Intent(context, DownloadService.class); Intent launchIntent = new Intent(context, DownloadService.class);
launchIntent.putParcelableArrayListExtra(DownloadService.EXTRA_REQUESTS, requestsToSend); launchIntent.putParcelableArrayListExtra(DownloadService.EXTRA_REQUESTS, requestsToSend);
if (cleanupMedia) { if (cleanupMedia) {