[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/android-components][android-components-57.0.6-10.0-2] 2 commits: Bug 40002: Ensure system download manager is not used

Title: GitLab

Matthew Finkel pushed to branch android-components-57.0.6-10.0-2 at The Tor Project / Applications / android-components

Commits:

3 changed files:

Changes:

  • components/feature/downloads/build.gradle
    ... ... @@ -20,6 +20,8 @@ android {
    20 20 
                     arg("room.schemaLocation", "$projectDir/schemas".toString())
    21 21 
                 }
    22 22 
             }
    23 
    +
    24 
    +        buildConfigField("boolean", "ANDROID_DOWNLOADS_INTEGRATION", "false")
    23 25 
         }
    24 26
    25 27 
         buildTypes {

  • components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
    ... ... @@ -326,7 +326,9 @@ abstract class AbstractFetchDownloadService : Service() {
    326 326 
                 PAUSED -> DownloadNotification.createPausedDownloadNotification(context, download)
    327 327 
                 FAILED -> DownloadNotification.createDownloadFailedNotification(context, download)
    328 328 
                 COMPLETED -> {
    329 
    -                addToDownloadSystemDatabaseCompat(download.state)
    329 
    +                if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION) {
    330 
    +                    addToDownloadSystemDatabaseCompat(download.state)
    331 
    +                }
    330 332 
                     DownloadNotification.createDownloadCompletedNotification(context, download)
    331 333 
                 }
    332 334 
                 CANCELLED -> {
    ... ... @@ -688,7 +690,7 @@ abstract class AbstractFetchDownloadService : Service() {
    688 690 
             val downloadWithUniqueFileName = makeUniqueFileNameIfNecessary(download, append)
    689 691 
             updateDownloadState(downloadWithUniqueFileName)
    690 692
    691 
    -        if (getSdkVersion() >= Build.VERSION_CODES.Q && !isExternalStorageLegacy()) {
    693 
    +        if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION && getSdkVersion() >= Build.VERSION_CODES.Q && !isExternalStorageLegacy()) {
    692 694 
                 useFileStreamScopedStorage(downloadWithUniqueFileName, block)
    693 695 
             } else {
    694 696 
                 useFileStreamLegacy(downloadWithUniqueFileName, append, block)

  • components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt
    ... ... @@ -25,7 +25,6 @@ import mozilla.components.browser.state.state.SessionState
    25 25 
     import mozilla.components.browser.state.state.content.DownloadState
    26 26 
     import mozilla.components.browser.state.store.BrowserStore
    27 27 
     import mozilla.components.feature.downloads.DownloadDialogFragment.Companion.FRAGMENT_TAG
    28 
    -import mozilla.components.feature.downloads.manager.AndroidDownloadManager
    29 28 
     import mozilla.components.feature.downloads.manager.DownloadManager
    30 29 
     import mozilla.components.feature.downloads.manager.noop
    31 30 
     import mozilla.components.feature.downloads.manager.onDownloadStopped
    ... ... @@ -69,7 +68,7 @@ class DownloadsFeature(
    69 68 
         internal val useCases: DownloadsUseCases,
    70 69 
         override var onNeedToRequestPermissions: OnNeedToRequestPermissions = { },
    71 70 
         onDownloadStopped: onDownloadStopped = noop,
    72 
    -    private val downloadManager: DownloadManager = AndroidDownloadManager(applicationContext, store),
    71 
    +    private val downloadManager: DownloadManager,
    73 72 
         private val tabId: String? = null,
    74 73 
         private val fragmentManager: FragmentManager? = null,
    75 74 
         private val promptsStyling: PromptsStyling? = null,

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. If you'd like to receive fewer emails, you can adjust your notification settings. 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits