From 7c279b6e1ff22fa50b08bd94a58594a3478b4b92 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Mon, 13 Apr 2020 11:43:31 -0400
Subject: [PATCH] No issue: Fix add-on translate() breaking change

---
 .../java/org/mozilla/fenix/addons/AddonDetailsFragment.kt  | 7 ++++---
 .../mozilla/fenix/addons/AddonInternalSettingsFragment.kt  | 4 ++--
 .../fenix/addons/AddonPermissionsDetailsFragment.kt        | 4 ++--
 .../mozilla/fenix/addons/InstalledAddonDetailsFragment.kt  | 3 +--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsFragment.kt
index 2b43c901f..de542ebf1 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsFragment.kt
@@ -20,7 +20,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.ui.showInformationDialog
-import mozilla.components.feature.addons.ui.translate
+import mozilla.components.feature.addons.ui.translatedName
+import mozilla.components.feature.addons.ui.translatedDescription
 import mozilla.components.feature.addons.update.DefaultAddonUpdater.UpdateAttemptStorage
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.showToolbar
@@ -44,7 +45,7 @@ class AddonDetailsFragment : Fragment(R.layout.fragment_add_on_details) {
     }
 
     private fun bind(addon: Addon, view: View) {
-        val title = addon.translatableName.translate()
+        val title = addon.translatedName
         showToolbar(title)
 
         bindDetails(addon, view)
@@ -111,7 +112,7 @@ class AddonDetailsFragment : Fragment(R.layout.fragment_add_on_details) {
 
     private fun bindDetails(addon: Addon, view: View) {
         val detailsView = view.details
-        val detailsText = addon.translatableDescription.translate()
+        val detailsText = addon.translatedDescription
 
         val parsedText = detailsText.replace("\n", "<br/>")
         val text = HtmlCompat.fromHtml(parsedText, HtmlCompat.FROM_HTML_MODE_COMPACT)
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt
index 9216ddaf4..7c170f2f7 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonInternalSettingsFragment.kt
@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import kotlinx.android.synthetic.main.fragment_add_on_internal_settings.*
-import mozilla.components.feature.addons.ui.translate
+import mozilla.components.feature.addons.ui.translatedName
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.showToolbar
 
@@ -33,7 +33,7 @@ class AddonInternalSettingsFragment : AddonPopupBaseFragment() {
 
     override fun onResume() {
         super.onResume()
-        showToolbar(args.addon.translatableName.translate())
+        showToolbar(args.addon.translatedName)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt
index d248051a2..933b01e2c 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt
@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.fragment_add_on_permissions.view.*
 import mozilla.components.feature.addons.Addon
 import mozilla.components.feature.addons.ui.AddonPermissionsAdapter
-import mozilla.components.feature.addons.ui.translate
+import mozilla.components.feature.addons.ui.translatedName
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.theme.ThemeManager
@@ -32,7 +32,7 @@ class AddonPermissionsDetailsFragment : Fragment(R.layout.fragment_add_on_permis
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        showToolbar(args.addon.translatableName.translate())
+        showToolbar(args.addon.translatedName)
 
         bindPermissions(args.addon, view)
         bindLearnMore(view)
diff --git a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
index edca30125..ca0ee03aa 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
@@ -19,7 +19,6 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.map
 import mozilla.components.feature.addons.Addon
-import mozilla.components.feature.addons.ui.translate
 import mozilla.components.feature.addons.ui.translatedName
 import mozilla.components.lib.state.ext.flowScoped
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
@@ -75,7 +74,7 @@ class InstalledAddonDetailsFragment : Fragment() {
     }
 
     private fun bind(view: View) {
-        val title = addon.translatableName.translate()
+        val title = addon.translatedName
         showToolbar(title)
 
         bindEnableSwitch(view)