From ec3a968df9d8fc706fedb788959631e2ed84e04b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 14 Mar 2020 18:11:46 -0700 Subject: android/usb: pass in the UsbDevice when downloading This finally allows us to download from not just the first device, but specifically the device that the user picks. Passing the object through a void pointer is not nice - but since this traverses C code other solutions (like passing an index into the list) seemed even worse. Signed-off-by: Dirk Hohndel --- mobile-widgets/qmlmanager.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'mobile-widgets/qmlmanager.cpp') diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 1a9a54a86..e7a557155 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -1999,6 +1999,18 @@ void QMLManager::DC_setProduct(const QString& product) void QMLManager::DC_setDevName(const QString& devName) { DCDeviceData::instance()->setDevName(devName); +#if defined(Q_OS_ANDROID) + // get the currently valid list of devices and set up the USB device descriptor + // if the connection string matches a connection in that list + androidSerialDevices = serial_usb_android_get_devices(); + std::string connection = devName.toStdString(); + for (unsigned int i = 0; i < androidSerialDevices.size(); i++) { + if (androidSerialDevices[i].uiRepresentation == connection) { + appendTextToLog(QString("setDevName matches USB device %1").arg(i)); + DCDeviceData::instance()->setUsbDevice((void *)&androidSerialDevices[i]); + } + } +#endif } void QMLManager::DC_setDevBluetoothName(const QString& devBluetoothName) -- cgit v1.2.3-70-g09d2