From f633ed74cb8d3ee5afedf2c01ccfa5cfe38f8cf1 Mon Sep 17 00:00:00 2001 From: andrekir Date: Mon, 1 Apr 2024 22:55:21 -0300 Subject: [PATCH] refactor: align channel PSK `Base64` flags with other platforms closes #937 --- .../mesh/ui/components/config/EditChannelDialog.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt index 721ed881c..075330fbc 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt @@ -53,9 +53,8 @@ fun EditChannelDialog( modifier: Modifier = Modifier, modemPresetName: String = "Default", ) { - val base64Flags = Base64.URL_SAFE + Base64.NO_WRAP fun encodeToString(input: ByteString) = - Base64.encodeToString(input.toByteArray() ?: ByteArray(0), base64Flags) + Base64.encodeToString(input.toByteArray() ?: ByteArray(0), Base64.DEFAULT) var channelInput by remember(channelSettings) { mutableStateOf(channelSettings) } var pskString by remember(channelInput) { mutableStateOf(encodeToString(channelInput.psk)) } @@ -97,7 +96,7 @@ fun EditChannelDialog( onValueChange = { try { pskString = it // empty (no crypto), 128 or 256 bit only - val decoded = Base64.decode(it, base64Flags).toByteString() + val decoded = Base64.decode(it, Base64.DEFAULT).toByteString() val fullPsk = Channel(channelSettings { psk = decoded }).psk if (fullPsk.size() in setOf(0, 16, 32)) { channelInput = channelInput.copy { psk = decoded }