diff options
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp | 142 |
1 files changed, 70 insertions, 72 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp index 1b48769385..d8a5c58d2c 100644 --- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp +++ b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp @@ -1,53 +1,21 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB) -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB) +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qandroidplatformfiledialoghelper.h" #include <androidjnimain.h> -#include <jni.h> +#include <QtCore/QJniObject> -#include <QMimeType> #include <QMimeDatabase> +#include <QMimeType> #include <QRegularExpression> +#include <QUrl> QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + namespace QtAndroidFileDialogHelper { #define RESULT_OK -1 @@ -57,7 +25,7 @@ const char JniIntentClass[] = "android/content/Intent"; QAndroidPlatformFileDialogHelper::QAndroidPlatformFileDialogHelper() : QPlatformFileDialogHelper(), - m_activity(QtAndroid::activity()) + m_activity(QtAndroidPrivate::activity()) { } @@ -71,65 +39,83 @@ bool QAndroidPlatformFileDialogHelper::handleActivityResult(jint requestCode, ji return true; } - const QJNIObjectPrivate intent = QJNIObjectPrivate::fromLocalRef(data); + const QJniObject intent = QJniObject::fromLocalRef(data); - const QJNIObjectPrivate uri = intent.callObjectMethod("getData", "()Landroid/net/Uri;"); + const QJniObject uri = intent.callObjectMethod("getData", "()Landroid/net/Uri;"); if (uri.isValid()) { takePersistableUriPermission(uri); m_selectedFile.append(QUrl(uri.toString())); - Q_EMIT fileSelected(m_selectedFile.first()); + Q_EMIT fileSelected(m_selectedFile.constFirst()); + Q_EMIT currentChanged(m_selectedFile.constFirst()); Q_EMIT accept(); return true; } - const QJNIObjectPrivate uriClipData = + const QJniObject uriClipData = intent.callObjectMethod("getClipData", "()Landroid/content/ClipData;"); if (uriClipData.isValid()) { const int size = uriClipData.callMethod<jint>("getItemCount"); for (int i = 0; i < size; ++i) { - QJNIObjectPrivate item = uriClipData.callObjectMethod( + QJniObject item = uriClipData.callObjectMethod( "getItemAt", "(I)Landroid/content/ClipData$Item;", i); - QJNIObjectPrivate itemUri = item.callObjectMethod("getUri", "()Landroid/net/Uri;"); + QJniObject itemUri = item.callObjectMethod("getUri", "()Landroid/net/Uri;"); takePersistableUriPermission(itemUri); m_selectedFile.append(itemUri.toString()); } Q_EMIT filesSelected(m_selectedFile); + Q_EMIT currentChanged(m_selectedFile.constFirst()); Q_EMIT accept(); } return true; } -void QAndroidPlatformFileDialogHelper::takePersistableUriPermission(const QJNIObjectPrivate &uri) +void QAndroidPlatformFileDialogHelper::takePersistableUriPermission(const QJniObject &uri) { - int modeFlags = QJNIObjectPrivate::getStaticField<jint>( + int modeFlags = QJniObject::getStaticField<jint>( JniIntentClass, "FLAG_GRANT_READ_URI_PERMISSION"); if (options()->acceptMode() == QFileDialogOptions::AcceptSave) { - modeFlags |= QJNIObjectPrivate::getStaticField<jint>( + modeFlags |= QJniObject::getStaticField<jint>( JniIntentClass, "FLAG_GRANT_WRITE_URI_PERMISSION"); } - QJNIObjectPrivate contentResolver = m_activity.callObjectMethod( + QJniObject contentResolver = m_activity.callObjectMethod( "getContentResolver", "()Landroid/content/ContentResolver;"); contentResolver.callMethod<void>("takePersistableUriPermission", "(Landroid/net/Uri;I)V", uri.object(), modeFlags); } -void QAndroidPlatformFileDialogHelper::setIntentTitle(const QString &title) +void QAndroidPlatformFileDialogHelper::setInitialFileName(const QString &title) { - const QJNIObjectPrivate extraTitle = QJNIObjectPrivate::getStaticObjectField( + const QJniObject extraTitle = QJniObject::getStaticObjectField( JniIntentClass, "EXTRA_TITLE", "Ljava/lang/String;"); m_intent.callObjectMethod("putExtra", "(Ljava/lang/String;Ljava/lang/String;)Landroid/content/Intent;", - extraTitle.object(), QJNIObjectPrivate::fromString(title).object()); + 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 QJNIObjectPrivate CATEGORY_OPENABLE = QJNIObjectPrivate::getStaticObjectField( + const QJniObject CATEGORY_OPENABLE = QJniObject::getStaticObjectField( JniIntentClass, "CATEGORY_OPENABLE", "Ljava/lang/String;"); m_intent.callObjectMethod("addCategory", "(Ljava/lang/String;)Landroid/content/Intent;", CATEGORY_OPENABLE.object()); @@ -137,7 +123,7 @@ void QAndroidPlatformFileDialogHelper::setOpenableCategory() void QAndroidPlatformFileDialogHelper::setAllowMultipleSelections(bool allowMultiple) { - const QJNIObjectPrivate allowMultipleSelections = QJNIObjectPrivate::getStaticObjectField( + const QJniObject allowMultipleSelections = QJniObject::getStaticObjectField( JniIntentClass, "EXTRA_ALLOW_MULTIPLE", "Ljava/lang/String;"); m_intent.callObjectMethod("putExtra", "(Ljava/lang/String;Z)Landroid/content/Intent;", allowMultipleSelections.object(), allowMultiple); @@ -147,10 +133,10 @@ QStringList nameFilterExtensions(const QString nameFilters) { QStringList ret; #if QT_CONFIG(regularexpression) - QRegularExpression re("(\\*\\.?\\w*)"); + QRegularExpression re("(\\*\\.[a-z .]+)"); QRegularExpressionMatchIterator i = re.globalMatch(nameFilters); while (i.hasNext()) - ret << i.next().captured(1); + ret << i.next().captured(1).trimmed(); #endif // QT_CONFIG(regularexpression) ret.removeAll("*"); return ret; @@ -159,27 +145,31 @@ QStringList nameFilterExtensions(const QString nameFilters) void QAndroidPlatformFileDialogHelper::setMimeTypes() { QStringList mimeTypes = options()->mimeTypeFilters(); - const QString nameFilter = options()->initiallySelectedNameFilter(); + const QStringList nameFilters = options()->nameFilters(); - if (mimeTypes.isEmpty() && !nameFilter.isEmpty()) { + if (!nameFilters.isEmpty()) { QMimeDatabase db; - for (const QString &filter : nameFilterExtensions(nameFilter)) - mimeTypes.append(db.mimeTypeForFile(filter).name()); + for (auto filter : nameFilters) { + if (!filter.isEmpty()) { + for (const QString &filter : nameFilterExtensions(filter)) + mimeTypes.append(db.mimeTypeForFile(filter, QMimeDatabase::MatchExtension).name()); + } + } } - QString type = !mimeTypes.isEmpty() ? mimeTypes.at(0) : QLatin1String("*/*"); + const QString initialType = mimeTypes.size() == 1 ? mimeTypes.at(0) : "*/*"_L1; m_intent.callObjectMethod("setType", "(Ljava/lang/String;)Landroid/content/Intent;", - QJNIObjectPrivate::fromString(type).object()); + QJniObject::fromString(initialType).object()); if (!mimeTypes.isEmpty()) { - const QJNIObjectPrivate extraMimeType = QJNIObjectPrivate::getStaticObjectField( + const QJniObject extraMimeType = QJniObject::getStaticObjectField( JniIntentClass, "EXTRA_MIME_TYPES", "Ljava/lang/String;"); - QJNIObjectPrivate mimeTypesArray = QJNIObjectPrivate::callStaticObjectMethod( - "org/qtproject/qt5/android/QtNative", + const QJniObject mimeTypesArray = QJniObject::callStaticObjectMethod( + "org/qtproject/qt/android/QtNative", "getStringArray", "(Ljava/lang/String;)[Ljava/lang/String;", - QJNIObjectPrivate::fromString(mimeTypes.join(",")).object()); + QJniObject::fromString(mimeTypes.join(",")).object()); m_intent.callObjectMethod( "putExtra", "(Ljava/lang/String;[Ljava/lang/String;)Landroid/content/Intent;", @@ -187,11 +177,11 @@ void QAndroidPlatformFileDialogHelper::setMimeTypes() } } -QJNIObjectPrivate QAndroidPlatformFileDialogHelper::getFileDialogIntent(const QString &intentType) +QJniObject QAndroidPlatformFileDialogHelper::getFileDialogIntent(const QString &intentType) { - const QJNIObjectPrivate ACTION_OPEN_DOCUMENT = QJNIObjectPrivate::getStaticObjectField( + const QJniObject ACTION_OPEN_DOCUMENT = QJniObject::getStaticObjectField( JniIntentClass, intentType.toLatin1(), "Ljava/lang/String;"); - return QJNIObjectPrivate(JniIntentClass, "(Ljava/lang/String;)V", + return QJniObject(JniIntentClass, "(Ljava/lang/String;)V", ACTION_OPEN_DOCUMENT.object()); } @@ -207,6 +197,9 @@ 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) + setInitialFileName(selectedFiles.first().fileName()); } else if (options()->acceptMode() == QFileDialogOptions::AcceptOpen) { switch (options()->fileMode()) { case QFileDialogOptions::FileMode::DirectoryOnly: @@ -230,7 +223,7 @@ bool QAndroidPlatformFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::Win setMimeTypes(); } - setIntentTitle(options()->windowTitle()); + setInitialDirectoryUri(m_directory.toString()); QtAndroidPrivate::registerActivityResultListener(this); m_activity.callMethod<void>("startActivityForResult", "(Landroid/content/Intent;I)V", @@ -245,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); |