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

Amends edd983071e0a90ee8665d2f45916fb575fc25857.

Remove redundant calls to AAssetDir_getNextFileName() in
AndroidAbstractFileEngine::setFileName(). It's enough to check
if AAssetManager_open() returns null and AAssetManager_openDir() is
valid for the provided asset file name.

As part of this fix, add some unit tests to cover/ensure assets
listing/iterating works as expected.

Fixes: QTBUG-107627
Change-Id: I37ae9cb64fbbc60699bb748895f77fd6a34fae1f
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 89f89cedc0e62f4b66de340da57d6c56dc61baf0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

4 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/file_in_top_dir.txt b/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/file_in_top_dir.txt
new file mode 100644
index 0000000000..61e2c47c25
--- /dev/null
+++ b/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/file_in_top_dir.txt
@@ -0,0 +1 @@
+FooBar
\ No newline at end of file
diff --git a/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/file_in_sub_dir.txt b/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/file_in_sub_dir.txt
new file mode 100644
index 0000000000..61e2c47c25
--- /dev/null
+++ b/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/file_in_sub_dir.txt
@@ -0,0 +1 @@
+FooBar
\ No newline at end of file
diff --git a/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/sub_dir_2/sub_dir_3/file_in_sub_dir_3.txt b/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/sub_dir_2/sub_dir_3/file_in_sub_dir_3.txt
new file mode 100644
index 0000000000..61e2c47c25
--- /dev/null
+++ b/tests/auto/corelib/platform/android/testdata/assets/top_level_dir/sub_dir/sub_dir_2/sub_dir_3/file_in_sub_dir_3.txt
@@ -0,0 +1 @@
+FooBar
\ No newline at end of file
diff --git a/tests/auto/corelib/platform/android/tst_android.cpp b/tests/auto/corelib/platform/android/tst_android.cpp
index 710e5b2ecf..6f5484f2b1 100644
--- a/tests/auto/corelib/platform/android/tst_android.cpp
+++ b/tests/auto/corelib/platform/android/tst_android.cpp
@@ -31,6 +31,7 @@
 #include <QTest>
 #include <QtCore/qnativeinterface.h>
 #include <QtCore/qjniobject.h>
+#include <QtCore/qdiriterator.h>
 
 class tst_Android : public QObject
 {
@@ -38,6 +39,7 @@ Q_OBJECT
 private slots:
     void assetsRead();
     void assetsNotWritable();
+    void assetsIterating();
     void testAndroidSdkVersion();
     void testAndroidActivity();
     void testRunOnAndroidMainThread();
@@ -66,6 +68,27 @@ void tst_Android::assetsNotWritable()
     QVERIFY(!file.open(QIODevice::Append));
 }
 
+void tst_Android::assetsIterating()
+{
+    QStringList assets = {"assets:/top_level_dir/file_in_top_dir.txt",
+                          "assets:/top_level_dir/sub_dir",
+                          "assets:/top_level_dir/sub_dir/file_in_sub_dir.txt",
+                          "assets:/top_level_dir/sub_dir/sub_dir_2",
+                          "assets:/top_level_dir/sub_dir/sub_dir_2/sub_dir_3",
+                          "assets:/top_level_dir/sub_dir/sub_dir_2/sub_dir_3/file_in_sub_dir_3.txt"};
+
+    // Note that we have an "assets:/top_level_dir/sub_dir/empty_sub_dir" in the test's
+    // assets physical directory, but empty folders are not packaged in the built apk,
+    // so it's expected to not have such folder be listed in the assets on runtime
+
+    QDirIterator it("assets:/top_level_dir", QDirIterator::Subdirectories);
+    QStringList iteratorAssets;
+     while (it.hasNext())
+         iteratorAssets.append(it.next());
+
+     QVERIFY(assets == iteratorAssets);
+}
+
 void tst_Android::testAndroidSdkVersion()
 {
     QVERIFY(QNativeInterface::QAndroidApplication::sdkVersion() > 0);