From 47366b982ef8ea4d343e08582faf699cca66448b Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 10 Oct 2018 20:15:57 +0800 Subject: [PATCH] Allow null interfaceName in onLinkPropertiesChanged --- .../mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt | 6 +++++- .../main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt index 0cfb4035..b2803315 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt @@ -41,7 +41,11 @@ object DefaultNetworkMonitor : UpstreamMonitor() { if (currentNetwork != network) return val oldProperties = currentLinkProperties!! currentLinkProperties = properties - val ifname = properties.interfaceName!! + val ifname = properties.interfaceName + if (ifname == null) { + onLost(network) + return + } check(ifname == oldProperties.interfaceName) if (properties.dnsServers != oldProperties.dnsServers) callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt index e7f24b41..8f459e45 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt @@ -44,7 +44,11 @@ object VpnMonitor : UpstreamMonitor() { synchronized(this@VpnMonitor) { if (currentNetwork != network) return val oldProperties = available.put(network, properties)!! - val ifname = properties.interfaceName!! + val ifname = properties.interfaceName + if (ifname == null) { + onLost(network) + return + } check(ifname == oldProperties.interfaceName) if (properties.dnsServers != oldProperties.dnsServers) callbacks.forEach { it.onAvailable(ifname, properties.dnsServers) }