applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wwan: Make sure secrets are set when querying connection APN password

Browse source 
Otherwise the comparison in wwan_data_apn_are_same will always be False
due to nm_setting_gsm_get_password always returning NULL.

Helps #1468
Relates !1059
This commit is contained in:
Pablo Correa Gómez 2022-02-12 11:52:54 +01:00 • committed by Georges Basile Stavracas Neto
parent ede39f210a
commit c5ca6717e5
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
panels/wwan/cc-wwan-data.c
View file

@ -202,16 +202,16 @@ wwan_data_get_nm_connection (CcWwanDataApn *apn)
} }
static gboolean static gboolean
wwan_data_apn_are_same (NMRemoteConnection *remote_connection, wwan_data_apn_are_same (CcWwanDataApn *apn,
NMAMobileAccessMethod *access_method) NMAMobileAccessMethod *access_method)
{ {
NMConnection *connection; NMConnection *connection;
NMSetting *setting; NMSetting *setting;
if (!remote_connection) if (!apn->remote_connection)
return FALSE; return FALSE;
connection = NM_CONNECTION (remote_connection); connection = NM_CONNECTION (apn->remote_connection);
setting = NM_SETTING (nm_connection_get_setting_gsm (connection)); setting = NM_SETTING (nm_connection_get_setting_gsm (connection));
if (g_strcmp0 (nma_mobile_access_method_get_3gpp_apn (access_method), if (g_strcmp0 (nma_mobile_access_method_get_3gpp_apn (access_method),
@ -223,7 +223,7 @@ wwan_data_apn_are_same (NMRemoteConnection *remote_connection,
return FALSE; return FALSE;
if (g_strcmp0 (nma_mobile_access_method_get_password (access_method), if (g_strcmp0 (nma_mobile_access_method_get_password (access_method),
nm_setting_gsm_get_password (NM_SETTING_GSM (setting))) != 0) cc_wwan_data_apn_get_password (apn)) != 0)
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -245,8 +245,7 @@ wwan_data_find_matching_apn (CcWwanData *self,
if (apn->access_method == access_method) if (apn->access_method == access_method)
return apn; return apn;
if (wwan_data_apn_are_same (apn->remote_connection, if (wwan_data_apn_are_same (apn, access_method))
access_method))
return apn; return apn;
g_object_unref (apn); g_object_unref (apn);