From 04acc9d75e359359aaeb51faf2242ff00e063de2 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Thu, 25 Oct 2018 10:57:15 +0800
Subject: [PATCH] Handle if ifname became non-null

---
 .../be/mygod/vpnhotspot/net/monitor/DefaultNetworkMonitor.kt  | 4 ++++
 .../main/java/be/mygod/vpnhotspot/net/monitor/VpnMonitor.kt   | 4 ++++
 2 files changed, 8 insertions(+)

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 22b309f5..580c815a 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
@@ -38,6 +38,10 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
         }
 
         override fun onLinkPropertiesChanged(network: Network, properties: LinkProperties) {
+            if (currentNetwork == null) {
+                onAvailable(network)
+                return
+            }
             if (currentNetwork != network) return
             val oldProperties = currentLinkProperties!!
             currentLinkProperties = properties
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 7686d44b..8dad7450 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
@@ -43,6 +43,10 @@ object VpnMonitor : UpstreamMonitor() {
 
         override fun onLinkPropertiesChanged(network: Network, properties: LinkProperties) {
             synchronized(this@VpnMonitor) {
+                if (currentNetwork == null) {
+                    onAvailable(network)
+                    return
+                }
                 if (currentNetwork != network) return
                 val oldProperties = available.put(network, properties)!!
                 val ifname = properties.interfaceName