leaner reflection

Author: binarynoise

AutomaticAdvancedSettingsExpander/src/main/java/de/binarynoise/automaticadvancedsettingsexpander/Hook.kt

@@ -7,6 +7,7 @@ import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XC_MethodHook
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
+import de.robv.android.xposed.XC_MethodHook as MethodHook
 
 const val TAG = "AutomaticSettingsExpand"
 
@@ -20,11 +21,10 @@ class Hook : IXposedHookLoadPackage {
 
         val classes = arrayOf("PreferenceGroup")
 
-        val hook = object : XC_MethodHook() {
+        val hook = object : MethodHook() {
             override fun beforeHookedMethod(param: MethodHookParam) {
-                var expandedCount by param.args(0)
-                Log.d(TAG, "expandedCount would have been set to $expandedCount, but setting to Int.MAX_VALUE instead")
-                expandedCount = Int.MAX_VALUE
+                Log.d(TAG, "expandedCount would have been set to ${param.args[0]}, but setting to Int.MAX_VALUE instead")
+                param.args[0] = Int.MAX_VALUE
             }
         }
 
@@ -44,18 +44,4 @@ class Hook : IXposedHookLoadPackage {
             }
         }
     }
-    
-    operator fun <T> Array<T>.invoke(index: Int): ArrayDelegate<T> {
-        return ArrayDelegate(this, index)
-    }
-    
-    class ArrayDelegate<T>(val array: Array<T>, val index: Int) : ReadWriteProperty<Any?, T> {
-        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
-            return array[index]
-        }
-        
-        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
-            array[index] = value
-        }
-    }
 }

BetterVerboseWiFiLogging/src/main/java/de/binarynoise/betterVerboseWiFiLogging/Wrapper.kt

@@ -2,15 +2,14 @@
 
 package de.binarynoise.betterVerboseWiFiLogging
 
-import java.lang.reflect.Method
 import android.annotation.SuppressLint
 import android.net.wifi.ScanResult
 import android.net.wifi.WifiInfo
 import android.os.Build
 import de.binarynoise.betterVerboseWiFiLogging.WifiEntry.mWifiInfoField
 import de.binarynoise.betterVerboseWiFiLogging.Wrapper.classLoader
-import de.binarynoise.reflection.field
-import de.binarynoise.reflection.method
+import de.binarynoise.reflection.findDeclaredField
+import de.binarynoise.reflection.findDeclaredMethod
 
 const val wifitrackerlib = "com.android.wifitrackerlib"
 
@@ -203,7 +202,7 @@ val channelMap = mapOf(
 object WifiEntry {
     val wifiEntryClass: Class<*> = classLoader.loadClass("$wifitrackerlib.WifiEntry")
 
-    val getWifiInfoDescription: Method by method(wifiEntryClass)
+    val getWifiInfoDescription = wifiEntryClass.findDeclaredMethod("getWifiInfoDescription")
 
     private const val CONNECTED_STATE_CONNECTED = 2
     fun newGetWifiInfoDescription(wifiEntry: Any): String {
@@ -228,19 +227,19 @@ object WifiEntry {
         }
     }
 
-    val getNetworkCapabilityDescription by method(wifiEntryClass)
-    val getNetworkSelectionDescription by method(wifiEntryClass)
+    val getNetworkCapabilityDescription = wifiEntryClass.findDeclaredMethod("getNetworkCapabilityDescription")
+    val getNetworkSelectionDescription = wifiEntryClass.findDeclaredMethod("getNetworkSelectionDescription")
 
-    val getScanResultDescription by method(wifiEntryClass) // -> StandardWifiEntry
+    val getScanResultDescription = wifiEntryClass.findDeclaredMethod("getScanResultDescription") // -> StandardWifiEntry
 
-    val getConnectedState by method(wifiEntryClass)
+    val getConnectedState = wifiEntryClass.findDeclaredMethod("getConnectedState")
 
-    val mWifiInfoField by field(wifiEntryClass)
+    val mWifiInfoField = wifiEntryClass.findDeclaredField("mWifiInfo")
 }
 
 object StandardWifiEntry {
     private val standardWifiEntryClass: Class<*> = classLoader.loadClass("$wifitrackerlib.StandardWifiEntry")
-    val getScanResultDescription by method(WifiEntry.wifiEntryClass) // -> StandardWifiEntry
+    val getScanResultDescription = WifiEntry.wifiEntryClass.findDeclaredMethod("getScanResultDescription") // -> StandardWifiEntry
 
     fun newGetScanResultDescription(wifiEntry: Any): String {
         @Suppress("UNCHECKED_CAST") val mTargetScanResults = mTargetScanResultsField[wifiEntry] as ArrayList<ScanResult>
@@ -274,5 +273,5 @@ object StandardWifiEntry {
         }
     }
 
-    private val mTargetScanResultsField by field(standardWifiEntryClass)
+    private val mTargetScanResultsField = standardWifiEntryClass.findDeclaredField("mTargetScanResults")
 }

FreeNotifications/src/main/java/de/binarynoise/freeNotifications/Hook.kt

@@ -2,7 +2,7 @@ package de.binarynoise.freeNotifications
 
 import android.annotation.SuppressLint
 import android.app.NotificationChannel
-import de.binarynoise.reflection.field
+import de.binarynoise.reflection.findDeclaredField
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
@@ -15,7 +15,7 @@ class Hook : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
         val cls = NotificationChannel::class.java
 
-        val mBlockableSystem by field(cls)
+        val mBlockableSystem = cls.findDeclaredField("mBlockableSystem")
 
         val setToTrue = object : MethodHook() {
             override fun beforeHookedMethod(param: MethodHookParam) {

MuteSlf4jWarnings/src/main/java/de/binarynoise/MuteSlf4jWarnings/Hook.kt

@@ -1,7 +1,7 @@
 package de.binarynoise.muteSlf4jWarnings
 
 import android.annotation.SuppressLint
-import de.binarynoise.reflection.method
+import de.binarynoise.reflection.findDeclaredMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.callbacks.XC_LoadPackage
@@ -13,8 +13,8 @@ class Hook : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
         val errorPrintStreamClass = lpparam.classLoader.loadClass("com.android.internal.os.AndroidPrintStream")
 
-        val println by method(errorPrintStreamClass, String::class.java)
-        val print by method(errorPrintStreamClass, String::class.java)
+        val println = errorPrintStreamClass.findDeclaredMethod("println", String::class.java)
+        val print = errorPrintStreamClass.findDeclaredMethod("print", String::class.java)
 
         val hook = object : MethodHook() {
             override fun beforeHookedMethod(param: MethodHookParam) {

PersistentForegroundServiceNotifications/src/main/java/de/binarynoise/persistentForegroundServiceNotifications/Hook.kt

@@ -15,7 +15,7 @@ import android.app.Notification.FLAG_ONLY_ALERT_ONCE
 import android.app.Notification.FLAG_SHOW_LIGHTS
 import android.service.notification.StatusBarNotification
 import de.binarynoise.logger.Logger.log
-import de.binarynoise.reflection.method
+import de.binarynoise.reflection.findDeclaredMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
@@ -29,7 +29,7 @@ class Hook : IXposedHookLoadPackage {
 
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) = try {
         val statusBarNotificationClass = StatusBarNotification::class.java
-        val isNonDismissableMethod by method(statusBarNotificationClass)
+        val isNonDismissableMethod = statusBarNotificationClass.findDeclaredMethod("isNonDismissable")
 
         XposedBridge.hookMethod(isNonDismissableMethod, object : MethodHook() {
             override fun beforeHookedMethod(param: MethodHookParam) {

reflection/src/main/java/de/binarynoise/reflection/Reflection.kt

@@ -5,39 +5,28 @@ package de.binarynoise.reflection
 import java.lang.reflect.AccessibleObject
 import java.lang.reflect.Field
 import java.lang.reflect.Method
+import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
-class field(private val cls: Class<*>) {
-    operator fun getValue(thisRef: Nothing?, property: KProperty<*>): Field {
-        return cls.getDeclaredField(property.name.removeSuffix("Field")).makeAccessible()
+fun <T> Class<T>.findDeclaredMethod(name: String, vararg params: Class<*>): Method {
+    var c: Class<*>? = this
+    while (c != null) {
+        c.declaredMethods.filter { it.name == name }
+            .firstOrNull() { params.isEmpty() || (it.parameterTypes.map { t -> t.name }) == (params.map { p -> p.name }) }
+            ?.let { return it.makeAccessible() }
+        c = c.superclass
     }
 
-    operator fun getValue(thisRef: Any?, property: KProperty<*>): Field {
-        return cls.getDeclaredField(property.name.removeSuffix("Field")).makeAccessible()
-    }
+    throw NoSuchMethodException("$name(${params.joinToString { it.simpleName }})")
 }
 
-class method(private val cls: Class<*>, private vararg val params: Class<*>) {
-    operator fun getValue(thisRef: Nothing?, property: KProperty<*>): Method {
-        return getMethod(property)
-    }
-    
-    operator fun getValue(thisRef: Any?, property: KProperty<*>): Method {
-        return getMethod(property)
-    }
-    
-    private fun getMethod(property: KProperty<*>): Method {
-        val methods = mutableListOf<Method>()
-        var c: Class<*>? = cls
-        while (c != null) {
-            methods += c.declaredMethods
-            c = c.superclass
-        }
-        
-        return methods.filter { it.name == property.name.removeSuffix("Method") }
-            .first { params.isEmpty() || (it.parameterTypes.map { t -> t.name }) == (params.map { p -> p.name }) }
-            .makeAccessible()
+fun <T> Class<T>.findDeclaredField(name: String): Field {
+    var c: Class<*>? = this
+    while (c != null) {
+        c.declaredFields.filter { it.name == name }.firstOrNull()?.let { return it.makeAccessible() }
+        c = c.superclass
     }
+    throw NoSuchFieldException(name)
 }
 
 fun <T : AccessibleObject> T.makeAccessible(): T = apply { isAccessible = true }