Support loading images from content:/ URLs on Android

Patch 251038 adds support for content:/ URLs on Android, but to be able to load images from them
this patch is needed. It copies the existing code for assets:/ URls

Change-Id: Ic086da6396576553a9635dbbbb1fa12d45bd3f52
Reviewed-by: BogDan Vatra <bogdan@kdab.com>

2 files changed, 26 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlfile.cpp b/src/qml/qml/qqmlfile.cpp
index 99031e1e74..465a342129 100644
--- a/src/qml/qml/qqmlfile.cpp
+++ b/src/qml/qml/qqmlfile.cpp
@@ -64,6 +64,7 @@ static char file_string[] = "file";
 
 #if defined(Q_OS_ANDROID)
 static char assets_string[] = "assets";
+static char content_string[] = "content";
 #endif
 
 class QQmlFilePrivate;
@@ -452,6 +453,8 @@ bool QQmlFile::isSynchronous(const QUrl &url)
 #if defined(Q_OS_ANDROID)
     } else if (scheme.length() == 6 && 0 == scheme.compare(QLatin1String(assets_string), Qt::CaseInsensitive)) {
         return true;
+    } else if (scheme.length() == 7 && 0 == scheme.compare(QLatin1String(content_string), Qt::CaseInsensitive)) {
+        return true;
 #endif
 
     } else {
@@ -492,7 +495,10 @@ bool QQmlFile::isSynchronous(const QString &url)
         return url.length() >= 8 /* assets:/ */ &&
                url.startsWith(QLatin1String(assets_string), Qt::CaseInsensitive) &&
                url[6] == QLatin1Char(':') && url[7] == QLatin1Char('/');
-
+    } else if (f == QLatin1Char('c') || f == QLatin1Char('C')) {
+        return url.length() >= 9 /* content:/ */ &&
+               url.startsWith(QLatin1String(content_string), Qt::CaseInsensitive) &&
+               url[7] == QLatin1Char(':') && url[8] == QLatin1Char('/');
     }
 #endif
 
@@ -556,7 +562,10 @@ bool QQmlFile::isLocalFile(const QString &url)
         return url.length() >= 8 /* assets:/ */ &&
                url.startsWith(QLatin1String(assets_string), Qt::CaseInsensitive) &&
                url[6] == QLatin1Char(':') && url[7] == QLatin1Char('/');
-
+    } else if (f == QLatin1Char('c') || f == QLatin1Char('C')) {
+        return url.length() >= 9 /* content:/ */ &&
+               url.startsWith(QLatin1String(content_string), Qt::CaseInsensitive) &&
+               url[7] == QLatin1Char(':') && url[8] == QLatin1Char('/');
     }
 #endif
 
@@ -580,6 +589,8 @@ QString QQmlFile::urlToLocalFileOrQrc(const QUrl& url)
         if (url.authority().isEmpty())
             return url.toString();
         return QString();
+    } else if (url.scheme().compare(QLatin1String("content"), Qt::CaseInsensitive) == 0) {
+        return url.toString();
     }
 #endif
 
@@ -618,6 +629,8 @@ QString QQmlFile::urlToLocalFileOrQrc(const QString& url)
 #if defined(Q_OS_ANDROID)
     else if (url.startsWith(QLatin1String("assets:"), Qt::CaseInsensitive)) {
         return url;
+    } else if (url.startsWith(QLatin1String("content:"), Qt::CaseInsensitive)) {
+        return url;
     }
 #endif
 
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index fc48957bcb..b508a66f84 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -1821,6 +1821,11 @@ QString QQmlTypeLoader::absoluteFilePath(const QString &path)
         // assets resource url
         QFileInfo fileInfo(QQmlFile::urlToLocalFileOrQrc(path));
         return fileInfo.isFile() ? fileInfo.absoluteFilePath() : QString();
+    } else if (path.count() > 8 && path.at(7) == QLatin1Char(':') && path.at(8) == QLatin1Char('/') &&
+           path.startsWith(QLatin1String("content"), Qt::CaseInsensitive)) {
+        // content url
+        QFileInfo fileInfo(QQmlFile::urlToLocalFileOrQrc(path));
+        return fileInfo.isFile() ? fileInfo.absoluteFilePath() : QString();
     }
 #endif
 
@@ -1878,6 +1883,11 @@ bool QQmlTypeLoader::fileExists(const QString &path, const QString &file)
         // assets resource url
         QFileInfo fileInfo(QQmlFile::urlToLocalFileOrQrc(path + file));
         return fileInfo.isFile();
+    } else if (path.count() > 8 && path.at(7) == QLatin1Char(':') && path.at(8) == QLatin1Char('/') &&
+           path.startsWith(QLatin1String("content"), Qt::CaseInsensitive)) {
+        // content url
+        QFileInfo fileInfo(QQmlFile::urlToLocalFileOrQrc(path + file));
+        return fileInfo.isFile();
     }
 #endif
 
@@ -1913,7 +1923,7 @@ bool QQmlTypeLoader::directoryExists(const QString &path)
 
     bool isResource = path.at(0) == QLatin1Char(':');
 #if defined(Q_OS_ANDROID)
-    isResource = isResource || path.startsWith(QLatin1String("assets:/"));
+    isResource = isResource || path.startsWith(QLatin1String("assets:/")) || path.startsWith(QLatin1String("content:/"));
 #endif
 
     if (isResource) {