Close #8847 Do not show download dialogs when

the fragmentManager is destroyed.
mozilla-mobile · Oct 30, 2020 · 3e7cee0 · 3e7cee0
1 parent 234a3a3
commit 3e7cee0
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/.../feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt b/.../feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt
@@ -239,7 +239,7 @@ class DownloadsFeature(
             useCases.consumeDownload.invoke(tab.id, download.id)
         }
 
-        if (!isAlreadyADownloadDialog() && fragmentManager != null) {
+        if (!isAlreadyADownloadDialog() && fragmentManager != null && !fragmentManager.isDestroyed) {
             dialog.showNow(fragmentManager, FRAGMENT_TAG)
         }
     }
@@ -279,7 +279,7 @@ class DownloadsFeature(
             useCases.consumeDownload.invoke(tab.id, download.id)
         }
 
-        if (!isAlreadyAppDownloaderDialog() && fragmentManager != null) {
+        if (!isAlreadyAppDownloaderDialog() && fragmentManager != null && !fragmentManager.isDestroyed) {
             appChooserDialog.showNow(fragmentManager, DownloadAppChooserDialog.FRAGMENT_TAG)
         }
     }

diff --git a/...ture/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt b/...ture/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt
@@ -443,6 +443,46 @@ class DownloadsFeatureTest {
         verify(dialog, times(1)).showNow(fragmentManager, DownloadDialogFragment.FRAGMENT_TAG)
     }
 
+    @Test
+    fun `download dialog must NOT be shown WHEN the fragmentManager isDestroyed`() {
+        val fragmentManager = mockFragmentManager()
+        val dialog = mock<DownloadDialogFragment>()
+        val feature = spy(DownloadsFeature(
+            testContext,
+            store,
+            useCases = mock(),
+            downloadManager = mock(),
+            fragmentManager = fragmentManager
+        ))
+
+        doReturn(false).`when`(feature).isAlreadyADownloadDialog()
+        doReturn(true).`when`(fragmentManager).isDestroyed
+
+        feature.showDownloadDialog(mock(), mock(), dialog)
+
+        verify(dialog, never()).showNow(fragmentManager, DownloadDialogFragment.FRAGMENT_TAG)
+    }
+
+    @Test
+    fun `app downloader dialog must NOT be shown WHEN the fragmentManager isDestroyed`() {
+        val fragmentManager = mockFragmentManager()
+        val dialog = mock<DownloadAppChooserDialog>()
+        val feature = spy(DownloadsFeature(
+                testContext,
+                store,
+                useCases = mock(),
+                downloadManager = mock(),
+                fragmentManager = fragmentManager
+        ))
+
+        doReturn(false).`when`(feature).isAlreadyADownloadDialog()
+        doReturn(true).`when`(fragmentManager).isDestroyed
+
+        feature.showAppDownloaderDialog(mock(), mock(), emptyList(), dialog)
+
+        verify(dialog, never()).showNow(fragmentManager, DownloadDialogFragment.FRAGMENT_TAG)
+    }
+
     @Test
     fun `processDownload only forward downloads when shouldForwardToThirdParties is true`() {
         val tab = createTab("https://www.mozilla.org", id = "test-tab")

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -43,6 +43,7 @@ permalink: /changelog/
 
 * **feature-downloads**
   * 🚒 Bug fixed [issue #8585](https://github.com/mozilla-mobile/android-components/issues/8784) create download directory when it doesn't exists for more information see [mozilla-mobile/fenix#15527](https://github.com/mozilla-mobile/fenix/issues/5829).
+  * 🚒 Bug fixed [issue #8847](https://github.com/mozilla-mobile/android-components/issues/8847) crash when trying to download a file and switching from a normal to a private mode.
 
 * **feature-top-sites**
   * Added `RenameTopSiteUseCase` to rename pinned site entries. [#8751](https://github.com/mozilla-mobile/android-components/issues/8751)