Skip to content

WifiInterface: clean up wifi_activate_cb #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 4 commits into from
Jan 14, 2026
Merged

WifiInterface: clean up wifi_activate_cb #359

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f221b5
WifiInterface: clean up wifi_activate_cb
danirabbit Dec 19, 2025
8bd30ec
Merge branch 'master' into danirabbit/wifiinterface-wifiactivatecb-cl…
danirabbit Dec 20, 2025
2c789c5
Merge branch 'master' into danirabbit/wifiinterface-wifiactivatecb-cl…
danirabbit Jan 13, 2026
02364e6
Merge branch 'master' into danirabbit/wifiinterface-wifiactivatecb-cl…
danirabbit Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions src/Widgets/WifiInterface.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,7 @@ public class Network.WifiInterface : Network.WidgetNMInterface {
}
}

private async void wifi_activate_cb (WifiMenuItem i) {
if (device == null) {
Copy link
Copy Markdown
Member

@leolost2605 leolost2605 Dec 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it expected behavior that device can be null? If so we shouldn't use required because that will print a warning

Copy link
Copy Markdown
Member Author

@danirabbit danirabbit Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@leolost2605 I don't think it's expected no. I think theoretically this class can't be constructed without a device

return;
}

private async void wifi_activate_cb (WifiMenuItem i) requires (device != null) {
/* Do not activate connection if it is already activated */
if (wifi_device.get_active_access_point () == i.ap) {
return;
Expand Down Expand Up @@ -263,47 +259,54 @@ public class Network.WifiInterface : Network.WidgetNMInterface {
return;
}

var flags = i.ap.get_wpa_flags () | i.ap.get_rsn_flags ();
var is_secured = flags != NM.@80211ApSecurityFlags.NONE;
// Always create a proper connection and wireless setting for libnma
var s_con = new NM.SettingConnection () {
id = NM.Utils.ssid_to_utf8 (i.ap.get_ssid ().get_data ()),
uuid = NM.Utils.uuid_generate (),
type = NM.SettingWireless.SETTING_NAME
};

var connection = NM.SimpleConnection.new ();
var s_wifi = new NM.SettingWireless () {
ssid = i.ap.get_ssid ()
};

// Always create a proper connection and wireless setting for libnma
var s_con = new NM.SettingConnection ();
s_con.uuid = NM.Utils.uuid_generate ();
s_con.id = NM.Utils.ssid_to_utf8 (i.ap.get_ssid ().get_data ());
s_con.type = NM.SettingWireless.SETTING_NAME;
var connection = NM.SimpleConnection.new ();
connection.add_setting (s_con);

var s_wifi = new NM.SettingWireless ();
s_wifi.ssid = i.ap.get_ssid ();
connection.add_setting (s_wifi);

if (is_secured) {
var flags = i.ap.get_wpa_flags () | i.ap.get_rsn_flags ();
if (flags != NM.@80211ApSecurityFlags.NONE) {
if (NM.@80211ApSecurityFlags.KEY_MGMT_OWE in flags ||
NM.@80211ApSecurityFlags.KEY_MGMT_OWE_TM in flags) {
var s_wsec = new NM.SettingWirelessSecurity ();
s_wsec.key_mgmt = "owe";
var s_wsec = new NM.SettingWirelessSecurity () {
key_mgmt = "owe"
};

connection.add_setting (s_wsec);
}

if (NM.@80211ApSecurityFlags.KEY_MGMT_SAE in flags) {
var s_wsec = new NM.SettingWirelessSecurity ();
s_wsec.key_mgmt = "sae";
var s_wsec = new NM.SettingWirelessSecurity () {
key_mgmt = "sae"
};

connection.add_setting (s_wsec);
}

// If the AP is WPA[2]-Enterprise then we need to set up a minimal 802.1x setting before
// prompting the user to configure the authentication, otherwise, the dialog works out
// what sort of credentials to prompt for automatically
if (NM.@80211ApSecurityFlags.KEY_MGMT_802_1X in flags) {
var s_wsec = new NM.SettingWirelessSecurity ();
s_wsec.key_mgmt = "wpa-eap";
connection.add_setting (s_wsec);
var s_wsec = new NM.SettingWirelessSecurity () {
key_mgmt = "wpa-eap"
};

var s_8021x = new NM.Setting8021x ();
var s_8021x = new NM.Setting8021x () {
phase2_auth = "mschapv2"
};
s_8021x.add_eap_method ("ttls");
s_8021x.phase2_auth = "mschapv2";

connection.add_setting (s_wsec);
connection.add_setting (s_8021x);
}

Expand Down