Skip to content

Commit

Permalink
Tested verification process more. Cleaned up and tweaked verification UI
Browse files Browse the repository at this point in the history
Everything works beautifully now and is ready for merge.

Post-merge, there are some improvements we can make:
* If we're transitioning from an unverified/unknown device state
  to a verififed state, then we need to do two things for rooms
  that are E2EE:
  1. Re-request/re-render all of the latest messages
  2. Clear the drawn cache in those timelines.
  • Loading branch information
kevinaboos committed Oct 7, 2024
1 parent 1364e58 commit 129cc4f
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 62 deletions.
37 changes: 34 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="

[dependencies]
# makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }
makepad-widgets = { path = "../makepad/widgets" }
makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "modal_sends_dismissed_action_to_inner_modal_content" }

## Including this crate automatically configures all `robius-*` crates to work with Makepad.
robius-use-makepad = "0.1.0"
Expand Down
6 changes: 4 additions & 2 deletions src/verification.rs
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,10 @@ async fn sas_verification_handler(
}
SasState::Cancelled(cancel_info) => {
log!("SAS verification has been cancelled, reason: {}", cancel_info.reason());
// No need to send a specific action here, the VerificationRequestState stream loop
// will handle the Cancelled state and send a RequestCancelled action.
// We go ahead and send the RequestCancelled action here,
// because it is not guaranteed that the VerificationRequestState stream loop
// will receive an update an enter the `Cancelled` state.
Cx::post_action(VerificationAction::RequestCancelled(cancel_info));
break;
}
}
Expand Down
Loading

0 comments on commit 129cc4f

Please sign in to comment.