Batyka/zaprett-app
1
0
Fork 0
mirror of https://github.com/CherretGit/zaprett-app.git synced 2025-12-10 05:29:37 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

Compare commits

base: Batyka:59e30206f7c3d3d71323a24f8c4974085ae2fc7f
Branches Tags
Batyka:main Batyka:m3e
Batyka:2.13.0 Batyka:2.12.0 Batyka:2.11.0 Batyka:2.10.0 Batyka:2.9.0 Batyka:2.8.0 Batyka:2.7 Batyka:2_7_0 Batyka:2_6 Batyka:2_5 Batyka:2_4 Batyka:2_3 Batyka:2_2 Batyka:2_1 Batyka:2_0 Batyka:1_10_0 Batyka:1_9_0 Batyka:1_8_0 Batyka:1_7_0 Batyka:1_6_0 Batyka:1_5_0 Batyka:1_4_0 Batyka:1_3_0 Batyka:1.2.0 Batyka:1.1.0 Batyka:1.0.0
...
compare: Batyka:ad614b3b4a6e478799130a8472d765de0d70ef81
Branches Tags
Batyka:main Batyka:m3e
Batyka:2.13.0 Batyka:2.12.0 Batyka:2.11.0 Batyka:2.10.0 Batyka:2.9.0 Batyka:2.8.0 Batyka:2.7 Batyka:2_7_0 Batyka:2_6 Batyka:2_5 Batyka:2_4 Batyka:2_3 Batyka:2_2 Batyka:2_1 Batyka:2_0 Batyka:1_10_0 Batyka:1_9_0 Batyka:1_8_0 Batyka:1_7_0 Batyka:1_6_0 Batyka:1_5_0 Batyka:1_4_0 Batyka:1_3_0 Batyka:1.2.0 Batyka:1.1.0 Batyka:1.0.0

2 Commits
59e30206f7 ... ad614b3b4a

Author SHA1 Message Date
CherretGit
ad614b3b4a fix ByeDpiVpnService 2025-11-03 02:19:06 +07:00
CherretGit
5c8425573a change commands in ZaprettManager 2025-11-03 02:05:14 +07:00
2 changed files with 11 additions and 16 deletions
Expand all files Collapse all files

20
app/src/main/java/com/cherret/zaprett/byedpi/ByeDpiVpnService.kt
View File

@@ -266,24 +266,18 @@ class ByeDpiVpnService : VpnService() {
.flatMap { arg ->
if (getHostListMode(sharedPreferences) == "whitelist") {
when {
arg == "\$hostlist" && list.isNotEmpty() -> listOf("-H", list)
arg == "\$hostlist" && list.isNotEmpty() -> listOf("--hosts", list)
arg == "\$hostlist" && list.isEmpty() -> emptyList()
arg == "\$ipset" && list.isNotEmpty() -> listOf("-H", list)
arg == "\$ipset" && list.isNotEmpty() -> listOf("--ipset", list)
arg == "\$ipset" && list.isEmpty() -> emptyList()
else -> listOf(arg)
}
} else {
if (list.isNotEmpty()) {
listOf("-H", list, "-An", arg).filter { it != "\$hostlist" }
} else {
listOf("-An", arg).filter { it != "\$hostlist" }
}
if (ipset.isEmpty()) {
listOf("-H", list, "-An", arg).filter { it != "\$ipset" }
}
else {
listOf("-An", arg).filter { it != "\$ipset" }
when {
arg == "\$hostlist" && list.isNotEmpty() -> listOf("--hosts", list, "-An", list)
arg == "\$ipset" && ipset.isNotEmpty() -> listOf("--ipset", ipset, "-An", ipset)
arg == "\$hostlist" || arg == "\$ipset" -> emptyList()
else -> listOf(arg)
}
}
}

7
app/src/main/java/com/cherret/zaprett/utils/ZaprettManager.kt
View File

@@ -16,6 +16,7 @@ private val json = Json {
prettyPrint = true
ignoreUnknownKeys = true
coerceInputValues = true
encodeDefaults = true
}
private fun readConfig(): ZaprettConfig {
@@ -78,13 +79,13 @@ fun restartService(callback: (Boolean) -> Unit) {
}
fun getModuleVersion(callback: (String) -> Unit) {
Shell.cmd("zaprett module-ver").submit { result ->
Shell.cmd("zaprett module-version").submit { result ->
if (result.out.isNotEmpty()) callback(result.out.first()) else "undefined"
}
}
fun getBinVersion(callback: (String) -> Unit) {
Shell.cmd("zaprett bin-ver").submit { result ->
Shell.cmd("zaprett binary-version").submit { result ->
if (result.out.isNotEmpty()) callback(result.out.first()) else "undefined"
}
}
@@ -95,7 +96,7 @@ fun getConfigFile(): File {
fun setStartOnBoot(prefs: SharedPreferences, callback: (Boolean) -> Unit) {
if (prefs.getBoolean("use_module", false)) {
Shell.cmd("zaprett autostart").submit { result ->
Shell.cmd("zaprett set-autostart").submit { result ->
if (result.out.isNotEmpty() && result.out.toString().contains("true")) callback(true) else callback(false)
}
}