brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash on deviceAddress being empty

Browse Source
This commit is contained in:
Mygod
2020-06-15 04:46:19 +08:00
parent 650ff57450
commit d00d7983d1
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
View File

@@ -164,11 +164,9 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
private val deviceListener = broadcastReceiver { _, intent -> private val deviceListener = broadcastReceiver { _, intent ->
when (intent.action) { when (intent.action) {
WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION -> { WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION -> {
val device = intent.getParcelableExtra<WifiP2pDevice>(WifiP2pManager.EXTRA_WIFI_P2P_DEVICE) val addr = intent.getParcelableExtra<WifiP2pDevice>(WifiP2pManager.EXTRA_WIFI_P2P_DEVICE)?.deviceAddress
val address = MacAddressCompat.fromString(device?.deviceAddress ?: return@broadcastReceiver) if (!addr.isNullOrEmpty() && (Build.VERSION.SDK_INT < 29 ||
if (Build.VERSION.SDK_INT < 29 || address != MacAddressCompat.ANY_ADDRESS) { MacAddressCompat.fromString(addr) != MacAddressCompat.ANY_ADDRESS)) lastMac = addr
lastMac = device.deviceAddress
}
} }
WifiP2pManagerHelper.ACTION_WIFI_P2P_PERSISTENT_GROUPS_CHANGED -> if (!safeMode) onPersistentGroupsChanged() WifiP2pManagerHelper.ACTION_WIFI_P2P_PERSISTENT_GROUPS_CHANGED -> if (!safeMode) onPersistentGroupsChanged()
} }