diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-09 10:38:23 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-03-09 12:40:44 -0700 |
| commit | e5c62f0858ba6e08ec21e1018e4f5758ee89ab58 (patch) | |
| tree | f6a0df33c6dfe1c6b0951a6d9d8857b4fa460c79 | |
| parent | 2fcd4fff0a44340c1d22857373d2e88cf6641160 (diff) | |
| download | subsurface-e5c62f0858ba6e08ec21e1018e4f5758ee89ab58.tar.gz | |
Android: don't list devices with unsupported transport
We know that we cannot support native USB, USB HID, IRDA, and USB
storage on Android.
On the flip side, don't try to force the long broken FTDI download.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/downloadfromdcthread.cpp | 5 | ||||
| -rw-r--r-- | core/libdivecomputer.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp index edaa7fd42..fd423438f 100644 --- a/core/downloadfromdcthread.cpp +++ b/core/downloadfromdcthread.cpp @@ -76,11 +76,6 @@ void DownloadThread::run() qDebug() << "No download possible when DC type is unknown"; return; } -#if defined(Q_OS_ANDROID) - // on Android we either use BT, a USB device, or we download via FTDI cable - if (!internalData->bluetooth_mode && (same_string(internalData->devname, "FTDI") || same_string(internalData->devname, ""))) - internalData->devname = "ftdi"; -#endif qDebug() << "Starting download from " << (internalData->bluetooth_mode ? "BT" : internalData->devname); qDebug() << "downloading" << (internalData->force_download ? "all" : "only new") << "dives"; clear_dive_table(&downloadTable); diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c index 79eb63c7f..2728cd8ab 100644 --- a/core/libdivecomputer.c +++ b/core/libdivecomputer.c @@ -1235,7 +1235,10 @@ unsigned int get_supported_transports(device_data_t *data) #if defined(BLE_SUPPORT) supported |= DC_TRANSPORT_BLE; #endif - +#if defined(Q_OS_ANDROID) + // we cannot support transports that need libusb, hid, filesystem access, or IRDA on Android + supported &= ~(DC_TRANSPORT_USB | DC_TRANSPORT_USBHID | DC_TRANSPORT_IRDA | DC_TRANSPORT_USBSTORAGE); +#endif if (data) { /* * If we have device data available, we can refine this: |