From 025efc12d469017b068bdb14a78f664c47be5ac1 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 17 Jul 2017 07:43:31 -0700 Subject: QML UI: remove the Paired Bluetooth Devices virtual vendor We now actually handle connections in a sane manner and don't need that workaround anymore. Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DownloadFromDiveComputer.qml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'mobile-widgets/qml') diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 9086a2e0f..4c5349f10 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -157,20 +157,10 @@ Kirigami.Page { } onClicked: { text = qsTr("Retry") - if (downloadThread.deviceData.bluetoothMode) { - var addr = downloadThread.data().getDetectedDeviceAddress(comboVendor.currentText, - comboProduct.currentText) - if (addr !== "") - downloadThread.deviceData.devName = addr - var vendor = downloadThread.deviceData.getDeviceDescriptorVendor(comboVendor.currentText, - comboProduct.currentText) - downloadThread.deviceData.vendor = vendor; - - var product = downloadThread.deviceData.getDeviceDescriptorProduct(comboVendor.currentText, - comboProduct.currentText) - downloadThread.deviceData.product = product; - } - manager.appendTextToLog("DCDownloadThread started for " + downloadThread.deviceData.devName) + // strip any BT Name from the address + var devName = downloadThread.deviceData.devName + downloadThread.deviceData.devName = devName.replace(/ (.*)$/, "") + manager.appendTextToLog("DCDownloadThread started for " + downloadThread.deviceData.product + " on "+ downloadThread.deviceData.devName) progressBar.visible = true downloadThread.start() } -- cgit v1.2.3-70-g09d2