Software/iDescriptor
1
0
Fork 0
mirror of https://github.com/iDescriptor/iDescriptor.git synced 2026-06-22 03:45:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve paired device flow

Browse Source
This commit is contained in:
uncor3
2025-07-27 12:33:33 +00:00
parent 76e2bf5e5d
commit 2c80814682
4 changed files with 108 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/appcontext.cpp
+16 -27
View File
@@ -64,12 +64,10 @@ void AppContext::handleDBusSignal(const QDBusMessage &msg)
}
}
void AppContext::addDevice(QString udid, idevice_connection_type conn_type)
void AppContext::addDevice(QString udid, idevice_connection_type conn_type,
AddType addType)
{
try {
// ui->stackedWidget->setCurrentIndex(1);
// ui->tabWidget->show();
IDescriptorInitDeviceResult initResult =
init_idescriptor_device(udid.toStdString().c_str());
@@ -81,10 +79,16 @@ void AppContext::addDevice(QString udid, idevice_connection_type conn_type)
qDebug() << "Failed to initialize device with UDID: " << udid;
// return onDeviceInitFailed(udid, initResult.error);
if (initResult.error == LOCKDOWN_E_PASSWORD_PROTECTED) {
warn("Device with UDID " + udid +
" is password protected. Please unlock the device and "
"try again.",
"Warning");
// warn("Device with UDID " + udid +
// " is password protected. Please unlock the device
// and " "try again.",
// "Warning");
// TODO: also handle pairing devices
// the reason why we don't handle pairing devices here is
// because it's less likely that it will be an error typeof
// LOCKDOWN_E_PASSWORD_PROTECTED if the device is paired type
if (addType == AddType::Regular)
emit devicePairPending(udid);
} else if (initResult.error == LOCKDOWN_E_INVALID_HOST_ID) {
warn("Device with UDID " + udid +
" is not trusted. Please trust this computer on the "
@@ -97,7 +101,6 @@ void AppContext::addDevice(QString udid, idevice_connection_type conn_type)
}
return;
}
// Find the device once using std::find_if
iDescriptorDevice *device = new iDescriptorDevice{
.udid = udid.toStdString(),
.conn_type = conn_type,
@@ -105,29 +108,15 @@ void AppContext::addDevice(QString udid, idevice_connection_type conn_type)
.deviceInfo = initResult.deviceInfo,
};
m_devices[device->udid] = device;
emit deviceAdded(device);
if (addType == AddType::Regular)
return emit deviceAdded(device);
emit devicePaired(device);
} catch (const std::exception &e) {
qDebug() << "Exception in onDeviceAdded: " << e.what();
// QMessageBox::critical(this, "Error", "An error occurred while
// processing device information");
}
// if (!device) return std::string();
// QUuid uuid = QUuid::createUuid();
// QString uuidNoBraces = uuid.toString(QUuid::WithoutBraces); //
// "3F2504E0-4F89-41D3-9A0C-0305E82C3301"
// If device already exists, clean up the old one first
// if (m_devices.contains(uuidNoBraces.toStdString())) {
// cleanDevice(m_devices[uuidNoBraces.toStdString()]);
// delete m_devices[uuidNoBraces.toStdString()];
// }
// m_devices[uuidNoBraces.toStdString()] = device;
// return true;
// return uuidNoBraces.toStdString();
// return device->udid;
}
void AppContext::removeDevice(QString _udid)
src/appcontext.h
+4 -1
View File
@@ -32,13 +32,16 @@ private:
signals:
void deviceAdded(iDescriptorDevice *device);
void deviceRemoved(const std::string &udid);
void devicePaired(iDescriptorDevice *device);
void recoveryDeviceAdded(RecoveryDeviceInfo *deviceInfo);
void recoveryDeviceRemoved(const QString &udid);
void devicePairPending(const QString &udid);
void systemSleepStarting();
void systemWakeup();
public slots:
void removeDevice(QString udid);
void addDevice(QString udid, idevice_connection_type connType);
void addDevice(QString udid, idevice_connection_type connType,
AddType addType);
};
#endif // APPCONTEXT_H
src/iDescriptor.h
+2
View File
@@ -161,6 +161,8 @@ struct IDescriptorInitDeviceResultRecovery {
void warn(const QString &message, const QString &title = "Warning",
QWidget *parent = nullptr);
enum class AddType { Regular, Pairing };
#define APP_LABEL "iDescriptor"
#define APP_VERSION "0.0.1"
#define APP_COPYRIGHT "© 2023 Uncore. All rights reserved."
src/mainwindow.cpp
+86 -2
View File
@@ -56,7 +56,8 @@ void handleCallback(const idevice_event_t *event, void *userData)
QMetaObject::invokeMethod(
AppContext::sharedInstance(), "addDevice", Qt::QueuedConnection,
Q_ARG(QString, QString::fromUtf8(event->udid)),
Q_ARG(idevice_connection_type, event->conn_type));
Q_ARG(idevice_connection_type, event->conn_type),
Q_ARG(AddType, AddType::Regular));
break;
}
@@ -78,7 +79,8 @@ void handleCallback(const idevice_event_t *event, void *userData)
QMetaObject::invokeMethod(
AppContext::sharedInstance(), "addDevice", Qt::QueuedConnection,
Q_ARG(QString, QString::fromUtf8(event->udid)),
Q_ARG(idevice_connection_type, event->conn_type));
Q_ARG(idevice_connection_type, event->conn_type),
Q_ARG(AddType, AddType::Pairing));
break;
}
default:
@@ -234,6 +236,88 @@ MainWindow::MainWindow(QWidget *parent)
updateNoDevicesConnected();
});
connect(
AppContext::sharedInstance(), &AppContext::devicePairPending, this,
[this](const QString &udid) {
QWidget *placeholderWidget = new QWidget();
QVBoxLayout *layout = new QVBoxLayout(placeholderWidget);
QLabel *label = new QLabel(
"Device is not paired. Please pair the device to continue.");
label->setAlignment(Qt::AlignCenter);
layout->addWidget(label);
placeholderWidget->setLayout(layout);
m_device_menu_widgets[udid.toStdString()] = placeholderWidget;
// DeviceTabWidget *customTabWidget =
// qobject_cast<DeviceTabWidget *>(ui->tabWidget);
// QString tabTitle = QString::fromStdString(udid.toStdString());
// QPixmap placeholderIcon(16, 16);
// placeholderIcon.fill(Qt::red);
// int mostRecentDevice = customTabWidget->addTabWithIcon(
// placeholderWidget, placeholderIcon, tabTitle);
int mostRecentDevice = ui->tabWidget->addTab(
placeholderWidget, getDeviceIcon(udid.toStdString()),
QString::fromStdString(udid.toStdString()));
// customTabWidget->setSizePolicy(QSizePolicy::Expanding,
// QSizePolicy::Preferred);
// customTabWidget->setCurrentIndex(mostRecentDevice);
ui->tabWidget->setCurrentIndex(mostRecentDevice);
ui->stackedWidget->setCurrentIndex(1); // Show device list page
});
connect(AppContext::sharedInstance(), &AppContext::devicePaired, this,
[this](iDescriptorDevice *device) {
qDebug() << "Device paired:"
<< QString::fromStdString(device->udid);
DeviceMenuWidget *deviceWidget = new DeviceMenuWidget(device);
// Find the tab index for this device
int tabIndex = -1;
for (int i = 0; i < ui->tabWidget->count(); ++i) {
if (ui->tabWidget->tabText(i) ==
QString::fromStdString(device->udid)) {
tabIndex = i;
break;
}
}
// If tab exists, remove the old widget and tab
if (tabIndex != -1) {
QWidget *oldWidget = ui->tabWidget->widget(tabIndex);
ui->tabWidget->removeTab(tabIndex);
if (oldWidget)
oldWidget->deleteLater();
}
DeviceTabWidget *customTabWidget =
qobject_cast<DeviceTabWidget *>(ui->tabWidget);
QString tabTitle =
QString::fromStdString(device->deviceInfo.productType);
QPixmap placeholderIcon(16, 16);
placeholderIcon.fill(Qt::red);
int mostRecentDevice = customTabWidget->addTabWithIcon(
deviceWidget, placeholderIcon, tabTitle);
// int mostRecentDevice = ui->tabWidget->addTab(
// placeholderWidget, getDeviceIcon(udid.toStdString()),
// QString::fromStdString(udid.toStdString()));
customTabWidget->setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Preferred);
customTabWidget->setCurrentIndex(mostRecentDevice);
// ui->tabWidget->setCurrentIndex(mostRecentDevice);
ui->stackedWidget->setCurrentIndex(1); // Show device list page
// Clean up old mapping and update
if (m_device_menu_widgets.count(device->udid)) {
m_device_menu_widgets[device->udid]->deleteLater();
}
m_device_menu_widgets[device->udid] = deviceWidget;
});
connect(
AppContext::sharedInstance(), &AppContext::recoveryDeviceRemoved, this,
[this](const QString &ecid) {