From 2e94481c511b86dccbacd3fa5f98b2b1125544f7 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Tue, 14 Feb 2023 14:24:46 +0200
Subject: [PATCH] Android: avoid duplicate paths from
 QStandardPaths::standardLocations()

Don't return duplicate path entries from calling
QStandardPaths::standardLocations() and as a pass by no empty entries
either.

Task-number: QTBUG-104892
Change-Id: If05b20d2c07d75428cb572d9549a39cf21bdef99
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 30014ed850bbe62005b4aa789586b01c1281cab4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/io/qstandardpaths_android.cpp | 86 ++++++++++-------------
 1 file changed, 37 insertions(+), 49 deletions(-)

diff --git a/src/corelib/io/qstandardpaths_android.cpp b/src/corelib/io/qstandardpaths_android.cpp
index 4c5bea42ed3..4d5664d3ff8 100644
--- a/src/corelib/io/qstandardpaths_android.cpp
+++ b/src/corelib/io/qstandardpaths_android.cpp
@@ -172,59 +172,47 @@ QString QStandardPaths::writableLocation(StandardLocation type)
 
 QStringList QStandardPaths::standardLocations(StandardLocation type)
 {
+    QStringList locations;
+
     if (type == MusicLocation) {
-        return QStringList() << writableLocation(type)
-                             << getExternalFilesDir("DIRECTORY_MUSIC")
-                             << getExternalFilesDir("DIRECTORY_PODCASTS")
-                             << getExternalFilesDir("DIRECTORY_NOTIFICATIONS")
-                             << getExternalFilesDir("DIRECTORY_ALARMS");
-    }
-
-    if (type == MoviesLocation) {
-        return QStringList() << writableLocation(type)
-                             << getExternalFilesDir("DIRECTORY_MOVIES");
-    }
-
-    if (type == PicturesLocation) {
-        return QStringList()  << writableLocation(type)
-                              << getExternalFilesDir("DIRECTORY_PICTURES");
-    }
-
-    if (type == DocumentsLocation) {
-        return QStringList() << writableLocation(type)
-                             << getExternalFilesDir("DIRECTORY_DOCUMENTS");
-    }
-
-    if (type == DownloadLocation) {
-        return QStringList() << writableLocation(type)
-                             << getExternalFilesDir("DIRECTORY_DOWNLOADS");
-    }
-
-    if (type == AppDataLocation || type == AppLocalDataLocation) {
-        return QStringList() << writableLocation(type)
-                             << getExternalFilesDir();
-    }
-
-    if (type == CacheLocation) {
-        return QStringList() << writableLocation(type)
-                             << getExternalCacheDir();
-    }
-
-    if (type == FontsLocation) {
+        locations << getExternalFilesDir("DIRECTORY_MUSIC")
+                  << getExternalFilesDir("DIRECTORY_PODCASTS")
+                  << getExternalFilesDir("DIRECTORY_NOTIFICATIONS")
+                  << getExternalFilesDir("DIRECTORY_ALARMS");
+    } else if (type == MoviesLocation) {
+        locations << getExternalFilesDir("DIRECTORY_MOVIES");
+    } else if (type == PicturesLocation) {
+        locations << getExternalFilesDir("DIRECTORY_PICTURES");
+    } else if (type == DocumentsLocation) {
+        locations << getExternalFilesDir("DIRECTORY_DOCUMENTS");
+    } else if (type == DownloadLocation) {
+        locations << getExternalFilesDir("DIRECTORY_DOWNLOADS");
+    } else if (type == AppDataLocation || type == AppLocalDataLocation) {
+        locations << getExternalFilesDir();
+    } else if (type == CacheLocation) {
+        locations << getExternalCacheDir();
+    } else if (type == FontsLocation) {
         QString &fontLocation = (*androidDirCache)[QStringLiteral("FONT_LOCATION")];
-        if (!fontLocation.isEmpty())
-            return QStringList(fontLocation);
-
-        const QByteArray ba = qgetenv("QT_ANDROID_FONT_LOCATION");
-        if (!ba.isEmpty())
-            return QStringList((fontLocation = QDir::cleanPath(QString::fromLocal8Bit(ba))));
-
-        // Don't cache the fallback, as we might just have been called before
-        // QT_ANDROID_FONT_LOCATION has been set.
-        return QStringList("/system/fonts"_L1);
+        if (!fontLocation.isEmpty()) {
+            locations << fontLocation;
+        } else {
+            const QByteArray ba = qgetenv("QT_ANDROID_FONT_LOCATION");
+            if (!ba.isEmpty()) {
+                locations << (fontLocation = QDir::cleanPath(QString::fromLocal8Bit(ba)));
+            } else {
+                // Don't cache the fallback, as we might just have been called before
+                // QT_ANDROID_FONT_LOCATION has been set.
+                locations << "/system/fonts"_L1;
+            }
+        }
     }
 
-    return QStringList(writableLocation(type));
+    const QString writable = writableLocation(type);
+    if (!writable.isEmpty())
+        locations.prepend(writable);
+
+    locations.removeDuplicates();
+    return locations;
 }
 
 QT_END_NAMESPACE