1 files changed, 74 insertions, 10 deletions

diff --git a/src/plugins/platforms/android/androidcontentfileengine.h b/src/plugins/platforms/android/androidcontentfileengine.h
index e58c990c51..a5dd1b30f3 100644
--- a/src/plugins/platforms/android/androidcontentfileengine.h
+++ b/src/plugins/platforms/android/androidcontentfileengine.h
@@ -5,7 +5,13 @@
 #define ANDROIDCONTENTFILEENGINE_H
 
 #include <private/qfsfileengine_p.h>
+
 #include <QtCore/qjniobject.h>
+#include <QtCore/qlist.h>
+
+QT_BEGIN_NAMESPACE
+
+using DocumentFilePtr = std::shared_ptr<class DocumentFile>;
 
 class AndroidContentFileEngine : public QFSFileEngine
 {
@@ -14,35 +20,93 @@ public:
     bool open(QIODevice::OpenMode openMode, std::optional<QFile::Permissions> permissions) override;
     bool close() override;
     qint64 size() const override;
+    bool remove() override;
+    bool rename(const QString &newName) override;
+    bool mkdir(const QString &dirName, bool createParentDirectories,
+               std::optional<QFile::Permissions> permissions = std::nullopt) const override;
+    bool rmdir(const QString &dirName, bool recurseParentDirectories) const override;
+    QByteArray id() const override;
+    bool caseSensitive() const override { return true; }
+    QDateTime fileTime(QFile::FileTime time) 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;
+    IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters,
+                                     const QStringList &filterNames) override;
+
 private:
-    QString m_file;
-    QJniObject m_pfd;
+    void closeNativeFileDescriptor();
 
+    QString m_initialFile;
+    QJniObject m_pfd;
+    DocumentFilePtr m_documentFile;
 };
 
 class AndroidContentFileEngineHandler : public QAbstractFileEngineHandler
 {
+    Q_DISABLE_COPY_MOVE(AndroidContentFileEngineHandler)
 public:
     AndroidContentFileEngineHandler();
     ~AndroidContentFileEngineHandler();
-    QAbstractFileEngine *create(const QString &fileName) const override;
+    std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override;
 };
 
 class AndroidContentFileEngineIterator : public QAbstractFileEngineIterator
 {
 public:
-    AndroidContentFileEngineIterator(QDir::Filters filters, const QStringList &filterNames);
+    AndroidContentFileEngineIterator(const QString &path, QDir::Filters filters,
+                                     const QStringList &filterNames);
     ~AndroidContentFileEngineIterator();
-    QString next() override;
-    bool hasNext() const override;
+
+    bool advance() override;
+
     QString currentFileName() const override;
+    QString currentFilePath() const override;
 private:
-    mutable QStringList m_entries;
-    mutable int m_index = -1;
+    mutable QList<DocumentFilePtr> m_files;
+    mutable qsizetype m_index = -1;
 };
 
+/*!
+ *
+ * DocumentFile Api.
+ * Check https://developer.android.com/reference/androidx/documentfile/provider/DocumentFile
+ * for more information.
+ *
+ */
+class DocumentFile : public std::enable_shared_from_this<DocumentFile>
+{
+public:
+    static DocumentFilePtr parseFromAnyUri(const QString &filename);
+    static DocumentFilePtr fromSingleUri(const QJniObject &uri);
+    static DocumentFilePtr fromTreeUri(const QJniObject &treeUri);
+
+    DocumentFilePtr createFile(const QString &mimeType, const QString &displayName);
+    DocumentFilePtr createDirectory(const QString &displayName);
+    const QJniObject &uri() const;
+    const DocumentFilePtr &parent() const;
+    QString name() const;
+    QString id() const;
+    QString mimeType() const;
+    bool isDirectory() const;
+    bool isFile() const;
+    bool isVirtual() const;
+    QDateTime lastModified() const;
+    int64_t length() const;
+    bool canRead() const;
+    bool canWrite() const;
+    bool remove();
+    bool exists() const;
+    std::vector<DocumentFilePtr> listFiles();
+    bool rename(const QString &newName);
+
+protected:
+    DocumentFile(const QJniObject &uri, const std::shared_ptr<DocumentFile> &parent);
+
+protected:
+    QJniObject m_uri;
+    DocumentFilePtr m_parent;
+};
+
+QT_END_NAMESPACE
+
 #endif // ANDROIDCONTENTFILEENGINE_H