brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement Object methods correctly

Browse Source
This commit is contained in:
Mygod
2020-07-14 11:37:14 -04:00
parent 1c70a24f03
commit 0e51db7793
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt
View File

@@ -146,7 +146,16 @@ fun InvocationHandler.callSuper(interfaceClass: Class<*>, proxy: Any, method: Me
if (args == null) invokeWithArguments() else invokeWithArguments(*args) if (args == null) invokeWithArguments() else invokeWithArguments(*args)
} }
// otherwise, we just redispatch it to InvocationHandler // otherwise, we just redispatch it to InvocationHandler
method.declaringClass.isAssignableFrom(javaClass) -> if (args == null) method(this) else method(this, *args) method.declaringClass.isAssignableFrom(javaClass) -> when {
method.declaringClass == Object::class.java -> when (method.name) {
"hashCode" -> System.identityHashCode(proxy)
"equals" -> proxy === args!![0]
"toString" -> "${proxy.javaClass.name}@${System.identityHashCode(proxy).toString(16)}"
else -> error("Unsupported Object method dispatched")
}
args == null -> method(this)
else -> method(this, *args)
}
else -> { else -> {
Timber.w("Unhandled method: $method(${args?.contentDeepToString()})") Timber.w("Unhandled method: $method(${args?.contentDeepToString()})")
null null