games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Use performNativeCopy instead of copy (#6185)

Browse Source
This commit is contained in:
George King
2025-10-05 11:21:20 +02:00
committed by GitHub
parent e8a8a5b13c
commit 4fcca634ea
5 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
launcher/helper.cpp
View File

@@ -42,6 +42,19 @@ static QScrollerProperties generateScrollerProperties()
}
#endif
#ifdef VCMI_ANDROID
static QString safeEncode(QString uri)
{
// %-encode unencoded parts of string.
// This is needed because Qt returns a mixed content url with %-encoded and unencoded parts. On Android >= 13 this causes problems reading these files, when using spaces and unicode characters in folder or filename.
// Only these should be encoded (other typically %-encoded chars should not be encoded because this leads to errors).
// Related, but seems not completly fixed (at least in our setup): https://bugreports.qt.io/browse/QTBUG-114435
if (!uri.startsWith("content://", Qt::CaseInsensitive))
return uri;
return QString::fromUtf8(QUrl::toPercentEncoding(uri, "!#$&'()*+,/:;=?@[]<>{}\"`^~%"));
}
#endif
namespace Helper
{
void loadSettings()
@@ -77,35 +90,28 @@ QString getRealPath(QString path)
#ifdef VCMI_ANDROID
if(path.contains("content://", Qt::CaseInsensitive))
{
auto str = QAndroidJniObject::fromString(path);
auto str = QAndroidJniObject::fromString(safeEncode(path));
return QAndroidJniObject::callStaticObjectMethod("eu/vcmi/vcmi/util/FileUtil", "getFilenameFromUri", "(Ljava/lang/String;Landroid/content/Context;)Ljava/lang/String;", str.object<jstring>(), QtAndroid::androidContext().object()).toString();
}
else
return path;
return path;
#else
return path;
#endif
}
void performNativeCopy(QString src, QString dst)
bool performNativeCopy(QString src, QString dst)
{
#ifdef VCMI_ANDROID
// %-encode unencoded parts of string.
// This is needed because Qt returns a mixed content url with %-encoded and unencoded parts. On Android >= 13 this causes problems reading these files, when using spaces and unicode characters in folder or filename.
// Only these should be encoded (other typically %-encoded chars should not be encoded because this leads to errors).
// Related, but seems not completly fixed (at least in our setup): https://bugreports.qt.io/browse/QTBUG-114435
auto safeEncode = [&](QString uri) -> QString
{
if(!uri.startsWith("content://", Qt::CaseInsensitive))
return uri;
return QString::fromUtf8(QUrl::toPercentEncoding(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());
if(QFileInfo(dst).exists())
return true;
else
return false;
#else
QFile::copy(src, dst);
return QFile::copy(src, dst);
#endif
}

2
launcher/helper.h
View File

@@ -20,7 +20,7 @@ void loadSettings();
void reLoadSettings();
void enableScrollBySwiping(QObject * scrollTarget);
QString getRealPath(QString path);
void performNativeCopy(QString src, QString dst);
bool performNativeCopy(QString src, QString dst);
void revealDirectoryInFileBrowser(QString path);
MainWindow * getMainWindow();
void keepScreenOn(bool isEnabled);

2
launcher/mainwindow_moc.cpp
View File

@@ -295,7 +295,7 @@ void MainWindow::manualInstallFile(QString filePath)
{
const auto configFilePath = configDir.filePath(configFile[0]);
QFile::remove(configFilePath);
QFile::copy(filePath, configFilePath);
Helper::performNativeCopy(filePath, configFilePath);
Helper::reLoadSettings();
}

4
launcher/modManager/chroniclesextractor.cpp
View File

@@ -133,7 +133,7 @@ void ChroniclesExtractor::createBaseMod() const
{
QDir().mkpath(pathToQString(destFolder));
QFile::remove(destFile);
QFile::copy(file, destFile);
Helper::performNativeCopy(file, destFile);
}
}
}
@@ -237,7 +237,7 @@ void ChroniclesExtractor::extractFiles(int no) const
continue;
auto srcName = vstd::reverseMap(mapping).at(no);
auto dstName = (no == 7 || no == 8) ? srcName : "Intro";
QFile::copy(tmpDir.filePath(QString::fromStdString(srcName + ending)), outDirVideo.filePath(QString::fromStdString(dstName + ending)));
Helper::performNativeCopy(tmpDir.filePath(QString::fromStdString(srcName + ending)), outDirVideo.filePath(QString::fromStdString(dstName + ending)));
}
}

2
launcher/modManager/cmodlistview_moc.cpp
View File

@@ -1212,7 +1212,7 @@ void CModListView::installMaps(QStringList maps)
QFile::remove(destFile);
}
if (QFile::copy(map, destFile))
if (Helper::performNativeCopy(map, destFile))
successCount++;
else
{