From 151e8595b678e718648169919652a051ced49522 Mon Sep 17 00:00:00 2001 From: Kate Glazko Date: Fri, 24 Jul 2020 14:43:12 -0700 Subject: [PATCH] For AC #7673 Move DownloadStatus to DownloadState Fenix Side Changes --- .../org/mozilla/fenix/browser/BaseBrowserFragment.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 4a0bb9799..5597ef08b 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -378,8 +378,8 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session downloadFeature.onDownloadStopped = { downloadState, _, downloadJobStatus -> // If the download is just paused, don't show any in-app notification - if (downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.COMPLETED || - downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.FAILED + if (downloadJobStatus == DownloadState.Status.COMPLETED || + downloadJobStatus == DownloadState.Status.FAILED ) { saveDownloadDialogState( @@ -391,7 +391,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session val dynamicDownloadDialog = DynamicDownloadDialog( container = view.browserLayout, downloadState = downloadState, - didFail = downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.FAILED, + didFail = downloadJobStatus == DownloadState.Status.FAILED, tryAgain = downloadFeature::tryAgain, onCannotOpenFile = { FenixSnackbar.make( @@ -616,12 +616,12 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session private fun saveDownloadDialogState( sessionId: String?, downloadState: DownloadState, - downloadJobStatus: AbstractFetchDownloadService.DownloadJobStatus + downloadJobStatus: DownloadState.Status ) { sessionId?.let { id -> sharedViewModel.downloadDialogState[id] = Pair( downloadState, - downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.FAILED + downloadJobStatus == DownloadState.Status.FAILED ) } }