Proton/android-mail
1
0
Fork 0
mirror of https://github.com/ProtonMail/android-mail.git synced 2026-05-15 09:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "fix(core-auth): Prevent launching FIDO dialog multiple times.""

Browse Source 
This reverts commit af61dc4377.
This commit is contained in:
Niccolò Forlini
2026-01-30 17:12:47 +01:00
committed by MargeBot
parent 17656653d3
commit d4d10ce968
1 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/core/auth/presentation/src/main/kotlin/me/proton/android/core/auth/presentation/secondfactor/SecondFactorActivity.kt
+47 -29
View File
@@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.launch
import me.proton.android.core.auth.presentation.R
import me.proton.android.core.auth.presentation.secondfactor.fido.Fido2InputAction
import me.proton.core.auth.fido.domain.entity.Fido2AuthenticationOptions
import me.proton.core.auth.fido.domain.entity.Fido2PublicKeyCredentialRequestOptions
import me.proton.core.auth.fido.domain.entity.SecondFactorProof
import me.proton.core.auth.fido.domain.usecase.PerformTwoFaWithSecurityKey
@@ -43,6 +44,8 @@ import me.proton.core.presentation.utils.errorToast
import javax.inject.Inject
import kotlin.jvm.optionals.getOrNull
private const val DID_LAUNCH_FIDO_DIALOG_ARG = "DID_LAUNCH_FIDO_DIALOG_ARG"
@AndroidEntryPoint
class SecondFactorActivity : ProtonActivity() {
@@ -55,43 +58,19 @@ class SecondFactorActivity : ProtonActivity() {
private val secondFactoryViewModel: SecondFactorInputViewModel by viewModels()
private var didLaunchFidoDialog = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
didLaunchFidoDialog = savedInstanceState?.getBoolean(DID_LAUNCH_FIDO_DIALOG_ARG) ?: false
performTwoFaWithSecurityKey.getOrNull()?.register(this, ::onTwoFaWithSecurityKeyResult)
addOnBackPressedCallback { onClose() }
lifecycleScope.launch {
mutableAction.collect { action ->
when (action) {
is Fido2InputAction.ReadSecurityKey -> {
val launchResult =
performTwoFaWithSecurityKey.getOrNull()?.invoke(
this@SecondFactorActivity,
action.options.publicKey
)
secondFactoryViewModel.onFidoLaunchResult(launchResult)
when (launchResult) {
is LaunchResult.Failure ->
onError(
launchResult.exception.localizedMessage
?: getString(R.string.auth_login_general_error)
)
is LaunchResult.Success -> Unit
null -> {
onError(getString(R.string.auth_login_general_error))
mutableAction.tryEmit(
Fido2InputAction.SecurityKeyResult(
result = PerformTwoFaWithSecurityKey.Result.EmptyResult,
proof = null
)
)
}
}
}
is Fido2InputAction.ReadSecurityKey -> onLaunchFidoDialog(action.options)
else -> Unit
}
}
@@ -116,6 +95,43 @@ class SecondFactorActivity : ProtonActivity() {
}
}
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
outState.putBoolean(DID_LAUNCH_FIDO_DIALOG_ARG, didLaunchFidoDialog)
}
private suspend fun onLaunchFidoDialog(options: Fido2AuthenticationOptions) {
if (didLaunchFidoDialog) return
val launchResult = performTwoFaWithSecurityKey.getOrNull()?.invoke(
this@SecondFactorActivity,
options.publicKey
)
secondFactoryViewModel.onFidoLaunchResult(launchResult)
when (launchResult) {
is LaunchResult.Failure -> onError(
launchResult.exception.localizedMessage
?: getString(R.string.auth_login_general_error)
)
is LaunchResult.Success -> {
didLaunchFidoDialog = true
}
null -> {
onError(getString(R.string.auth_login_general_error))
mutableAction.tryEmit(
Fido2InputAction.SecurityKeyResult(
result = PerformTwoFaWithSecurityKey.Result.EmptyResult,
proof = null
)
)
}
}
}
private fun onClose() {
setResult(Activity.RESULT_CANCELED)
finish()
@@ -134,6 +150,8 @@ class SecondFactorActivity : ProtonActivity() {
result: PerformTwoFaWithSecurityKey.Result,
options: Fido2PublicKeyCredentialRequestOptions
) {
didLaunchFidoDialog = false
when (result) {
is PerformTwoFaWithSecurityKey.Result.Success -> onResultSuccess(result = result, options = options)
else -> mutableAction.tryEmit(Fido2InputAction.SecurityKeyResult(result = result, proof = null))