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

iface-modem: reordering of ready methods in sync()

Browse Source
This commit is contained in:
Aleksander Morgado
2022-07-29 15:07:45 +02:00
committed by Aleksander Morgado
parent dd51defd2b
commit bda3ade5a8
1 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-iface-modem.c
+38 -37
View File
@@ -4502,42 +4502,6 @@ mm_iface_modem_sync_finish (MMIfaceModem *self,
return g_task_propagate_boolean (G_TASK (res), error);
}
static void
sync_sim_lock_ready (MMIfaceModem *self,
GAsyncResult *res,
GTask *task)
{
SyncingContext *ctx;
g_autoptr (GError) error = NULL;
ctx = g_task_get_task_data (task);
if (!MM_IFACE_MODEM_GET_INTERFACE (self)->load_unlock_required_finish (self, res, &error))
mm_obj_warn (self, "checking sim lock status failed: %s", error->message);
/* Go on to next step */
ctx->step++;
interface_syncing_step (task);
}
static void
sync_detect_sim_swap_ready (MMIfaceModem *self,
GAsyncResult *res,
GTask *task)
{
SyncingContext *ctx;
g_autoptr (GError) error = NULL;
ctx = g_task_get_task_data (task);
if (!mm_iface_modem_check_for_sim_swap_finish (self, res, &error))
mm_obj_warn (self, "checking sim swap failed: %s", error->message);
/* Go on to next step */
ctx->step++;
interface_syncing_step (task);
}
static void
sync_all_bearers_ready (MMBearerList *bearer_list,
GAsyncResult *res,
@@ -4572,8 +4536,9 @@ reload_bearers (GTask *task)
MM_IFACE_MODEM_BEARER_LIST, &bearer_list,
NULL);
/* If no bearer list (e.g. none created or modem disabled),
* go on to next step */
if (!bearer_list) {
/* Go on to next step */
ctx->step++;
interface_syncing_step (task);
return;
@@ -4584,6 +4549,42 @@ reload_bearers (GTask *task)
task);
}
static void
sync_sim_lock_ready (MMIfaceModem *self,
GAsyncResult *res,
GTask *task)
{
SyncingContext *ctx;
g_autoptr (GError) error = NULL;
ctx = g_task_get_task_data (task);
if (!MM_IFACE_MODEM_GET_INTERFACE (self)->load_unlock_required_finish (self, res, &error))
mm_obj_warn (self, "checking sim lock status failed: %s", error->message);
/* Go on to next step */
ctx->step++;
interface_syncing_step (task);
}
static void
sync_detect_sim_swap_ready (MMIfaceModem *self,
GAsyncResult *res,
GTask *task)
{
SyncingContext *ctx;
g_autoptr (GError) error = NULL;
ctx = g_task_get_task_data (task);
if (!mm_iface_modem_check_for_sim_swap_finish (self, res, &error))
mm_obj_warn (self, "checking sim swap failed: %s", error->message);
/* Go on to next step */
ctx->step++;
interface_syncing_step (task);
}
static void
interface_syncing_step (GTask *task)
{