Device Selection for APK Installation (#208)

* Fix dock state saving during minimize

* Support installing to specific device

Author: vaibhavpandeyvpz

CMakeLists.txt

@@ -74,6 +74,8 @@ set(SOURCES
     sources/apksignworker.cpp
     sources/appearancesettingswidget.cpp
     sources/binarysettingswidget.cpp
+    sources/devicelistworker.cpp
+    sources/deviceselectiondialog.cpp
     sources/findreplacedialog.cpp
     sources/flickcharm.cpp
     sources/hexedit.cpp
@@ -99,6 +101,8 @@ set(HEADERS
     sources/apksignworker.h
     sources/appearancesettingswidget.h
     sources/binarysettingswidget.h
+    sources/devicelistworker.h
+    sources/deviceselectiondialog.h
     sources/findreplacedialog.h
     sources/flickcharm.h
     sources/hexedit.h

sources/adbinstallworker.cpp

@@ -2,8 +2,8 @@
 #include "adbinstallworker.h"
 #include "processutils.h"
 
-AdbInstallWorker::AdbInstallWorker(const QString &apk, QObject *parent)
-    : QObject(parent), m_Apk(apk)
+AdbInstallWorker::AdbInstallWorker(const QString &apk, const QString &deviceId, QObject *parent)
+    : QObject(parent), m_Apk(apk), m_DeviceId(deviceId)
 {
 }
 
@@ -19,7 +19,11 @@ void AdbInstallWorker::install()
         return;
     }
     QStringList args;
-    args << "install" << "-r" << m_Apk;
+    args << "install";
+    if (!m_DeviceId.isEmpty()) {
+        args << "-s" << m_DeviceId;
+    }
+    args << "-r" << m_Apk;
     ProcessResult result = ProcessUtils::runCommand(adb, args);
 #ifdef QT_DEBUG
     qDebug() << "ADB returned code" << result.code;

sources/adbinstallworker.h

@@ -7,10 +7,11 @@ class AdbInstallWorker : public QObject
 {
     Q_OBJECT
 public:
-    explicit AdbInstallWorker(const QString &apk, QObject *parent = nullptr);
+    explicit AdbInstallWorker(const QString &apk, const QString &deviceId = QString(), QObject *parent = nullptr);
     void install();
 private:
     QString m_Apk;
+    QString m_DeviceId;
 signals:
     void finished();
     void installFailed(const QString &apk);

sources/devicelistworker.cpp

@@ -0,0 +1,111 @@
+#include <QDebug>
+#include <QRegularExpression>
+#include "devicelistworker.h"
+#include "processutils.h"
+
+DeviceListWorker::DeviceListWorker(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void DeviceListWorker::listDevices()
+{
+    emit started();
+    
+    const QString adb = ProcessUtils::adbExe();
+    if (adb.isEmpty()) {
+        emit error(tr("ADB not found. Please configure it in Settings."));
+        emit finished();
+        return;
+    }
+
+    // Get device list with details
+    ProcessResult result = ProcessUtils::runCommand(adb, QStringList() << "devices" << "-l");
+    if (result.code != 0) {
+        emit error(tr("Failed to query devices: %1").arg(result.error.join("\n")));
+        emit finished();
+        return;
+    }
+
+    QList<DeviceInfo> devices;
+    
+    // Parse device list
+    bool foundHeader = false;
+    for (const QString &line : result.output) {
+        QString trimmed = line.trimmed();
+        if (trimmed.isEmpty()) {
+            continue;
+        }
+        if (!foundHeader) {
+            if (trimmed.startsWith("List of devices")) {
+                foundHeader = true;
+            }
+            continue;
+        }
+        
+        DeviceInfo device = parseDeviceLine(trimmed);
+        if (!device.serial.isEmpty()) {
+            // Get additional device properties if not already found
+            if (device.model.isEmpty()) {
+                device.model = getDeviceProperty(device.serial, "ro.product.model");
+            }
+            device.androidSdkVersion = getDeviceProperty(device.serial, "ro.build.version.sdk");
+            device.androidVersion = getDeviceProperty(device.serial, "ro.build.version.release");
+            devices.append(device);
+        }
+    }
+
+    emit devicesListed(devices);
+    emit finished();
+}
+
+DeviceInfo DeviceListWorker::parseDeviceLine(const QString &line)
+{
+    DeviceInfo device;
+    
+    // Format: SERIAL    STATUS [PROPERTY:VALUE]...
+    // Example: emulator-5554    device product:sdk_gphone64_arm64 model:sdk_gphone64_arm64 device:emu64xa
+    QRegularExpression regex(R"(^(\S+)\s+(\S+)(?:\s+(.+))?$)");
+    QRegularExpressionMatch match = regex.match(line);
+    
+    if (match.hasMatch()) {
+        device.serial = match.captured(1);
+        device.status = match.captured(2);
+        
+        // Parse properties from the rest of the line
+        QString properties = match.captured(3);
+        if (!properties.isEmpty()) {
+            QRegularExpression propRegex(R"((\w+):([^\s]+))");
+            QRegularExpressionMatchIterator propIter = propRegex.globalMatch(properties);
+            while (propIter.hasNext()) {
+                QRegularExpressionMatch propMatch = propIter.next();
+                QString key = propMatch.captured(1);
+                QString value = propMatch.captured(2);
+                if (key == "model") {
+                    device.model = value;
+                }
+            }
+        }
+    }
+    
+    return device;
+}
+
+QString DeviceListWorker::getDeviceProperty(const QString &serial, const QString &property)
+{
+    const QString adb = ProcessUtils::adbExe();
+    if (adb.isEmpty()) {
+        return QString();
+    }
+
+    QStringList args;
+    args << "-s" << serial << "shell" << "getprop" << property;
+    ProcessResult result = ProcessUtils::runCommand(adb, args, 5);
+    
+    if (result.code == 0 && !result.output.isEmpty()) {
+        return result.output.first().trimmed();
+    }
+    
+    return QString();
+}
+

sources/devicelistworker.h

@@ -0,0 +1,33 @@
+#ifndef DEVICELISTWORKER_H
+#define DEVICELISTWORKER_H
+
+#include <QList>
+#include <QObject>
+#include <QString>
+
+struct DeviceInfo {
+    QString serial;
+    QString status;
+    QString model;
+    QString androidSdkVersion;
+    QString androidVersion;
+};
+
+class DeviceListWorker : public QObject
+{
+    Q_OBJECT
+public:
+    explicit DeviceListWorker(QObject *parent = nullptr);
+    void listDevices();
+signals:
+    void finished();
+    void devicesListed(const QList<DeviceInfo> &devices);
+    void error(const QString &message);
+    void started();
+private:
+    DeviceInfo parseDeviceLine(const QString &line);
+    QString getDeviceProperty(const QString &serial, const QString &property);
+};
+
+#endif // DEVICELISTWORKER_H
+