From fa409c8fe408bb3089aa108eb377ce60336ee396 Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 22 Jul 2020 11:11:00 -0400 Subject: [PATCH] Prevent crash on some vendors --- .../src/main/java/be/mygod/vpnhotspot/RepeaterService.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt index f16f5bff..c75d977d 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt @@ -134,7 +134,12 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene if (isNotEmpty()) persistentSupported = true val ownedGroups = filter { if (!it.isGroupOwner) return@filter false - val address = MacAddressCompat.fromString(it.owner.deviceAddress) + val address = try { + MacAddressCompat.fromString(it.owner.deviceAddress) + } catch (e: IllegalArgumentException) { + Timber.w(e) + return@filter true // assuming it was changed due to privacy + } // WifiP2pServiceImpl only removes self address Build.VERSION.SDK_INT >= 29 && address == MacAddressCompat.ANY_ADDRESS || address == ownerAddress }