Skip to content

Commit 129cc4f

Browse files
committed
Tested verification process more. Cleaned up and tweaked verification UI
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.
1 parent 1364e58 commit 129cc4f

4 files changed

Lines changed: 84 additions & 62 deletions

File tree

Cargo.lock

Lines changed: 34 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
1717

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

2222
## Including this crate automatically configures all `robius-*` crates to work with Makepad.
2323
robius-use-makepad = "0.1.0"

src/verification.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,10 @@ async fn sas_verification_handler(
170170
}
171171
SasState::Cancelled(cancel_info) => {
172172
log!("SAS verification has been cancelled, reason: {}", cancel_info.reason());
173-
// No need to send a specific action here, the VerificationRequestState stream loop
174-
// will handle the Cancelled state and send a RequestCancelled action.
173+
// We go ahead and send the RequestCancelled action here,
174+
// because it is not guaranteed that the VerificationRequestState stream loop
175+
// will receive an update an enter the `Cancelled` state.
176+
Cx::post_action(VerificationAction::RequestCancelled(cancel_info));
175177
break;
176178
}
177179
}

0 commit comments

Comments
 (0)