feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

iOS: Fix small issues when connecting/disconnecting devices

Browse Source 
- Make sure that the updating TaskTree is deleted on quitting QtC by
  maintaining a hash of running updates per device
- If an update is triggered for a device while another is running,
  cancel the first one
- If the device is disconnected while an update is running, cancel the
  update. Otherwise this leads to wrong connection information in QtC

Change-Id: Ia76921d01b47229da1b5decd6b890303f4acfbf5
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2024-01-15 11:47:44 +01:00
parent e70b99c7da
commit 699b91d371
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/ios/iosdevice.cpp
View File

@@ -251,6 +251,9 @@ void IosDeviceManager::deviceConnected(const QString &uid, const QString &name)
void IosDeviceManager::deviceDisconnected(const QString &uid)
{
qCDebug(detectLog) << "detected disconnection of ios device " << uid;
// if an update is currently still running for the device being connected, cancel that
// erasing deletes the unique_ptr which deletes the TaskTree which stops it
m_updateTasks.erase(uid);
DeviceManager *devManager = DeviceManager::instance();
Utils::Id baseDevId(Constants::IOS_DEVICE_ID);
Utils::Id devType(Constants::IOS_DEVICE_TYPE);
@@ -279,7 +282,7 @@ void IosDeviceManager::updateInfo(const QString &devId)
process.setCommand({FilePath::fromString("/usr/bin/xcrun"),
{"devicectl", "list", "devices", "--quiet", "--json-output", "-"}});
},
[this, devId](const Process &process, DoneWith) -> DoneResult {
[this, devId](const Process &process) {
auto jsonOutput = QJsonDocument::fromJson(process.rawStdOut());
// find device
const QJsonArray deviceList = jsonOutput["result"]["devices"].toArray();
@@ -327,8 +330,16 @@ void IosDeviceManager::updateInfo(const QString &devId)
});
const Group root{sequential, stopOnSuccess, infoFromDeviceCtl, infoFromIosTool};
auto task = new TaskTree(root);
connect(task, &TaskTree::done, task, [task] { task->deleteLater(); });
TaskTree *task = new TaskTree(root);
m_updateTasks[devId].reset(task); // cancels any existing update, not calling done handlers
connect(task, &TaskTree::done, this, [this, task, devId] {
const auto taskIt = m_updateTasks.find(devId);
QTC_ASSERT(taskIt != m_updateTasks.end(), return);
QTC_ASSERT(taskIt->second.get() == task, return);
taskIt->second.release()->deleteLater();
m_updateTasks.erase(taskIt);
});
task->start();
}