Revert "Android: fix Android assets handler not listing dirs with only sub dirs"

This reverts commit 89f89cedc0e62f4b66de340da57d6c56dc61baf0.

Reason for revert: QTBUG-107879

Task-number: QTBUG-107627
Fixes: QTBUG-107879
Change-Id: I31ceec5156837281b25fd17024c01e3477550ce0
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
index 5bff4206e6..bd1619e6db 100644
--- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
+++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
@@ -108,12 +108,10 @@ public:
     FolderIterator(const QString &path)
         : m_path(path)
     {
-        // Note that empty dirs in the assets dir before the build are not going to be
-        // included in the final apk, so no empty folders should expected to be listed.
         QJniObject files = QJniObject::callStaticObjectMethod(QtAndroid::applicationClass(),
-                        "listAssetContent",
-                        "(Landroid/content/res/AssetManager;Ljava/lang/String;)[Ljava/lang/String;",
-                        QtAndroid::assets(), QJniObject::fromString(path).object());
+                                                                            "listAssetContent",
+                                                                            "(Landroid/content/res/AssetManager;Ljava/lang/String;)[Ljava/lang/String;",
+                                                                            QtAndroid::assets(), QJniObject::fromString(path).object());
         if (files.isValid()) {
             QJniEnvironment env;
             jobjectArray jFiles = files.object<jobjectArray>();
@@ -352,7 +350,8 @@ public:
         } else {
             auto *assetDir = AAssetManager_openDir(m_assetManager, m_fileName.toUtf8());
             if (assetDir) {
-                m_assetInfo->type = AssetItem::Type::Folder;
+                if (AAssetDir_getNextFileName(assetDir))
+                    m_assetInfo->type = AssetItem::Type::Folder;
                 AAssetDir_close(assetDir);
             }
         }