diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-06 18:29:27 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-08-11 11:14:22 -0700 |
| commit | 0b242bcaca6a6cb1f0ae734f8ea1c1b22a01648b (patch) | |
| tree | 3f0b0333bbba41e1bcb9a378dc326e7ea537cafd | |
| parent | a3ddd823bbba8f72495c01e62e91639cc6b88694 (diff) | |
| download | subsurface-0b242bcaca6a6cb1f0ae734f8ea1c1b22a01648b.tar.gz | |
Android: notify the UI a dive computer was plugged in
And try to guess which one from the device string we get from the Intent.
The function is named to indicate its future use (because once the user
plugs in such a device, we should show the download page).
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | core/android.cpp | 3 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 7 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.h | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/core/android.cpp b/core/android.cpp index 865a0ad7e..f64182b08 100644 --- a/core/android.cpp +++ b/core/android.cpp @@ -175,6 +175,9 @@ Java_org_subsurfacedivelog_mobile_SubsurfaceMobileActivity_setDeviceString(JNIEn const char *deviceString = env->GetStringUTFChars(javaDeviceString, NULL); Q_UNUSED (obj) LOG(deviceString); +#if defined(SUBSURFACE_MOBILE) + QMLManager::instance()->showDownloadPage(deviceString); +#endif env->ReleaseStringUTFChars(javaDeviceString, deviceString); return; } diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 3495468db..1adf5bf57 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -1776,3 +1776,10 @@ int QMLManager::getDetectedProductIndex(const QString ¤tVendorText) { return m_device_data->getDetectedProductIndex(currentVendorText); } + +void QMLManager::showDownloadPage(QString deviceString) +{ + // inform the QML UI that it should show the download page + m_pluggedInDeviceName = strdup(qPrintable(deviceString)); + emit pluggedInDeviceNameChanged(); +} diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index c4ed27e7c..9b956aafe 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -192,7 +192,7 @@ public slots: void quit(); void hasLocationSourceChanged(); void btRescan(); - + void showDownloadPage(QString deviceString); private: BuddyCompletionModel buddyModel; |