From 6f4de48428a80ee268e8cbef2fdde22e82744dda Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Fri, 15 Nov 2019 14:53:13 -0800
Subject: [PATCH] For #6434: Fixes downloadCompleted for paused downloads

---
 .../fenix/browser/BaseBrowserFragment.kt      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 639b6658a..019888b38 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -23,7 +23,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavDirections
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.component_search.toolbar
+import kotlinx.android.synthetic.main.component_search.*
 import kotlinx.android.synthetic.main.fragment_browser.*
 import kotlinx.android.synthetic.main.fragment_browser.view.*
 import kotlinx.coroutines.Dispatchers.IO
@@ -264,13 +264,17 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
             )
 
             downloadFeature.onDownloadCompleted = { download, _, downloadJobStatus ->
-                val dialog = DownloadNotificationBottomSheetDialog(
-                    context = context,
-                    didFail = downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.FAILED,
-                    download = download,
-                    tryAgain = downloadFeature::tryAgain
-                )
-                dialog.show()
+                // If the download is just paused, don't show any in-app notification
+                if (downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.COMPLETED ||
+                    downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.FAILED) {
+                    val dialog = DownloadNotificationBottomSheetDialog(
+                        context = context,
+                        didFail = downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.FAILED,
+                        download = download,
+                        tryAgain = downloadFeature::tryAgain
+                    )
+                    dialog.show()
+                }
             }
 
             downloadsFeature.set(