Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-02-01 11:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Make notification text readable (fixes #1233)"

Browse Source 
This reverts commit 40aefe05a60fa8bfbe71c518e838dd12d1b87c49.
This commit is contained in:
no.reply 2015-10-02 18:25:46 -04:00
parent 40aefe05a6
commit 4ce407c485
1 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,7 @@ public class DownloadService extends Service {
private NotificationCompat.Builder notificationCompatBuilder; private NotificationCompat.Builder notificationCompatBuilder;
private Notification.BigTextStyle notificationBuilder;
private int NOTIFICATION_ID = 2; private int NOTIFICATION_ID = 2;
private int REPORT_ID = 3; private int REPORT_ID = 3;
@ -321,16 +322,23 @@ public class DownloadService extends Service {
DBTasks.autodownloadUndownloadedItems(getApplicationContext()); DBTasks.autodownloadUndownloadedItems(getApplicationContext());
} }
@SuppressLint("NewApi")
private void setupNotificationBuilders() { private void setupNotificationBuilders() {
Bitmap icon = BitmapFactory.decodeResource(getResources(), Bitmap icon = BitmapFactory.decodeResource(getResources(),
R.drawable.stat_notify_sync); R.drawable.stat_notify_sync);
if (android.os.Build.VERSION.SDK_INT >= 16) {
notificationBuilder = new Notification.BigTextStyle(
new Notification.Builder(this).setOngoing(true)
.setContentIntent(ClientConfig.downloadServiceCallbacks.getNotificationContentIntent(this)).setLargeIcon(icon)
.setSmallIcon(R.drawable.stat_notify_sync)
);
} else {
notificationCompatBuilder = new NotificationCompat.Builder(this) notificationCompatBuilder = new NotificationCompat.Builder(this)
.setOngoing(true) .setOngoing(true).setContentIntent(ClientConfig.downloadServiceCallbacks.getNotificationContentIntent(this))
.setContentIntent(ClientConfig.downloadServiceCallbacks.getNotificationContentIntent(this))
.setLargeIcon(icon) .setLargeIcon(icon)
.setSmallIcon(R.drawable.stat_notify_sync); .setSmallIcon(R.drawable.stat_notify_sync);
}
Log.d(TAG, "Notification set up"); Log.d(TAG, "Notification set up");
} }
@ -338,16 +346,20 @@ public class DownloadService extends Service {
* Updates the contents of the service's notifications. Should be called * Updates the contents of the service's notifications. Should be called
* before setupNotificationBuilders. * before setupNotificationBuilders.
*/ */
@SuppressLint("NewApi")
private Notification updateNotifications() { private Notification updateNotifications() {
String contentTitle = getString(R.string.download_notification_title); String contentTitle = getString(R.string.download_notification_title);
int numDownloads = requester.getNumberOfDownloads(); int numDownloads = requester.getNumberOfDownloads();
String downloadsLeft; String downloadsLeft;
if (numDownloads > 0) { if (numDownloads > 0) {
downloadsLeft = requester.getNumberOfDownloads() + getString(R.string.downloads_left); downloadsLeft = requester.getNumberOfDownloads()
+ getString(R.string.downloads_left);
} else { } else {
downloadsLeft = getString(R.string.downloads_processing); downloadsLeft = getString(R.string.downloads_processing);
} }
if (notificationCompatBuilder != null) { if (android.os.Build.VERSION.SDK_INT >= 16) {
if (notificationBuilder != null) {
StringBuilder bigText = new StringBuilder(""); StringBuilder bigText = new StringBuilder("");
for (int i = 0; i < downloads.size(); i++) { for (int i = 0; i < downloads.size(); i++) {
@ -373,14 +385,20 @@ public class DownloadService extends Service {
} }
} }
notificationBuilder.setSummaryText(downloadsLeft);
notificationBuilder.setBigContentTitle(contentTitle);
if (bigText != null) {
notificationBuilder.bigText(bigText.toString());
}
return notificationBuilder.build();
}
} else {
if (notificationCompatBuilder != null) {
notificationCompatBuilder.setContentTitle(contentTitle); notificationCompatBuilder.setContentTitle(contentTitle);
notificationCompatBuilder.setContentText(downloadsLeft); notificationCompatBuilder.setContentText(downloadsLeft);
if (bigText != null) {
notificationCompatBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(bigText.toString()));
}
notificationCompatBuilder.setColor(0xff424242);
return notificationCompatBuilder.build(); return notificationCompatBuilder.build();
} }
}
return null; return null;
} }