From d911336b1ca32ab628b37ac6b3a82ba16b988a86 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Fri, 11 Sep 2020 15:40:57 -0400
Subject: [PATCH] [components] Closes
 /~https://github.com/mozilla-mobile/android-components/issues/8323: Add-on
 permission dialog does not prompt for host permissions

X-Channel-Revision: [main] mozilla-mobile/android-components@96444ddbd36acf0987ca531574187647bc74b5f3
X-Channel-Revision: [main] mozilla-mobile/fenix@d039188782084c5475112e6d98ab829c7992e759
X-Channel-Revision: [main] mozilla-mobile/focus-android@a9a09b171665081b4e5f4d426f0e30f22f84ae49
X-Channel-Converted-Revision: [main] mozilla-mobile/firefox-android@222637cd1c352e8a1755dd4561cdc875e4274445
---
 ...ile-firefox-android-android-components.json |  2 +-
 .../addons/src/main/res/values/strings.xml     | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/_meta/mozilla-mobile-firefox-android-android-components.json b/_meta/mozilla-mobile-firefox-android-android-components.json
index b31ef3810e7..572c95a54a3 100644
--- a/_meta/mozilla-mobile-firefox-android-android-components.json
+++ b/_meta/mozilla-mobile-firefox-android-android-components.json
@@ -1,6 +1,6 @@
 {
   "name": "mozilla-mobile/firefox-android/android-components",
   "revs": {
-    "main": "8a3cfa53f6ebf5dc697672d1b1176b6a60c9cb29"
+    "main": "222637cd1c352e8a1755dd4561cdc875e4274445"
   }
 }
\ No newline at end of file
diff --git a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
index ae889c642fa..6a9be932420 100644
--- a/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
+++ b/mozilla-mobile/android-components/components/feature/addons/src/main/res/values/strings.xml
@@ -4,6 +4,24 @@
     <string name="mozac_feature_addons_permissions_privacy_description">Read and modify privacy settings</string>
     <!-- Description for all_urls add-on permission. -->
     <string name="mozac_feature_addons_permissions_all_urls_description">Access your data for all websites</string>
+    <!-- Description for giving an add-on access to users's data on one site. %1$s  will be replaced by the DNS host name for which a web extension is requesting access (e.g., www.mozilla.org). -->
+    <string name="mozac_feature_addons_permissions_one_site_description">Access your data for %1$s</string>
+    <!-- Description for giving an add-on access to users's data in multiple sites in the domain %1$s. %1$s will be replaced by the DNS domain for which a web extension is requesting access (e.g., mozilla.org). -->
+    <string name="mozac_feature_addons_permissions_sites_in_domain_description">Access your data for sites in the %1$s domain</string>
+    <!-- When an add-on requires access to more than 4 sites, for example the add-on requires access for 5 sites. We will show the first 4 sites in individual entries, as in mozac_feature_addons_permissions_one_site_description,
+     then we will show another collapsed entry saying "Access your data on 1 other site". This entry it's for the singular case, when the add-on is only accessing one extra site. -->
+    <string name="mozac_feature_addons_permissions_one_extra_site_description" tools:ignore="PluralsCandidate">Access your data on 1 other site</string>
+    <!-- When an add-on requires access to more than 4 sites, for example the add-on requires access for 6 sites. We will show the first 4 sites in individual entries, as in mozac_feature_addons_permissions_one_site_description,
+     then we will show another collapsed entry saying "Access your data on 2 other sites". This entry it's for the plural case, when the add-on is accessing more than one extra site.
+     %1$d will be replaced by an integer indicating the number of additional hosts for which this web extension is requesting permission. -->
+    <string name="mozac_feature_addons_permissions_extra_sites_description" tools:ignore="PluralsCandidate">Access your data on %1$d other sites</string>
+    <!-- When an add-on requires access to more than 4 domains, for example the add-on requires access for 5 domains. We will show the first 4 domains in individual entries, as in mozac_feature_addons_permissions_sites_in_domain_description,
+      then we will show another collapsed entry saying "Access your data on 1 other domain". This entry it's for the singular case, when the add-on is only accessing one extra domain. -->
+    <string name="mozac_feature_addons_permissions_one_extra_domain_description" tools:ignore="PluralsCandidate">Access your data on 1 other domain</string>
+    <!-- When an add-on requires access to more than 4 domains, for example the add-on requires access for 6 domains. We will show the first 4 domains in individual entries, as in mozac_feature_addons_permissions_sites_in_domain_description,
+     then we will show another collapsed entry saying "Access your data on 2 other domains". This entry it's for the plural case, when the add-on is accessing more than one extra domain.
+     %1$d will be replaced by an integer indicating the number of additional domains for which this web extension is requesting permission. -->
+    <string name="mozac_feature_addons_permissions_extra_domains_description_plural" tools:ignore="PluralsCandidate">Access your data on %1$d other domains</string>
     <!-- Description for tabs add-on permission. -->
     <string name="mozac_feature_addons_permissions_tabs_description">Access browser tabs</string>
     <!-- Description for unlimited_storage permission. -->