Implement user verification #4294
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * Copyright 2025 New Vector Ltd. | ||
| * | ||
| * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial | ||
| * Please see LICENSE files in the repository root for full details. | ||
| */ | ||
|
|
||
| package io.element.android.features.ftue.impl.di | ||
|
|
||
| import com.squareup.anvil.annotations.ContributesTo | ||
| import dagger.Binds | ||
| import dagger.Module | ||
| import io.element.android.features.ftue.impl.sessionverification.choosemode.ChooseSelfVerificationModePresenter | ||
| import io.element.android.features.ftue.impl.sessionverification.choosemode.ChooseSelfVerificationModeState | ||
| import io.element.android.libraries.architecture.Presenter | ||
| import io.element.android.libraries.di.SessionScope | ||
|
|
||
| @ContributesTo(SessionScope::class) | ||
| @Module | ||
| interface FtueModule { | ||
| @Binds | ||
| fun bindChooseSelfVerificationMethodPresenter(presenter: ChooseSelfVerificationModePresenter): Presenter<ChooseSelfVerificationModeState> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| /* | ||
| * Copyright 2025 New Vector Ltd. | ||
| * | ||
| * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial | ||
| * Please see LICENSE files in the repository root for full details. | ||
| */ | ||
|
|
||
| package io.element.android.features.ftue.impl.sessionverification.choosemode | ||
|
|
||
| sealed interface ChooseSelfVerificationModeEvent { | ||
| data object SignOut : ChooseSelfVerificationModeEvent | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright 2025 New Vector Ltd. | ||
| * | ||
| * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial | ||
| * Please see LICENSE files in the repository root for full details. | ||
| */ | ||
|
|
||
| package io.element.android.features.ftue.impl.sessionverification.choosemode | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import com.bumble.appyx.core.modality.BuildContext | ||
| import com.bumble.appyx.core.node.Node | ||
| import com.bumble.appyx.core.plugin.Plugin | ||
| import com.bumble.appyx.core.plugin.plugins | ||
| import dagger.assisted.Assisted | ||
| import dagger.assisted.AssistedInject | ||
| import io.element.android.anvilannotations.ContributesNode | ||
| import io.element.android.features.logout.api.direct.DirectLogoutView | ||
| import io.element.android.libraries.architecture.Presenter | ||
| import io.element.android.libraries.di.SessionScope | ||
|
|
||
| @ContributesNode(SessionScope::class) | ||
| class ChooseSelfVerificationModeNode @AssistedInject constructor( | ||
| @Assisted buildContext: BuildContext, | ||
| @Assisted plugins: List<Plugin>, | ||
| private val presenter: Presenter<ChooseSelfVerificationModeState>, | ||
| private val directLogoutView: DirectLogoutView, | ||
| ) : Node(buildContext, plugins = plugins) { | ||
| interface Callback : Plugin { | ||
| fun onUseAnotherDevice() | ||
| fun onUseRecoveryKey() | ||
| fun onResetKey() | ||
| fun onLearnMoreAboutEncryption() | ||
| } | ||
|
|
||
| private val callback = plugins<Callback>().first() | ||
|
|
||
| @Composable | ||
| override fun View(modifier: Modifier) { | ||
| val state = presenter.present() | ||
|
|
||
| ChooseSelfVerificationModeView( | ||
| state = state, | ||
| onUseAnotherDevice = callback::onUseAnotherDevice, | ||
| onUseRecoveryKey = callback::onUseRecoveryKey, | ||
| onResetKey = callback::onResetKey, | ||
| onLearnMore = callback::onLearnMoreAboutEncryption, | ||
| modifier = modifier, | ||
| ) | ||
|
|
||
| directLogoutView.Render(state = state.directLogoutState) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can
RustSessionVerificationServiceensure thatonIncomingSessionRequestis invoked on the same thread that was used when registering the listener?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think so, this is due to how JNA works, it'll create a separate thread for this callback and use it when receiving data from Rust. Maybe we could somehow retain the thread instance and force the callback to somehow run some runnable in it, but it seems like an overkill.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is what I had in mind, but OK to keep it like this :)