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

Merge pull request #5793 from ByteHamster/better-download-notification 

Simplify download notification title
This commit is contained in:
ByteHamster 2022-03-22 19:52:16 +01:00 committed by GitHub
parent 66da9dad70 33e9e57d6e
commit f6a7985901
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,18 +52,41 @@ public class DownloadServiceNotification {
return null;
}
String contentTitle = context.getString(R.string.download_notification_title);
String downloadsLeft = (downloads.size() > 0)
String contentTitle;
if (typeIsOnly(downloads, Feed.FEEDFILETYPE_FEED)) {
contentTitle = context.getString(R.string.download_notification_title_feeds);
} else if (typeIsOnly(downloads, FeedMedia.FEEDFILETYPE_FEEDMEDIA)) {
contentTitle = context.getString(R.string.download_notification_title_episodes);
} else {
contentTitle = context.getString(R.string.download_notification_title);
}
String contentText = (downloads.size() > 0)
? context.getResources().getQuantityString(R.plurals.downloads_left, downloads.size(), downloads.size())
: context.getString(R.string.completing);
String bigText = compileNotificationString(downloads);
if (!bigText.contains("\n")) {
contentText = bigText;
}
notificationCompatBuilder.setContentTitle(contentTitle);
notificationCompatBuilder.setContentText(downloadsLeft);
notificationCompatBuilder.setContentText(contentText);
notificationCompatBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(bigText));
return notificationCompatBuilder.build();
}
private boolean typeIsOnly(List<Downloader> downloads, int feedFileType) {
for (Downloader downloader : downloads) {
if (downloader.cancelled) {
continue;
}
DownloadRequest request = downloader.getDownloadRequest();
if (request.getFeedfileType() != feedFileType) {
return false;
}
}
return true;
}
private static String compileNotificationString(List<Downloader> downloads) {
StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < downloads.size(); i++) {

2
ui/i18n/src/main/res/values/strings.xml
View File

@ -279,6 +279,8 @@
</plurals>
<string name="completing">Completing…</string>
<string name="download_notification_title">Downloading podcast data</string>
<string name="download_notification_title_feeds">Refreshing podcasts</string>
<string name="download_notification_title_episodes">Downloading episodes</string>
<string name="download_log_title_unknown">Unknown Title</string>
<string name="download_type_feed">Feed</string>
<string name="download_type_media">Media file</string>