diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2020-03-14 18:05:06 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2020-03-16 07:58:20 -0700 |
commit | 4cd453dc928397bb70c4bc0be4f27eb21894e3c8 (patch) | |
tree | 60caa647f695097c493267992a7800c2682b22e5 /mobile-widgets/qmlmanager.h | |
parent | b0eccec8ed330d000e88b01404a30cc610d93ee2 (diff) | |
download | subsurface-4cd453dc928397bb70c4bc0be4f27eb21894e3c8.tar.gz |
android/usb: parse the usbDevice when responding to intent
This vastly simplifies our handling of devive information as we simply use
what is already in the descriptor. This way we do not duplicate information
about USB devices in the QMLManager.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qmlmanager.h')
-rw-r--r-- | mobile-widgets/qmlmanager.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index 969d95076..88bb350bf 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -18,6 +18,10 @@ #include "core/settings/qPrefCloudStorage.h" #include "core/subsurface-qt/divelistnotifier.h" +#if defined(Q_OS_ANDROID) +#include "core/serial_usb_android.h" +#endif + class QAction; class DiveObjectHelper; class DiveSiteChange; // An obscure implementation artifact - remove in due course. @@ -227,7 +231,9 @@ public slots: void quit(); void hasLocationSourceChanged(); void btRescan(); - void showDownloadPage(QString deviceString); +#if defined(Q_OS_ANDROID) + void showDownloadPage(QAndroidJniObject usbDevice); +#endif void divesChanged(const QVector<dive *> &dives, DiveField field); private: |