Skip to content

[pull] master from yujincheng08:master #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jun 18, 2026
Merged

[pull] master from yujincheng08:master #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 27 additions & 17 deletions app/src/main/java/me/iacn/biliroaming/BiliBiliPackage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,9 @@ class BiliBiliPackage constructor(private val mClassLoader: ClassLoader, mContex
}?.declaringClass ?: return@biliAccounts
class_ = class_ { name = biliAccountsClass.name }
val biliAccountIndex = dexHelper.encodeClassIndex(biliAccountsClass)
val biliAuthFragmentMethodIndex = dexHelper.findMethodUsingString(
// 调用图反推兼容方法名被混淆的历史版本；锚点 "initFacial enter" 失效时
// (如 8.98.0 方法名未混淆)，回退到按签名/方法名直接查找
val calledMethods = dexHelper.findMethodUsingString(
"initFacial enter",
true,
-1,
Expand All @@ -719,30 +721,38 @@ class BiliBiliPackage constructor(private val mClassLoader: ClassLoader, mContex
null,
null,
true
).firstOrNull() ?: return@biliAccounts
val calledMethods = dexHelper.findMethodInvoking(
biliAuthFragmentMethodIndex,
-1,
-1,
null,
biliAccountIndex,
null,
null,
null,
false
).asSequence().mapNotNull {
dexHelper.decodeMethodIndex(it) as? Method
).firstOrNull()?.let {
dexHelper.findMethodInvoking(
it,
-1,
-1,
null,
biliAccountIndex,
null,
null,
null,
false
).asSequence().mapNotNull { m ->
dexHelper.decodeMethodIndex(m) as? Method
}
}

get = method {
name = calledMethods.firstOrNull {
name = calledMethods?.firstOrNull {
it.isStatic && it.parameterTypes.size == 1 && it.parameterTypes[0] == Context::class.java && it.returnType == biliAccountsClass
}?.name ?: biliAccountsClass.declaredMethods.firstOrNull {
it.isStatic && it.parameterTypes.size == 1
&& it.parameterTypes[0] == Context::class.java
&& it.returnType == biliAccountsClass
}?.name ?: return@method
}

getAccessKey = method {
name = calledMethods.firstOrNull {
name = calledMethods?.firstOrNull {
it.isNotStatic && it.parameterTypes.isEmpty() && it.returnType == String::class.java
}?.name ?: biliAccountsClass.declaredMethods.firstOrNull {
it.name == "getAccessKey" && it.isNotStatic
&& it.parameterTypes.isEmpty()
&& it.returnType == String::class.java
}?.name ?: return@method
}
}
Expand Down
Loading