Hi Tommi,
On 06/18/2015 06:46 AM, Tommi Kenakkala wrote:
Fixes property change not being emited when hot-swapping a
PIN-enabled card.
---
src/sim.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/sim.c b/src/sim.c
index b5badf1..0bcafe0 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -2737,6 +2737,10 @@ static void sim_pin_query_cb(const struct ofono_error *error,
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(sim->atom);
const char *pin_name;
+ char **locked_pins;
+ gboolean lock_changed;
+
+ DBG("sim->pin_type: %d, pin_type: %d", sim->pin_type, pin_type);
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_error("Querying PIN authentication state failed");
@@ -2751,9 +2755,23 @@ static void sim_pin_query_cb(const struct ofono_error *error,
password_is_pin(pin_type) == FALSE)
pin_type = puk2pin(pin_type);
- if (pin_type != OFONO_SIM_PASSWORD_INVALID)
+ if (pin_type != OFONO_SIM_PASSWORD_INVALID) {
you might want to add && pin_type != OFONO_SIM_PASSWORD_NONE here. See
below.
+ lock_changed = !sim->locked_pins[pin_type];
+
So when do you want to emit LockedPins here? Only when the list is
non-empty or always?
There is a subtlety here. OFONO_SIM_PASSWORD_NONE is never considered
when emitting LockedPins. However, in this proposal you can trigger a
LockedPins emission even if there's no PIN set.
To me it seems like emitting LockedPins with an empty value seems
unnecessary. Thoughts?
sim->locked_pins[pin_type] = TRUE;
+ if (lock_changed) {
+ locked_pins = get_locked_pins(sim);
+
+ ofono_dbus_signal_array_property_changed(conn,
+ path,
+ OFONO_SIM_MANAGER_INTERFACE,
+ "LockedPins", DBUS_TYPE_STRING,
+ &locked_pins);
+
+ g_strfreev(locked_pins);
+ }
+ }
ofono_dbus_signal_property_changed(conn, path,
OFONO_SIM_MANAGER_INTERFACE,
"PinRequired", DBUS_TYPE_STRING,
Regards,
-Denis