diff --git a/src-tauri/src/matrix_crypto/mod.rs b/src-tauri/src/matrix_crypto/mod.rs index 277d86125..c00f5da9b 100644 --- a/src-tauri/src/matrix_crypto/mod.rs +++ b/src-tauri/src/matrix_crypto/mod.rs @@ -74,36 +74,6 @@ impl CryptoEngineState { .remove(account) .is_some()) } - - pub fn close_account_if(&self, account: &str, machine: &Arc) -> Result<(), String> { - let removed = { - let mut machines = self.machines.lock().map_err(|e| e.to_string())?; - match machines.get(account) { - Some(current) if Arc::ptr_eq(current, machine) => { - machines.remove(account); - true - } - _ => false, - } - }; - - if !removed { - return Ok(()); - } - - if let Some(listeners) = self - .listeners - .lock() - .map_err(|e| e.to_string())? - .remove(account) - { - for listener in listeners { - listener.abort(); - } - } - - Ok(()) - } } #[derive(Debug, Serialize)] @@ -388,29 +358,6 @@ mod tests { let _ = std::fs::remove_dir_all(&dir); } - #[tokio::test] - async fn close_account_if_leaves_a_machine_it_does_not_own() { - let user: &matrix_sdk::ruma::UserId = "@race:example.org".try_into().unwrap(); - let device: &matrix_sdk::ruma::DeviceId = "RACEDEVICE".into(); - let account = account_key(user.as_str(), device.as_str()); - - let mine = Arc::new(OlmMachine::new(user, device).await); - let theirs = Arc::new(OlmMachine::new(user, device).await); - - let state = CryptoEngineState::default(); - state - .machines - .lock() - .unwrap() - .insert(account.clone(), Arc::clone(&theirs)); - - state.close_account_if(&account, &mine).unwrap(); - assert!(state.machine(user.as_str(), device.as_str()).is_ok()); - - state.close_account_if(&account, &theirs).unwrap(); - assert!(state.machine(user.as_str(), device.as_str()).is_err()); - } - #[tokio::test] async fn engine_plumbing() { let dir = std::env::temp_dir().join(format!("sable-engine-test-{}", std::process::id())); diff --git a/src/app/features/settings/settingsLink.ts b/src/app/features/settings/settingsLink.ts index 60d7cb32d..cd86b44e9 100644 --- a/src/app/features/settings/settingsLink.ts +++ b/src/app/features/settings/settingsLink.ts @@ -192,6 +192,7 @@ export const settingsLinkFocusIdsBySection: Record