From ac17e62f6512eed6e5c63263fab0bf3c896761aa Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 17 Jul 2020 14:01:04 +0200 Subject: Android: Add support for travesing directories and accessing files This enables QDir and QFileInfo/QFile to work with entries found from a entryList() as it will obtain the permission for these files correctly when it is encountered. Due to what seems to be a quirk in the Android API, we cache whenever we come across a known directory to save time later on for checking if it is a directory. All uris accessed where we get permissions for are cached so we get the right URI for that given content url as some are granted via the Intent. Fixes: QTBUG-85538 Fixes: QTBUG-83041 Fixes: QTBUG-76886 Pick-to: 5.15 Change-Id: I685b3c60804812a0e4b85fbdbb4ec5efaa09420c Reviewed-by: Assam Boudjelthia --- .../platforms/android/androidcontentfileengine.cpp | 79 +++++++++++++++++++++- .../platforms/android/androidcontentfileengine.h | 15 ++++ 2 files changed, 91 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/android') diff --git a/src/plugins/platforms/android/androidcontentfileengine.cpp b/src/plugins/platforms/android/androidcontentfileengine.cpp index 3e3bdc2592..e552b8fa86 100644 --- a/src/plugins/platforms/android/androidcontentfileengine.cpp +++ b/src/plugins/platforms/android/androidcontentfileengine.cpp @@ -92,13 +92,21 @@ AndroidContentFileEngine::FileFlags AndroidContentFileEngine::fileFlags(FileFlag { FileFlags commonFlags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag); FileFlags flags; - const bool exists = QJNIObjectPrivate::callStaticMethod( + const bool isDir = QJNIObjectPrivate::callStaticMethod( + "org/qtproject/qt5/android/QtNative", "checkIfDir", + "(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(), + QJNIObjectPrivate::fromString(fileName(DefaultName)).object()); + // If it is a directory then we know it exists so there is no reason to explicitly check + const bool exists = isDir ? true : QJNIObjectPrivate::callStaticMethod( "org/qtproject/qt5/android/QtNative", "checkFileExists", "(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(), QJNIObjectPrivate::fromString(fileName(DefaultName)).object()); - if (!exists) + if (!exists && !isDir) return flags; - flags = FileType | commonFlags; + if (isDir) + flags = DirectoryType | commonFlags; + else + flags = FileType | commonFlags; return type & flags; } @@ -122,6 +130,16 @@ QString AndroidContentFileEngine::fileName(FileName f) const } } +QAbstractFileEngine::Iterator *AndroidContentFileEngine::beginEntryList(QDir::Filters filters, const QStringList &filterNames) +{ + return new AndroidContentFileEngineIterator(filters, filterNames); +} + +QAbstractFileEngine::Iterator *AndroidContentFileEngine::endEntryList() +{ + return nullptr; +} + AndroidContentFileEngineHandler::AndroidContentFileEngineHandler() = default; AndroidContentFileEngineHandler::~AndroidContentFileEngineHandler() = default; @@ -133,3 +151,58 @@ QAbstractFileEngine* AndroidContentFileEngineHandler::create(const QString &file return new AndroidContentFileEngine(fileName); } + +AndroidContentFileEngineIterator::AndroidContentFileEngineIterator(QDir::Filters filters, + const QStringList &filterNames) + : QAbstractFileEngineIterator(filters, filterNames) +{ +} + +AndroidContentFileEngineIterator::~AndroidContentFileEngineIterator() +{ +} + +QString AndroidContentFileEngineIterator::next() +{ + if (!hasNext()) + return QString(); + ++m_index; + return currentFilePath(); +} + +bool AndroidContentFileEngineIterator::hasNext() const +{ + if (m_index == -1) { + if (path().isEmpty()) + return false; + const bool isDir = QJNIObjectPrivate::callStaticMethod( + "org/qtproject/qt5/android/QtNative", "checkIfDir", + "(Landroid/content/Context;Ljava/lang/String;)Z", + QtAndroidPrivate::context(), + QJNIObjectPrivate::fromString(path()).object()); + if (isDir) { + QJNIObjectPrivate objArray = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", + "listContentsFromTreeUri", + "(Landroid/content/Context;Ljava/lang/String;)[Ljava/lang/String;", + QtAndroidPrivate::context(), + QJNIObjectPrivate::fromString(path()).object()); + if (objArray.isValid()) { + QJNIEnvironmentPrivate env; + const jsize length = env->GetArrayLength(static_cast(objArray.object())); + for (int i = 0; i != length; ++i) { + m_entries << QJNIObjectPrivate(env->GetObjectArrayElement( + static_cast(objArray.object()), i)).toString(); + } + } + } + m_index = 0; + } + return m_index < m_entries.size(); +} + +QString AndroidContentFileEngineIterator::currentFileName() const +{ + if (m_index <= 0 || m_index > m_entries.size()) + return QString(); + return m_entries.at(m_index - 1); +} diff --git a/src/plugins/platforms/android/androidcontentfileengine.h b/src/plugins/platforms/android/androidcontentfileengine.h index 09e5d77553..31eaf9b0ab 100644 --- a/src/plugins/platforms/android/androidcontentfileengine.h +++ b/src/plugins/platforms/android/androidcontentfileengine.h @@ -50,6 +50,8 @@ public: qint64 size() const override; FileFlags fileFlags(FileFlags type = FileInfoAll) const override; QString fileName(FileName file = DefaultName) const override; + QAbstractFileEngine::Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; + QAbstractFileEngine::Iterator *endEntryList() override; private: QString m_file; @@ -63,4 +65,17 @@ public: QAbstractFileEngine *create(const QString &fileName) const override; }; +class AndroidContentFileEngineIterator : public QAbstractFileEngineIterator +{ +public: + AndroidContentFileEngineIterator(QDir::Filters filters, const QStringList &filterNames); + ~AndroidContentFileEngineIterator(); + QString next() override; + bool hasNext() const override; + QString currentFileName() const override; +private: + mutable QStringList m_entries; + mutable int m_index = -1; +}; + #endif // ANDROIDCONTENTFILEENGINE_H -- cgit v1.2.3