[libqofono] add assisted satellite navigation, location reporting and

positioning request agent API's
sailfishos · May 19, 2013 · 6ed33c5 · 6ed33c5
1 parent 2e37239
commit 6ed33c5
Show file tree

Hide file tree

Showing 20 changed files with 801 additions and 13 deletions.
diff --git a/TODO b/TODO
@@ -1,6 +1,3 @@
- - handsfree API
- - location reporting API
- - assisted satellite navigation API
  - audio settings API
  - cdma* API
  - dundee API

diff --git a/plugin/qofonodeclarativeplugin.cpp b/plugin/qofonodeclarativeplugin.cpp
@@ -56,6 +56,10 @@
 #include "qofonohandsfreeaudiocard.h"
 #include "qofonohandsfreeaudiomanager.h"
 
+#include "qofonoassistedsatellitenavigation.h"
+#include "qofonopositioningrequestagent.h"
+#include "qofonolocationreporting.h"
+
 
 void QOfonoDeclarativePlugin::registerTypes(const char *uri)
 {
@@ -101,6 +105,10 @@ void QOfonoDeclarativePlugin::registerTypes(const char *uri)
     qmlRegisterType<QOfonoHandsfreeAudioCard>(uri,0,2,"OfonoHandsfreeAudioCard");
     qmlRegisterType<QOfonoHandsfreeAudioManager>(uri,0,2,"OfonoHandsfreeAudioManager");
 
+    qmlRegisterType<QOfonoAssistedSatelliteNavigation>(uri,0,2,"OfonoAssistedSatelliteNavigation");
+    qmlRegisterType<QOfonoPositioningRequestAgent>(uri,0,2,"OfonoPositioningRequestAgent");
+    qmlRegisterType<QOfonoLocationReporting>(uri,0,2,"OfonoLocationReporting");
+
 }
 
 #ifdef QT_VERSION_4

diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
@@ -1,5 +1,4 @@
 
-#system(qdbusxml2cpp -c OfonoAssistedSatelliteNavigation -p ofonoassistedsatellitenavigation -N ofono_assisted_satellite_navigation.xml)
 #system(qdbusxml2cpp -c OfonoAudioSettings -p ofonoaudiosettings -N ofono_audio_settings.xml)
 #system(qdbusxml2cpp -c OfonoCallBarring -p ofonocallbarring -N ofono_call_barring.xml)
 #system(qdbusxml2cpp -c OfonoCallForwarding -p ofonocallforwarding -N ofono_call_forwarding.xml)
@@ -28,7 +27,13 @@
 ##system(qdbusxml2cpp -c OfonoNetworkRegistration -p ofononetworkregistration -N -i dbustypes.h ofono_network_registration.xml)
 ##system(qdbusxml2cpp -c OfonoVoiceCallManager -p ofonovoicecallmanager -N -i dbustypes.h ofono_voicecallmanager.xml)
 
-system(qdbusxml2cpp -c OfonoHandsfree -p ofonohandsfree -N ofono_handsfree.xml)
-system(qdbusxml2cpp -c OfonoHandsfreeAudioAgent -p ofonohandsfreeaudioagent -N ofono_handsfree_audio_agent.xml)
-system(qdbusxml2cpp -c OfonoHandsfreeAudioCard -p ofonohandsfreeaudiocard -N ofono_handsfree_audio_card.xml)
-system(qdbusxml2cpp -c OfonoHandsfreeAudioManager -p ofonohandsfreeaudiomanager -N -i dbustypes.h ofono_handsfree_audio_manager.xml)
+#system(qdbusxml2cpp -c OfonoHandsfree -p ofonohandsfree -N ofono_handsfree.xml)
+#system(qdbusxml2cpp -c OfonoHandsfreeAudioAgent -p ofonohandsfreeaudioagent -N ofono_handsfree_audio_agent.xml)
+#system(qdbusxml2cpp -c OfonoHandsfreeAudioCard -p ofonohandsfreeaudiocard -N ofono_handsfree_audio_card.xml)
+#system(qdbusxml2cpp -c OfonoHandsfreeAudioManager -p ofonohandsfreeaudiomanager -N -i dbustypes.h ofono_handsfree_audio_manager.xml)
+
+#system(qdbusxml2cpp -c OfonoAssistedSatelliteNavigation -p ofonoassistedsatellitenavigation -N ofono_assisted_satellite_navigation.xml)
+#system(qdbusxml2cpp -c OfonoPositioningRequestAgent -p ofonopositioningrequestagent ofono_positioning_request_agent.xml )
+#system(qdbusxml2cpp -c OfonoLocationReporting -p ofonolocationreporting ofono_location_reporting.xml )
+
+
diff --git a/src/dbus/ofono_assisted_satellite_navigation.xml b/src/dbus/ofono_assisted_satellite_navigation.xml
@@ -2,7 +2,7 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node name="">
 	<interface name="org.ofono.AssistedSatelliteNavigation">
-		<method name="SendPositioning">
+        <method name="SendPositioningElement">
 			<arg type="s" direction="in"/>
 		</method>
 		<method name="RegisterPositioningRequestAgent">

diff --git a/src/dbus/ofono_location_reporting.xml b/src/dbus/ofono_location_reporting.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="">
+        <interface name="org.ofono.LocationReporting">
+                <method name="GetProperties">
+                        <arg type="a{sv}" direction="out"/>
+                        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+                </method>
+                <method name="Request">
+                        <arg type="h" direction="out"/>
+                </method>
+                <method name="Release" />
+                </method>
+        </interface>
+
+</node>
diff --git a/src/dbus/ofono_positioning_request_agent.xml b/src/dbus/ofono_positioning_request_agent.xml
@@ -0,0 +1,14 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="">
+        <interface name="org.ofono.PositioningRequestAgent">
+                <method name="Request">
+                        <arg type="s" direction="in"/>
+                </method>
+                <method name="ResetAssistanceData">
+                </method>
+                <method name="Release" />
+                </method>
+        </interface>
+
+</node>
diff --git a/src/dbus/ofono_sim_toolkit.xml b/src/dbus/ofono_sim_toolkit.xml
@@ -0,0 +1,24 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="">
+	<interface name="org.ofono.SimToolkit">
+		<method name="GetProperties">
+			<arg type="a{sv}" direction="out"/>
+			<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+		</method>
+		<signal name="PropertyChanged">
+			<arg type="s"/>
+			<arg type="v"/>
+		</signal>
+		<method name="SelectItem">
+			<arg type="y" direction="in"/>
+			<arg type="o" direction="in"/>
+		</method>
+		<method name="RegisterAgent">
+			<arg type="o" direction="in"/>
+		</method>
+		<method name="UnregisterAgent">
+			<arg type="o" direction="in"/>
+		</method>
+	</interface>
+</node>
diff --git a/src/dbus/ofono_sim_toolkit_agent.xml b/src/dbus/ofono_sim_toolkit_agent.xml
@@ -0,0 +1,91 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="">
+        <interface name="org.ofono.SimToolkitAgent">
+                <method name="RequestSelection">
+                    <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="OfonoMenuEntriesList"/>
+                    <arg type="s" direction="in" name="title" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="a(sy)" direction="in" name="items" />
+                    <arg type="n" direction="in" name="defaultValue" />
+                    <arg type="y" direction="out"/>
+                </method>
+                <method name="DisplayText">
+                    <arg type="s" direction="in" name="title" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="b" direction="in" name="urgent" />
+                </method>
+                <method name="RequestInput">
+                    <arg type="s" direction="in" name="title" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="s" direction="in" name="defaultValue" />
+                    <arg type="y" direction="in" name="minChars" />
+                    <arg type="y" direction="in" name="maxChars" />
+                    <arg type="b" direction="in" name="hideTyping" />
+                    <arg type="s" direction="out"/>
+                </method>
+                <method name="RequestDigits">
+                    <arg type="s" direction="in" name="title" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="s" direction="in" name="defaultValue" />
+                    <arg type="y" direction="in" name="minChars" />
+                    <arg type="y" direction="in" name="maxChars" />
+                    <arg type="b" direction="in" name="hideTyping" />
+                    <arg type="s" direction="out"/>
+                </method>
+                <method name="RequestKey">
+                    <arg type="s" direction="in" name="title" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="s" direction="out"/>
+                </method>
+                <method name="RequestDigit">
+                    <arg type="s" direction="in" name="title" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="s" direction="out"/>
+                </method>
+                <method name="RequestConfirmation">
+                    <arg type="s" direction="in" name="title" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="b" direction="out"/>
+                </method>
+                <method name="ConfirmCallSetup">
+                    <arg type="s" direction="in" name="info" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="b" direction="out"/>
+                </method>
+                <method name="PlayTone">
+                    <arg type="s" direction="in" name="tone" />
+                    <arg type="s" direction="in" name="text" />
+                    <arg type="y" direction="in" name="icon" />
+                </method>
+                <method name="LoopTone">
+                    <arg type="s" direction="in" name="tone" />
+                    <arg type="s" direction="in" name="text" />
+                    <arg type="y" direction="in" name="icon" />
+                </method>
+                <method name="DisplayActionInformation">
+                    <arg type="s" direction="in" name="text" />
+                    <arg type="y" direction="in" name="icon" />
+                </method>
+                <method name="DisplayAction">
+                    <arg type="s" direction="in" name="text" />
+                    <arg type="y" direction="in" name="icon" />
+                </method>
+                <method name="ConfirmLaunchBrowser">
+                    <arg type="s" direction="in" name="info" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="s" direction="in" name="url" />
+                    <arg type="b" direction="out"/>
+                </method>
+                <method name="ConfirmOpenChannel">
+                    <arg type="s" direction="in" name="info" />
+                    <arg type="y" direction="in" name="icon" />
+                    <arg type="b" direction="out"/>
+                </method>
+                <method name="Cancel">
+                </method>
+                <method name="Release">
+                </method>
+        </interface>
+</node>
+
diff --git a/src/dbus/ofonoassistedsatellitenavigation.h b/src/dbus/ofonoassistedsatellitenavigation.h
@@ -8,8 +8,8 @@
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef OFONOASSISTEDSATELLITENAVIGATION_H_1357940298
-#define OFONOASSISTEDSATELLITENAVIGATION_H_1357940298
+#ifndef OFONOASSISTEDSATELLITENAVIGATION_H_1368991021
+#define OFONOASSISTEDSATELLITENAVIGATION_H_1368991021
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -43,11 +43,11 @@ public Q_SLOTS: // METHODS
         return asyncCallWithArgumentList(QLatin1String("RegisterPositioningRequestAgent"), argumentList);
     }
 
-    inline QDBusPendingReply<> SendPositioning(const QString &in0)
+    inline QDBusPendingReply<> SendPositioningElement(const QString &in0)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("SendPositioning"), argumentList);
+        return asyncCallWithArgumentList(QLatin1String("SendPositioningElement"), argumentList);
     }
 
     inline QDBusPendingReply<> UnregisterPositioningRequestAgent(const QDBusObjectPath &in0)

diff --git a/src/dbus/ofonolocationreporting.cpp b/src/dbus/ofonolocationreporting.cpp
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -c OfonoLocationReporting -p ofonolocationreporting ofono_location_reporting.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "ofonolocationreporting.h"
+
+/*
+ * Implementation of interface class OfonoLocationReporting
+ */
+
+OfonoLocationReporting::OfonoLocationReporting(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+OfonoLocationReporting::~OfonoLocationReporting()
+{
+}
+
diff --git a/src/dbus/ofonolocationreporting.h b/src/dbus/ofonolocationreporting.h
@@ -0,0 +1,65 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -c OfonoLocationReporting -p ofonolocationreporting ofono_location_reporting.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#ifndef OFONOLOCATIONREPORTING_H_1368991655
+#define OFONOLOCATIONREPORTING_H_1368991655
+
+#include <QtCore/QObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtDBus/QtDBus>
+
+/*
+ * Proxy class for interface org.ofono.LocationReporting
+ */
+class OfonoLocationReporting: public QDBusAbstractInterface
+{
+    Q_OBJECT
+public:
+    static inline const char *staticInterfaceName()
+    { return "org.ofono.LocationReporting"; }
+
+public:
+    OfonoLocationReporting(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+
+    ~OfonoLocationReporting();
+
+public Q_SLOTS: // METHODS
+    inline QDBusPendingReply<QVariantMap> GetProperties()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
+    }
+
+    inline QDBusPendingReply<> Release()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("Release"), argumentList);
+    }
+
+    inline QDBusPendingReply<QDBusUnixFileDescriptor> Request()
+    {
+        QList<QVariant> argumentList;
+        return asyncCallWithArgumentList(QLatin1String("Request"), argumentList);
+    }
+
+Q_SIGNALS: // SIGNALS
+};
+
+namespace org {
+  namespace ofono {
+    typedef ::OfonoLocationReporting LocationReporting;
+  }
+}
+#endif
diff --git a/src/dbus/ofonopositioningrequestagent.cpp b/src/dbus/ofonopositioningrequestagent.cpp
@@ -0,0 +1,26 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -c OfonoPositioningRequestAgent -p ofonopositioningrequestagent ofono_positioning_request_agent.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#include "ofonopositioningrequestagent.h"
+
+/*
+ * Implementation of interface class OfonoPositioningRequestAgent
+ */
+
+OfonoPositioningRequestAgent::OfonoPositioningRequestAgent(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
+    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
+{
+}
+
+OfonoPositioningRequestAgent::~OfonoPositioningRequestAgent()
+{
+}
+