Commit e9406080 authored by Max Lv's avatar Max Lv

Merge pull request #535 from wyzegob/master

Change the state after all the checks and initialization
parents 3facb73c 7f937a8e
...@@ -393,13 +393,10 @@ class ShadowsocksNatService extends BaseService { ...@@ -393,13 +393,10 @@ class ShadowsocksNatService extends BaseService {
} }
override def startRunner(config: Config) { override def startRunner(config: Config) {
changeState(State.CONNECTING)
if (!Console.isRoot) { if (!Console.isRoot) {
changeState(State.STOPPED, getString(R.string.nat_no_root)) changeState(State.STOPPED, getString(R.string.nat_no_root))
return return
} }
super.startRunner(config) super.startRunner(config)
// register close receiver // register close receiver
...@@ -414,6 +411,8 @@ class ShadowsocksNatService extends BaseService { ...@@ -414,6 +411,8 @@ class ShadowsocksNatService extends BaseService {
ShadowsocksApplication.track(TAG, "start") ShadowsocksApplication.track(TAG, "start")
changeState(State.CONNECTING)
ThrowableFuture { ThrowableFuture {
if (config.proxy == "198.199.101.152") { if (config.proxy == "198.199.101.152") {
val holder = ShadowsocksApplication.containerHolder val holder = ShadowsocksApplication.containerHolder
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment