Refactor handle_degrade_event

This commit is contained in:
Alexander Krotov
2020-08-13 22:45:19 +03:00
committed by holger krekel
parent 1c2b4fa7fc
commit 55389c4190
4 changed files with 44 additions and 51 deletions

View File

@@ -15,7 +15,6 @@ use crate::key::{DcKey, Fingerprint, SignedPublicKey, SignedSecretKey};
use crate::keyring::*;
use crate::peerstate::*;
use crate::pgp;
use crate::securejoin::handle_degrade_event;
#[derive(Debug)]
pub struct EncryptHelper {
@@ -166,9 +165,7 @@ pub async fn try_decrypt(
peerstate = Peerstate::from_addr(&context, &from).await?;
}
if let Some(peerstate) = peerstate {
if peerstate.degrade_event.is_some() {
handle_degrade_event(context, &peerstate).await?;
}
peerstate.handle_degrade_event(context).await?;
if let Some(key) = peerstate.gossip_key {
public_keyring_for_validate.add(key);
}