HighCapable/YukiHookAPI
5
0
Fork 0
mirror of https://github.com/HighCapable/YukiHookAPI.git synced 2025-09-04 09:45:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix add keyNonRepeatName to solve the duplicate key for different Host Apps problem in YukiHookDataChannel

Browse Source
This commit is contained in:
fankesyooni
2023-01-03 01:32:08 +08:00
parent 985b0a9068
commit 84bd473415
1 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/channel/YukiHookDataChannel.kt
View File

@@ -220,7 +220,14 @@ class YukiHookDataChannel private constructor() {
* @param type 类型 * @param type 类型
* @return [String] * @return [String]
*/ */
private fun keyShortName(type: CallbackKeyType) = "_${if (isXposedEnvironment) "X" else context?.javaClass?.name ?: "M"}_${type.ordinal}" private fun keyShortName(type: CallbackKeyType) =
"${keyNonRepeatName}_${if (isXposedEnvironment) "X" else context?.javaClass?.name ?: "M"}_${type.ordinal}"
/**
* 键值不重复名称 - 确保每个宿主使用的键值名称互不干扰
* @return [String]
*/
private val keyNonRepeatName get() = "_${packageName.hashCode()}"
/** /**
* 创建一个调用空间 * 创建一个调用空间
@@ -262,8 +269,9 @@ class YukiHookDataChannel private constructor() {
*/ */
fun <T> wait(key: String, result: (value: T) -> Unit) { fun <T> wait(key: String, result: (value: T) -> Unit) {
receiverCallbacks[key + keyShortName(CallbackKeyType.SINGLE)] = Pair(context) { action, intent -> receiverCallbacks[key + keyShortName(CallbackKeyType.SINGLE)] = Pair(context) { action, intent ->
if (action == if (isXposedEnvironment) hostActionName(packageName) else moduleActionName(context)) if (action == if (isXposedEnvironment) hostActionName(packageName) else moduleActionName(context)) {
(intent.extras?.get(key) as? T?)?.let { result(it) } (intent.extras?.get(key + keyNonRepeatName) as? T?)?.let { result(it) }
}
} }
} }
@@ -275,7 +283,7 @@ class YukiHookDataChannel private constructor() {
fun <T> wait(data: ChannelData<T>, result: (value: T) -> Unit) { fun <T> wait(data: ChannelData<T>, result: (value: T) -> Unit) {
receiverCallbacks[data.key + keyShortName(CallbackKeyType.CDATA)] = Pair(context) { action, intent -> receiverCallbacks[data.key + keyShortName(CallbackKeyType.CDATA)] = Pair(context) { action, intent ->
if (action == if (isXposedEnvironment) hostActionName(packageName) else moduleActionName(context)) if (action == if (isXposedEnvironment) hostActionName(packageName) else moduleActionName(context))
(intent.extras?.get(data.key) as? T?)?.let { result(it) } (intent.extras?.get(data.key + keyNonRepeatName) as? T?)?.let { result(it) }
} }
} }
@@ -289,7 +297,7 @@ class YukiHookDataChannel private constructor() {
fun wait(key: String, callback: () -> Unit) { fun wait(key: String, callback: () -> Unit) {
receiverCallbacks[key + keyShortName(CallbackKeyType.VMFL)] = Pair(context) { action, intent -> receiverCallbacks[key + keyShortName(CallbackKeyType.VMFL)] = Pair(context) { action, intent ->
if (action == if (isXposedEnvironment) hostActionName(packageName) else moduleActionName(context)) if (action == if (isXposedEnvironment) hostActionName(packageName) else moduleActionName(context))
if (intent.getStringExtra(key) == VALUE_WAIT_FOR_LISTENER) callback() if (intent.getStringExtra(key + keyNonRepeatName) == VALUE_WAIT_FOR_LISTENER) callback()
} }
} }
@@ -337,28 +345,28 @@ class YukiHookDataChannel private constructor() {
data.takeIf { it.isNotEmpty() }?.forEach { data.takeIf { it.isNotEmpty() }?.forEach {
when (it.value) { when (it.value) {
null -> Unit null -> Unit
is Bundle -> putExtra(it.key, it.value as Bundle) is Bundle -> putExtra(it.key + keyNonRepeatName, it.value as Bundle)
is Array<*> -> putExtra(it.key, it.value as Array<*>) is Array<*> -> putExtra(it.key + keyNonRepeatName, it.value as Array<*>)
is Boolean -> putExtra(it.key, it.value as Boolean) is Boolean -> putExtra(it.key + keyNonRepeatName, it.value as Boolean)
is BooleanArray -> putExtra(it.key, it.value as BooleanArray) is BooleanArray -> putExtra(it.key + keyNonRepeatName, it.value as BooleanArray)
is Byte -> putExtra(it.key, it.value as Byte) is Byte -> putExtra(it.key + keyNonRepeatName, it.value as Byte)
is ByteArray -> putExtra(it.key, it.value as ByteArray) is ByteArray -> putExtra(it.key + keyNonRepeatName, it.value as ByteArray)
is Char -> putExtra(it.key, it.value as Char) is Char -> putExtra(it.key + keyNonRepeatName, it.value as Char)
is CharArray -> putExtra(it.key, it.value as CharArray) is CharArray -> putExtra(it.key + keyNonRepeatName, it.value as CharArray)
is Double -> putExtra(it.key, it.value as Double) is Double -> putExtra(it.key + keyNonRepeatName, it.value as Double)
is DoubleArray -> putExtra(it.key, it.value as DoubleArray) is DoubleArray -> putExtra(it.key + keyNonRepeatName, it.value as DoubleArray)
is Float -> putExtra(it.key, it.value as Float) is Float -> putExtra(it.key + keyNonRepeatName, it.value as Float)
is FloatArray -> putExtra(it.key, it.value as FloatArray) is FloatArray -> putExtra(it.key + keyNonRepeatName, it.value as FloatArray)
is Int -> putExtra(it.key, it.value as Int) is Int -> putExtra(it.key + keyNonRepeatName, it.value as Int)
is IntArray -> putExtra(it.key, it.value as IntArray) is IntArray -> putExtra(it.key + keyNonRepeatName, it.value as IntArray)
is Long -> putExtra(it.key, it.value as Long) is Long -> putExtra(it.key + keyNonRepeatName, it.value as Long)
is LongArray -> putExtra(it.key, it.value as LongArray) is LongArray -> putExtra(it.key + keyNonRepeatName, it.value as LongArray)
is Short -> putExtra(it.key, it.value as Short) is Short -> putExtra(it.key + keyNonRepeatName, it.value as Short)
is ShortArray -> putExtra(it.key, it.value as ShortArray) is ShortArray -> putExtra(it.key + keyNonRepeatName, it.value as ShortArray)
is String -> putExtra(it.key, it.value as String) is String -> putExtra(it.key + keyNonRepeatName, it.value as String)
is CharSequence -> putExtra(it.key, it.value as CharSequence) is CharSequence -> putExtra(it.key + keyNonRepeatName, it.value as CharSequence)
is Parcelable -> putExtra(it.key, it.value as CharSequence) is Parcelable -> putExtra(it.key + keyNonRepeatName, it.value as CharSequence)
is Serializable -> putExtra(it.key, it.value as Serializable) is Serializable -> putExtra(it.key + keyNonRepeatName, it.value as Serializable)
else -> error("Key-Value type ${it.value?.javaClass?.name} is not allowed") else -> error("Key-Value type ${it.value?.javaClass?.name} is not allowed")
} }
} }