diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-17 07:43:31 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-07-18 00:49:31 -0700 |
| commit | 025efc12d469017b068bdb14a78f664c47be5ac1 (patch) | |
| tree | fdc01a93ce4eb145c29c3c1a70ca86b2033dd513 /mobile-widgets/qml/DownloadFromDiveComputer.qml | |
| parent | cec3c256e71a979d0f97c472829e74693c1d2b84 (diff) | |
| download | subsurface-025efc12d469017b068bdb14a78f664c47be5ac1.tar.gz | |
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 <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qml/DownloadFromDiveComputer.qml')
| -rw-r--r-- | mobile-widgets/qml/DownloadFromDiveComputer.qml | 18 |
1 files changed, 4 insertions, 14 deletions
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() } |