From 5d23c96244e6145941ba3c0e3bc66e1b5f22e502 Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 5 May 2021 10:15:22 -0400 Subject: [PATCH] Avoid using contentToString for confusing output --- .../main/java/be/mygod/vpnhotspot/net/MacAddressCompat.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/MacAddressCompat.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/MacAddressCompat.kt index cc31a92e..0b190c1c 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/MacAddressCompat.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/MacAddressCompat.kt @@ -24,10 +24,13 @@ value class MacAddressCompat(val addr: Long) { fun bytesToString(addr: ByteArray) = when (addr.size) { ETHER_ADDR_LEN -> addr.joinToString(":") { "%02x".format(it) } 8 -> { - require(addr.take(2).all { it == 0.toByte() }) { "Unrecognized padding " + addr.contentToString() } + require(addr.take(2).all { it == 0.toByte() }) { + "Unrecognized padding " + addr.joinToString(":") { "%02x".format(it) } + } addr.drop(2).joinToString(":") { "%02x".format(it) } } - else -> throw IllegalArgumentException(addr.contentToString() + " was not a valid MAC address") + else -> throw IllegalArgumentException(addr.joinToString(":") { "%02x".format(it) } + + " was not a valid MAC address") } /**