TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-11 12:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Defer setting display name until necessary in create flow in onboarding

Browse Source
This commit is contained in:
bemusementpark
2024-07-02 13:41:01 +09:30
parent 9cf3a37a2b
commit 508547a013
10 changed files with 134 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt
View File

@@ -116,7 +116,6 @@ class MnemonicCodec(private val loadFileContents: (String) -> String) {
}
fun sanitizeAndDecodeAsByteArray(mnemonic: String): ByteArray = sanitizeRecoveryPhrase(mnemonic).let(::decode).let(Hex::fromStringCondensed)
fun decodeAsByteArray(mnemonic: String): ByteArray = decode(mnemonic = mnemonic).let(Hex::fromStringCondensed)
private fun sanitizeRecoveryPhrase(rawMnemonic: String): String = rawMnemonic
.replace("[^\\w]+".toRegex(), " ") // replace any sequence of non-word characters with a space
@@ -125,27 +124,30 @@ class MnemonicCodec(private val loadFileContents: (String) -> String) {
.joinToString(" ") // reassemble
fun decodeMnemonicOrHexAsByteArray(mnemonicOrHex: String): ByteArray = try {
// Try to use decode mnemonicOrHex as a mnemonic
decode(mnemonic = mnemonicOrHex).let(Hex::fromStringCondensed)
} catch (decodeException: Exception) {
if (mnemonicOrHex.isHex()) throw decodeException
// It's not a valid mnemonic, if it's pure-hexadecimal then we'll interpret it as a
// hexadecimal-byte encoded mnemonic.
if (!mnemonicOrHex.isHex()) throw decodeException
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)
val p3 = x.substring(2 until 4)
val p4 = x.substring(0 until 2)
return p1 + p2 + p3 + p4
}
private fun determineChecksumIndex(x: List<String>, prefixLength: Int): Int {
val bytes = x.joinToString("") { it.substring(0 until prefixLength) }.toByteArray()
val checksum = CRC32().apply { update(bytes) }.value
return (checksum % x.size.toLong()).toInt()
}
}
private fun swap(x: String): String {
val p1 = x.substring(6 until 8)
val p2 = x.substring(4 until 6)
val p3 = x.substring(2 until 4)
val p4 = x.substring(0 until 2)
return p1 + p2 + p3 + p4
}
private fun determineChecksumIndex(x: List<String>, prefixLength: Int): Int {
val bytes = x.joinToString("") { it.substring(0 until prefixLength) }.toByteArray()
val checksum = CRC32().apply { update(bytes) }.value
return (checksum % x.size.toLong()).toInt()
}