Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl

Change-Id: Ie9df84af22570d601db002e391a1a0d97e7cd9e1

1 files changed, 24 insertions, 4 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
index 8a8ecc4489..b4f1c95746 100644
--- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
+++ b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
@@ -128,6 +128,22 @@ void QAndroidPlatformFileDialogHelper::setInitialFileName(const QString &title)
                               extraTitle.object(), QJNIObjectPrivate::fromString(title).object());
 }
 
+void QAndroidPlatformFileDialogHelper::setInitialDirectoryUri(const QString &directory)
+{
+    if (directory.isEmpty())
+        return;
+
+    if (QtAndroidPrivate::androidSdkVersion() < 26)
+        return;
+
+    const auto extraInitialUri = QJNIObjectPrivate::getStaticObjectField(
+            "android/provider/DocumentsContract", "EXTRA_INITIAL_URI", "Ljava/lang/String;");
+    m_intent.callObjectMethod("putExtra",
+                              "(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;",
+                              extraInitialUri.object(),
+                              QJNIObjectPrivate::fromString(directory).object());
+}
+
 void QAndroidPlatformFileDialogHelper::setOpenableCategory()
 {
     const QJNIObjectPrivate CATEGORY_OPENABLE = QJNIObjectPrivate::getStaticObjectField(
@@ -210,11 +226,8 @@ bool QAndroidPlatformFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::Win
     if (options()->acceptMode() == QFileDialogOptions::AcceptSave) {
         m_intent = getFileDialogIntent("ACTION_CREATE_DOCUMENT");
         const QList<QUrl> selectedFiles = options()->initiallySelectedFiles();
-        if (selectedFiles.size() > 0) {
-            // TODO: The initial folder to show at the start should be handled by EXTRA_INITIAL_URI
-            // Take only the file name.
+        if (selectedFiles.size() > 0)
             setInitialFileName(selectedFiles.first().fileName());
-        }
     } else if (options()->acceptMode() == QFileDialogOptions::AcceptOpen) {
         switch (options()->fileMode()) {
         case QFileDialogOptions::FileMode::DirectoryOnly:
@@ -238,6 +251,8 @@ bool QAndroidPlatformFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::Win
         setMimeTypes();
     }
 
+    setInitialDirectoryUri(m_directory.toString());
+
     QtAndroidPrivate::registerActivityResultListener(this);
     m_activity.callMethod<void>("startActivityForResult", "(Landroid/content/Intent;I)V",
                               m_intent.object(), REQUEST_CODE);
@@ -251,6 +266,11 @@ void QAndroidPlatformFileDialogHelper::hide()
     QtAndroidPrivate::unregisterActivityResultListener(this);
 }
 
+void QAndroidPlatformFileDialogHelper::setDirectory(const QUrl &directory)
+{
+    m_directory = directory;
+}
+
 void QAndroidPlatformFileDialogHelper::exec()
 {
     m_eventLoop.exec(QEventLoop::DialogExec);