Bug 1829372 - Allow PDF files to be opened in third party apps.

app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt

@@ -168,7 +168,7 @@ abstract class BaseBrowserFragment :
     AccessibilityManager.AccessibilityStateChangeListener {
 
     private var _binding: FragmentBrowserBinding? = null
-    protected val binding get() = _binding!!
+    internal val binding get() = _binding!!
 
     private lateinit var browserFragmentStore: BrowserFragmentStore
     private lateinit var browserAnimator: BrowserAnimator
@@ -221,7 +221,7 @@ abstract class BaseBrowserFragment :
     private var initUIJob: Job? = null
     protected var webAppToolbarShouldBeVisible = true
 
-    private val sharedViewModel: SharedViewModel by activityViewModels()
+    internal val sharedViewModel: SharedViewModel by activityViewModels()
     private val homeViewModel: HomeScreenViewModel by activityViewModels()
 
     private var currentStartDownloadDialog: StartDownloadDialog? = null
@@ -577,29 +577,7 @@ abstract class BaseBrowserFragment :
         )
 
         downloadFeature.onDownloadStopped = { downloadState, _, downloadJobStatus ->
-            // If the download is just paused, don't show any in-app notification
-            if (shouldShowCompletedDownloadDialog(downloadState, downloadJobStatus)) {
-                saveDownloadDialogState(
-                    downloadState.sessionId,
-                    downloadState,
-                    downloadJobStatus,
-                )
-
-                val dynamicDownloadDialog = DynamicDownloadDialog(
-                    context = context,
-                    downloadState = downloadState,
-                    didFail = downloadJobStatus == DownloadState.Status.FAILED,
-                    tryAgain = downloadFeature::tryAgain,
-                    onCannotOpenFile = {
-                        showCannotOpenFileError(binding.dynamicSnackbarContainer, context, it)
-                    },
-                    binding = binding.viewDynamicDownloadDialog,
-                    toolbarHeight = toolbarHeight,
-                ) { sharedViewModel.downloadDialogState.remove(downloadState.sessionId) }
-
-                dynamicDownloadDialog.show()
-                browserToolbarView.expand()
-            }
+            handleOnDownloadFinished(downloadState, downloadJobStatus, downloadFeature::tryAgain)
         }
 
         resumeDownloadDialogState(
@@ -1005,7 +983,7 @@ abstract class BaseBrowserFragment :
      * Preserves current state of the [DynamicDownloadDialog] to persist through tab changes and
      * other fragments navigation.
      * */
-    private fun saveDownloadDialogState(
+    internal fun saveDownloadDialogState(
         sessionId: String?,
         downloadState: DownloadState,
         downloadJobStatus: DownloadState.Status,
@@ -1544,7 +1522,7 @@ abstract class BaseBrowserFragment :
         )
     }
 
-    private fun showCannotOpenFileError(
+    internal fun showCannotOpenFileError(
         container: ViewGroup,
         context: Context,
         downloadState: DownloadState,
@@ -1608,7 +1586,6 @@ abstract class BaseBrowserFragment :
     @VisibleForTesting
     internal fun getSwipeRefreshLayout() = binding.swipeRefresh
 
-    @VisibleForTesting
     internal fun shouldShowCompletedDownloadDialog(
         downloadState: DownloadState,
         status: DownloadState.Status,

app/src/main/java/org/mozilla/fenix/browser/DownloadUtils.kt

@@ -0,0 +1,53 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.browser
+
+import mozilla.components.browser.state.state.content.DownloadState
+import mozilla.components.browser.state.state.content.DownloadState.Status
+import mozilla.components.feature.downloads.AbstractFetchDownloadService
+import org.mozilla.fenix.R
+import org.mozilla.fenix.downloads.DynamicDownloadDialog
+
+internal fun BaseBrowserFragment.handleOnDownloadFinished(
+    downloadState: DownloadState,
+    downloadJobStatus: Status,
+    tryAgain: (String) -> Unit,
+) {
+    // If the download is just paused, don't show any in-app notification
+    if (shouldShowCompletedDownloadDialog(downloadState, downloadJobStatus)) {
+        val safeContext = context ?: return
+        val onCannotOpenFile: (DownloadState) -> Unit = {
+            showCannotOpenFileError(binding.dynamicSnackbarContainer, safeContext, it)
+        }
+        if (downloadState.openInApp && downloadJobStatus == Status.COMPLETED) {
+            val fileWasOpened = AbstractFetchDownloadService.openFile(
+                applicationContext = safeContext.applicationContext,
+                download = downloadState,
+            )
+            if (!fileWasOpened) {
+                onCannotOpenFile(downloadState)
+            }
+        } else {
+            saveDownloadDialogState(
+                downloadState.sessionId,
+                downloadState,
+                downloadJobStatus,
+            )
+
+            val dynamicDownloadDialog = DynamicDownloadDialog(
+                context = safeContext,
+                downloadState = downloadState,
+                didFail = downloadJobStatus == Status.FAILED,
+                tryAgain = tryAgain,
+                onCannotOpenFile = onCannotOpenFile,
+                binding = binding.viewDynamicDownloadDialog,
+                toolbarHeight = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height),
+            ) { sharedViewModel.downloadDialogState.remove(downloadState.sessionId) }
+
+            dynamicDownloadDialog.show()
+            browserToolbarView.expand()
+        }
+    }
+}