Skip to content

Commit a8ded37

Browse files
committed
Remove unnecessary check
1 parent 0c2cfea commit a8ded37

3 files changed

Lines changed: 4 additions & 14 deletions

File tree

buildSrc/src/main/kotlin/Helpers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fun Project.setupCore() {
6666
ndkVersion = "27.0.12077973"
6767
buildFeatures.buildConfig = true
6868
}
69-
dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:2.1.0")
69+
dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:2.1.1")
7070
}
7171

7272
fun Project.setupApp() {

core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ dependencies {
101101
api("androidx.work:work-runtime-ktx:$workVersion")
102102
api("com.google.android.gms:play-services-oss-licenses:17.1.0")
103103
api("com.google.code.gson:gson:2.11.0")
104-
api("com.google.firebase:firebase-analytics-ktx:22.1.0")
104+
api("com.google.firebase:firebase-analytics:22.1.0")
105105
api("com.google.firebase:firebase-crashlytics:19.0.3")
106106
api("com.jakewharton.timber:timber:5.0.1")
107107
api("dnsjava:dnsjava:3.6.1")

core/src/main/java/com/github/shadowsocks/bg/VpnService.kt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
package com.github.shadowsocks.bg
2222

2323
import android.annotation.SuppressLint
24-
import android.app.Service
2524
import android.content.Intent
2625
import android.content.pm.PackageManager
2726
import android.net.LocalSocket
@@ -33,15 +32,13 @@ import android.system.ErrnoException
3332
import android.system.Os
3433
import android.system.OsConstants
3534
import com.github.shadowsocks.Core
36-
import com.github.shadowsocks.VpnRequestActivity
3735
import com.github.shadowsocks.acl.Acl
3836
import com.github.shadowsocks.core.R
3937
import com.github.shadowsocks.net.ConcurrentLocalSocketListener
4038
import com.github.shadowsocks.net.DefaultNetworkListener
4139
import com.github.shadowsocks.net.DnsResolverCompat
4240
import com.github.shadowsocks.net.Subnet
4341
import com.github.shadowsocks.preference.DataStore
44-
import com.github.shadowsocks.utils.Key
4542
import com.github.shadowsocks.utils.int
4643
import kotlinx.coroutines.CoroutineScope
4744
import 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

Comments
 (0)