shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 05:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: shkong:81be383b5ff06e75a8223724e387a29da627b406
Branches Tags
shkong:master shkong:v1.0.9 shkong:gh-pages shkong:docs
shkong:1.1.1 shkong:1.0.9 shkong:1.1.0-ntrnm shkong:1.1.0 shkong:1.0.8 shkong:1.0.7 shkong:1.0.6 shkong:1.0.5
...
compare: shkong:48b720bdd78a73e369bb690708d5e8b740acac0e
Branches Tags
shkong:v1.0.9 shkong:master shkong:gh-pages shkong:docs
shkong:1.1.1 shkong:1.0.9 shkong:1.1.0-ntrnm shkong:1.1.0 shkong:1.0.8 shkong:1.0.7 shkong:1.0.6 shkong:1.0.5

2 Commits
81be383b5f ... 48b720bdd7

Author SHA1 Message Date
whitechi73
48b720bdd7 Merge remote-tracking branch 'origin/master' 2024-01-20 03:03:07 +08:00
whitechi73
2038d81ce8 Shamrock: 调整包拦截策略 2024-01-20 03:02:55 +08:00
2 changed files with 2 additions and 2 deletions
Expand all files Collapse all files

1
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/listener/PrimitiveListener.kt
View File

@ -48,7 +48,6 @@ internal object PrimitiveListener {
if ( if (
!pb.has(1, 3) !pb.has(1, 3)
|| !pb.has(1, 2) || !pb.has(1, 2)
// || !pb.has(1, 2, 2)
|| !pb.has(1, 2, 6) || !pb.has(1, 2, 6)
) return ) return
val msgType = pb[1, 2, 1].asInt val msgType = pb[1, 2, 1].asInt

3
xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/actions/HookWrapperCodec.kt
View File

@ -113,7 +113,8 @@ internal class HookWrapperCodec: IAction {
from.putWupBuffer(merge.toByteArray()) from.putWupBuffer(merge.toByteArray())
} else if (from.appId != MAGIC_APP_ID) { } else if (from.appId != MAGIC_APP_ID) {
if (from.serviceCmd in IgnoredCmd && ShamrockConfig.isInjectPacket()) { if (from.serviceCmd in IgnoredCmd && ShamrockConfig.isInjectPacket()) {
from.serviceCmd = "ShamrockInjectedCmd_${from.serviceCmd}" //from.serviceCmd = "ShamrockInjectedCmd_${from.serviceCmd}"
from.setBusinessFail(1)
from.putWupBuffer(EMPTY_BYTE_ARRAY) from.putWupBuffer(EMPTY_BYTE_ARRAY)
} else { } else {
pushOnReceive(from) pushOnReceive(from)