mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 13:55:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4957 from xavi-b/master

Browse source 
Fix MacOS UTF-8 normalization issue
This commit is contained in:
Claudio Cambra 2023-04-24 11:14:42 +08:00 committed by GitHub
commit 44296357df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/syncjournaldb.cpp
View file

@ -882,10 +882,15 @@ QVector<QByteArray> SyncJournalDb::tableColumns(const QByteArray &table)
qint64 SyncJournalDb::getPHash(const QByteArray &file)
{
qint64 h = 0;
int len = file.length();
QByteArray bytes = file;
#ifdef Q_OS_MAC
bytes = QString::fromUtf8(file).normalized(QString::NormalizationForm_C).toUtf8();
#endif
h = c_jhash64((uint8_t *)file.data(), len, 0);
qint64 h = 0;
int len = bytes.length();
h = c_jhash64((uint8_t *)bytes.data(), len, 0);
return h;
}