Misc bugfixes for FAB Progress Circle

2015-11-08 17:26:04 +08:00
parent d6c45df372
commit 7b7614db42
1 changed files with 9 additions and 3 deletions
@@ -786,11 +786,17 @@ class Shadowsocks
    super.onResume()
    if (bgService != null) {
      bgService.getState match {
-        case State.CONNECTED =>
-          changeSwitch(checked = true)
        case State.CONNECTING =>
+          fabProgressCircle.show()
          changeSwitch(checked = true)
+        case State.CONNECTED =>
+          fabProgressCircle.hide()
+          changeSwitch(checked = true)
+        case State.STOPPING =>
+          fabProgressCircle.show()
+          changeSwitch(checked = false)
        case _ =>
+          fabProgressCircle.hide()
          changeSwitch(checked = false)
      }
      state = bgService.getState
@@ -1036,7 +1042,7 @@ class Shadowsocks
          changeSwitch(checked = true)
          setPreferenceEnabled(enabled = false)
        case State.STOPPED =>
-          fabProgressCircle.hide()
+          handler.post(() => fabProgressCircle.hide())
          fab.setEnabled(true)
          changeSwitch(checked = false)
          if (m != null) Snackbar.make(getWindow.getDecorView.findViewById(android.R.id.content),