blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #6434: Fixes downloadCompleted for paused downloads

master
Sawyer Blatz 2019-11-15 14:53:13 -08:00 committed by Emily Kager
parent 77667bf724
commit 6f4de48428
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavDirections import androidx.navigation.NavDirections
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import com.google.android.material.snackbar.Snackbar 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.*
import kotlinx.android.synthetic.main.fragment_browser.view.* import kotlinx.android.synthetic.main.fragment_browser.view.*
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
@ -264,13 +264,17 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
) )
downloadFeature.onDownloadCompleted = { download, _, downloadJobStatus -> downloadFeature.onDownloadCompleted = { download, _, downloadJobStatus ->
val dialog = DownloadNotificationBottomSheetDialog( // If the download is just paused, don't show any in-app notification
context = context, if (downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.COMPLETED ||
didFail = downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.FAILED, downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.FAILED) {
download = download, val dialog = DownloadNotificationBottomSheetDialog(
tryAgain = downloadFeature::tryAgain context = context,
) didFail = downloadJobStatus == AbstractFetchDownloadService.DownloadJobStatus.FAILED,
dialog.show() download = download,
tryAgain = downloadFeature::tryAgain
)
dialog.show()
}
} }
downloadsFeature.set( downloadsFeature.set(