Specialize file dialog for Android

Akaflieg-Freiburg · Mar 4, 2025 · ae5ccc5 · ae5ccc5
1 parent 3245942
commit ae5ccc5
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.32.14] - 2025-03-xx
+
+### Fixed
+- Fix problem with the file picker dialog on Android, where files from external
+  sources were not opened. (#491)
+
+
 ## [2.32.13] - 2025-03-02
 
 ### Fixed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ option(QTDEPLOY "Generate and run Qt deployment scripts" OFF)
 # Project data
 #
 
-project(enroute VERSION 2.32.13)
+project(enroute VERSION 2.32.14)
 set(APP_ID de.akaflieg_freiburg.enroute)
 set(DISPLAY_NAME "Enroute")
 math(EXPR PROJECT_VERSION_CODE 10000*${PROJECT_VERSION_MAJOR}+100*${PROJECT_VERSION_MINOR}+${PROJECT_VERSION_PATCH})

diff --git a/src/qml/pages/DataManagerPage.qml b/src/qml/pages/DataManagerPage.qml
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2019-2023 by Stefan Kebekus                             *
+ *   Copyright (C) 2019-2025 by Stefan Kebekus                             *
  *   [email protected]                                              *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -32,6 +32,7 @@ Page {
     required property var dialogLoader
     required property var stackView
     property bool isIos: Qt.platform.os === "ios"
+    property bool isAndroid: Qt.platform.os === "android"
 
     title: qsTr("Map and Data Library")
 
@@ -234,6 +235,8 @@ Page {
                                                               text: qsTr("Locate your file in the browser, then select 'Open with' from the share menu, and choose Enroute"),
                                                               standardButtons: Dialog.Ok})
                             Global.dialogLoader.active = true
+                        } else if (isAndroid) {
+                            FileExchange.openFilePicker("")
                         } else {
                             importFileDialog.open()
                         }

diff --git a/src/qml/pages/FlightRouteEditor.qml b/src/qml/pages/FlightRouteEditor.qml
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2019-2024 by Stefan Kebekus                             *
+ *   Copyright (C) 2019-2025 by Stefan Kebekus                             *
  *   [email protected]                                              *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -268,7 +268,6 @@ Page {
                                                               standardButtons: Dialog.Ok})
                             Global.dialogLoader.active = true
                         } else if (isAndroid) {
-                            console.log("AA")
                             FileExchange.openFilePicker("")
                         } else {
                             importFileDialog.open()

diff --git a/src/qml/pages/FlightRouteLibrary.qml b/src/qml/pages/FlightRouteLibrary.qml
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2019-2024 by Stefan Kebekus                             *
+ *   Copyright (C) 2019-2025 by Stefan Kebekus                             *
  *   [email protected]                                              *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -98,7 +98,18 @@ Page {
                     onTriggered: {
                         PlatformAdaptor.vibrateBrief()
                         highlighted = false
-                        importFileDialog.open()
+                        if (isIos) {
+                            Global.dialogLoader.active = false
+                            Global.dialogLoader.setSource("../dialogs/LongTextDialog.qml", {
+                                                              title: qsTr("Import files"),
+                                                              text: qsTr("Locate your file in the browser, then select 'Open with' from the share menu, and choose Enroute"),
+                                                              standardButtons: Dialog.Ok})
+                            Global.dialogLoader.active = true
+                        } else if (isAndroid) {
+                            FileExchange.openFilePicker("")
+                        } else {
+                            importFileDialog.open()
+                        }
                     }
 
                     FileDialog {

diff --git a/src/qml/pages/WaypointLibraryPage.qml b/src/qml/pages/WaypointLibraryPage.qml
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2022-2023 by Stefan Kebekus                             *
+ *   Copyright (C) 2022-2025 by Stefan Kebekus                             *
  *   [email protected]                                              *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -106,6 +106,8 @@ Page {
                                                               text: qsTr("Locate your file in the browser, then select 'Open with' from the share menu, and choose Enroute"),
                                                               standardButtons: Dialog.Ok})
                             Global.dialogLoader.active = true
+                        } else if (isAndroid) {
+                            FileExchange.openFilePicker("")
                         } else {
                             importFileDialog.open()
                         }