aboutsummaryrefslogtreecommitdiffstats
path: root/mobile-widgets/qml
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-03-15 12:27:10 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-03-16 07:58:20 -0700
commit0b72495413e8b060b58b96aa6d6a0ce96baa168c (patch)
tree6517fa914d2ffd9ba1317e100e8f92f419990430 /mobile-widgets/qml
parent4619b4932eb2f75f8026b79e8a810ddf5f5fd7e9 (diff)
downloadsubsurface-0b72495413e8b060b58b96aa6d6a0ce96baa168c.tar.gz
android/usb: simply restart the download after receiving permission
If the user tries to download from a device that he hasn't given the app permission to read from, Android will pop up a dialogue asking for that permission. With this after giving the permission we continue (well, technically, restart) the download which is likely the expected behavior. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qml')
-rw-r--r--mobile-widgets/qml/DownloadFromDiveComputer.qml25
1 files changed, 19 insertions, 6 deletions
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml
index 8ef4520a2..5a732b73f 100644
--- a/mobile-widgets/qml/DownloadFromDiveComputer.qml
+++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml
@@ -293,6 +293,24 @@ Kirigami.Page {
Layout.fillWidth: true
Layout.topMargin: Kirigami.Units.smallSpacing
spacing: Kirigami.Units.smallSpacing
+
+
+ function doDownload() {
+ var message = "DCDownloadThread started for " + manager.DC_vendor + " " + manager.DC_product + " on " + manager.DC_devName;
+ message += " downloading " + (manager.DC_forceDownload ? "all" : "only new" ) + " dives";
+ manager.appendTextToLog(message)
+ progressBar.visible = true
+ divesDownloaded = false // this allows the progressMessage to be displayed
+ importModel.startDownload()
+ }
+
+ Connections {
+ target: manager
+ onRestartDownloadSignal: {
+ buttonBar.doDownload()
+ }
+ }
+
TemplateButton {
id: download
text: qsTr("Download")
@@ -322,12 +340,7 @@ Kirigami.Page {
manager.DC_bluetoothMode = false;
manager.DC_devName = connectionString;
}
- var message = "DCDownloadThread started for " + manager.DC_vendor + " " + manager.DC_product + " on " + manager.DC_devName;
- message += " downloading " + (manager.DC_forceDownload ? "all" : "only new" ) + " dives";
- manager.appendTextToLog(message)
- progressBar.visible = true
- divesDownloaded = false // this allows the progressMessage to be displayed
- importModel.startDownload()
+ buttonBar.doDownload()
}
}
TemplateButton {