fix: throw null receiver when singleton is null on Android 9 (#112)

* fix: check origin return value is an issue with type Any

* refactor: replace to modern usage

---------

Co-authored-by: fankesyooni <qzmmcn@163.com>

gradle/sweet-dependency/sweet-dependency-config.yaml

@@ -61,15 +61,15 @@ libraries:
       version: 1.0.1
   com.highcapable.hikage:
     hikage-core:
-      version: 1.0.1
+      version: 1.0.2
     hikage-compiler:
-      version: 1.0.0
+      version: 1.0.1
     hikage-extension:
-      version: 1.0.0
+      version: 1.0.1
     hikage-widget-androidx:
-      version: 1.0.0
+      version: 1.0.1
     hikage-widget-material:
-      version: 1.0.0
+      version: 1.0.1
   com.highcapable.betterandroid:
     ui-component:
       version: 1.0.8

yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/core/YukiMemberHookCreator.kt

@@ -26,6 +26,7 @@
 
 package com.highcapable.yukihookapi.hook.core
 
+import com.highcapable.kavaref.extension.classOf
 import com.highcapable.kavaref.extension.isNotSubclassOf
 import com.highcapable.yukihookapi.YukiHookAPI
 import com.highcapable.yukihookapi.hook.bean.HookClass
@@ -545,6 +546,7 @@ class YukiMemberHookCreator internal constructor(private val packageParam: Packa
          */
         private fun checkingReturnType(origin: Class<*>?, target: Class<*>?) {
             if (origin == null || target == null) return
+            if (origin == classOf<Any>()) return
             origin.toJavaPrimitiveType().also { o ->
                 target.toJavaPrimitiveType().also { t ->
                     if (o isNotSubclassOf t && t isNotSubclassOf o)

yukihookapi-core/src/main/java/com/highcapable/yukihookapi/hook/xposed/parasitic/AppParasitics.kt

@@ -509,16 +509,18 @@ internal object AppParasitics {
                 ?.optional(silent = true)
                 ?.firstFieldOrNull { name = "IActivityTaskManagerSingleton" }
                 ?.get()
-            SingletonClass.resolve()
+            singleton?.let {
-                .processor(AndroidHiddenApiBypassResolver.get())
+                SingletonClass.resolve()
-                .optional(silent = true)
+                    .processor(AndroidHiddenApiBypassResolver.get())
-                .firstMethodOrNull { name = "get" }
+                    .optional(silent = true)
-                ?.of(singleton)
+                    .firstMethodOrNull { name = "get" }
-                ?.invokeQuietly()
+                    ?.of(singleton)
-            val mInstanceResolver2 = mInstanceResolver?.copy()?.of(singleton)
+                    ?.invokeQuietly()
-            val mInstance2 = mInstanceResolver2?.get()
+                val mInstanceResolver2 = mInstanceResolver?.copy()?.of(singleton)
-            mInstance2?.let {
+                val mInstance2 = mInstanceResolver2?.get()
-                mInstanceResolver2.set(IActivityManagerProxyImpl.createWrapper(IActivityTaskManagerClass, it))
+                mInstance2?.let {
+                    mInstanceResolver2.set(IActivityManagerProxyImpl.createWrapper(IActivityTaskManagerClass, it))
+                }
             }
             isActivityProxyRegistered = true
         }.onFailure { YLog.innerE("Activity Proxy initialization failed because got an exception", it) }