1
0
Fork 0

Updated tracking protectionPolicy to the recommend one.

master
Arturo Mejia 2019-05-21 11:27:48 -04:00 committed by Sawyer Blatz
parent 93d0982a6f
commit b2294483a8
2 changed files with 4 additions and 7 deletions

View File

@ -55,5 +55,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- #1599 - Fixed a crash creating a bookmark for a custom tab
- #1414 - Fixed site permissions settings getting reset in Android 6.
- #1994 - Made app state persist better when rotating the screen
- [AC #2725](https://github.com/mozilla-mobile/android-components/issues/2725) Updated tracking protectionPolicy to [recommend](https://github.com/mozilla-mobile/android-components/blob/master/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt#L156)
### Removed

View File

@ -21,6 +21,7 @@ import mozilla.components.browser.storage.sync.PlacesHistoryStorage
import mozilla.components.concept.engine.DefaultSettings
import mozilla.components.concept.engine.Engine
import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy
import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.Companion.SAFE_BROWSING_ALL
import mozilla.components.concept.engine.mediaquery.PreferredColorScheme
import mozilla.components.concept.fetch.Client
import mozilla.components.feature.session.HistoryDelegate
@ -152,17 +153,13 @@ class Core(private val context: Context) {
normalMode: Boolean = Settings.getInstance(context).shouldUseTrackingProtection,
privateMode: Boolean = true
): TrackingProtectionPolicy {
val trackingProtectionPolicy = TrackingProtectionPolicy.select(
TrackingProtectionPolicy.AD,
TrackingProtectionPolicy.ANALYTICS,
TrackingProtectionPolicy.SOCIAL
)
val trackingProtectionPolicy = TrackingProtectionPolicy.recommended()
return when {
normalMode && privateMode -> trackingProtectionPolicy
normalMode && !privateMode -> trackingProtectionPolicy.forRegularSessionsOnly()
!normalMode && privateMode -> trackingProtectionPolicy.forPrivateSessionsOnly()
else -> TrackingProtectionPolicy.none()
else -> TrackingProtectionPolicy.select(SAFE_BROWSING_ALL)
}
}