Bug 1859744 - After installing an add-on add the metadata from instal…

…led extension .
mohamed00736 · Oct 19, 2023 · e73e3a7 · e73e3a7
1 parent 0d97dc3
commit e73e3a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...components/feature/addons/src/main/java/mozilla/components/feature/addons/AddonManager.kt b/...components/feature/addons/src/main/java/mozilla/components/feature/addons/AddonManager.kt
@@ -134,8 +134,8 @@ class AddonManager(
  id = addon.id,
  url = addon.downloadUrl,
  onSuccess = { ext ->
- val installedAddon = addon.copy(installedState = ext.toInstalledState())
- addonUpdater.registerForFutureUpdates(installedAddon.id)
+ val installedAddon = Addon.newFromWebExtension(ext, ext.toInstalledState())
+  .copy(iconUrl = addon.iconUrl)
  completePendingAddonAction(pendingAction)
  onSuccess(installedAddon)
  },

diff --git a/android-components/components/feature/addons/src/test/java/AddonManagerTest.kt b/android-components/components/feature/addons/src/test/java/AddonManagerTest.kt
@@ -28,11 +28,13 @@ import mozilla.components.concept.engine.webextension.EnableSource
 import mozilla.components.concept.engine.webextension.Metadata
 import mozilla.components.concept.engine.webextension.WebExtension
 import mozilla.components.feature.addons.AddonManager.Companion.ADDON_ICON_SIZE
+import mozilla.components.feature.addons.ui.translateName
 import mozilla.components.feature.addons.update.AddonUpdater.Status
 import mozilla.components.support.test.any
 import mozilla.components.support.test.argumentCaptor
 import mozilla.components.support.test.eq
 import mozilla.components.support.test.mock
+import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.rule.MainCoroutineRule
 import mozilla.components.support.test.rule.runTestOnMain
 import mozilla.components.support.test.whenever
@@ -542,11 +544,15 @@ class AddonManagerTest {
  any(),
  )
 
+ val metadata: Metadata = mock()
  val extension: WebExtension = mock()
+ whenever(metadata.name).thenReturn("nameFromMetadata")
  whenever(extension.id).thenReturn("ext1")
+ whenever(extension.getMetadata()).thenReturn(metadata)
  onSuccessCaptor.value.invoke(extension)
  assertNotNull(installedAddon)
  assertEquals(addon.id, installedAddon!!.id)
+ assertEquals("nameFromMetadata", installedAddon!!.translateName(testContext))
  assertTrue(manager.pendingAddonActions.isEmpty())
  }