Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-android

Mygod · Mygod · commit 52cd6d1576b6 · 2015-11-19T14:34:02.000+08:00
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -440,22 +440,18 @@ class Shadowsocks
       bgService.getState match {
         case State.CONNECTING =>
           fab.setBackgroundTintList(greyTint)
-          fabProgressCircle.show()
           changeSwitch(checked = true)
           setPreferenceEnabled(false)
         case State.CONNECTED =>
           fab.setBackgroundTintList(greenTint)
-          fabProgressCircle.hide()
           changeSwitch(checked = true)
           setPreferenceEnabled(false)
         case State.STOPPING =>
           fab.setBackgroundTintList(greyTint)
-          fabProgressCircle.show()
           changeSwitch(checked = false)
           setPreferenceEnabled(false)
         case _ =>
           fab.setBackgroundTintList(greyTint)
-          fabProgressCircle.hide()
           changeSwitch(checked = false)
           setPreferenceEnabled(true)
       }
