From b1976403ccb2e46e1b9c0545ca8dd4256d9184f9 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 20 Aug 2019 10:20:47 +0800 Subject: [PATCH] Correctly handle null p2p group --- mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt index d6fb714b..93d72b02 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt @@ -134,7 +134,7 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene WifiP2pManager.WIFI_P2P_STATE_DISABLED) launch { cleanLocked() } // ignore P2P enabled WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION -> onP2pConnectionChanged( intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_INFO)!!, - intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_GROUP) ?: WifiP2pGroup()) + intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_GROUP)) } } @Deprecated("No longer used since API 29") @@ -342,10 +342,10 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene /** * Used during step 2, also called when connection changed */ - private fun onP2pConnectionChanged(info: WifiP2pInfo, group: WifiP2pGroup) = launch { + private fun onP2pConnectionChanged(info: WifiP2pInfo, group: WifiP2pGroup?) = launch { DebugHelper.log(TAG, "P2P connection changed: $info\n$group") when { - !info.groupFormed || !info.isGroupOwner || !group.isGroupOwner -> { + !info.groupFormed || !info.isGroupOwner || group?.isGroupOwner != true -> { if (routingManager != null) cleanLocked() // P2P shutdown, else other groups changing before start, ignore }