[connectionagent] add roaming, autoconenct features. fix other bugs

sailfishos · Apr 16, 2013 · 4114aca · 4114aca
1 parent 7a2de2a
commit 4114aca
Show file tree

Hide file tree

Showing 12 changed files with 248 additions and 91 deletions.
diff --git a/connd/com.jollamobile.Connectiond.xml b/connd/com.jollamobile.Connectiond.xml
@@ -1,34 +1,42 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
   <interface name="com.jolla.Connectiond">
-    <signal name="connectionRequest"/>
-    <signal name="wlanConfigurationNeeded"/>
+    <property name="askRoaming" type="b" access="readwrite"/>
+    <signal name="connectionRequest">
+    </signal>
+    <signal name="connectionState">
+      <arg name="state" type="s" direction="out"/>
+      <arg name="type" type="s" direction="out"/>
+    </signal>
     <signal name="errorReported">
-      <arg direction="out" type="s" name="error"/>
+      <arg name="error" type="s" direction="out"/>
     </signal>
     <signal name="requestBrowser">
-      <arg direction="out" type="s" name="url"/>
+      <arg name="url" type="s" direction="out"/>
+    </signal>
+    <signal name="userInputCanceled">
     </signal>
-    <signal name="userInputCanceled"/>
     <signal name="userInputRequested">
-      <arg direction="out" type="s" name="service"/>
-      <arg direction="out" type="a{sv}" name="fields"/>
-      <annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In1"/>
+      <arg name="service" type="s" direction="out"/>
+      <arg name="fields" type="a{sv}" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
     </signal>
-    <signal name="connectionState">
-      <arg direction="out" type="s" name="state"/>
-      <arg direction="out" type="s" name="type"/>
+    <signal name="configurationNeeded">
+      <arg name="type" type="s" direction="out"/>
     </signal>
+    <signal name="roamingAskChanged">
+      <arg name="askRoaming" type="b" direction="out"/>
+    </signal>
+    <method name="connectToType">
+      <arg name="in0" type="s" direction="in"/>
+    </method>
     <method name="sendConnectReply">
-      <arg direction="in" type="s" name="in0"/>
-      <arg direction="in" type="i" name="in1"/>
+      <arg name="in0" type="s" direction="in"/>
+      <arg name="in1" type="i" direction="in"/>
     </method>
     <method name="sendUserReply">
-      <arg direction="in" type="a{sv}" name="input"/>
-      <annotation value="QVariantMap" name="org.qtproject.QtDBus.QtTypeName.In0"/>
-    </method>
-    <method name="connectToType">
-      <arg direction="in" type="s" name="in0"/>
+      <arg name="input" type="a{sv}" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
     </method>
   </interface>
 </node>
diff --git a/connd/connadaptor.cpp b/connd/connadaptor.cpp
@@ -1,6 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -v -c ConnAdaptor -a connadaptor.h:connadaptor.cpp conn.xml
+ * Command line was: qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jollamobile.Connectiond.xml
  *
  * qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -33,6 +33,18 @@ ConnAdaptor::~ConnAdaptor()
     // destructor
 }
 
+bool ConnAdaptor::askRoaming() const
+{
+    // get the value of property askRoaming
+    return qvariant_cast< bool >(parent()->property("askRoaming"));
+}
+
+void ConnAdaptor::setAskRoaming(bool value)
+{
+    // set the value of property askRoaming
+    parent()->setProperty("askRoaming", QVariant::fromValue(value));
+}
+
 void ConnAdaptor::connectToType(const QString &in0)
 {
     // handle method call com.jolla.Connectiond.connectToType

diff --git a/connd/connadaptor.h b/connd/connadaptor.h
@@ -1,6 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -v -c ConnAdaptor -a connadaptor.h:connadaptor.cpp conn.xml
+ * Command line was: qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jollamobile.Connectiond.xml
  *
  * qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
  *
@@ -9,8 +9,8 @@
  * before re-generating it.
  */
 
-#ifndef CONNADAPTOR_H_1363752885
-#define CONNADAPTOR_H_1363752885
+#ifndef CONNADAPTOR_H_1366057292
+#define CONNADAPTOR_H_1366057292
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
@@ -30,9 +30,11 @@ class ConnAdaptor: public QDBusAbstractAdaptor
     Q_CLASSINFO("D-Bus Interface", "com.jolla.Connectiond")
     Q_CLASSINFO("D-Bus Introspection", ""
 "  <interface name=\"com.jolla.Connectiond\">\n"
+"    <property access=\"readwrite\" type=\"b\" name=\"askRoaming\"/>\n"
 "    <signal name=\"connectionRequest\"/>\n"
-"    <signal name=\"configurationNeeded\">\n"
-"      <arg direction=\"out\" type=\"s\" name=\"url\"/>\n"
+"    <signal name=\"connectionState\">\n"
+"      <arg direction=\"out\" type=\"s\" name=\"state\"/>\n"
+"      <arg direction=\"out\" type=\"s\" name=\"type\"/>\n"
 "    </signal>\n"
 "    <signal name=\"errorReported\">\n"
 "      <arg direction=\"out\" type=\"s\" name=\"error\"/>\n"
@@ -46,10 +48,15 @@ class ConnAdaptor: public QDBusAbstractAdaptor
 "      <arg direction=\"out\" type=\"a{sv}\" name=\"fields\"/>\n"
 "      <annotation value=\"QVariantMap\" name=\"org.qtproject.QtDBus.QtTypeName.In1\"/>\n"
 "    </signal>\n"
-"    <signal name=\"connectionState\">\n"
-"      <arg direction=\"out\" type=\"s\" name=\"state\"/>\n"
+"    <signal name=\"configurationNeeded\">\n"
 "      <arg direction=\"out\" type=\"s\" name=\"type\"/>\n"
 "    </signal>\n"
+"    <signal name=\"roamingAskChanged\">\n"
+"      <arg direction=\"out\" type=\"b\" name=\"askRoaming\"/>\n"
+"    </signal>\n"
+"    <method name=\"connectToType\">\n"
+"      <arg direction=\"in\" type=\"s\" name=\"in0\"/>\n"
+"    </method>\n"
 "    <method name=\"sendConnectReply\">\n"
 "      <arg direction=\"in\" type=\"s\" name=\"in0\"/>\n"
 "      <arg direction=\"in\" type=\"i\" name=\"in1\"/>\n"
@@ -58,28 +65,30 @@ class ConnAdaptor: public QDBusAbstractAdaptor
 "      <arg direction=\"in\" type=\"a{sv}\" name=\"input\"/>\n"
 "      <annotation value=\"QVariantMap\" name=\"org.qtproject.QtDBus.QtTypeName.In0\"/>\n"
 "    </method>\n"
-"    <method name=\"connectToType\">\n"
-"      <arg direction=\"in\" type=\"s\" name=\"in0\"/>\n"
-"    </method>\n"
 "  </interface>\n"
         "")
 public:
     ConnAdaptor(QObject *parent);
     virtual ~ConnAdaptor();
 
 public: // PROPERTIES
+    Q_PROPERTY(bool askRoaming READ askRoaming WRITE setAskRoaming)
+    bool askRoaming() const;
+    void setAskRoaming(bool value);
+
 public Q_SLOTS: // METHODS
     void connectToType(const QString &in0);
     void sendConnectReply(const QString &in0, int in1);
     void sendUserReply(const QVariantMap &input);
 Q_SIGNALS: // SIGNALS
+    void configurationNeeded(const QString &type);
     void connectionRequest();
     void connectionState(const QString &state, const QString &type);
     void errorReported(const QString &error);
     void requestBrowser(const QString &url);
+    void roamingAskChanged(bool askRoaming);
     void userInputCanceled();
     void userInputRequested(const QString &service, const QVariantMap &fields);
-    void configurationNeeded( const QString &type);
 };
 
 #endif
diff --git a/connd/connd.pro b/connd/connd.pro
@@ -18,7 +18,7 @@ INCLUDEPATH += lipstick
 OTHER_FILES += com.jolla.Connectiond.xml
 
 # create adaptor
-#system(qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jolla.Connectiond.xml)
+#system(qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jollamobile.Connectiond.xml)
 
 SOURCES += main.cpp \
     qconnectionmanager.cpp \