fix(ci): register the battery optimization focus id and drop an orphaned crypto helper

This commit is contained in:
Erwan Leboucher committed 2026-09-10 23:09:23 +02:00
1 parent 1c114c7aab
commit ca4b3d812e
2 files changed
+1 -53

No files matched your search

-53
View File
@@ -74,36 +74,6 @@ impl CryptoEngineState {
.remove(account)
.is_some())
}
pub fn close_account_if(&self, account: &str, machine: &Arc<OlmMachine>) -> 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()));
@@ -192,6 +192,7 @@ export const settingsLinkFocusIdsBySection: Record<SettingsSectionId, readonly s
'direct-messages',
'direct-messages-encrypted',
'email-notification',
'embedded-push-battery-optimization',
'favicon-dot-mentions-only',
'highlight-mentions',
'in-app-notification-sound',