colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-sim: don't reload properties that may have been already initialized

Browse Source 
If we created the SIM objects during the SIM slots processing, we
should not attempt to reload the settings that were already set during
the re-initialization, as that may end up clearing the initial
properties.
This commit is contained in:
Aleksander Morgado
2022-05-20 12:58:05 +02:00
parent ac3f9be3d3
commit 1b30d10ad1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mm-base-sim.c
View File

@@ -2568,7 +2568,8 @@ interface_initialization_step (GTask *task)
/* Fall through */ /* Fall through */
case INITIALIZATION_STEP_PREFERRED_NETWORKS: case INITIALIZATION_STEP_PREFERRED_NETWORKS:
if (MM_BASE_SIM_GET_CLASS (self)->load_preferred_networks && if (mm_gdbus_sim_get_preferred_networks (MM_GDBUS_SIM (self)) == NULL &&
MM_BASE_SIM_GET_CLASS (self)->load_preferred_networks &&
MM_BASE_SIM_GET_CLASS (self)->load_preferred_networks_finish) { MM_BASE_SIM_GET_CLASS (self)->load_preferred_networks_finish) {
MM_BASE_SIM_GET_CLASS (self)->load_preferred_networks ( MM_BASE_SIM_GET_CLASS (self)->load_preferred_networks (
self, self,
@@ -2580,7 +2581,8 @@ interface_initialization_step (GTask *task)
/* Fall through */ /* Fall through */
case INITIALIZATION_STEP_SIM_TYPE: case INITIALIZATION_STEP_SIM_TYPE:
if (MM_BASE_SIM_GET_CLASS (self)->load_sim_type && if (mm_gdbus_sim_get_sim_type (MM_GDBUS_SIM (self)) == MM_SIM_TYPE_UNKNOWN &&
MM_BASE_SIM_GET_CLASS (self)->load_sim_type &&
MM_BASE_SIM_GET_CLASS (self)->load_sim_type_finish) { MM_BASE_SIM_GET_CLASS (self)->load_sim_type_finish) {
MM_BASE_SIM_GET_CLASS (self)->load_sim_type ( MM_BASE_SIM_GET_CLASS (self)->load_sim_type (
self, self,
@@ -2592,7 +2594,8 @@ interface_initialization_step (GTask *task)
/* Fall through */ /* Fall through */
case INITIALIZATION_STEP_ESIM_STATUS: case INITIALIZATION_STEP_ESIM_STATUS:
if (MM_BASE_SIM_GET_CLASS (self)->load_esim_status && if (mm_gdbus_sim_get_esim_status (MM_GDBUS_SIM (self)) == MM_SIM_ESIM_STATUS_UNKNOWN &&
MM_BASE_SIM_GET_CLASS (self)->load_esim_status &&
MM_BASE_SIM_GET_CLASS (self)->load_esim_status_finish) { MM_BASE_SIM_GET_CLASS (self)->load_esim_status_finish) {
MM_BASE_SIM_GET_CLASS (self)->load_esim_status ( MM_BASE_SIM_GET_CLASS (self)->load_esim_status (
self, self,
@@ -2604,7 +2607,8 @@ interface_initialization_step (GTask *task)
/* Fall through */ /* Fall through */
case INITIALIZATION_STEP_REMOVABILITY: case INITIALIZATION_STEP_REMOVABILITY:
if (MM_BASE_SIM_GET_CLASS (self)->load_removability && if (mm_gdbus_sim_get_removability (MM_GDBUS_SIM (self)) == MM_SIM_REMOVABILITY_UNKNOWN &&
MM_BASE_SIM_GET_CLASS (self)->load_removability &&
MM_BASE_SIM_GET_CLASS (self)->load_removability_finish) { MM_BASE_SIM_GET_CLASS (self)->load_removability_finish) {
MM_BASE_SIM_GET_CLASS (self)->load_removability ( MM_BASE_SIM_GET_CLASS (self)->load_removability (
self, self,