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

Fix race condition in progress notification

Browse Source
This commit is contained in:
ByteHamster 2023-08-19 10:52:43 +02:00 committed by ByteHamster
parent 4f6b563e3f
commit 18ab4ab8c6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/de/danoeh/antennapod/core/service/download/EpisodeDownloadWorker.java
View File

@ -270,17 +270,20 @@ public class EpisodeDownloadWorker extends Worker {
private Notification generateProgressNotification() { private Notification generateProgressNotification() {
StringBuilder bigTextB = new StringBuilder(); StringBuilder bigTextB = new StringBuilder();
Map<String, Integer> progressCopy = new HashMap<>(notificationProgress); Map<String, Integer> progressCopy;
synchronized (notificationProgress) {
progressCopy = new HashMap<>(notificationProgress);
}
for (Map.Entry<String, Integer> entry : progressCopy.entrySet()) { for (Map.Entry<String, Integer> entry : progressCopy.entrySet()) {
bigTextB.append(String.format(Locale.getDefault(), "%s (%d%%)\n", entry.getKey(), entry.getValue())); bigTextB.append(String.format(Locale.getDefault(), "%s (%d%%)\n", entry.getKey(), entry.getValue()));
} }
String bigText = bigTextB.toString().trim(); String bigText = bigTextB.toString().trim();
String contentText; String contentText;
if (notificationProgress.size() == 1) { if (progressCopy.size() == 1) {
contentText = bigText; contentText = bigText;
} else { } else {
contentText = getApplicationContext().getResources().getQuantityString(R.plurals.downloads_left, contentText = getApplicationContext().getResources().getQuantityString(R.plurals.downloads_left,
notificationProgress.size(), notificationProgress.size()); progressCopy.size(), progressCopy.size());
} }
NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext(), NotificationCompat.Builder builder = new NotificationCompat.Builder(getApplicationContext(),
NotificationUtils.CHANNEL_ID_DOWNLOADING); NotificationUtils.CHANNEL_ID_DOWNLOADING);