Austin/gkd
1
0
Fork 0
mirror of https://github.com/gkd-kit/gkd.git synced 2024-11-16 11:42:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 添加规则 key 处理错误 (#166)

Browse Source
This commit is contained in:
lisonge 2023-11-17 21:36:04 +08:00
parent 5a03ce5136
commit 1e84805e5e
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/li/songe/gkd/ui/SubsPage.kt
View File

@ -237,6 +237,10 @@ fun SubsPage(
ToastUtils.showShort("非法规则${e.message}")
return@TextButton
}
if (newAppRaw.groups.isEmpty()) {
ToastUtils.showShort("不允许添加空规则组")
return@TextButton
}
if (newAppRaw.groups.any { s -> s.name.isBlank() }) {
ToastUtils.showShort("不允许添加空白名规则组,请先命名")
return@TextButton
@ -252,20 +256,29 @@ fun SubsPage(
}
}
}
// 重写添加的规则的 key
val initKey =
((oldAppRaw?.groups ?: emptyList()).maxByOrNull { g -> g.key }?.key ?: -1) + 1
val finalAppRaw = if (oldAppRaw != null) {
newAppRaw.copy(groups = oldAppRaw.groups + newAppRaw.groups.mapIndexed { i, g ->
g.copy(
key = initKey + i
)
})
} else {
newAppRaw.copy(groups = newAppRaw.groups.mapIndexed { i, g ->
g.copy(
key = initKey + i
)
})
}
val newApps = if (oldAppRaw != null) {
val oldKey = oldAppRaw.groups.maxBy { g -> g.key }.key + 1
val finalAppRaw =
newAppRaw.copy(groups = oldAppRaw.groups + newAppRaw.groups.mapIndexed { i, g ->
g.copy(
key = oldKey + i
)
})
subsRaw.apps.toMutableList().apply {
set(oldAppRawIndex, finalAppRaw)
}
} else {
subsRaw.apps.toMutableList().apply {
add(newAppRaw)
add(finalAppRaw)
}
}
vm.viewModelScope.launchTry {