Revert "For Fenix#16832: Separate facts for addon install and addon enabled" (mozilla-mobile#9499)

* Revert "Remove unused line"

This reverts commit 129968b.

* Revert "Fix web extension support test"

This reverts commit 2e3ec8d.

* Revert "Separate web extention install and enable facts"

This reverts commit efad6f6.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: rocketsroger

components/support/webextensions/src/main/java/mozilla/components/support/webextensions/WebExtensionSupport.kt

@@ -35,8 +35,7 @@ import mozilla.components.support.base.log.logger.Logger
 import mozilla.components.support.ktx.kotlin.isExtensionUrl
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.filterChanged
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
-import mozilla.components.support.webextensions.facts.emitWebExtensionEnabledFact
-import mozilla.components.support.webextensions.facts.emitWebExtensionInstalledFact
+import mozilla.components.support.webextensions.facts.emitWebExtensionsInitializedFact
 import java.util.concurrent.ConcurrentHashMap
 
 /**
@@ -244,7 +243,6 @@ object WebExtensionSupport {
             override fun onEnabled(extension: WebExtension) {
                 installedExtensions[extension.id] = extension
                 store.dispatch(WebExtensionAction.UpdateWebExtensionEnabledAction(extension.id, true))
-                emitWebExtensionEnabledFact(extension)
             }
 
             override fun onDisabled(extension: WebExtension) {
@@ -301,6 +299,7 @@ object WebExtensionSupport {
         runtime.listInstalledWebExtensions(
             onSuccess = {
                 extensions -> extensions.forEach { registerInstalledExtension(store, it) }
+                emitWebExtensionsInitializedFact(extensions)
                 closeUnsupportedTabs(store, extensions)
                 initializationResult.complete(Unit)
                 onExtensionsLoaded?.invoke(extensions.filter { !it.isBuiltIn() })
@@ -319,10 +318,6 @@ object WebExtensionSupport {
         installedExtensions[webExtension.id] = webExtension
         store.dispatch(WebExtensionAction.InstallWebExtensionAction(webExtension.toState()))
 
-        if (!webExtension.isBuiltIn()) {
-            emitWebExtensionInstalledFact(webExtension)
-        }
-
         // Register action handler for all existing engine sessions on the new extension,
         // an issue was filed to get us an API, so we don't have to do this per extension:
         // https://bugzilla.mozilla.org/show_bug.cgi?id=1603559

components/support/webextensions/src/main/java/mozilla/components/support/webextensions/facts/WebExtensionFacts.kt

@@ -18,8 +18,7 @@ class WebExtensionFacts {
      * Items that specify which portion of the web extension events were invoked.
      */
     object Items {
-        const val WEB_EXTENSION_ENABLED = "web_extension_enabled"
-        const val WEB_EXTENSION_INSTALLED = "web_extension_installed"
+        const val WEB_EXTENSIONS_INITIALIZED = "web_extensions_initialized"
     }
 }
 
@@ -38,22 +37,15 @@ private fun emitWebExtensionFact(
     ).collect()
 }
 
-internal fun emitWebExtensionEnabledFact(extension: WebExtension) {
+internal fun emitWebExtensionsInitializedFact(extensions: List<WebExtension>) {
+    val installedAddons = extensions.filter { !it.isBuiltIn() }
+    val enabledAddons = installedAddons.filter { it.isEnabled() }
     emitWebExtensionFact(
         Action.INTERACTION,
-        WebExtensionFacts.Items.WEB_EXTENSION_ENABLED,
+        WebExtensionFacts.Items.WEB_EXTENSIONS_INITIALIZED,
         metadata = mapOf(
-            "enabled" to extension.id
-        )
-    )
-}
-
-internal fun emitWebExtensionInstalledFact(extension: WebExtension) {
-    emitWebExtensionFact(
-        Action.INTERACTION,
-        WebExtensionFacts.Items.WEB_EXTENSION_INSTALLED,
-        metadata = mapOf(
-            "installed" to extension.id
+            "installed" to installedAddons.map { it.id },
+            "enabled" to enabledAddons.map { it.id }
         )
     )
 }

components/support/webextensions/src/test/java/mozilla/components/support/webextensions/WebExtensionSupportTest.kt

@@ -39,7 +39,7 @@ import mozilla.components.support.test.libstate.ext.waitUntilIdle
 import mozilla.components.support.test.mock
 import mozilla.components.support.test.whenever
 import mozilla.components.support.webextensions.WebExtensionSupport.toState
-import mozilla.components.support.webextensions.facts.WebExtensionFacts.Items.WEB_EXTENSION_INSTALLED
+import mozilla.components.support.webextensions.facts.WebExtensionFacts.Items.WEB_EXTENSIONS_INITIALIZED
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
@@ -114,9 +114,12 @@ class WebExtensionSupportTest {
             val interactionFact = facts[0]
             assertEquals(FactsAction.INTERACTION, interactionFact.action)
             assertEquals(Component.SUPPORT_WEBEXTENSIONS, interactionFact.component)
-            assertEquals(WEB_EXTENSION_INSTALLED, interactionFact.item)
-            assertEquals(1, interactionFact.metadata?.size)
+            assertEquals(WEB_EXTENSIONS_INITIALIZED, interactionFact.item)
+            assertEquals(2, interactionFact.metadata?.size)
             assertTrue(interactionFact.metadata?.containsKey("installed")!!)
+            assertTrue(interactionFact.metadata?.containsKey("enabled")!!)
+            assertEquals(listOf(ext1.id, ext2.id), interactionFact.metadata?.get("installed"))
+            assertEquals(listOf(ext1.id), interactionFact.metadata?.get("enabled"))
         }
         assertEquals(ext1, WebExtensionSupport.installedExtensions[ext1.id])
         assertEquals(ext2, WebExtensionSupport.installedExtensions[ext2.id])