From 5d07a58085953cf4f74ddb0c88ba00dee0ac2407 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 18 Jun 2024 12:21:38 +0930 Subject: [PATCH] Use MutableSharedFlow in QrCodeActivity --- .../securesms/preferences/QRCodeActivity.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt index 1cc1a31378..f074ecf895 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt @@ -13,9 +13,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign -import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.receiveAsFlow +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.asSharedFlow import network.loki.messenger.R import org.session.libsession.utilities.Address import org.session.libsession.utilities.TextSecurePreferences @@ -38,7 +38,7 @@ private val TITLES = listOf(R.string.view, R.string.scan) class QRCodeActivity : PassphraseRequiredActionBarActivity() { - private val errors = Channel() + private val errors = MutableSharedFlow() override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) { super.onCreate(savedInstanceState, isReady) @@ -47,7 +47,7 @@ class QRCodeActivity : PassphraseRequiredActionBarActivity() { setComposeContent { Tabs( TextSecurePreferences.getLocalNumber(this)!!, - errors.receiveAsFlow(), + errors.asSharedFlow(), onScan = ::onScan ) } @@ -55,7 +55,7 @@ class QRCodeActivity : PassphraseRequiredActionBarActivity() { fun onScan(string: String) { if (!PublicKeyValidation.isValid(string)) { - errors.trySend(getString(R.string.this_qr_code_does_not_contain_an_account_id)) + errors.tryEmit(getString(R.string.this_qr_code_does_not_contain_an_account_id)) } else if (!isFinishing) { val recipient = Recipient.from(this, Address.fromSerialized(string), false) start {