From 0d0645f120c5ab5c7e8a7fabc479c65f133c172e Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 21 Jan 2018 12:31:38 -0800 Subject: [PATCH] Rename stuff --- .../java/be/mygod/vpnhotspot/net/VpnMonitor.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/VpnMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/VpnMonitor.kt index 5ac9e282..82205acb 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/VpnMonitor.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/VpnMonitor.kt @@ -16,13 +16,11 @@ object VpnMonitor : ConnectivityManager.NetworkCallback() { private const val TAG = "VpnMonitor" - val connectivityManager = app.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - private val request by lazy { - NetworkRequest.Builder() - .addTransportType(NetworkCapabilities.TRANSPORT_VPN) - .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) - .build() - } + private val manager = app.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + private val request = NetworkRequest.Builder() + .addTransportType(NetworkCapabilities.TRANSPORT_VPN) + .removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN) + .build() private val callbacks = HashSet() private var registered = false @@ -31,7 +29,7 @@ object VpnMonitor : ConnectivityManager.NetworkCallback() { */ private val available = HashMap() override fun onAvailable(network: Network) { - val ifname = connectivityManager.getLinkProperties(network)?.interfaceName ?: return + val ifname = manager.getLinkProperties(network)?.interfaceName ?: return if (available.put(network, ifname) != null) return debugLog(TAG, "onAvailable: $ifname") callbacks.forEach { it.onAvailable(ifname) } @@ -46,13 +44,13 @@ object VpnMonitor : ConnectivityManager.NetworkCallback() { fun registerCallback(callback: Callback) { if (!callbacks.add(callback)) return if (registered) available.forEach { callback.onAvailable(it.value) } else { - connectivityManager.registerNetworkCallback(request, this) + manager.registerNetworkCallback(request, this) registered = true } } fun unregisterCallback(callback: Callback) { if (!callbacks.remove(callback) || callbacks.isNotEmpty() || !registered) return - connectivityManager.unregisterNetworkCallback(this) + manager.unregisterNetworkCallback(this) registered = false available.clear() }