From 174af614f42be9e921bcfac488b839a129106afa Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 2 Apr 2020 14:35:28 -0400
Subject: [PATCH] [fenix] For issue
 https://github.com/mozilla-mobile/fenix/issues/9647 Crash when tapping
 settings after quickly enabling/disabling add-on

---
 .../mozilla/fenix/addons/InstalledAddonDetailsFragment.kt    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 525c3375e0..17491c5be8 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt
@@ -168,6 +168,7 @@ class InstalledAddonDetailsFragment : Fragment() {
             val optionsPageUrl = addon.installedState?.optionsPageUrl
             isVisible = !optionsPageUrl.isNullOrEmpty()
             setOnClickListener {
+                val settingUrl = addon.installedState?.optionsPageUrl ?: return@setOnClickListener
                 val directions = if (addon.installedState?.openOptionsPageInTab == true) {
                     val components = it.context.components
                     val shouldCreatePrivateSession =
@@ -176,9 +177,9 @@ class InstalledAddonDetailsFragment : Fragment() {
                             ?: false
 
                     if (shouldCreatePrivateSession) {
-                        components.tabsUseCases.addPrivateTab(optionsPageUrl as String)
+                        components.tabsUseCases.addPrivateTab(settingUrl)
                     } else {
-                        components.tabsUseCases.addTab(optionsPageUrl as String)
+                        components.tabsUseCases.addTab(settingUrl)
                     }
 
                     InstalledAddonDetailsFragmentDirections