WIP: Fix changing device label once connected

olomono · Jun 8, 2024 · 8fa8ddf · 8fa8ddf
1 parent 1393b8f
commit 8fa8ddf
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/omemo/QXmppOmemoManager_p.cpp b/src/omemo/QXmppOmemoManager_p.cpp
@@ -2951,15 +2951,21 @@ QXmppTask<bool> ManagerPrivate::changeDeviceLabel(const QString &deviceLabel)
 
     ownDevice.label = deviceLabel;
 
-    if (isStarted) {
+    auto updateDeviceLabel = [this, interface]() mutable {
         auto future = omemoStorage->setOwnDevice(ownDevice);
         future.then(q, [=, this]() mutable {
             publishDeviceListItem(true, [=](bool isPublished) mutable {
                 interface.finish(std::move(isPublished));
             });
         });
+    };
+
+    if (isStarted) {
+        updateDeviceLabel();
     } else {
-        interface.finish(true);
+        q->connect(q->client(), &QXmppClient::connected, q, [updateDeviceLabel]() mutable {
+            updateDeviceLabel();
+        });
     }
 
     return interface.task();