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

Added allowed repeat callback in YukiHookDataChannel and fix when activity destroyed, the callback still called

Browse Source
This commit is contained in:
fankesyooni
2022-05-26 01:54:35 +08:00
parent 055a86c1ca
commit bc1ca9cdb0
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@
package com.highcapable.yukihookapi.hook.xposed.channel
import android.app.Activity
import android.app.Application
import android.content.BroadcastReceiver
import android.content.Context
@@ -38,7 +39,6 @@ import android.os.Bundle
import android.os.Parcelable
import com.highcapable.yukihookapi.YukiHookAPI
import com.highcapable.yukihookapi.hook.log.yLoggerW
import com.highcapable.yukihookapi.hook.utils.putIfAbsentCompat
import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication
import com.highcapable.yukihookapi.hook.xposed.bridge.YukiHookBridge
import com.highcapable.yukihookapi.hook.xposed.channel.data.ChannelData
@@ -83,7 +83,7 @@ class YukiHookDataChannel private constructor() {
}
/** 注册广播回调数组 */
private var receiverCallbacks = HashMap<String, ((String, Intent) -> Unit)>()
private var receiverCallbacks = HashMap<String, Pair<Context?, (String, Intent) -> Unit>>()
/** 当前注册广播的 [Context] */
private var receiverContext: Context? = null
@@ -93,7 +93,17 @@ class YukiHookDataChannel private constructor() {
object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) {
if (intent == null) return
intent.action?.also { action -> receiverCallbacks.takeIf { it.isNotEmpty() }?.forEach { (_, it) -> it(action, intent) } }
intent.action?.also { action ->
receiverCallbacks.takeIf { it.isNotEmpty() }?.apply {
val destroyedCallbacks = arrayListOf<String>()
forEach { (key, it) ->
if (it.first is Activity && (it.first as? Activity?)?.isDestroyed == true)
destroyedCallbacks.add(key)
else it.second(action, intent)
}
destroyedCallbacks.takeIf { it.isNotEmpty() }?.forEach { remove(it) }
}
}
}
}
}
@@ -201,7 +211,7 @@ class YukiHookDataChannel private constructor() {
* @param result 回调结果数据
*/
fun <T> wait(key: String, value: T? = null, result: (value: T) -> Unit) {
receiverCallbacks.putIfAbsentCompat(key) { action, intent ->
receiverCallbacks[key + "_single_" + context?.javaClass?.name] = Pair(context) { action, intent ->
if (action == if (isXposedEnvironment) hostActionName(packageName) else moduleActionName(context))
(intent.extras?.get(key) as? T?).also { if (it != null || value != null) (it ?: value)?.let { e -> result(e) } }
}
@@ -214,7 +224,7 @@ class YukiHookDataChannel private constructor() {
* @param result 回调结果数据
*/
fun <T> wait(data: ChannelData<T>, value: T? = data.value, result: (value: T) -> Unit) {
receiverCallbacks.putIfAbsentCompat(data.key) { action, intent ->
receiverCallbacks[data.key + "_cdata_" + context?.javaClass?.name] = Pair(context) { action, intent ->
if (action == if (isXposedEnvironment) hostActionName(packageName) else moduleActionName(context))
(intent.extras?.get(data.key) as? T?).also { if (it != null || value != null) (it ?: value)?.let { e -> result(e) } }
}
@@ -228,7 +238,7 @@ class YukiHookDataChannel private constructor() {
* @param result 回调结果
*/
fun wait(key: String, result: () -> Unit) {
receiverCallbacks.putIfAbsentCompat(key) { action, intent ->
receiverCallbacks[key + "_vwfl_" + context?.javaClass?.name] = Pair(context) { action, intent ->
if (action == if (isXposedEnvironment) hostActionName(packageName) else moduleActionName(context))
if (intent.getStringExtra(key) == VALUE_WAIT_FOR_LISTENER) result()
}