Abstracting over Notification.Builder + NotificationCompat.Builder

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadNotificationService.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.download;
 
 import android.app.ActivityManager;
 import android.app.DownloadManager;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.shapes.OvalShape;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.init.BrowserParts;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.init.EmptyBrowserParts;
+import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
 import org.chromium.chrome.browser.notifications.NotificationConstants;
 import org.chromium.chrome.browser.offlinepages.downloads.OfflinePageDownloadBridge;
 import org.chromium.chrome.browser.util.IntentUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 
 /**
@@ skipping 241 matching lines @@
         } else if (indeterminate) {
             contentText = DownloadUtils.getStringForBytes(
                     mContext, DownloadUtils.BYTES_DOWNLOADED_STRINGS, bytesReceived);
         } else {
             contentText = timeRemainingInMillis < 0
                     ? mContext.getResources().getString(R.string.download_started)
                     : formatRemainingTime(mContext, timeRemainingInMillis);
         }
         int resId = isDownloadPending ? R.drawable.ic_download_pending
                 : android.R.drawable.stat_sys_download;
-        NotificationCompat.Builder builder = buildNotification(resId, fileName, contentText);
+        ChromeNotificationBuilder builder = buildNotification(resId, fileName, contentText);
         builder.setOngoing(true);
         builder.setPriority(Notification.PRIORITY_HIGH);
 
         // Avoid animations while the download isn't progressing.
         if (!isDownloadPending) {
             builder.setProgress(100, percentage, indeterminate);
         }
 
         if (!indeterminate && !isOfflinePage) {
             String percentText = DownloadUtils.getPercentageString(percentage);
@@ skipping 82 matching lines @@
         // If download is interrupted due to network disconnection, show download pending state.
         if (isAutoResumable) {
             notifyDownloadPending(entry.downloadGuid, entry.fileName, entry.isOffTheRecord,
                     entry.canDownloadWhileMetered, entry.isOfflinePage());
             mDownloadsInProgress.remove(downloadGuid);
             return;
         }
 
         String contentText = mContext.getResources().getString(
                 R.string.download_notification_paused);
-        NotificationCompat.Builder builder = buildNotification(
-                R.drawable.ic_download_pause, entry.fileName, contentText);
+        ChromeNotificationBuilder builder =
+                buildNotification(R.drawable.ic_download_pause, entry.fileName, contentText);
 
         // Clicking on an in-progress download sends the user to see all their downloads.
         Intent downloadHomeIntent = buildActionIntent(
                 mContext, DownloadManager.ACTION_NOTIFICATION_CLICKED, null, false, false);
         builder.setContentIntent(PendingIntent.getBroadcast(mContext, entry.notificationId,
                 downloadHomeIntent, PendingIntent.FLAG_UPDATE_CURRENT));
         builder.setAutoCancel(false);
 
         Intent resumeIntent = buildActionIntent(mContext, ACTION_DOWNLOAD_RESUME,
                 entry.downloadGuid, entry.isOffTheRecord, entry.isOfflinePage());
@@ skipping 30 matching lines @@
      * @param isOfflinePage Whether the download is for offline page.
      * @param isSupportedMimeType Whether the MIME type can be viewed inside browser.
      * @return ID of the successful download notification. Used for removing the notification when
      *         user click on the snackbar.
      */
     @VisibleForTesting
     public int notifyDownloadSuccessful(
             String downloadGuid, String filePath, String fileName, long systemDownloadId,
             boolean isOfflinePage, boolean isSupportedMimeType) {
         int notificationId = getNotificationId(downloadGuid);
-        NotificationCompat.Builder builder = buildNotification(
-                R.drawable.offline_pin, fileName,
+        ChromeNotificationBuilder builder = buildNotification(R.drawable.offline_pin, fileName,
                 mContext.getResources().getString(R.string.download_notification_completed));
         ComponentName component = new ComponentName(
                 mContext.getPackageName(), DownloadBroadcastReceiver.class.getName());
         Intent intent;
         if (isOfflinePage) {
             intent = buildActionIntent(mContext, ACTION_DOWNLOAD_OPEN, downloadGuid, false, true);
         } else {
             intent = new Intent(DownloadManager.ACTION_NOTIFICATION_CLICKED);
             long[] idArray = {systemDownloadId};
             intent.putExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS, idArray);
@@ skipping 25 matching lines @@
         // If the download is not in history db, fileName could be empty. Get it from
         // SharedPreferences.
         if (TextUtils.isEmpty(fileName)) {
             DownloadSharedPreferenceEntry entry =
                     mDownloadSharedPreferenceHelper.getDownloadSharedPreferenceEntry(downloadGuid);
             if (entry == null) return;
             fileName = entry.fileName;
         }
 
         int notificationId = getNotificationId(downloadGuid);
-        NotificationCompat.Builder builder = buildNotification(
-                android.R.drawable.stat_sys_download_done, fileName,
-                mContext.getResources().getString(R.string.download_notification_failed));
+        ChromeNotificationBuilder builder =
+                buildNotification(android.R.drawable.stat_sys_download_done, fileName,
+                        mContext.getResources().getString(R.string.download_notification_failed));
         updateNotification(notificationId, builder.build());
         mDownloadSharedPreferenceHelper.removeSharedPreferenceEntry(downloadGuid);
         mDownloadsInProgress.remove(downloadGuid);
     }
 
     /**
      * Called to pause all the download notifications.
      */
     @VisibleForTesting
     void pauseAllDownloads() {
@@ skipping 47 matching lines @@
         return intent;
     }
 
     /**
      * Builds a notification to be displayed.
      * @param iconId Id of the notification icon.
      * @param title Title of the notification.
      * @param contentText Notification content text to be displayed.
      * @return notification builder that builds the notification to be displayed
      */
-    private NotificationCompat.Builder buildNotification(
+    private ChromeNotificationBuilder buildNotification(
             int iconId, String title, String contentText) {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext)
-                .setContentTitle(DownloadUtils.getAbbreviatedFileName(title, MAX_FILE_NAME_LENGTH))
-                .setSmallIcon(iconId)
-                .setLocalOnly(true)
-                .setAutoCancel(true)
-                .setContentText(contentText)
-                .setGroup(NotificationConstants.GROUP_DOWNLOADS);
+        ChromeNotificationBuilder builder =
+                ((ChromeApplication) mContext)
+                        .getChromeNotificationBuilder(true, NotificationConstants.TYPE_ID_GENERAL,

[Peter Beverloo, 2017/02/20 01:06:45]

nit: true -> true /* preferCompat */ (elsewhere too)

[awdf, 2017/02/24 00:38:46]

Done.

+                                NotificationConstants.TYPE_NAME_GENERAL)
+                        .setContentTitle(
+                                DownloadUtils.getAbbreviatedFileName(title, MAX_FILE_NAME_LENGTH))
+                        .setSmallIcon(iconId)
+                        .setLocalOnly(true)
+                        .setAutoCancel(true)
+                        .setContentText(contentText)
+                        .setGroup(NotificationConstants.GROUP_DOWNLOADS);
         return builder;
     }
 
     private Bitmap getLargeNotificationIcon(Bitmap bitmap) {
         Resources resources = mContext.getResources();
         int height = (int) resources.getDimension(android.R.dimen.notification_large_icon_height);
         int width = (int) resources.getDimension(android.R.dimen.notification_large_icon_width);
         final OvalShape circle = new OvalShape();
         circle.resize(width, height);
         final Paint paint = new Paint();
@@ skipping 285 matching lines @@
             return context.getString(R.string.remaining_duration_minutes, minutes);
         } else if (minutes > 0) {
             return context.getString(R.string.remaining_duration_one_minute);
         } else if (seconds == 1) {
             return context.getString(R.string.remaining_duration_one_second);
         } else {
             return context.getString(R.string.remaining_duration_seconds, seconds);
         }
     }
 }