vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

verification: Add debug log for cross-signing key state

Browse source
This commit is contained in:
Julian Sparber 2022-03-17 17:57:02 +01:00
parent 63d828edbb
commit fb31c43734
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/session/mod.rs
View file

@ -486,17 +486,6 @@ impl Session {
self.imp().is_ready.set(true);
let encryption = client.encryption();
let has_cross_signing_keys = spawn_tokio!(async move {
if let Some(cross_signing_status) = encryption.cross_signing_status().await {
cross_signing_status.has_master
&& cross_signing_status.has_self_signing
&& cross_signing_status.has_user_signing
} else {
false
}
});
let encryption = client.encryption();
let need_new_identity = spawn_tokio!(async move {
// If there is an error just assume we don't need a new identity since
@ -509,7 +498,7 @@ impl Session {
spawn!(clone!(@weak self as obj => async move {
let priv_ = obj.imp();
if !has_cross_signing_keys.await.unwrap() {
if !obj.has_cross_signing_keys().await {
if need_new_identity.await.unwrap() {
let encryption = obj.client().encryption();
@ -764,6 +753,9 @@ impl Session {
pub fn show_content(&self) {
let priv_ = self.imp();
// FIXME: we should actually check if we have now the keys
spawn!(clone!(@weak self as obj => async move {
obj.has_cross_signing_keys().await;
}));
priv_.stack.set_visible_child(&*priv_.content);
priv_.logout_on_dispose.set(false);
if let Some(window) = self.parent_window() {
@ -784,6 +776,23 @@ impl Session {
priv_.stack.set_visible_child(&*priv_.media_viewer);
}
async fn has_cross_signing_keys(&self) -> bool {
let encryption = self.client().encryption();
spawn_tokio!(async move {
if let Some(cross_signing_status) = encryption.cross_signing_status().await {
debug!("Cross signing keys status: {:?}", cross_signing_status);
cross_signing_status.has_master
&& cross_signing_status.has_self_signing
&& cross_signing_status.has_user_signing
} else {
debug!("Session doesn't have needed cross signing keys");
false
}
})
.await
.unwrap()
}
}
impl Default for Session {