Verified Commit 380c3c46 authored by cypherpunks1's avatar cypherpunks1 Committed by Pier Angelo Vendrame
Browse files

fixup! [android] Modify UI/UX 

Bug 41550: Disable the webcompat and webcompat-reporter features
parent da39cdcd

mobile/android/fenix/.buildconfig.yml

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ projects: 
    - feature-toolbar

    - feature-top-sites

    - feature-webauthn

    - feature-webcompat

    - feature-webcompat-reporter

#   - feature-webcompat

#   - feature-webcompat-reporter

    - feature-webnotifications

    - lib-crash

    - lib-crash-sentry

mobile/android/fenix/app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -633,9 +633,9 @@ dependencies { 
    implementation project(':feature-share')

    implementation project(':feature-accounts-push')

    implementation project(':feature-webauthn')

    implementation project(':feature-webcompat')

//  implementation project(':feature-webcompat')

    implementation project(':feature-webnotifications')

    implementation project(':feature-webcompat-reporter')

//  implementation project(':feature-webcompat-reporter')



    implementation project(':service-pocket')

    implementation project(':service-contile')

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

+6 −6
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ import mozilla.components.feature.session.middleware.undo.UndoMiddleware 
import mozilla.components.feature.sitepermissions.OnDiskSitePermissionsStorage

import mozilla.components.feature.top.sites.DefaultTopSitesStorage

import mozilla.components.feature.top.sites.PinnedSiteStorage

import mozilla.components.feature.webcompat.WebCompatFeature

import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature

// import mozilla.components.feature.webcompat.WebCompatFeature

// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature

import mozilla.components.feature.webnotifications.WebNotificationFeature

import mozilla.components.lib.dataprotect.SecureAbove22Preferences

import mozilla.components.service.contile.ContileTopSitesProvider
@@ -165,6 +165,7 @@ class Core( 
            defaultSettings,

            geckoRuntime,

        ).also {

//          WebCompatFeature.install(it)



            /**

             * There are some issues around localization to be resolved, as well as questions around
@@ -172,10 +173,9 @@ class Core( 
             * disabled in Fenix Release builds for now.

             * This is consistent with both Fennec and Firefox Desktop.

             */

            if (false && (Config.channel.isNightlyOrDebug || Config.channel.isBeta)) {

                WebCompatFeature.install(it)

                WebCompatReporterFeature.install(it, "fenix")

            }

//          if (Config.channel.isNightlyOrDebug || Config.channel.isBeta) {

//              WebCompatReporterFeature.install(it, "fenix")

//          }

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import mozilla.components.browser.state.state.TabSessionState 
import mozilla.components.browser.state.store.BrowserStore

import mozilla.components.concept.storage.BookmarksStorage

import mozilla.components.feature.top.sites.PinnedSiteStorage

import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature

// import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature

import mozilla.components.lib.state.ext.flowScoped

import mozilla.components.support.ktx.android.content.getColorFromAttr

import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged