Commit 2ca6737f authored by Mygod's avatar Mygod

Remove redundant lazy initialization

parent d9de5430
...@@ -92,8 +92,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, OnPre ...@@ -92,8 +92,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, OnPre
// service // service
var state = BaseService.IDLE var state = BaseService.IDLE
override val serviceCallback: IShadowsocksServiceCallback.Stub by lazy { override val serviceCallback = object : IShadowsocksServiceCallback.Stub() {
object : IShadowsocksServiceCallback.Stub() {
override fun stateChanged(state: Int, profileName: String?, msg: String?) { override fun stateChanged(state: Int, profileName: String?, msg: String?) {
Core.handler.post { changeState(state, msg, true) } Core.handler.post { changeState(state, msg, true) }
} }
...@@ -111,7 +110,6 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, OnPre ...@@ -111,7 +110,6 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, OnPre
Core.handler.post { ProfilesFragment.instance?.onTrafficPersisted(profileId) } Core.handler.post { ProfilesFragment.instance?.onTrafficPersisted(profileId) }
} }
} }
}
private fun changeState(state: Int, msg: String? = null, animate: Boolean = false) { private fun changeState(state: Int, msg: String? = null, animate: Boolean = false) {
fab.changeState(state, animate) fab.changeState(state, animate)
......
...@@ -42,9 +42,7 @@ class TileService : BaseTileService(), ShadowsocksConnection.Interface { ...@@ -42,9 +42,7 @@ class TileService : BaseTileService(), ShadowsocksConnection.Interface {
private val keyguard by lazy { getSystemService<KeyguardManager>()!! } private val keyguard by lazy { getSystemService<KeyguardManager>()!! }
private var tapPending = false private var tapPending = false
override val serviceCallback: IShadowsocksServiceCallback.Stub by lazy { override val serviceCallback = object : IShadowsocksServiceCallback.Stub() {
@RequiresApi(24)
object : IShadowsocksServiceCallback.Stub() {
override fun stateChanged(state: Int, profileName: String?, msg: String?) { override fun stateChanged(state: Int, profileName: String?, msg: String?) {
val tile = qsTile ?: return val tile = qsTile ?: return
var label: String? = null var label: String? = null
...@@ -69,7 +67,6 @@ class TileService : BaseTileService(), ShadowsocksConnection.Interface { ...@@ -69,7 +67,6 @@ class TileService : BaseTileService(), ShadowsocksConnection.Interface {
override fun trafficUpdated(profileId: Long, stats: TrafficStats) { } override fun trafficUpdated(profileId: Long, stats: TrafficStats) { }
override fun trafficPersisted(profileId: Long) { } override fun trafficPersisted(profileId: Long) { }
} }
}
override fun onServiceConnected(service: IShadowsocksService) { override fun onServiceConnected(service: IShadowsocksService) {
serviceCallback.stateChanged(service.state, service.profileName, null) serviceCallback.stateChanged(service.state, service.profileName, null)
......
...@@ -89,8 +89,7 @@ class MainPreferenceFragment : LeanbackPreferenceFragment(), ShadowsocksConnecti ...@@ -89,8 +89,7 @@ class MainPreferenceFragment : LeanbackPreferenceFragment(), ShadowsocksConnecti
// service // service
var state = BaseService.IDLE var state = BaseService.IDLE
private set private set
override val serviceCallback: IShadowsocksServiceCallback.Stub by lazy { override val serviceCallback = object : IShadowsocksServiceCallback.Stub() {
object : IShadowsocksServiceCallback.Stub() {
override fun stateChanged(state: Int, profileName: String?, msg: String?) { override fun stateChanged(state: Int, profileName: String?, msg: String?) {
Core.handler.post { changeState(state, msg) } Core.handler.post { changeState(state, msg) }
} }
...@@ -103,7 +102,6 @@ class MainPreferenceFragment : LeanbackPreferenceFragment(), ShadowsocksConnecti ...@@ -103,7 +102,6 @@ class MainPreferenceFragment : LeanbackPreferenceFragment(), ShadowsocksConnecti
} }
override fun trafficPersisted(profileId: Long) { } override fun trafficPersisted(profileId: Long) { }
} }
}
private fun changeState(state: Int, msg: String? = null) { private fun changeState(state: Int, msg: String? = null) {
fab.isEnabled = state == BaseService.STOPPED || state == BaseService.CONNECTED fab.isEnabled = state == BaseService.STOPPED || state == BaseService.CONNECTED
......
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