1 files changed, 35 insertions, 12 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
index 6d28bd2388..d8a5c58d2c 100644
--- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
+++ b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
@@ -25,7 +25,7 @@ const char JniIntentClass[] = "android/content/Intent";
 
 QAndroidPlatformFileDialogHelper::QAndroidPlatformFileDialogHelper()
     : QPlatformFileDialogHelper(),
-      m_activity(QtAndroid::activity())
+      m_activity(QtAndroidPrivate::activity())
 {
 }
 
@@ -45,8 +45,8 @@ bool QAndroidPlatformFileDialogHelper::handleActivityResult(jint requestCode, ji
     if (uri.isValid()) {
         takePersistableUriPermission(uri);
         m_selectedFile.append(QUrl(uri.toString()));
-        Q_EMIT fileSelected(m_selectedFile.first());
-        Q_EMIT currentChanged(m_selectedFile.first());
+        Q_EMIT fileSelected(m_selectedFile.constFirst());
+        Q_EMIT currentChanged(m_selectedFile.constFirst());
         Q_EMIT accept();
 
         return true;
@@ -65,7 +65,7 @@ bool QAndroidPlatformFileDialogHelper::handleActivityResult(jint requestCode, ji
             m_selectedFile.append(itemUri.toString());
         }
         Q_EMIT filesSelected(m_selectedFile);
-        Q_EMIT currentChanged(m_selectedFile.first());
+        Q_EMIT currentChanged(m_selectedFile.constFirst());
         Q_EMIT accept();
     }
 
@@ -97,6 +97,22 @@ void QAndroidPlatformFileDialogHelper::setInitialFileName(const QString &title)
                               extraTitle.object(), QJniObject::fromString(title).object());
 }
 
+void QAndroidPlatformFileDialogHelper::setInitialDirectoryUri(const QString &directory)
+{
+    if (directory.isEmpty())
+        return;
+
+    if (QNativeInterface::QAndroidApplication::sdkVersion() < 26)
+        return;
+
+    const auto extraInitialUri = QJniObject::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(),
+                              QJniObject::fromString(directory).object());
+}
+
 void QAndroidPlatformFileDialogHelper::setOpenableCategory()
 {
     const QJniObject CATEGORY_OPENABLE = QJniObject::getStaticObjectField(
@@ -130,12 +146,15 @@ void QAndroidPlatformFileDialogHelper::setMimeTypes()
 {
     QStringList mimeTypes = options()->mimeTypeFilters();
     const QStringList nameFilters = options()->nameFilters();
-    const QString nameFilter = nameFilters.isEmpty() ? QString() : nameFilters.first();
 
-    if (!nameFilter.isEmpty()) {
+    if (!nameFilters.isEmpty()) {
         QMimeDatabase db;
-        for (const QString &filter : nameFilterExtensions(nameFilter))
-            mimeTypes.append(db.mimeTypeForFile(filter, QMimeDatabase::MatchExtension).name());
+        for (auto filter : nameFilters) {
+            if (!filter.isEmpty()) {
+                for (const QString &filter : nameFilterExtensions(filter))
+                    mimeTypes.append(db.mimeTypeForFile(filter, QMimeDatabase::MatchExtension).name());
+            }
+        }
     }
 
     const QString initialType = mimeTypes.size() == 1 ? mimeTypes.at(0) : "*/*"_L1;
@@ -179,11 +198,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:
@@ -207,6 +223,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);
@@ -220,6 +238,11 @@ void QAndroidPlatformFileDialogHelper::hide()
     QtAndroidPrivate::unregisterActivityResultListener(this);
 }
 
+void QAndroidPlatformFileDialogHelper::setDirectory(const QUrl &directory)
+{
+    m_directory = directory;
+}
+
 void QAndroidPlatformFileDialogHelper::exec()
 {
     m_eventLoop.exec(QEventLoop::DialogExec);