Matthew Finkel pushed to branch android-components-96.0.15-11.5-1 at The Tor Project / Applications / android-components

Commits:

2 changed files:

Changes:

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

  • components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
    ... ... @@ -371,9 +371,7 @@ abstract class AbstractFetchDownloadService : Service() {
    371 371
                     style.notificationAccentColor
    
    372 372
                 )
    
    373 373
                 COMPLETED -> {
    
    374
    -                if (BuildConfig.ANDROID_DOWNLOADS_INTEGRATION) {
    
    375
    -                    addToDownloadSystemDatabaseCompat(download.state, scope)
    
    376
    -                }
    
    374
    +                addToDownloadSystemDatabaseCompat(download.state, scope)
    
    377 375
                     DownloadNotification.createDownloadCompletedNotification(
    
    378 376
                         context,
    
    379 377
                         download,
    
    ... ... @@ -841,9 +839,7 @@ abstract class AbstractFetchDownloadService : Service() {
    841 839
         }
    
    842 840
     
    
    843 841
         @VisibleForTesting
    
    844
    -    internal fun shouldUseScopedStorage() =
    
    845
    -            BuildConfig.ANDROID_DOWNLOADS_INTEGRATION &&
    
    846
    -            getSdkVersion() >= Build.VERSION_CODES.Q
    
    842
    +    internal fun shouldUseScopedStorage() = getSdkVersion() >= Build.VERSION_CODES.Q
    
    847 843
     
    
    848 844
         /**
    
    849 845
          * Gets the SDK version from the system.