Merge pull request #79 from amccarthy/master

[connectionagent] Add option to keep tech powered when disabling tethering.
sailfishos · Jul 14, 2014 · df3dbc1 · df3dbc1
2 parents 3e2d644 + d5e7f0e
commit df3dbc1
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 141 deletions.
diff --git a/connd/com.jollamobile.Connectiond.xml b/connd/com.jollamobile.Connectiond.xml
@@ -47,6 +47,9 @@
     </method>
     <method name="stopTethering">
     </method>
+    <method name="stopTethering">
+      <arg name="in0" type="b" direction="in"/>
+    </method>
   </interface>
 </node>
 
diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp
@@ -864,7 +864,7 @@ void QConnectionAgent::startTethering(const QString &type)
     }
 }
 
-void QConnectionAgent::stopTethering()
+void QConnectionAgent::stopTethering(bool keepPowered)
 {
     delayedTethering = false;
     QSettings confFile;
@@ -890,7 +890,7 @@ void QConnectionAgent::stopTethering()
     }
 
     b = confFile.value("tetheringTechPowered").toBool();
-    if (!b  && tetherTech) {
+    if (!b && tetherTech && !keepPowered) {
         tetherTech->setPowered(false);
     }
     Q_EMIT tetheringFinished(false);

diff --git a/connd/qconnectionagent.h b/connd/qconnectionagent.h
@@ -77,7 +77,7 @@ public Q_SLOTS:
     void connectToType(const QString &type);
 
     void startTethering(const QString &type);
-    void stopTethering();
+    void stopTethering(bool keepPowered = false);
 
 private:
     explicit QConnectionAgent(QObject *parent = 0);

diff --git a/connectionagentplugin/connectionagentplugin.cpp b/connectionagentplugin/connectionagentplugin.cpp
@@ -15,7 +15,7 @@
 ****************************************************************************/
 
 #include "connectionagentplugin.h"
-#include "connectionamanagerinterface.h"
+#include "connectiond_interface.h"
 
 #include <connman-qt5/networkmanager.h>
 #include <connman-qt5/networktechnology.h>
@@ -192,7 +192,7 @@ void ConnectionAgentPlugin::onTetheringFinished(bool success)
     Q_EMIT tetheringFinished(success);
 }
 
-void ConnectionAgentPlugin::stopTethering()
+void ConnectionAgentPlugin::stopTethering(bool keepPowered)
 {
-    connManagerInterface->stopTethering();
+    connManagerInterface->stopTethering(keepPowered);
 }
diff --git a/connectionagentplugin/connectionagentplugin.h b/connectionagentplugin/connectionagentplugin.h
@@ -18,7 +18,7 @@
 #define CONNECTIONAGENTPLUGIN_H
 
 #include "connectionagentplugin.h"
-#include "connectionamanagerinterface.h"
+#include "connectiond_interface.h"
 
 class NetworkManager;
 class ConnectionAgentPlugin : public QObject
@@ -39,7 +39,7 @@ public slots:
     void sendConnectReply(const QString &replyMessage, int timeout = 120);
     void connectToType(const QString &type);
     void startTethering(const QString &type);
-    void stopTethering();
+    void stopTethering(bool keepPowered = false);
 
 signals:
     void userInputRequested(const QString &servicePath, const QVariantMap &fields);

diff --git a/connectionagentplugin/connectionagentplugin.pro b/connectionagentplugin/connectionagentplugin.pro
@@ -5,18 +5,18 @@ CONFIG += qt plugin
 
 uri = com.jolla.connection
 
-#create client
-#system(qdbusxml2cpp ../connd/com.jollamobile.Connectiond.xml -c ConnectionManagerInterface -p connectionamanagerinterface)
-
 SOURCES += \
     connectionagentplugin_plugin.cpp \
-    connectionagentplugin.cpp \
-    connectionamanagerinterface.cpp
+    connectionagentplugin.cpp
 
 HEADERS += \
     connectionagentplugin_plugin.h \
-    connectionagentplugin.h \
-    connectionamanagerinterface.h
+    connectionagentplugin.h
+
+DBUS_INTERFACES = connectiond_interface
+connectiond_interface.files = ../connd/com.jollamobile.Connectiond.xml
+connectiond_interface.header_flags = "-c ConnectionManagerInterface"
+connectiond_interface.source_flags = "-c ConnectionManagerInterface"
 
 OTHER_FILES = qmldir
 

diff --git a/connectionagentplugin/connectionamanagerinterface.cpp b/connectionagentplugin/connectionamanagerinterface.cpp
diff --git a/connectionagentplugin/connectionamanagerinterface.h b/connectionagentplugin/connectionamanagerinterface.h
diff --git a/test/auto/tst_connectionagent_plugin/tst_connectionagent_plugin.pro b/test/auto/tst_connectionagent_plugin/tst_connectionagent_plugin.pro
@@ -16,12 +16,15 @@ TEMPLATE = app
 
 
 SOURCES += tst_connectionagent_plugintest.cpp \
-        ../../../connectionagentplugin/connectionagentplugin.cpp \
-        ../../../connectionagentplugin/connectionamanagerinterface.cpp
+        ../../../connectionagentplugin/connectionagentplugin.cpp
 
 HEADERS += \
-        ../../../connectionagentplugin/connectionagentplugin.h \
-        ../../../connectionagentplugin/connectionamanagerinterface.h
+        ../../../connectionagentplugin/connectionagentplugin.h
+
+DBUS_INTERFACES = connectiond_interface
+connectiond_interface.files = ../../../connd/com.jollamobile.Connectiond.xml
+connectiond_interface.header_flags = "-c ConnectionManagerInterface"
+connectiond_interface.source_flags = "-c ConnectionManagerInterface"
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"