Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refine #1489

Browse Source
This commit is contained in:
Mygod
2017-12-08 17:24:29 -08:00
parent a444d7ccc3
commit 497a74760d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/src/main/java/com/github/shadowsocks/bg/BaseService.kt
+9 -3
View File
@@ -221,10 +221,10 @@ object BaseService {
"-t", "600",
"-c", "shadowsocks.json"))
val route = data.profile!!.route
if (route != Acl.ALL) {
val acl = getAclFile()
if (acl != null) {
cmd += "--acl"
cmd += Acl.getFile(if (route == Acl.CUSTOM_RULES) Acl.CUSTOM_RULES_FLATTENED else route).absolutePath
cmd += acl.absolutePath
}
if (TcpFastOpen.sendEnabled) cmd += "--fast-open"
@@ -232,6 +232,12 @@ object BaseService {
data.sslocalProcess = GuardedProcess(cmd).start()
}
fun getAclFile(): File? {
val route = data.profile!!.route
return if (route == Acl.ALL) null else
Acl.getFile(if (route == Acl.CUSTOM_RULES) Acl.CUSTOM_RULES_FLATTENED else route)
}
fun createNotification(): ServiceNotification
fun startRunner() {
mobile/src/main/java/com/github/shadowsocks/bg/LocalDnsService.kt
+1 -1
View File
@@ -89,7 +89,7 @@ object LocalDnsService {
.put("PrimaryDNS", localDns)
.put("AlternativeDNS", remoteDns)
.put("IPNetworkFile", "china_ip_list.txt")
.put("DomainFile", app.filesDir.absolutePath + "/" + profile.route + ".acl")
.put("DomainFile", getAclFile()!!.absolutePath)
Acl.CHINALIST -> config
.put("PrimaryDNS", localDns)
.put("AlternativeDNS", remoteDns)