TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-04 01:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate QR success

Browse Source
This commit is contained in:
Andrew 2024-03-01 19:56:29 +10:30
parent 9e270c7ac0
commit 673e53e4c7
1 changed files with 32 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceViewModel.kt
View File

@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.onboarding package org.thoughtcrime.securesms.onboarding
import android.app.Application import android.app.Application
import androidx.compose.runtime.snapshots.SnapshotApplyResult
import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
@ -8,7 +9,14 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.consumeAsFlow
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.flow.takeWhile
import kotlinx.coroutines.flow.transformWhile
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.crypto.MnemonicCodec
@ -25,62 +33,39 @@ class LinkDeviceViewModel @Inject constructor(
private val state = MutableStateFlow(LinkDeviceState()) private val state = MutableStateFlow(LinkDeviceState())
val stateFlow = state.asStateFlow() val stateFlow = state.asStateFlow()
private val qrErrors = Channel<Throwable>()
private val event = Channel<LinkDeviceEvent>() private val event = Channel<LinkDeviceEvent>()
val eventFlow = event.receiveAsFlow() val eventFlow = event.receiveAsFlow()
fun onRecoveryPhrase() { private val phrases = Channel<String>()
val mnemonic = state.value.recoveryPhrase
tryPhrase(mnemonic)
}
fun onQrPhrase(string: String) { init {
tryPhrase(string) viewModelScope.launch {
} phrases.receiveAsFlow().map {
runCatching {
private fun tryPhrase(mnemonic: String) { MnemonicCodec { MnemonicUtilities.loadFileContents(getApplication(), it) }
viewModelScope.launch(Dispatchers.IO) { .decode(it)
try { .let(Hex::fromStringCondensed)
MnemonicCodec { MnemonicUtilities.loadFileContents(getApplication(), it) }
.decode(mnemonic)
.let(Hex::fromStringCondensed)
.let(::LinkDeviceEvent)
.let { event.send(it) }
} catch (exception: Exception) {
state.update {
it.copy(
error = when (exception) {
is MnemonicCodec.DecodingError -> exception.description
else -> "An error occurred."
}
)
} }
} }.takeWhile {
it.getOrNull()?.let(::LinkDeviceEvent)?.let { event.send(it) }
it.exceptionOrNull()?.let { qrErrors.send(it) }
it.isFailure
}.collect()
} }
} }
// override fun handleQRCodeScanned(mnemonic: String) { fun onRecoveryPhrase() {
// try { viewModelScope.launch {
// val seed = Hex.fromStringCondensed(mnemonic) phrases.send(state.value.recoveryPhrase)
// continueWithSeed(seed) }
// } catch (e: Exception) { }
// Log.e("Loki","Error getting seed from QR code", e)
// Toast.makeText(this, "An error occurred.", Toast.LENGTH_LONG).show()
// }
// }
// fun continueWithMnemonic(mnemonic: String) { fun onQrPhrase(string: String) {
// val loadFileContents: (String) -> String = { fileName -> viewModelScope.launch {
// MnemonicUtilities.loadFileContents(this, fileName) phrases.send(string)
// } }
// try { }
// val hexEncodedSeed = MnemonicCodec(loadFileContents).decode(mnemonic)
// val seed = Hex.fromStringCondensed(hexEncodedSeed)
// continueWithSeed(seed)
// } catch (error: Exception) {
// val message = if (error is MnemonicCodec.DecodingError) {
// error.description
// } else {
// "An error occurred."
fun onChange(recoveryPhrase: String) { fun onChange(recoveryPhrase: String) {
state.value = LinkDeviceState(recoveryPhrase) state.value = LinkDeviceState(recoveryPhrase)