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

Avoid using contentToString for confusing output

Browse Source
This commit is contained in:
Mygod
2021-05-05 10:15:22 -04:00
parent 5c4f88967b
commit 5d23c96244
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/src/main/java/be/mygod/vpnhotspot/net/MacAddressCompat.kt
View File

@@ -24,10 +24,13 @@ value class MacAddressCompat(val addr: Long) {
fun bytesToString(addr: ByteArray) = when (addr.size) { fun bytesToString(addr: ByteArray) = when (addr.size) {
ETHER_ADDR_LEN -> addr.joinToString(":") { "%02x".format(it) } ETHER_ADDR_LEN -> addr.joinToString(":") { "%02x".format(it) }
8 -> { 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) } 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")
} }
/** /**