games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

fix android url encoding

Browse Source
This commit is contained in:
Laserlicht
2025-08-31 02:52:34 +02:00
committed by GitHub
parent 710de2b638
commit 2982d4ef7b
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
launcher/helper.cpp
View File

@@ -89,8 +89,34 @@ QString getRealPath(QString path)
void performNativeCopy(QString src, QString dst)
{
#ifdef VCMI_ANDROID
auto srcStr = QAndroidJniObject::fromString(src);
auto dstStr = QAndroidJniObject::fromString(dst);
auto percentEncodeNonAscii = [](const QString &input) {
QByteArray utf8 = input.toUtf8();
QByteArray encoded;
for (char c : utf8) {
// If ASCII (0x00 to 0x7F), keep as is
if (static_cast<unsigned char>(c) < 0x80) {
encoded.append(c);
} else {
// Non-ASCII: encode as %HH
encoded.append('%');
encoded.append(QByteArray::number(static_cast<unsigned char>(c), 16).toUpper().rightJustified(2, '0'));
}
}
return QString::fromUtf8(encoded);
};
auto safeEncode = [&](QString uri) -> QString
{
if (!uri.startsWith("content://", Qt::CaseInsensitive))
return uri;
uri.replace(" ", "%20");
return percentEncodeNonAscii(uri);
};
auto srcStr = QAndroidJniObject::fromString(safeEncode(src));
auto dstStr = QAndroidJniObject::fromString(safeEncode(dst));
QAndroidJniObject::callStaticObjectMethod("eu/vcmi/vcmi/util/FileUtil", "copyFileFromUri", "(Ljava/lang/String;Ljava/lang/String;Landroid/content/Context;)V", srcStr.object<jstring>(), dstStr.object<jstring>(), QtAndroid::androidContext().object());
#else
QFile::copy(src, dst);