StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr2687'

Browse Source 
Closes #2687
This commit is contained in:
tux3 2015-12-21 13:35:20 +01:00
commit 73c4c07dbd
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/persistence/profile.cpp
View File

@ -342,11 +342,14 @@ QString Profile::avatarPath(const QString &ownerId, bool forceUnencrypted)
return Settings::getInstance().getSettingsDirPath() + "avatars/" + ownerId + ".png"; return Settings::getInstance().getSettingsDirPath() + "avatars/" + ownerId + ".png";
QByteArray idData = ownerId.toUtf8(); QByteArray idData = ownerId.toUtf8();
constexpr int hashSize = TOX_PUBLIC_KEY_SIZE; // As long as an unencrypted hash QByteArray pubkeyData = core->getSelfId().publicKey.toUtf8();
constexpr int hashSize = TOX_PUBLIC_KEY_SIZE;
static_assert(hashSize >= crypto_generichash_BYTES_MIN static_assert(hashSize >= crypto_generichash_BYTES_MIN
&& hashSize <= crypto_generichash_BYTES_MAX, "Hash size not supported by libsodium"); && hashSize <= crypto_generichash_BYTES_MAX, "Hash size not supported by libsodium");
static_assert(hashSize >= crypto_generichash_KEYBYTES_MIN
&& hashSize <= crypto_generichash_KEYBYTES_MAX, "Key size not supported by libsodium");
QByteArray hash(hashSize, 0); QByteArray hash(hashSize, 0);
crypto_generichash((uint8_t*)hash.data(), hashSize, (uint8_t*)idData.data(), idData.size(), nullptr, 0); crypto_generichash((uint8_t*)hash.data(), hashSize, (uint8_t*)idData.data(), idData.size(), (uint8_t*)pubkeyData.data(), pubkeyData.size());
return Settings::getInstance().getSettingsDirPath() + "avatars/" + hash.toHex().toUpper() + ".png"; return Settings::getInstance().getSettingsDirPath() + "avatars/" + hash.toHex().toUpper() + ".png";
} }
@ -363,6 +366,11 @@ QPixmap Profile::loadAvatar(const QString &ownerId)
} }
QByteArray Profile::loadAvatarData(const QString &ownerId) QByteArray Profile::loadAvatarData(const QString &ownerId)
{
return loadAvatarData(ownerId, password);
}
QByteArray Profile::loadAvatarData(const QString &ownerId, const QString &password)
{ {
QString path = avatarPath(ownerId); QString path = avatarPath(ownerId);
bool encrypted = !password.isEmpty(); bool encrypted = !password.isEmpty();
@ -554,7 +562,7 @@ void Profile::restartCore()
void Profile::setPassword(QString newPassword) void Profile::setPassword(QString newPassword)
{ {
QByteArray avatar = loadAvatarData(core->getSelfId().publicKey); QByteArray avatar = loadAvatarData(core->getSelfId().publicKey);
QString oldPassword = password;
password = newPassword; password = newPassword;
passkey = *core->createPasskey(password); passkey = *core->createPasskey(password);
saveToxSave(); saveToxSave();
@ -565,4 +573,12 @@ void Profile::setPassword(QString newPassword)
Nexus::getDesktopGUI()->reloadHistory(); Nexus::getDesktopGUI()->reloadHistory();
} }
saveAvatar(avatar, core->getSelfId().publicKey); saveAvatar(avatar, core->getSelfId().publicKey);
QVector<uint32_t> friendList = core->getFriendList();
QVectorIterator<uint32_t> i(friendList);
while (i.hasNext())
{
QString friendPublicKey = core->getFriendPublicKey(i.next());
saveAvatar(loadAvatarData(friendPublicKey,oldPassword),friendPublicKey);
}
} }

1
src/persistence/profile.h
View File

@ -64,6 +64,7 @@ public:
QPixmap loadAvatar(); ///< Get our avatar from cache QPixmap loadAvatar(); ///< Get our avatar from cache
QPixmap loadAvatar(const QString& ownerId); ///< Get a contact's avatar from cache QPixmap loadAvatar(const QString& ownerId); ///< Get a contact's avatar from cache
QByteArray loadAvatarData(const QString& ownerId); ///< Get a contact's avatar from cache QByteArray loadAvatarData(const QString& ownerId); ///< Get a contact's avatar from cache
QByteArray loadAvatarData(const QString& ownerId, const QString& password); ///< Get a contact's avatar from cache, with a specified profile password.
void saveAvatar(QByteArray pic, const QString& ownerId); ///< Save an avatar to cache void saveAvatar(QByteArray pic, const QString& ownerId); ///< Save an avatar to cache
QByteArray getAvatarHash(const QString& ownerId); ///< Get the tox hash of a cached avatar QByteArray getAvatarHash(const QString& ownerId); ///< Get the tox hash of a cached avatar
void removeAvatar(const QString& ownerId); ///< Removes a cached avatar void removeAvatar(const QString& ownerId); ///< Removes a cached avatar