fsogsmd: adjust for changes to modem API related to the SIM auth status

5 files changed, 9 insertions, 19 deletions

diff --git a/fsogsmd/src/lib/at/atmediatorhelpers.vala b/fsogsmd/src/lib/at/atmediatorhelpers.vala
index 2478756d..8bd50940 100644
--- a/fsogsmd/src/lib/at/atmediatorhelpers.vala
+++ b/fsogsmd/src/lib/at/atmediatorhelpers.vala
@@ -194,15 +194,11 @@ public async void gatherSimStatusAndUpdate( FsoGsm.Modem modem ) throws FreeSmar
     if ( rcode == Constants.AtResponse.VALID )
     {
         modem.logger.info( @"SIM Auth status $(cmd.status)" );
-        // send the dbus signal
-        var obj = modem.theDevice<FreeSmartphone.GSM.SIM>();
-        obj.auth_status( cmd.status );
+        modem.advanceSimAuthState( cmd.status );
 
         // check whether we need to advance the modem state
-        if ( cmd.status != data.simAuthStatus )
+        if ( cmd.status != theModem.simAuthStatus() )
         {
-            data.simAuthStatus = cmd.status;
-
             // advance global modem state
             var modemStatus = modem.status();
             if ( modemStatus >= Modem.Status.INITIALIZING && modemStatus <= Modem.Status.ALIVE_REGISTERED )
diff --git a/fsogsmd/src/lib/watchdog.vala b/fsogsmd/src/lib/watchdog.vala
index 8c10d842..12c6b470 100644
--- a/fsogsmd/src/lib/watchdog.vala
+++ b/fsogsmd/src/lib/watchdog.vala
@@ -66,7 +66,7 @@ public class FsoGsm.GenericWatchDog : FsoGsm.WatchDog, FsoFramework.AbstractObje
         switch ( status )
         {
             case Modem.Status.ALIVE_SIM_LOCKED:
-                if ( data.simAuthStatus == FreeSmartphone.GSM.SIMAuthStatus.PIN_REQUIRED &&
+                if ( theModem.simAuthStatus() == FreeSmartphone.GSM.SIMAuthStatus.PIN_REQUIRED &&
                      data.simPin != "" &&
                      !unlockFailed )
                 {
diff --git a/fsogsmd/src/plugins/modem_dummy/mediators.vala b/fsogsmd/src/plugins/modem_dummy/mediators.vala
index 15e4b61c..19844b8f 100644
--- a/fsogsmd/src/plugins/modem_dummy/mediators.vala
+++ b/fsogsmd/src/plugins/modem_dummy/mediators.vala
@@ -172,8 +172,8 @@ public class DummyAtDeviceSetFunctionality : DeviceSetFunctionality
 
         if ( modem_pin != pin )
         {
-            var simiface = modem.theDevice<FreeSmartphone.GSM.SIM>();
-            simiface.auth_status( FreeSmartphone.GSM.SIMAuthStatus.PIN_REQUIRED );
+            var simiface = theModem.theDevice<FreeSmartphone.GSM.SIM>();
+            modem.advanceSimAuthState( FreeSmartphone.GSM.SIMAuthStatus.PIN_REQUIRED );
         }
     }
 }
diff --git a/fsogsmd/src/plugins/modem_samsung/mediators_sim.vala b/fsogsmd/src/plugins/modem_samsung/mediators_sim.vala
index 8ae4f116..e9f13c1b 100644
--- a/fsogsmd/src/plugins/modem_samsung/mediators_sim.vala
+++ b/fsogsmd/src/plugins/modem_samsung/mediators_sim.vala
@@ -27,8 +27,7 @@ public class SamsungSimGetAuthStatus : SimGetAuthStatus
         // NOTE: there is no command to gather the actual SIM auth status
         // we have to remember the last state and set it to the right value
         // whenever a command/response needs a modified sim auth state
-        var data = modem.data();
-        status = data.simAuthStatus;
+        status = modem.simAuthStatus();
     }
 }
 
@@ -39,7 +38,7 @@ public class SamsungSimSendAuthCode : SimSendAuthCode
         unowned SamsungIpc.Response? response;
         var channel = modem.channel( "main" ) as Samsung.IpcChannel;
 
-        if ( modem.data().simAuthStatus == FreeSmartphone.GSM.SIMAuthStatus.READY )
+        if ( modem.simAuthStatus() == FreeSmartphone.GSM.SIMAuthStatus.READY )
             return;
 
         if ( pin.length != 4 && pin.length != 8 )
diff --git a/fsogsmd/src/plugins/modem_samsung/utils.vala b/fsogsmd/src/plugins/modem_samsung/utils.vala
index 6a3f1d79..69dcf51e 100644
--- a/fsogsmd/src/plugins/modem_samsung/utils.vala
+++ b/fsogsmd/src/plugins/modem_samsung/utils.vala
@@ -24,16 +24,11 @@ public void updateSimAuthStatus( FsoGsm.Modem modem, FreeSmartphone.GSM.SIMAuthS
 {
     modem.logger.info( @"SIM Auth status now $status" );
 
-    // send the dbus signal
-    var obj = modem.theDevice<FreeSmartphone.GSM.SIM>();
-    obj.auth_status( status );
+    modem.advanceSimAuthState( status );
 
     // check whether we need to advance the modem state
-    var data = modem.data();
-    if ( status != data.simAuthStatus )
+    if ( status != modem.simAuthStatus() )
     {
-        data.simAuthStatus = status;
-
         // advance global modem state
         var modemStatus = modem.status();
         if ( modemStatus == Modem.Status.INITIALIZING )