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

This reverts commit 40aefe05a60fa8bfbe71c518e838dd12d1b87c49.

1 files changed, 49 insertions, 31 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index abde464f2..cb050463e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -130,6 +130,7 @@ public class DownloadService extends Service {
 
 
     private NotificationCompat.Builder notificationCompatBuilder;
+    private Notification.BigTextStyle notificationBuilder;
     private int NOTIFICATION_ID = 2;
     private int REPORT_ID = 3;
 
@@ -321,16 +322,23 @@ public class DownloadService extends Service {
         DBTasks.autodownloadUndownloadedItems(getApplicationContext());
     }
 
+    @SuppressLint("NewApi")
     private void setupNotificationBuilders() {
         Bitmap icon = BitmapFactory.decodeResource(getResources(),
                 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)
-                    .setOngoing(true)
-                    .setContentIntent(ClientConfig.downloadServiceCallbacks.getNotificationContentIntent(this))
+                    .setOngoing(true).setContentIntent(ClientConfig.downloadServiceCallbacks.getNotificationContentIntent(this))
                     .setLargeIcon(icon)
                     .setSmallIcon(R.drawable.stat_notify_sync);
-
+        }
         Log.d(TAG, "Notification set up");
     }
 
@@ -338,48 +346,58 @@ public class DownloadService extends Service {
      * Updates the contents of the service's notifications. Should be called
      * before setupNotificationBuilders.
      */
+    @SuppressLint("NewApi")
     private Notification updateNotifications() {
         String contentTitle = getString(R.string.download_notification_title);
         int numDownloads = requester.getNumberOfDownloads();
         String downloadsLeft;
         if (numDownloads > 0) {
-            downloadsLeft = requester.getNumberOfDownloads() + getString(R.string.downloads_left);
+            downloadsLeft = requester.getNumberOfDownloads()
+                    + getString(R.string.downloads_left);
         } else {
             downloadsLeft = getString(R.string.downloads_processing);
         }
-        if (notificationCompatBuilder != null) {
-
-            StringBuilder bigText = new StringBuilder("");
-            for (int i = 0; i < downloads.size(); i++) {
-                Downloader downloader = downloads.get(i);
-                final DownloadRequest request = downloader
-                        .getDownloadRequest();
-                if (request.getFeedfileType() == Feed.FEEDFILETYPE_FEED) {
-                    if (request.getTitle() != null) {
-                        if (i > 0) {
-                            bigText.append("\n");
+        if (android.os.Build.VERSION.SDK_INT >= 16) {
+
+            if (notificationBuilder != null) {
+
+                StringBuilder bigText = new StringBuilder("");
+                for (int i = 0; i < downloads.size(); i++) {
+                    Downloader downloader = downloads.get(i);
+                    final DownloadRequest request = downloader
+                            .getDownloadRequest();
+                    if (request.getFeedfileType() == Feed.FEEDFILETYPE_FEED) {
+                        if (request.getTitle() != null) {
+                            if (i > 0) {
+                                bigText.append("\n");
+                            }
+                            bigText.append("\u2022 " + request.getTitle());
                         }
-                        bigText.append("\u2022 " + request.getTitle());
-                    }
-                } else if (request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
-                    if (request.getTitle() != null) {
-                        if (i > 0) {
-                            bigText.append("\n");
+                    } else if (request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
+                        if (request.getTitle() != null) {
+                            if (i > 0) {
+                                bigText.append("\n");
+                            }
+                            bigText.append("\u2022 " + request.getTitle()
+                                    + " (" + request.getProgressPercent()
+                                    + "%)");
                         }
-                        bigText.append("\u2022 " + request.getTitle()
-                                + " (" + request.getProgressPercent()
-                                + "%)");
                     }
-                }
 
+                }
+                notificationBuilder.setSummaryText(downloadsLeft);
+                notificationBuilder.setBigContentTitle(contentTitle);
+                if (bigText != null) {
+                    notificationBuilder.bigText(bigText.toString());
+                }
+                return notificationBuilder.build();
             }
-            notificationCompatBuilder.setContentTitle(contentTitle);
-            notificationCompatBuilder.setContentText(downloadsLeft);
-            if (bigText != null) {
-                notificationCompatBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(bigText.toString()));
+        } else {
+            if (notificationCompatBuilder != null) {
+                notificationCompatBuilder.setContentTitle(contentTitle);
+                notificationCompatBuilder.setContentText(downloadsLeft);
+                return notificationCompatBuilder.build();
             }
-            notificationCompatBuilder.setColor(0xff424242);
-            return notificationCompatBuilder.build();
         }
         return null;
     }