diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 54b317e2..4f6479b9 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="126" + android:versionName="2.9.4"> diff --git a/src/main/scala/com/github/shadowsocks/BaseService.scala b/src/main/scala/com/github/shadowsocks/BaseService.scala index 2ca17571..f580ed8a 100644 --- a/src/main/scala/com/github/shadowsocks/BaseService.scala +++ b/src/main/scala/com/github/shadowsocks/BaseService.scala @@ -51,10 +51,10 @@ trait BaseService extends Service { @volatile private var state = State.STOPPED @volatile private var callbackCount = 0 + @volatile protected var config: Config = null var timer: Timer = null var trafficMonitorThread: TrafficMonitorThread = null - var config: Config = null final val callbacks = new RemoteCallbackList[IShadowsocksServiceCallback]