Don't cancel download when dismissing the notification

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.annotation.TargetApi;
 import android.app.DownloadManager;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ skipping 343 matching lines @@
         boolean cancelActualDownload = LibraryLoader.isInitialized()
                 && Profile.getLastUsedProfile().hasOffTheRecordProfile();
 
         List<DownloadSharedPreferenceEntry> entries = mDownloadSharedPreferenceHelper.getEntries();
         for (DownloadSharedPreferenceEntry entry : entries) {
             if (!entry.isOffTheRecord) continue;
 
             notifyDownloadCanceled(entry.downloadGuid);
             if (cancelActualDownload) {
                 DownloadServiceDelegate delegate = getServiceDelegate(entry.itemType);
-                delegate.cancelDownload(entry.downloadGuid, entry.isOffTheRecord, false);
+                delegate.cancelDownload(entry.downloadGuid, entry.isOffTheRecord);
                 delegate.destroyServiceDelegate();
             }
             for (Observer observer : mObservers) observer.onDownloadCanceled(entry.downloadGuid);
         }
     }
 
     /**
      * Track in-progress downloads here and, if on an Android version greater or equal to O, make
      * this a foreground service.
      * @param downloadGuid The guid of the download that has been started and should be tracked.
@@ skipping 253 matching lines @@
         builder.addAction(R.drawable.ic_get_app_white_24dp,
                 mContext.getResources().getString(R.string.download_notification_resume_button),
                 buildPendingIntent(resumeIntent, entry.notificationId));
 
         Intent cancelIntent = buildActionIntent(mContext, ACTION_DOWNLOAD_CANCEL,
                 entry.downloadGuid, entry.isOffTheRecord, entry.isOfflinePage());
         builder.addAction(R.drawable.btn_close_white,
                 mContext.getResources().getString(R.string.download_notification_cancel_button),
                 buildPendingIntent(cancelIntent, entry.notificationId));
 
-        Intent dismissIntent = new Intent(cancelIntent);
-        dismissIntent.putExtra(EXTRA_NOTIFICATION_DISMISSED, true);
-        builder.setDeleteIntent(buildPendingIntent(dismissIntent, entry.notificationId));
-
         updateNotification(entry.notificationId, builder.build(), downloadGuid,
                 entry.isOfflinePage(),
                 new DownloadSharedPreferenceEntry(entry.notificationId, entry.isOffTheRecord,
                         entry.canDownloadWhileMetered, entry.downloadGuid, entry.fileName,
                         entry.itemType, isAutoResumable));
         stopTrackingInProgressDownload(downloadGuid);
     }
 
     /**
      * Add a download successful notification.
@@ skipping 191 matching lines @@
                     new DownloadSharedPreferenceEntry(entry.notificationId, entry.isOffTheRecord,
                             canDownloadWhileMetered, entry.downloadGuid, entry.fileName,
                             entry.itemType, true));
         } else if (ACTION_DOWNLOAD_RESUME_ALL.equals(intent.getAction())
                 && (mDownloadSharedPreferenceHelper.getEntries().isEmpty()
                         || DownloadManagerService.hasDownloadManagerService())) {
             hideSummaryNotificationIfNecessary();
             return;
         } else if (ACTION_DOWNLOAD_OPEN.equals(intent.getAction())) {
             // TODO(fgorski): Do we even need to do anything special here, before we launch Chrome?
+        } else if (ACTION_DOWNLOAD_CANCEL.equals(intent.getAction())
+                && IntentUtils.safeGetBooleanExtra(intent, EXTRA_NOTIFICATION_DISMISSED, false)) {
+            // User canceled a download by dismissing its notification from earlier versions, ignore
+            // it. TODO(qinmin): remove this else-if block after M60.
+            return;
         }
 
         BrowserParts parts = new EmptyBrowserParts() {
             @Override
             public boolean shouldStartGpuProcess() {
                 return false;
             }
 
             @Override
             public void finishNativeInitialization() {
                 int itemType = entry != null ? entry.itemType
                         : (ACTION_DOWNLOAD_OPEN.equals(intent.getAction())
                                 ? DownloadSharedPreferenceEntry.ITEM_TYPE_OFFLINE_PAGE
                                 : DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD);
                 DownloadServiceDelegate downloadServiceDelegate =
                         ACTION_DOWNLOAD_OPEN.equals(intent.getAction()) ? null
                                 : getServiceDelegate(itemType);
                 if (ACTION_DOWNLOAD_CANCEL.equals(intent.getAction())) {
                         // TODO(qinmin): Alternatively, we can delete the downloaded content on
                         // SD card, and remove the download ID from the SharedPreferences so we
                         // don't need to restart the browser process. http://crbug.com/579643.
                         cancelNotification(entry.notificationId, entry.downloadGuid);
                         downloadServiceDelegate.cancelDownload(entry.downloadGuid,
-                                entry.isOffTheRecord, IntentUtils.safeGetBooleanExtra(
-                                        intent, EXTRA_NOTIFICATION_DISMISSED, false));
+                                entry.isOffTheRecord);
                         for (Observer observer : mObservers) {
                             observer.onDownloadCanceled(entry.downloadGuid);
                         }
                 } else if (ACTION_DOWNLOAD_PAUSE.equals(intent.getAction())) {
                         downloadServiceDelegate.pauseDownload(entry.downloadGuid,
                                 entry.isOffTheRecord);
                 } else if (ACTION_DOWNLOAD_RESUME.equals(intent.getAction())) {
                         notifyDownloadPending(entry.downloadGuid, entry.fileName,
                                 entry.isOffTheRecord, entry.canDownloadWhileMetered,
                                 entry.isOfflinePage());
@@ skipping 38 matching lines @@
         String downloadGuid = IntentUtils.safeGetStringExtra(intent, EXTRA_DOWNLOAD_GUID);
         boolean isOffTheRecord =
                 IntentUtils.safeGetBooleanExtra(intent, EXTRA_IS_OFF_THE_RECORD, false);
         int itemType = IntentUtils.safeGetBooleanExtra(intent, EXTRA_IS_OFFLINE_PAGE, false)
                 ? DownloadSharedPreferenceEntry.ITEM_TYPE_OFFLINE_PAGE
                 : DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD;
         if (itemType != DownloadSharedPreferenceEntry.ITEM_TYPE_DOWNLOAD) return;
 
         // Pass information directly to the DownloadManagerService.
         if (TextUtils.equals(action, ACTION_DOWNLOAD_CANCEL)) {
-            getServiceDelegate(itemType).cancelDownload(downloadGuid, isOffTheRecord, false);
+            getServiceDelegate(itemType).cancelDownload(downloadGuid, isOffTheRecord);
         } else if (TextUtils.equals(action, ACTION_DOWNLOAD_PAUSE)) {
             getServiceDelegate(itemType).pauseDownload(downloadGuid, isOffTheRecord);
         } else if (TextUtils.equals(action, ACTION_DOWNLOAD_RESUME)) {
             DownloadInfo info = new DownloadInfo.Builder()
                                         .setDownloadGuid(downloadGuid)
                                         .setIsOffTheRecord(isOffTheRecord)
                                         .build();
             getServiceDelegate(itemType).resumeDownload(new DownloadItem(false, info), true);
         }
     }
@@ skipping 150 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);
         }
     }
 }