OmemoManager: Replace multi-result futures with single result futures

QXmppTask won't support multi-result and in the case of the OmemoManager
it's not really needed. If you want to know when each single request is
finished you can just subscribe/unsubscribe from each jid in a single
request.

Part of #502.

4 files changed, 60 insertions, 44 deletions

diff --git a/src/omemo/QXmppOmemoManager.cpp b/src/omemo/QXmppOmemoManager.cpp
index 11a7ec36..dc2cd5a2 100644
--- a/src/omemo/QXmppOmemoManager.cpp
+++ b/src/omemo/QXmppOmemoManager.cpp
@@ -564,31 +564,38 @@ void Manager::setMaximumDevicesPerStanza(int maximum)
 ///
 /// \return the results of the requests for each JID
 ///
-QFuture<Manager::DevicesResult> Manager::requestDeviceLists(const QList<QString> &jids)
+QFuture<QVector<Manager::DevicesResult>> Manager::requestDeviceLists(const QList<QString> &jids)
 {
     if (const auto jidsCount = jids.size()) {
-        QFutureInterface<Manager::DevicesResult> interface(QFutureInterfaceBase::Started);
-        auto processedJidsCount = std::make_shared<int>(0);
+        struct State {
+            int processed = 0;
+            int jidsCount = 0;
+            QFutureInterface<QVector<Manager::DevicesResult>> interface;
+            QVector<Manager::DevicesResult> devicesResults;
+        };
+
+        auto state = std::make_shared<State>();
+        state->jidsCount = jids.count();
 
         for (const auto &jid : jids) {
             Q_ASSERT_X(jid != d->ownBareJid(), "Requesting contact's device list", "Own JID passed");
 
             auto future = d->requestDeviceList(jid);
-            await(future, this, [=](auto result) mutable {
-                DevicesResult devicesResult {
+            await(future, this, [jid, state](auto result) mutable {
+                state->devicesResults << DevicesResult {
                     jid,
                     mapSuccess(std::move(result), [](QXmppOmemoDeviceListItem) { return Success(); })
                 };
-                interface.reportResult(devicesResult);
 
-                if (++(*processedJidsCount) == jidsCount) {
-                    interface.reportFinished();
+                if (++(state->processed) == state->jidsCount) {
+                    state->interface.reportResult(state->devicesResults);
+                    state->interface.reportFinished();
                 }
             });
         }
-        return interface.future();
+        return state->interface.future();
     }
-    return QFutureInterface<DevicesResult>(QFutureInterfaceBase::Finished).future();
+    return makeReadyFuture(QVector<Manager::DevicesResult>());
 }
 
 ///
@@ -605,31 +612,36 @@ QFuture<Manager::DevicesResult> Manager::requestDeviceLists(const QList<QString>
 ///
 /// \return the results of the subscription for each JID
 ///
-QFuture<Manager::DevicesResult> Manager::subscribeToDeviceLists(const QList<QString> &jids)
+QFuture<QVector<Manager::DevicesResult>> Manager::subscribeToDeviceLists(const QList<QString> &jids)
 {
-    QFutureInterface<Manager::DevicesResult> interface(QFutureInterfaceBase::Started);
-
     if (const auto jidsCount = jids.size()) {
-        auto processedJidsCount = std::make_shared<int>(0);
+        struct State {
+            int processed = 0;
+            int jidsCount = 0;
+            QFutureInterface<QVector<Manager::DevicesResult>> interface;
+            QVector<Manager::DevicesResult> devicesResults;
+        };
+
+        auto state = std::make_shared<State>();
+        state->jidsCount = jids.size();
 
         for (const auto &jid : jids) {
             auto future = d->subscribeToDeviceList(jid);
-            await(future, this, [=](QXmppPubSubManager::Result result) mutable {
+            await(future, this, [state, jid](QXmppPubSubManager::Result result) mutable {
                 Manager::DevicesResult devicesResult;
                 devicesResult.jid = jid;
                 devicesResult.result = result;
-                interface.reportResult(devicesResult);
+                state->devicesResults << devicesResult;
 
-                if (++(*processedJidsCount) == jidsCount) {
-                    interface.reportFinished();
+                if (++(state->processed) == state->jidsCount) {
+                    state->interface.reportResult(state->devicesResults);
+                    state->interface.reportFinished();
                 }
             });
         }
-    } else {
-        interface.reportFinished();
+        return state->interface.future();
     }
-
-    return interface.future();
+    return makeReadyFuture(QVector<Manager::DevicesResult>());
 }
 
 ///
@@ -641,7 +653,7 @@ QFuture<Manager::DevicesResult> Manager::subscribeToDeviceLists(const QList<QStr
 ///
 /// \return the results of the unsubscription for each JID
 ///
-QFuture<Manager::DevicesResult> Manager::unsubscribeFromDeviceLists()
+QFuture<QVector<Manager::DevicesResult>> Manager::unsubscribeFromDeviceLists()
 {
     return d->unsubscribeFromDeviceLists(d->jidsOfManuallySubscribedDevices);
 }
diff --git a/src/omemo/QXmppOmemoManager.h b/src/omemo/QXmppOmemoManager.h
index 2ba32671..5852b950 100644
--- a/src/omemo/QXmppOmemoManager.h
+++ b/src/omemo/QXmppOmemoManager.h
@@ -97,9 +97,9 @@ public:
     int maximumDevicesPerStanza() const;
     void setMaximumDevicesPerStanza(int maximum);
 
-    QFuture<DevicesResult> requestDeviceLists(const QList<QString> &jids);
-    QFuture<DevicesResult> subscribeToDeviceLists(const QList<QString> &jids);
-    QFuture<DevicesResult> unsubscribeFromDeviceLists();
+    QFuture<QVector<DevicesResult>> requestDeviceLists(const QList<QString> &jids);
+    QFuture<QVector<DevicesResult>> subscribeToDeviceLists(const QList<QString> &jids);
+    QFuture<QVector<DevicesResult>> unsubscribeFromDeviceLists();
 
     QXmppOmemoOwnDevice ownDevice();
     QFuture<QVector<QXmppOmemoDevice>> devices();
diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp
index 01981fad..722211a8 100644
--- a/src/omemo/QXmppOmemoManager_p.cpp
+++ b/src/omemo/QXmppOmemoManager_p.cpp
@@ -3154,32 +3154,36 @@ QFuture<QXmppPubSubManager::Result> ManagerPrivate::subscribeToDeviceList(const
 //
 // \return the results of each unsubscribe request
 //
-QFuture<Manager::DevicesResult> ManagerPrivate::unsubscribeFromDeviceLists(const QList<QString> &jids)
+QFuture<QVector<Manager::DevicesResult>> ManagerPrivate::unsubscribeFromDeviceLists(const QList<QString> &jids)
 {
-    QFutureInterface<Manager::DevicesResult> interface = (QFutureInterfaceBase::Started);
+    if (jids.isEmpty()) {
+        return makeReadyFuture(QVector<Manager::DevicesResult>());
+    }
 
-    const auto jidsCount = jids.size();
-    auto processedJidsCount = std::make_shared<int>(0);
+    struct State {
+        int processed = 0;
+        int jidsCount = 0;
+        QFutureInterface<QVector<Manager::DevicesResult>> interface;
+        QVector<Manager::DevicesResult> devicesResults;
+    };
 
-    if (jidsCount == 0) {
-        interface.reportFinished();
-    }
+    auto state = std::make_shared<State>();
+    state->jidsCount = jids.count();
 
     for (const auto &jid : jids) {
-        auto future = unsubscribeFromDeviceList(jid);
-        await(future, q, [=](QXmppPubSubManager::Result result) mutable {
-            Manager::DevicesResult devicesResult;
-            devicesResult.jid = jid;
-            devicesResult.result = result;
-            interface.reportResult(devicesResult);
-
-            if (++(*processedJidsCount) == jidsCount) {
-                interface.reportFinished();
+        await(unsubscribeFromDeviceList(jid), q, [jid, state](QXmppPubSubManager::Result result) mutable {
+            state->devicesResults << Manager::DevicesResult {
+                jid, result
+            };
+
+            if (++(state->processed) == state->jidsCount) {
+                state->interface.reportResult(state->devicesResults);
+                state->interface.reportFinished();
             }
         });
     }
 
-    return interface.future();
+    return state->interface.future();
 }
 
 //
diff --git a/src/omemo/QXmppOmemoManager_p.h b/src/omemo/QXmppOmemoManager_p.h
index f5ffa15b..78cf482f 100644
--- a/src/omemo/QXmppOmemoManager_p.h
+++ b/src/omemo/QXmppOmemoManager_p.h
@@ -312,7 +312,7 @@ public:
     QFuture<QXmppPubSubManager::ItemResult<QXmppOmemoDeviceListItem>> requestDeviceList(const QString &jid);
     void subscribeToNewDeviceLists(const QString &jid, uint32_t deviceId);
     QFuture<Result> subscribeToDeviceList(const QString &jid);
-    QFuture<QXmppOmemoManager::DevicesResult> unsubscribeFromDeviceLists(const QList<QString> &jids);
+    QFuture<QVector<QXmppOmemoManager::DevicesResult>> unsubscribeFromDeviceLists(const QList<QString> &jids);
     QFuture<Result> unsubscribeFromDeviceList(const QString &jid);
 
     QFuture<bool> resetOwnDevice();