Commit 7b5ed1b5 authored by brizental's avatar brizental Committed by Pier Angelo Vendrame
Browse files

fixup! [android] Disable features and functionality 

Bug 45085: Disable GooglePlayIntegrity
parent 87237b2d

mobile/android/fenix/app/build.gradle

+0 −1
Original line number Diff line number Diff line
@@ -539,7 +539,6 @@ dependencies { 
    implementation project(':components:lib-push-firebase')

    implementation project(':components:lib-state')

    implementation project(':components:lib-accelerometer-sensormanager')

    implementation project(':components:lib-integrity-googleplay')

    implementation project(':components:lib-llm-mlpa')

    implementation project(':components:lib-shake')

    implementation project(':components:lib-ai-controls')

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt

+3 −13
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ import mozilla.components.lib.ai.controls.dataStore 
import mozilla.components.lib.ai.controls.default

import mozilla.components.lib.crash.store.CrashAction

import mozilla.components.lib.crash.store.CrashMiddleware

import mozilla.components.lib.integrity.googleplay.GooglePlayIntegrityClient

import mozilla.components.lib.integrity.googleplay.IntegrityConsumer

import mozilla.components.lib.integrity.googleplay.RequestHashProvider

import mozilla.components.lib.llm.mlpa.MlpaTokenStorage

import mozilla.components.lib.publicsuffixlist.PublicSuffixList

import mozilla.components.service.fxrelay.eligibility.RelayEligibilityStore
@@ -428,16 +425,9 @@ class Components(private val context: Context) { 
        )

    }



    private val googlePlayIntegrityClient by lazyMonitored {

        GooglePlayIntegrityClient.create(

            context = context,

            projectNumberToken = BuildConfig.GPS_INTEGRITY_TOKEN,

            requestHashProvider = RequestHashProvider { clientUUID.generateHash() },

        )

    }



    // tor-browser#45085: Disable Google Play Integrity

    val integrityClient: IntegrityClient by lazyMonitored {

        googlePlayIntegrityClient.forConsumer(IntegrityConsumer.Summarize)

        IntegrityClient { Result.failure(IllegalStateException("Google Play Integrity is disabled")) }

    }



    /**
@@ -445,7 +435,7 @@ class Components(private val context: Context) { 
     * separately from [integrityClient] because warm-up is specific to the Google

     * Play-backed implementation and isn't part of the [IntegrityClient] concept.

     */

    suspend fun warmUpIntegrityClient(): Boolean = googlePlayIntegrityClient.warmUp()

    suspend fun warmUpIntegrityClient(): Boolean = false // tor-browser#45085: no-op



    val termsOfUsePromptRepository by lazyMonitored {

        DefaultTermsOfUsePromptRepository(settings)