From 8233f063ed3fc065551181037166b32933d2fc33 Mon Sep 17 00:00:00 2001 From: geeksville Date: Thu, 13 Aug 2020 15:24:36 -0700 Subject: [PATCH] fix hash --- app/src/main/java/com/geeksville/mesh/model/Channel.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/Channel.kt b/app/src/main/java/com/geeksville/mesh/model/Channel.kt index 745fe2853..cb8c5c1f8 100644 --- a/app/src/main/java/com/geeksville/mesh/model/Channel.kt +++ b/app/src/main/java/com/geeksville/mesh/model/Channel.kt @@ -8,7 +8,6 @@ import com.google.zxing.BarcodeFormat import com.google.zxing.MultiFormatWriter import com.journeyapps.barcodescanner.BarcodeEncoder import java.net.MalformedURLException -import kotlin.experimental.xor /** Utility function to make it easy to declare byte arrays - FIXME move someplace better */ fun byteArrayOfInts(vararg ints: Int) = ByteArray(ints.size) { pos -> ints[pos].toByte() } @@ -60,7 +59,7 @@ data class Channel( */ val humanName: String get() { - val code = settings.psk.fold(0.toByte(), { acc, x -> acc xor x }) + val code = settings.psk.fold(0, { acc, x -> acc xor (x.toInt() and 0xff) }) return "#${settings.name}-${'A' + (code % 26)}" }