For mozilla-mobile#10162: Set switch back to prev state when failed t…

…o enable/disable addon
psymoon · Apr 23, 2020 · 35be8cc · 35be8cc
1 parent e51e1c8
commit 35be8cc
Showing 1 changed file with 7 additions and 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
@@ -88,7 +88,8 @@ class InstalledAddonDetailsFragment : Fragment() {
     @SuppressWarnings("LongMethod")
     private fun bindEnableSwitch(view: View) {
         val switch = view.enable_switch
-        switch.setState(addon.isEnabled())
+        val currState = addon.isEnabled()
+        switch.setState(currState)
         switch.setOnCheckedChangeListener { v, isChecked ->
             val addonManager = v.context.components.addonManager
             switch.isClickable = false
@@ -116,6 +117,7 @@ class InstalledAddonDetailsFragment : Fragment() {
                         runIfFragmentIsAttached {
                             switch.isClickable = true
                             view.remove_add_on.isEnabled = true
+                            switch.setState(currState)
                             showSnackBar(
                                 view,
                                 getString(
@@ -149,6 +151,7 @@ class InstalledAddonDetailsFragment : Fragment() {
                         runIfFragmentIsAttached {
                             switch.isClickable = true
                             view.remove_add_on.isEnabled = true
+                            switch.setState(currState)
                             showSnackBar(
                                 view,
                                 getString(
@@ -214,7 +217,8 @@ class InstalledAddonDetailsFragment : Fragment() {
 
     private fun bindAllowInPrivateBrowsingSwitch(view: View) {
         val switch = view.allow_in_private_browsing_switch
-        switch.isChecked = addon.isAllowedInPrivateBrowsing()
+        val currState = addon.isAllowedInPrivateBrowsing()
+        switch.isChecked = currState
         switch.setOnCheckedChangeListener { v, isChecked ->
             val addonManager = v.context.components.addonManager
             switch.isClickable = false
@@ -230,6 +234,7 @@ class InstalledAddonDetailsFragment : Fragment() {
                     }
                 },
                 onError = {
+                    switch.isChecked = currState
                     runIfFragmentIsAttached {
                         switch.isClickable = true
                         view.remove_add_on.isEnabled = true