2121package com.github.shadowsocks.bg
2222
2323import android.annotation.SuppressLint
24- import android.app.Service
2524import android.content.Intent
2625import android.content.pm.PackageManager
2726import android.net.LocalSocket
@@ -33,15 +32,13 @@ import android.system.ErrnoException
3332import android.system.Os
3433import android.system.OsConstants
3534import com.github.shadowsocks.Core
36- import com.github.shadowsocks.VpnRequestActivity
3735import com.github.shadowsocks.acl.Acl
3836import com.github.shadowsocks.core.R
3937import com.github.shadowsocks.net.ConcurrentLocalSocketListener
4038import com.github.shadowsocks.net.DefaultNetworkListener
4139import com.github.shadowsocks.net.DnsResolverCompat
4240import com.github.shadowsocks.net.Subnet
4341import com.github.shadowsocks.preference.DataStore
44- import com.github.shadowsocks.utils.Key
4542import com.github.shadowsocks.utils.int
4643import kotlinx.coroutines.CoroutineScope
4744import kotlinx.coroutines.delay
@@ -136,15 +133,8 @@ class VpnService : BaseVpnService(), BaseService.Interface {
136133 conn = null
137134 }
138135
139- override fun onStartCommand (intent : Intent ? , flags : Int , startId : Int ): Int {
140- if (DataStore .serviceMode == Key .modeVpn) {
141- if (prepare(this ) != null ) {
142- startActivity(Intent (this , VpnRequestActivity ::class .java).addFlags(Intent .FLAG_ACTIVITY_NEW_TASK ))
143- } else return super <BaseService .Interface >.onStartCommand(intent, flags, startId)
144- }
145- stopRunner()
146- return Service .START_NOT_STICKY
147- }
136+ override fun onStartCommand (intent : Intent ? , flags : Int , startId : Int ): Int =
137+ super <BaseService .Interface >.onStartCommand(intent, flags, startId)
148138
149139 override suspend fun preInit () = DefaultNetworkListener .start(this ) { underlyingNetwork = it }
150140 override suspend fun rawResolver (query : ByteArray ) =
0 commit comments