From d00d7983d17bb0fec595b5923d61cbf7b74ef0de Mon Sep 17 00:00:00 2001 From: Mygod Date: Mon, 15 Jun 2020 04:46:19 +0800 Subject: [PATCH] Fix crash on deviceAddress being empty --- .../src/main/java/be/mygod/vpnhotspot/RepeaterService.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt index 682aa7f2..4813ea15 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt @@ -164,11 +164,9 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene private val deviceListener = broadcastReceiver { _, intent -> when (intent.action) { WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION -> { - val device = intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_DEVICE) - val address = MacAddressCompat.fromString(device?.deviceAddress ?: return@broadcastReceiver) - if (Build.VERSION.SDK_INT < 29 || address != MacAddressCompat.ANY_ADDRESS) { - lastMac = device.deviceAddress - } + val addr = intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_DEVICE)?.deviceAddress + if (!addr.isNullOrEmpty() && (Build.VERSION.SDK_INT < 29 || + MacAddressCompat.fromString(addr) != MacAddressCompat.ANY_ADDRESS)) lastMac = addr } WifiP2pManagerHelper.ACTION_WIFI_P2P_PERSISTENT_GROUPS_CHANGED -> if (!safeMode) onPersistentGroupsChanged() }