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

Log onClientsChanged if it ever gets fired

Browse Source
This commit is contained in:
Mygod
2020-05-28 01:54:08 -04:00
parent 753e09b2d6
commit 6dac683e70
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mobile/src/main/java/be/mygod/vpnhotspot/net/TetheringManager.kt
View File

@@ -298,7 +298,7 @@ object TetheringManager {
stopTetheringLegacy.invoke(app.connectivity, type) stopTetheringLegacy.invoke(app.connectivity, type)
} }
data class TetheredClient(val underlying: Any) { data class TetheredClient(private val underlying: Any) {
@get:RequiresApi(30) @get:RequiresApi(30)
val macAddress get() = getMacAddress.invoke(underlying) as MacAddress val macAddress get() = getMacAddress.invoke(underlying) as MacAddress
@get:RequiresApi(30) @get:RequiresApi(30)
@@ -307,6 +307,8 @@ object TetheringManager {
} }
@get:RequiresApi(30) @get:RequiresApi(30)
val tetheringType get() = getTetheringType.invoke(underlying) as Int val tetheringType get() = getTetheringType.invoke(underlying) as Int
override fun toString() = underlying.toString()
} }
/** /**
@@ -396,9 +398,13 @@ object TetheringManager {
* assignments are not visible to the tethering device; or even when using DHCP, such * assignments are not visible to the tethering device; or even when using DHCP, such
* clients may still be reported by this callback after disconnection as the system cannot * clients may still be reported by this callback after disconnection as the system cannot
* determine if they are still connected. * determine if they are still connected.
*
* Only called if having permission one of NETWORK_SETTINGS, MAINLINE_NETWORK_STACK, NETWORK_STACK.
* @param clients The new set of tethered clients; the collection is not ordered. * @param clients The new set of tethered clients; the collection is not ordered.
*/ */
fun onClientsChanged(clients: List<TetheredClient?>) {} fun onClientsChanged(clients: List<TetheredClient?>) {
Timber.d("onClientsChanged: ${clients.joinToString()}")
}
/** /**
* Called when tethering offload status changes. * Called when tethering offload status changes.
@@ -418,9 +424,16 @@ object TetheringManager {
@get:RequiresApi(30) @get:RequiresApi(30)
private val getTetheringType by lazy { classTetheredClient.getDeclaredMethod("getTetheringType") } private val getTetheringType by lazy { classTetheredClient.getDeclaredMethod("getTetheringType") }
@get:RequiresApi(30)
private val classAddressInfo by lazy { Class.forName("android.net.TetheredClient\$AddressInfo") }
@get:RequiresApi(30)
private val getAddress by lazy { classAddressInfo.getDeclaredMethod("getAddress") }
@get:RequiresApi(30)
private val getHostname by lazy { classAddressInfo.getDeclaredMethod("getHostname") }
@get:RequiresApi(30) @get:RequiresApi(30)
private val classTetheringInterfaceRegexps by lazy { private val classTetheringInterfaceRegexps by lazy {
Class.forName("android.net.TetheredClient\$TetheringInterfaceRegexps") Class.forName("android.net.TetheringManager\$TetheringInterfaceRegexps")
} }
@get:RequiresApi(30) @get:RequiresApi(30)
private val getTetherableBluetoothRegexs by lazy { private val getTetherableBluetoothRegexs by lazy {
@@ -435,16 +448,9 @@ object TetheringManager {
classTetheringInterfaceRegexps.getDeclaredMethod("getTetherableWifiRegexs") classTetheringInterfaceRegexps.getDeclaredMethod("getTetherableWifiRegexs")
} }
@get:RequiresApi(30)
private val classAddressInfo by lazy { Class.forName("android.net.TetheredClient\$AddressInfo") }
@get:RequiresApi(30)
private val getAddress by lazy { classAddressInfo.getDeclaredMethod("getAddress") }
@get:RequiresApi(30)
private val getHostname by lazy { classAddressInfo.getDeclaredMethod("getHostname") }
@get:RequiresApi(30) @get:RequiresApi(30)
private val interfaceTetheringEventCallback by lazy { private val interfaceTetheringEventCallback by lazy {
Class.forName("android.net.TetheredClient\$TetheringEventCallback") Class.forName("android.net.TetheringManager\$TetheringEventCallback")
} }
@get:RequiresApi(30) @get:RequiresApi(30)
private val registerTetheringEventCallback by lazy { private val registerTetheringEventCallback by lazy {
@@ -516,7 +522,9 @@ object TetheringManager {
} }
"onClientsChanged" -> { "onClientsChanged" -> {
if (args.size > 1) Timber.w("Unexpected args for $name: $args") if (args.size > 1) Timber.w("Unexpected args for $name: $args")
callback?.onClientsChanged((args[0] as Iterable<*>).map { TetheredClient(it!!) }) callback?.onClientsChanged((args[0] as Iterable<*>).map {
it?.run { TetheredClient(this) }
})
null null
} }
"onOffloadStatusChanged" -> { "onOffloadStatusChanged" -> {