Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Self verification : makes sure cancellation works properly

Browse source
This commit is contained in:
ganfra 2024-09-09 10:30:35 +02:00
parent 2be46edc17
commit 82a31d3ede
2 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
View file

@ -70,8 +70,17 @@ fun VerifySelfSessionView(
onSuccessLogout: (String?) -> Unit, onSuccessLogout: (String?) -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
fun resetFlow() { fun cancelOrResetFlow() {
state.eventSink(VerifySelfSessionViewEvents.Reset) when (state.verificationFlowStep) {
is FlowStep.Canceled -> state.eventSink(VerifySelfSessionViewEvents.Reset)
is FlowStep.AwaitingOtherDeviceResponse, FlowStep.Ready -> state.eventSink(VerifySelfSessionViewEvents.Cancel)
is FlowStep.Verifying -> {
if (!state.verificationFlowStep.state.isLoading()) {
state.eventSink(VerifySelfSessionViewEvents.DeclineVerification)
}
}
else -> Unit
}
} }
val latestOnFinish by rememberUpdatedState(newValue = onFinish) val latestOnFinish by rememberUpdatedState(newValue = onFinish)
@ -81,16 +90,7 @@ fun VerifySelfSessionView(
} }
} }
BackHandler { BackHandler {
when (state.verificationFlowStep) { cancelOrResetFlow()
is FlowStep.Canceled -> resetFlow()
is FlowStep.AwaitingOtherDeviceResponse, FlowStep.Ready -> state.eventSink(VerifySelfSessionViewEvents.Cancel)
is FlowStep.Verifying -> {
if (!state.verificationFlowStep.state.isLoading()) {
state.eventSink(VerifySelfSessionViewEvents.DeclineVerification)
}
}
else -> Unit
}
} }
val verificationFlowStep = state.verificationFlowStep val verificationFlowStep = state.verificationFlowStep
@ -133,9 +133,9 @@ fun VerifySelfSessionView(
footer = { footer = {
BottomMenu( BottomMenu(
screenState = state, screenState = state,
goBack = ::resetFlow, onCancelClick = ::cancelOrResetFlow,
onEnterRecoveryKey = onEnterRecoveryKey, onEnterRecoveryKey = onEnterRecoveryKey,
onFinish = onFinish, onContinueClick = onFinish,
onResetKey = onResetKey, onResetKey = onResetKey,
) )
} }
@ -268,8 +268,8 @@ private fun BottomMenu(
screenState: VerifySelfSessionState, screenState: VerifySelfSessionState,
onEnterRecoveryKey: () -> Unit, onEnterRecoveryKey: () -> Unit,
onResetKey: () -> Unit, onResetKey: () -> Unit,
goBack: () -> Unit, onCancelClick: () -> Unit,
onFinish: () -> Unit, onContinueClick: () -> Unit,
) { ) {
val verificationViewState = screenState.verificationFlowStep val verificationViewState = screenState.verificationFlowStep
val eventSink = screenState.eventSink val eventSink = screenState.eventSink
@ -316,7 +316,7 @@ private fun BottomMenu(
TextButton( TextButton(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
text = stringResource(CommonStrings.action_cancel), text = stringResource(CommonStrings.action_cancel),
onClick = goBack, onClick = onCancelClick,
) )
} }
} }
@ -330,7 +330,7 @@ private fun BottomMenu(
TextButton( TextButton(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
text = stringResource(CommonStrings.action_cancel), text = stringResource(CommonStrings.action_cancel),
onClick = goBack, onClick = onCancelClick,
) )
} }
} }
@ -375,7 +375,7 @@ private fun BottomMenu(
Button( Button(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
text = stringResource(CommonStrings.action_continue), text = stringResource(CommonStrings.action_continue),
onClick = onFinish, onClick = onContinueClick,
) )
// Placeholder so the 1st button keeps its vertical position // Placeholder so the 1st button keeps its vertical position
Spacer(modifier = Modifier.height(48.dp)) Spacer(modifier = Modifier.height(48.dp))

8
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt
View file

@ -97,7 +97,7 @@ class RustSessionVerificationService(
updateVerificationStatus() updateVerificationStatus()
} }
} }
.launchIn(sessionCoroutineScope) .launchIn(sessionCoroutineScope)
} }
override suspend fun requestVerification() = tryOrFail { override suspend fun requestVerification() = tryOrFail {
@ -105,7 +105,11 @@ class RustSessionVerificationService(
verificationController.requestVerification() verificationController.requestVerification()
} }
override suspend fun cancelVerification() = tryOrFail { verificationController.cancelVerification() } override suspend fun cancelVerification() = tryOrFail {
verificationController.cancelVerification()
// We need to manually set the state to canceled, as the Rust SDK doesn't always call `didCancel` when it should
didCancel()
}
override suspend fun approveVerification() = tryOrFail { verificationController.approveVerification() } override suspend fun approveVerification() = tryOrFail { verificationController.approveVerification() }