From b56afee0b78583522602834754a71982f7ba840c Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 19 May 2021 15:33:16 -0400 Subject: [PATCH] Filter out any address from hardwareAddress --- mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt index c0a3a20b..823cc4fd 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt @@ -91,7 +91,12 @@ fun makeMacSpan(mac: String) = if (app.hasTouch) SpannableString(mac).apply { fun NetworkInterface.formatAddresses(macOnly: Boolean = false) = SpannableStringBuilder().apply { try { - hardwareAddress?.let { appendLine(makeMacSpan(MacAddressCompat.bytesToString(it))) } + val address = hardwareAddress + if (address != null && try { + MacAddressCompat.fromBytes(address) == MacAddressCompat.ANY_ADDRESS + } catch (_: IllegalArgumentException) { true }) { + appendLine(makeMacSpan(MacAddressCompat.bytesToString(address))) + } } catch (_: SocketException) { } if (!macOnly) for (address in interfaceAddresses) { append(makeIpSpan(address.address))