diff options
-rw-r--r-- | fsogsmd/NEWS | 7 | ||||
-rw-r--r-- | fsogsmd/configure.ac | 2 | ||||
-rw-r--r-- | fsogsmd/src/lib/atcommand.vala | 1 | ||||
-rw-r--r-- | fsogsmd/src/lib/atmediators.vala | 8 | ||||
-rw-r--r-- | fsogsmd/src/lib/mediator.vala | 6 | ||||
-rw-r--r-- | fsogsmd/src/plugins/gsm_device/plugin.vala | 4 |
6 files changed, 25 insertions, 3 deletions
diff --git a/fsogsmd/NEWS b/fsogsmd/NEWS index bbaead77..784c0f87 100644 --- a/fsogsmd/NEWS +++ b/fsogsmd/NEWS @@ -2,3 +2,10 @@ fsogsmd 0.0.1.0 =============== * Basic structure with command queue, low level parser, modem abstraction, done. * Further work pending Vala support for async. dbus. + +fsogsmd 0.1.0.0 +=============== + * First bunch of AT mediators and commands implemented + * Infrastructure for unsolicited result codes done + * First bunch of dbus commands + diff --git a/fsogsmd/configure.ac b/fsogsmd/configure.ac index d2b6b63f..161fb97f 100644 --- a/fsogsmd/configure.ac +++ b/fsogsmd/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([fsogsmd], [0.0.1.0], [smartphones-userland@linuxtogo.org], [fsogsmd]) +AC_INIT([fsogsmd], [0.1.0.0], [smartphones-userland@linuxtogo.org], [fsogsmd]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE([dist-bzip2]) diff --git a/fsogsmd/src/lib/atcommand.vala b/fsogsmd/src/lib/atcommand.vala index 3ca26b53..69165108 100644 --- a/fsogsmd/src/lib/atcommand.vala +++ b/fsogsmd/src/lib/atcommand.vala @@ -208,7 +208,6 @@ public abstract class FsoGsm.AbstractAtCommand : FsoGsm.AtCommand, GLib.Object **/ public virtual FsoGsm.AtResponse validateMulti( string[] response ) { - message( "checking for OK" ); var status = validateOk( response ); if ( status != AtResponse.OK ) { diff --git a/fsogsmd/src/lib/atmediators.vala b/fsogsmd/src/lib/atmediators.vala index 13de4520..e2372b31 100644 --- a/fsogsmd/src/lib/atmediators.vala +++ b/fsogsmd/src/lib/atmediators.vala @@ -547,6 +547,14 @@ public class AtSimRetrievePhonebook : SimRetrievePhonebook } } +public class AtSimRetrieveMessagebook : SimRetrieveMessagebook +{ + public override async void run( string category ) throws FreeSmartphone.GSM.Error, FreeSmartphone.Error + { + throw new FreeSmartphone.Error.SYSTEM_ERROR( "Not yet implemented" ); + } +} + public class AtSimSendAuthCode : SimSendAuthCode { public override async void run( string pin ) throws FreeSmartphone.GSM.Error, FreeSmartphone.Error diff --git a/fsogsmd/src/lib/mediator.vala b/fsogsmd/src/lib/mediator.vala index 04f140cf..ab5a79dd 100644 --- a/fsogsmd/src/lib/mediator.vala +++ b/fsogsmd/src/lib/mediator.vala @@ -204,6 +204,12 @@ public abstract class FsoGsm.SimRetrievePhonebook : FsoGsm.AbstractMediator public abstract async void run( string category ) throws FreeSmartphone.GSM.Error, FreeSmartphone.Error; } +public abstract class FsoGsm.SimRetrieveMessagebook : FsoGsm.AbstractMediator +{ + public FreeSmartphone.GSM.SIMMessage[] messagebook { get; set; } + public abstract async void run( string category ) throws FreeSmartphone.GSM.Error, FreeSmartphone.Error; +} + public abstract class FsoGsm.SimSendAuthCode : FsoGsm.AbstractMediator { public abstract async void run( string pin ) throws FreeSmartphone.GSM.Error, FreeSmartphone.Error; diff --git a/fsogsmd/src/plugins/gsm_device/plugin.vala b/fsogsmd/src/plugins/gsm_device/plugin.vala index 577e8a74..ff8a438a 100644 --- a/fsogsmd/src/plugins/gsm_device/plugin.vala +++ b/fsogsmd/src/plugins/gsm_device/plugin.vala @@ -327,7 +327,9 @@ class GsmDevice.Device : public async FreeSmartphone.GSM.SIMMessage[] retrieve_messagebook( string category ) throws FreeSmartphone.GSM.Error, FreeSmartphone.Error, DBus.Error { - throw new FreeSmartphone.Error.INTERNAL_ERROR( "Not yet implemented" ); + var m = modem.createMediator<FsoGsm.SimRetrieveMessagebook>(); + yield m.run( category ); + return m.messagebook; } public async FreeSmartphone.GSM.SIMEntry[] retrieve_phonebook( string category ) throws FreeSmartphone.GSM.Error, FreeSmartphone.Error, DBus.Error |