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

iface-modem: sim swap check always refers to the active SIM

Browse Source 
Since 503e886c02 the events on inactive SIMs don't trigger a full
modem reprobe, and the slot index check is fully unused.
This commit is contained in:
Aleksander Morgado
2023-06-14 13:54:32 +00:00
parent af89e63c35
commit 4db5635f44
3 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-iface-modem.c
+1 -33
View File
@@ -157,7 +157,6 @@ explicit_check_for_sim_swap_ready (MMIfaceModem *self,
void
mm_iface_modem_check_for_sim_swap (MMIfaceModem *self,
guint slot_index,
const gchar *iccid,
const gchar *imsi,
GAsyncReadyCallback callback,
@@ -167,36 +166,6 @@ mm_iface_modem_check_for_sim_swap (MMIfaceModem *self,
task = g_task_new (self, NULL, callback, user_data);
/* Slot index 0 is used when slot is not known, assumingly on a modem with just one SIM slot */
if (slot_index != 0) {
MmGdbusModem *skeleton;
guint primary_slot;
g_object_get (self,
MM_IFACE_MODEM_DBUS_SKELETON, &skeleton,
NULL);
if (!skeleton) {
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Couldn't get interface skeleton");
g_object_unref (task);
return;
}
primary_slot = mm_gdbus_modem_get_primary_sim_slot (MM_GDBUS_MODEM (skeleton));
g_object_unref (skeleton);
/* Check that it's really the primary slot whose iccid or imsi has changed */
if (primary_slot && primary_slot != slot_index) {
mm_obj_info (self, "checking for SIM swap ignored: status changed in slot %u, but primary is %u", slot_index, primary_slot);
g_task_return_boolean (task, TRUE);
g_object_unref (task);
return;
}
}
if (!MM_IFACE_MODEM_GET_INTERFACE (self)->check_for_sim_swap ||
!MM_IFACE_MODEM_GET_INTERFACE (self)->check_for_sim_swap_finish) {
mm_obj_info (self, "checking for SIM swap ignored: not implemented");
@@ -205,7 +174,7 @@ mm_iface_modem_check_for_sim_swap (MMIfaceModem *self,
return;
}
mm_obj_info (self, "start checking for SIM swap in slot %u", slot_index);
mm_obj_info (self, "started checking for SIM swap...");
MM_IFACE_MODEM_GET_INTERFACE (self)->check_for_sim_swap (
self,
iccid,
@@ -4641,7 +4610,6 @@ interface_syncing_step (GTask *task)
*/
mm_iface_modem_check_for_sim_swap (
self,
0,
NULL,
NULL,
(GAsyncReadyCallback)sync_detect_sim_swap_ready,
src/mm-iface-modem.h
-1
View File
@@ -599,7 +599,6 @@ void mm_iface_modem_bind_simple_status (MMIfaceModem *self,
/* Check if the SIM or eSIM profile has changed */
void mm_iface_modem_check_for_sim_swap (MMIfaceModem *self,
guint slot_index,
const gchar *iccid,
const gchar *imsi,
GAsyncReadyCallback callback,
src/mm-shared-qmi.c
+2 -2
View File
@@ -3649,7 +3649,7 @@ uim_start_refresh_timeout (MMSharedQmi *self)
mm_obj_dbg (self, "refresh start timed out; trigger SIM change check");
mm_iface_modem_check_for_sim_swap (MM_IFACE_MODEM (self), 0, NULL, NULL, NULL, NULL);
mm_iface_modem_check_for_sim_swap (MM_IFACE_MODEM (self), NULL, NULL, NULL, NULL);
return G_SOURCE_REMOVE;
}
@@ -3715,7 +3715,7 @@ uim_refresh_indication_cb (QmiClientUim *client,
g_source_remove (priv->uim_refresh_start_timeout_id);
priv->uim_refresh_start_timeout_id = 0;
}
mm_iface_modem_check_for_sim_swap (MM_IFACE_MODEM (self), 0, NULL, NULL, NULL, NULL);
mm_iface_modem_check_for_sim_swap (MM_IFACE_MODEM (self), NULL, NULL, NULL, NULL);
}
}
}