Merge pull request #57 from lpotter/master

[timed] Fixes JB#29843 Make call to connman async.
sailfishos · Jun 16, 2015 · aa591b5 · aa591b5
2 parents d338426 + b20d2b3
commit aa591b5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/src/server/ntpcontroller.cpp b/src/server/ntpcontroller.cpp
@@ -25,6 +25,7 @@
 #include <QDBusReply>
 #include <QDBusVariant>
 #include <QDBusServiceWatcher>
+#include <QtDBus/QDBusPendingCallWatcher>
 
 #include "../common/log.h"
 
@@ -41,8 +42,9 @@ NtpController::NtpController(bool enable, QObject *parent) :
                                                this);
     connect(m_connmanWatcher, SIGNAL(serviceRegistered(QString)),
             this, SLOT(serviceRegistered()));
-
-    enableNtpTimeAdjustment(m_enable);
+    QDBusInterface connmanInterface(CONNMAN_SERVICE, "/",  CONNMAN_INTERFACE, QDBusConnection::systemBus());
+    if (connmanInterface.isValid())
+        enableNtpTimeAdjustment(m_enable);
 }
 
 void NtpController::enableNtpTimeAdjustment(bool enable)
@@ -68,7 +70,24 @@ void NtpController::setConnmanProperty(QString key, QString value)
     QList<QVariant> arguments;
     arguments << key << QVariant::fromValue(QDBusVariant(value));
     request.setArguments(arguments);
-    QDBusReply<void> reply = QDBusConnection::systemBus().call(request);
+
+    QDBusPendingReply<void> reply = QDBusConnection::systemBus().asyncCall(request);
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
+
+    QObject::connect(watcher,SIGNAL(finished(QDBusPendingCallWatcher*)),
+                     this, SLOT(propertiesReply(QDBusPendingCallWatcher*)));
+}
+
+void NtpController::serviceRegistered()
+{
+    enableNtpTimeAdjustment(m_enable);
+}
+
+void NtpController::propertiesReply(QDBusPendingCallWatcher *call)
+{
+    QDBusPendingReply<void> reply = *call;
+    call->deleteLater();
+
     if (reply.error().isValid()) {
         log_warning("Failed to call %s.%s: %s",
                     QString(CONNMAN_INTERFACE).toStdString().c_str(),
@@ -77,12 +96,7 @@ void NtpController::setConnmanProperty(QString key, QString value)
     } else {
         log_debug("Set %s property %s to value %s",
                   QString(CONNMAN_INTERFACE).toStdString().c_str(),
-                  key.toStdString().c_str(),
-                  value.toStdString().c_str());
+                  reply.argumentAt(0).toString().toStdString().c_str(),
+                  reply.argumentAt(1).toString().toStdString().c_str());
     }
 }
-
-void NtpController::serviceRegistered()
-{
-    enableNtpTimeAdjustment(m_enable);
-}
diff --git a/src/server/ntpcontroller.h b/src/server/ntpcontroller.h
@@ -25,6 +25,7 @@
 #include <QObject>
 
 class QDBusServiceWatcher;
+class QDBusPendingCallWatcher;
 
 class NtpController : public QObject
 {
@@ -36,6 +37,7 @@ class NtpController : public QObject
 
 public slots:
     void serviceRegistered();
+    void propertiesReply(QDBusPendingCallWatcher *call);
 
 private:
     void setConnmanProperty(QString key, QString value);