Accept mnemonic as hex in QR codes

This commit is contained in:
Andrew
2024-06-26 18:01:33 +09:30
parent 578c471f1e
commit ff6c0fb6f5
5 changed files with 50 additions and 8 deletions

View File

@@ -1,5 +1,6 @@
package org.session.libsignal.crypto
import org.session.libsignal.utilities.Hex
import java.util.zip.CRC32
/**
@@ -40,6 +41,9 @@ class MnemonicCodec(private val loadFileContents: (String) -> String) {
object VerificationFailed : DecodingError("Your mnemonic couldn't be verified. Please check what you entered and try again.")
}
/**
* Accepts a [hexEncodedString] and return s a mnemonic.
*/
fun encode(hexEncodedString: String, languageConfiguration: Language.Configuration = Language.Configuration.english): String {
var string = hexEncodedString
val language = Language(loadFileContents, languageConfiguration)
@@ -68,6 +72,9 @@ class MnemonicCodec(private val loadFileContents: (String) -> String) {
}.joinToString(" ")
}
/**
* Accepts a [mnemonic] and returns a hexEncodedString
*/
fun decode(mnemonic: String, languageConfiguration: Language.Configuration = Language.Configuration.english): String {
val words = mnemonic.split(" ")
val language = Language(loadFileContents, languageConfiguration)
@@ -107,6 +114,18 @@ class MnemonicCodec(private val loadFileContents: (String) -> String) {
}.joinToString(separator = "") { it }
}
fun decodeAsByteArray(mnemonic: String): ByteArray = decode(mnemonic = mnemonic).let(Hex::fromStringCondensed)
fun decodeMnemonicOrHexAsByteArray(mnemonicOrHex: String): ByteArray = try {
decode(mnemonic = mnemonicOrHex).let(Hex::fromStringCondensed)
} catch (decodeException: Exception) {
try {
Hex.fromStringCondensed(mnemonicOrHex)
} catch (_: Exception) {
throw decodeException
}
}
private fun swap(x: String): String {
val p1 = x.substring(6 until 8)
val p2 = x.substring(4 until 6)