Skip to content

Commit

Permalink
fix: 删除旧版本 XWeb 远程调试相关规则逻辑
Browse files Browse the repository at this point in the history
  • Loading branch information
@WankkoRee
WankkoRee committed Jan 20, 2023
1 parent 8ff765c commit 59f3307
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 275 deletions.
30 changes: 0 additions & 30 deletions app/src/main/java/cn/wankkoree/xp/webviewpp/activity/App.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -927,19 +927,6 @@ class App : AppCompatActivity() {
}
}
}
"hookXWebPreferences" -> {
if (rules.hookXWebPreferences != null) for (hookRule in rules.hookXWebPreferences) {
if (hookRule.name == ruleName) {
if (hookRule.version > targetRule.version) {
toast?.cancel()
toast = Toast.makeText(this@App, getString(R.string.there_are_updates_to_s, ruleName), Toast.LENGTH_SHORT)
toast!!.show()
hasUpdate = true
}
break
}
}
}
"hookXWebView" -> {
if (rules.hookXWebView != null) for (hookRule in rules.hookXWebView) {
if (hookRule.name == ruleName) {
Expand Down Expand Up @@ -1480,23 +1467,6 @@ class App : AppCompatActivity() {
).joinToString("")
)
}
"hookXWebPreferences" -> {
val hookEntry = Gson().fromJson(hookJson, HookRules.HookXWebPreferences::class.java)
v.code = getString(R.string.code_hookFunction,
when {
(hookEntry.remark != "" && hookEntry.version > 0u) -> getString(R.string.code_hookRemark, hookEntry.remark + "<br/>" + getString(R.string.rule_version_d, hookEntry.version.toLong()))
(hookEntry.remark != "" && hookEntry.version == 0u) -> getString(R.string.code_hookRemark, hookEntry.remark)
(hookEntry.remark == "" && hookEntry.version > 0u) -> getString(R.string.code_hookRemark, getString(R.string.rule_version_d, hookEntry.version.toLong()))
else -> "" // hookEntry.remark == "" && hookEntry.version == 0u
},
ruleName,
hookEntry.name,
arrayOf(
getString(R.string.code_hookParam, "Class_XWebPreferences", hookEntry.Class_XWebPreferences),
getString(R.string.code_hookParam, "Method_setValue", hookEntry.Method_setValue),
).joinToString("")
)
}
"hookXWebView" -> {
val hookEntry = Gson().fromJson(hookJson, HookRules.HookXWebView::class.java)
v.code = getString(R.string.code_hookFunction,
Expand Down
92 changes: 0 additions & 92 deletions app/src/main/java/cn/wankkoree/xp/webviewpp/activity/Rule.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class Rule : AppCompatActivity() {
"hookWebViewClient",
"replaceNebulaUCSDK",
"hookCrossWalk",
"hookXWebPreferences",
"hookXWebView",
))

Expand Down Expand Up @@ -237,42 +236,6 @@ class Rule : AppCompatActivity() {
}
dialogBinding.dialogCloudRulesRules.addView(v)
}
if (rules.hookXWebPreferences != null) for (hookRule in rules.hookXWebPreferences) {
val v = Code(this@Rule)
v.code = getString(R.string.code_hookFunction,
when {
(hookRule.remark.trim() != "" && hookRule.version > 0u) -> getString(R.string.code_hookRemark, hookRule.remark.trim() + "<br/>" + getString(R.string.rule_version_d, hookRule.version.toLong()))
(hookRule.remark.trim() != "" && hookRule.version == 0u) -> getString(R.string.code_hookRemark, hookRule.remark.trim())
(hookRule.remark.trim() == "" && hookRule.version > 0u) -> getString(R.string.code_hookRemark, getString(R.string.rule_version_d, hookRule.version.toLong()))
else -> "" // hookRule.remark == "" && hookRule.version == 0u
},
hookRule.name,
"hookXWebPreferences",
arrayOf(
getString(R.string.code_hookParam, "Class_XWebPreferences", hookRule.Class_XWebPreferences),
getString(R.string.code_hookParam, "Method_setValue", hookRule.Method_setValue),
).joinToString("")
)
v.isClickable = true
v.setOnClickListener {
if (hookRule.require > BuildConfig.VERSION_CODE.toUInt()) {
MaterialAlertDialogBuilder(this@Rule).apply {
setTitle(getString(R.string.error))
setMessage(getString(R.string.please_update_your_module_to_use_this_rule_as_the_current_version_you_are_using_does_not_meet_the_minimum_version_it_requires))
setPositiveButton(getString(R.string.ok)) { _, _ -> }
}.show()
} else {
viewBinding.ruleHookMethod.setText("hookXWebPreferences", false)
viewBinding.ruleName.setText(hookRule.name)
viewBinding.ruleVersion.setText(hookRule.version.toString())
viewBinding.ruleRemark.setText((getString(R.string.from, version) + "\n" + hookRule.remark.trim()).trim())
viewBinding.ruleHookXWebPreferencesClassXWebPreferences.setText(hookRule.Class_XWebPreferences)
viewBinding.ruleHookXWebPreferencesMethodSetValue.setText(hookRule.Method_setValue)
dialog.cancel()
}
}
dialogBinding.dialogCloudRulesRules.addView(v)
}
if (rules.hookXWebView != null) for (hookRule in rules.hookXWebView) {
val v = Code(this@Rule)
v.code = getString(R.string.code_hookFunction,
Expand Down Expand Up @@ -436,16 +399,6 @@ class Rule : AppCompatActivity() {
viewBinding.ruleHookCrossWalkMethodSetValue.text.toString(),
)
)
"hookXWebPreferences" -> Gson().toJson(
HookRules.HookXWebPreferences(
type,
viewBinding.ruleVersion.text.toString().toUIntOrNull()?:0u,
viewBinding.ruleRemark.text.toString(),
0u,
viewBinding.ruleHookXWebPreferencesClassXWebPreferences.text.toString(),
viewBinding.ruleHookXWebPreferencesMethodSetValue.text.toString(),
)
)
"hookXWebView" -> Gson().toJson(
HookRules.HookXWebView(
type,
Expand Down Expand Up @@ -477,7 +430,6 @@ class Rule : AppCompatActivity() {
viewBinding.ruleHookWebViewClient.visibility = View.GONE
viewBinding.ruleReplaceNebulaUCSDK.visibility = View.GONE
viewBinding.ruleHookCrossWalk.visibility = View.GONE
viewBinding.ruleHookXWebPreferences.visibility = View.GONE
viewBinding.ruleHookXWebView.visibility = View.GONE

HookRules.HookRuleWebView().also {
Expand All @@ -494,7 +446,6 @@ class Rule : AppCompatActivity() {
viewBinding.ruleHookWebViewClient.visibility = View.VISIBLE
viewBinding.ruleReplaceNebulaUCSDK.visibility = View.GONE
viewBinding.ruleHookCrossWalk.visibility = View.GONE
viewBinding.ruleHookXWebPreferences.visibility = View.GONE
viewBinding.ruleHookXWebView.visibility = View.GONE

HookRules.HookRuleWebViewClient().also {
Expand All @@ -509,7 +460,6 @@ class Rule : AppCompatActivity() {
viewBinding.ruleHookWebViewClient.visibility = View.GONE
viewBinding.ruleReplaceNebulaUCSDK.visibility = View.VISIBLE
viewBinding.ruleHookCrossWalk.visibility = View.GONE
viewBinding.ruleHookXWebPreferences.visibility = View.GONE
viewBinding.ruleHookXWebView.visibility = View.GONE

HookRules.ReplaceNebulaUCSDK().also {
Expand All @@ -523,7 +473,6 @@ class Rule : AppCompatActivity() {
viewBinding.ruleHookWebViewClient.visibility = View.GONE
viewBinding.ruleReplaceNebulaUCSDK.visibility = View.GONE
viewBinding.ruleHookCrossWalk.visibility = View.VISIBLE
viewBinding.ruleHookXWebPreferences.visibility = View.GONE
viewBinding.ruleHookXWebView.visibility = View.GONE

HookRules.HookCrossWalk().also {
Expand All @@ -536,25 +485,11 @@ class Rule : AppCompatActivity() {
if (viewBinding.ruleHookCrossWalkMethodSetValue.text!!.isEmpty()) viewBinding.ruleHookCrossWalkMethodSetValue.setText(it.Method_setValue)
}
}
"hookXWebPreferences" -> {
viewBinding.ruleHookWebView.visibility = View.GONE
viewBinding.ruleHookWebViewClient.visibility = View.GONE
viewBinding.ruleReplaceNebulaUCSDK.visibility = View.GONE
viewBinding.ruleHookCrossWalk.visibility = View.GONE
viewBinding.ruleHookXWebPreferences.visibility = View.VISIBLE
viewBinding.ruleHookXWebView.visibility = View.GONE

HookRules.HookXWebPreferences().also {
if (viewBinding.ruleHookXWebPreferencesClassXWebPreferences.text!!.isEmpty()) viewBinding.ruleHookXWebPreferencesClassXWebPreferences.setText(it.Class_XWebPreferences)
if (viewBinding.ruleHookXWebPreferencesMethodSetValue.text!!.isEmpty()) viewBinding.ruleHookXWebPreferencesMethodSetValue.setText(it.Method_setValue)
}
}
"hookXWebView" -> {
viewBinding.ruleHookWebView.visibility = View.GONE
viewBinding.ruleHookWebViewClient.visibility = View.GONE
viewBinding.ruleReplaceNebulaUCSDK.visibility = View.GONE
viewBinding.ruleHookCrossWalk.visibility = View.GONE
viewBinding.ruleHookXWebPreferences.visibility = View.GONE
viewBinding.ruleHookXWebView.visibility = View.VISIBLE

HookRules.HookXWebView().also {
Expand All @@ -571,7 +506,6 @@ class Rule : AppCompatActivity() {
viewBinding.ruleHookWebViewClient.visibility = View.GONE
viewBinding.ruleReplaceNebulaUCSDK.visibility = View.GONE
viewBinding.ruleHookCrossWalk.visibility = View.GONE
viewBinding.ruleHookXWebPreferences.visibility = View.GONE
viewBinding.ruleHookXWebView.visibility = View.GONE
Log.e(BuildConfig.APPLICATION_ID, getString(R.string.unknown_hook_method))
}
Expand Down Expand Up @@ -602,8 +536,6 @@ class Rule : AppCompatActivity() {
viewBinding.ruleHookCrossWalkMethodSetResourceClient.doAfterTextChanged { refreshCode() }
viewBinding.ruleHookCrossWalkClassXWalkPreferences.doAfterTextChanged { refreshCode() }
viewBinding.ruleHookCrossWalkMethodSetValue.doAfterTextChanged { refreshCode() }
viewBinding.ruleHookXWebPreferencesClassXWebPreferences.doAfterTextChanged { refreshCode() }
viewBinding.ruleHookXWebPreferencesMethodSetValue.doAfterTextChanged { refreshCode() }
viewBinding.ruleHookXWebViewClassClassXWebView.doAfterTextChanged { refreshCode() }
viewBinding.ruleHookXWebViewMethodInitWebviewCore.doAfterTextChanged { refreshCode() }
viewBinding.ruleHookXWebViewMethodIsXWeb.doAfterTextChanged { refreshCode() }
Expand Down Expand Up @@ -667,14 +599,6 @@ class Rule : AppCompatActivity() {
viewBinding.ruleHookCrossWalkMethodSetValue.setText(hookEntry.Method_setValue)
viewBinding.ruleHookMethod.setText("hookCrossWalk", false)
}
"hookXWebPreferences" -> {
val hookEntry = Gson().fromJson(hookJson, HookRules.HookXWebPreferences::class.java)
viewBinding.ruleVersion.setText(hookEntry.version.toString())
viewBinding.ruleRemark.setText(hookEntry.remark)
viewBinding.ruleHookXWebPreferencesClassXWebPreferences.setText(hookEntry.Class_XWebPreferences)
viewBinding.ruleHookXWebPreferencesMethodSetValue.setText(hookEntry.Method_setValue)
viewBinding.ruleHookMethod.setText("hookXWebPreferences", false)
}
"hookXWebView" -> {
val hookEntry = Gson().fromJson(hookJson, HookRules.HookXWebView::class.java)
viewBinding.ruleVersion.setText(hookEntry.version.toString())
Expand Down Expand Up @@ -777,22 +701,6 @@ class Rule : AppCompatActivity() {
getString(R.string.code_hookParam, "Method_setValue", viewBinding.ruleHookCrossWalkMethodSetValue.text.toString().trim()),
).joinToString("")
)
"hookXWebPreferences" -> getString(R.string.code_hookFunction,
Pair(viewBinding.ruleRemark.text.toString().trim(), viewBinding.ruleVersion.text.toString().toUIntOrNull()?:0u).let {(ruleRemark, ruleVersion) ->
when {
(ruleRemark != "" && ruleVersion > 0u) -> getString(R.string.code_hookRemark, ruleRemark + "<br/>" + getString(R.string.rule_version_d, ruleVersion.toLong()))
(ruleRemark != "" && ruleVersion == 0u) -> getString(R.string.code_hookRemark, ruleRemark)
(ruleRemark == "" && ruleVersion > 0u) -> getString(R.string.code_hookRemark, getString(R.string.rule_version_d, ruleVersion.toLong()))
else -> "" // ruleRemark == "" && ruleVersion == 0u
}
},
viewBinding.ruleName.text.toString().trim(),
"hookXWebPreferences",
arrayOf(
getString(R.string.code_hookParam, "Class_XWebPreferences", viewBinding.ruleHookXWebPreferencesClassXWebPreferences.text.toString().trim()),
getString(R.string.code_hookParam, "Method_setValue", viewBinding.ruleHookXWebPreferencesMethodSetValue.text.toString().trim()),
).joinToString("")
)
"hookXWebView" -> getString(R.string.code_hookFunction,
Pair(viewBinding.ruleRemark.text.toString().trim(), viewBinding.ruleVersion.text.toString().toUIntOrNull()?:0u).let {(ruleRemark, ruleVersion) ->
when {
Expand Down
7 changes: 0 additions & 7 deletions app/src/main/java/cn/wankkoree/xp/webviewpp/hook/Main.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,6 @@ class Main : IYukiHookXposedInit {
Method_setValue = hookEntry.Method_setValue,
)
}
"hookXWebPreferences" -> {
val hookEntry = Gson().fromJson(hookJson, HookRules.HookXWebPreferences::class.java)
hookXWebPreferences(
Class_XWebPreferences = hookEntry.Class_XWebPreferences,
Method_setValue = hookEntry.Method_setValue,
)
}
"hookXWebView" -> {
val hookEntry = Gson().fromJson(hookJson, HookRules.HookXWebView::class.java)
hookXWebView(
Expand Down
Loading

0 comments on commit 59f3307

Please sign in to comment.