For issue #8570: Disabling uBlock and quickly opening the Settings

section cause a crash
fennec/beta
Arturo Mejia 4 years ago committed by GitHub
parent f02e06afae
commit 8b7fd3a1df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -13,7 +13,6 @@ import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.navigation.Navigation import androidx.navigation.Navigation
import androidx.navigation.findNavController import androidx.navigation.findNavController
import kotlinx.android.synthetic.main.activity_addons.view.*
import kotlinx.android.synthetic.main.fragment_installed_add_on_details.* import kotlinx.android.synthetic.main.fragment_installed_add_on_details.*
import kotlinx.android.synthetic.main.fragment_installed_add_on_details.view.* import kotlinx.android.synthetic.main.fragment_installed_add_on_details.view.*
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@ -94,7 +93,7 @@ class InstalledAddonDetailsFragment : Fragment() {
switch.setOnCheckedChangeListener { v, isChecked -> switch.setOnCheckedChangeListener { v, isChecked ->
val addonManager = v.context.components.addonManager val addonManager = v.context.components.addonManager
switch.isClickable = false switch.isClickable = false
remove_add_on.isEnabled = false view.remove_add_on.isEnabled = false
if (isChecked) { if (isChecked) {
addonManager.enableAddon( addonManager.enableAddon(
addon, addon,
@ -103,7 +102,7 @@ class InstalledAddonDetailsFragment : Fragment() {
switch.isClickable = true switch.isClickable = true
switch.setText(R.string.mozac_feature_addons_settings_on) switch.setText(R.string.mozac_feature_addons_settings_on)
view.settings.isVisible = true view.settings.isVisible = true
remove_add_on.isEnabled = true view.remove_add_on.isEnabled = true
this.addon = it this.addon = it
showSnackBar( showSnackBar(
view, view,
@ -117,7 +116,7 @@ class InstalledAddonDetailsFragment : Fragment() {
onError = { onError = {
runIfFragmentIsAttached { runIfFragmentIsAttached {
switch.isClickable = true switch.isClickable = true
remove_add_on.isEnabled = true view.remove_add_on.isEnabled = true
showSnackBar( showSnackBar(
view, view,
getString( getString(
@ -129,14 +128,14 @@ class InstalledAddonDetailsFragment : Fragment() {
} }
) )
} else { } else {
view.settings.isVisible = false
addonManager.disableAddon( addonManager.disableAddon(
addon, addon,
onSuccess = { onSuccess = {
runIfFragmentIsAttached { runIfFragmentIsAttached {
switch.isClickable = true switch.isClickable = true
switch.setText(R.string.mozac_feature_addons_settings_off) switch.setText(R.string.mozac_feature_addons_settings_off)
view.settings.isVisible = false view.remove_add_on.isEnabled = true
remove_add_on.isEnabled = true
this.addon = it this.addon = it
showSnackBar( showSnackBar(
view, view,
@ -150,7 +149,7 @@ class InstalledAddonDetailsFragment : Fragment() {
onError = { onError = {
runIfFragmentIsAttached { runIfFragmentIsAttached {
switch.isClickable = true switch.isClickable = true
remove_add_on.isEnabled = true view.remove_add_on.isEnabled = true
showSnackBar( showSnackBar(
view, view,
getString( getString(

Loading…
Cancel
Save