From 4619b4932eb2f75f8026b79e8a810ddf5f5fd7e9 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 15 Mar 2020 11:45:12 -0700 Subject: android/usb: refresh USB device list on entering download from DC The usbRescan() code is smart enough not to duplicate entries that might already be there. And with this the user doesn't have to manually tap rescan if they didn't open Subsurface-mobile via the intent after a device was plugged in. Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DownloadFromDiveComputer.qml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index b0eda16f3..8ef4520a2 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -481,9 +481,13 @@ Kirigami.Page { comboVendor.currentIndex = comboProduct.currentIndex = comboConnection.currentIndex = -1 dc1.enabled = dc2.enabled = dc3.enabled = dc4.enabled = true if (visible) { + // we started the BT/BLE scan when Subsurface-mobile started, let's see if + // that found something comboVendor.currentIndex = manager.getDetectedVendorIndex() comboProduct.currentIndex = manager.getDetectedProductIndex(comboVendor.currentText) comboConnection.currentIndex = manager.getMatchingAddress(comboVendor.currentText, comboProduct.currentText) + // also check if there are USB devices (this only has an effect on Android) + manager.usbRescan() } } } -- cgit v1.2.3-70-g09d2