leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(network): bump nmrs to 3.5.2

Browse source
This commit is contained in:
Akrm Al-Hakimi 2026-09-05 17:48:05 -04:00 • committed by Ashley Wulber
parent 483da60f2a
commit bc44bfd1b5
3 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-settings/Cargo.toml
View file

@ -54,7 +54,7 @@ locale1 = { git = "https://github.com/pop-os/dbus-settings-bindings", optional =
sysinfo = { version = "=0.38.0", optional = true }
mime-apps = { package = "cosmic-mime-apps", git = "https://github.com/pop-os/cosmic-mime-apps", features = ["tokio"], optional = true }
notify = "8.2.0"
nmrs = { version = "3.4.2", optional = true }
nmrs = { version = "3.5.2", optional = true }
regex = "1.13.1"
ron = "0.12"
rust-embed = "8.12.0"

12
cosmic-settings/src/pages/networking/backend.rs
View file

@ -14,8 +14,8 @@ use nmrs::agent::{SecretAgent, SecretAgentFlags, SecretRequest, SecretResponder,
use nmrs::raw::zbus;
use nmrs::raw::zvariant::{Dict, OwnedObjectPath, OwnedValue, Str, Value};
use nmrs::{
ActiveConnection, ConnectType, ConnectionOptions, EapOptions, NetworkEvent, NetworkManager,
SavedConnection, SettingsSummary, WifiKeyMgmt, WifiSecurity,
ActiveConnection, ConnectByUuidConfig, ConnectType, ConnectionOptions, EapOptions,
NetworkEvent, NetworkManager, SavedConnection, SettingsSummary, WifiKeyMgmt, WifiSecurity,
};
use secure_string::SecureString;
use tokio::sync::oneshot;
@ -620,7 +620,11 @@ async fn handle_request(nm: &NetworkManager, req: Request) -> Event {
)
.await
.is_ok(),
Request::ActivateVpn(uuid) => nm.connect_vpn_by_uuid(uuid).await.is_ok(),
Request::ActivateVpn(uuid) => {
nm.connect_by_uuid(uuid, ConnectByUuidConfig::default())
.await
.is_ok()
}
Request::Deactivate(uuid) => deactivate_by_uuid(nm, uuid).await.is_ok(),
Request::Disconnect(ssid) => disconnect_wifi_by_ssid(nm, ssid).await.is_ok(),
Request::Forget(ssid) => nm.forget(ssid).await.is_ok(),
@ -907,7 +911,7 @@ async fn disconnect_wifi_by_ssid(nm: &NetworkManager, ssid: &str) -> Result<(),
}
async fn deactivate_by_uuid(nm: &NetworkManager, uuid: &str) -> Result<(), Error> {
if nm.disconnect_vpn_by_uuid(uuid).await.is_ok() {
if nm.disconnect_by_uuid(uuid).await.is_ok() {
return Ok(());
}