Merge lp:~morphis/ubuntu-system-settings/bt-always-do-async-calls into lp:ubuntu-system-settings

[Simon Fels]

Convert Bluetooth connect/disconnect operations to async ones to not block the UI when the backend takes a little bit longer to perform those.

Convert Bluetooth connect/disconnect operations to async ones to not block the UI when the backend takes a little bit longer to perform those.

[Mathieu Trudel-Lapierre (cyphermox)]

This is straightforward and obvious. Provided it has been tested and does not show regression, I see no issues.

review: Approve

[Charles Kerr (charlesk)]

+1

review: Approve

=== modified file 'plugins/bluetooth/device.cpp'
--- plugins/bluetooth/device.cpp	2015-03-16 13:51:36 +0000
+++ plugins/bluetooth/device.cpp	2015-07-29 09:54:12 +0000
@@ -163,24 +163,16 @@
     }
 }
 
-void Device::callInterface(const QSharedPointer<QDBusInterface> &interface, const QString &method)
+void Device::slotDisconnectDone(QDBusPendingCallWatcher *watcher)
 {
-    QDBusReply<void> reply;
-    constexpr int maxTries = 4;
-    int retryCount = 0;
-
-    while (retryCount < maxTries) {
-        reply = interface->call(method);
-        if (reply.isValid())
-            break;
-        QThread::msleep(500);
-        retryCount++;
-    }
-
-    if (retryCount >= maxTries && !reply.isValid()) {
-        qWarning() << "Could not" << method << "the interface" << interface->interface()
-                   << ":" << reply.error().message();
-    }
+    QDBusPendingReply<void> reply = *watcher;
+
+    if (reply.isError()) {
+        qWarning() << "Could not disconnect device:"
+                   << reply.error().message();
+    }
+
+    watcher->deleteLater();
 }
 
 void Device::disconnect(ConnectionMode mode)
@@ -198,7 +190,22 @@
         return;
     }
 
-    callInterface(interface, "Disconnect");
+    QDBusPendingCall call = interface->asyncCall("Disconnect");
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
+    QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
+                     this, SLOT(slotDisconnectDone(QDBusPendingCallWatcher*)));
+}
+
+void Device::slotConnectDone(QDBusPendingCallWatcher *watcher)
+{
+    QDBusPendingReply<void> reply = *watcher;
+
+    if (reply.isError()) {
+        qWarning() << "Could not connect device:"
+                   << reply.error().message();
+    }
+
+    watcher->deleteLater();
 }
 
 void Device::connect(ConnectionMode mode)
@@ -216,7 +223,10 @@
         return;
     }
 
-    callInterface(interface, "Connect");
+    QDBusPendingCall call = interface->asyncCall("Connect");
+    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
+    QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
+                     this, SLOT(slotConnectDone(QDBusPendingCallWatcher*)));
 }
 
 void Device::slotMakeTrustedDone(QDBusPendingCallWatcher *call)

=== modified file 'plugins/bluetooth/device.h'
--- plugins/bluetooth/device.h	2014-12-05 12:06:33 +0000
+++ plugins/bluetooth/device.h	2015-07-29 09:54:12 +0000
@@ -147,7 +147,6 @@
     Device(const QMap<QString,QVariant> &properties);
     void initDevice(const QString &path, QDBusConnection &bus);
     bool isValid() const { return getType() != Type::Other; }
-    void callInterface(const QSharedPointer<QDBusInterface> &interface, const QString &method);
     void connect(ConnectionMode);
     void connectPending();
     void makeTrusted(bool trusted);
@@ -162,6 +161,8 @@
     void slotPropertyChanged(const QString &key, const QDBusVariant &value);
     void slotServiceDiscoveryDone(QDBusPendingCallWatcher *call);
     void slotMakeTrustedDone(QDBusPendingCallWatcher *call);
+    void slotConnectDone(QDBusPendingCallWatcher *watcher);
+    void slotDisconnectDone(QDBusPendingCallWatcher *watcher);
 
   private:
     void updateProperties(QSharedPointer<QDBusInterface>);