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

fix(core): Track avatar offer file size to avoid cancelling transfers

Browse Source 
When ToxFile is constructed with a file size of 0, it cancels the transfer as
soon as the first chunk is received due to the received size being
larger than expected.
This commit is contained in:
Anthony Bilinski 2022-02-15 11:15:55 -08:00
parent 919cd6b210
commit 3ac37a5496
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/core.h
View File

@ -165,7 +165,7 @@ signals:
* @deprecated prefer signals using ToxPk * @deprecated prefer signals using ToxPk
*/ */
void fileAvatarOfferReceived(uint32_t friendId, uint32_t fileId, const QByteArray& avatarHash); void fileAvatarOfferReceived(uint32_t friendId, uint32_t fileId, const QByteArray& avatarHash, uint64_t filesize);
void friendMessageReceived(uint32_t friendId, const QString& message, bool isAction); void friendMessageReceived(uint32_t friendId, const QString& message, bool isAction);
void friendAdded(uint32_t friendId, const ToxPk& friendPk); void friendAdded(uint32_t friendId, const ToxPk& friendPk);

6
src/core/corefile.cpp
View File

@ -344,7 +344,7 @@ void CoreFile::onFileReceiveCallback(Tox* tox, uint32_t friendId, uint32_t fileI
tox_file_get_file_id(tox, friendId, fileId, avatarHash, nullptr); tox_file_get_file_id(tox, friendId, fileId, avatarHash, nullptr);
QByteArray avatarBytes{static_cast<const char*>(static_cast<const void*>(avatarHash)), QByteArray avatarBytes{static_cast<const char*>(static_cast<const void*>(avatarHash)),
TOX_HASH_LENGTH}; TOX_HASH_LENGTH};
emit core->fileAvatarOfferReceived(friendId, fileId, avatarBytes); emit core->fileAvatarOfferReceived(friendId, fileId, avatarBytes, filesize);
return; return;
} }
} else { } else {
@ -371,7 +371,7 @@ void CoreFile::onFileReceiveCallback(Tox* tox, uint32_t friendId, uint32_t fileI
} }
// TODO(sudden6): This whole method is a mess but needed to get stuff working for now // TODO(sudden6): This whole method is a mess but needed to get stuff working for now
void CoreFile::handleAvatarOffer(uint32_t friendId, uint32_t fileId, bool accept) void CoreFile::handleAvatarOffer(uint32_t friendId, uint32_t fileId, bool accept, uint64_t filesize)
{ {
if (!accept) { if (!accept) {
// If it's an avatar but we already have it cached, cancel // If it's an avatar but we already have it cached, cancel
@ -388,7 +388,7 @@ void CoreFile::handleAvatarOffer(uint32_t friendId, uint32_t fileId, bool accept
.arg(fileId); .arg(fileId);
tox_file_control(tox, friendId, fileId, TOX_FILE_CONTROL_RESUME, nullptr); tox_file_control(tox, friendId, fileId, TOX_FILE_CONTROL_RESUME, nullptr);
ToxFile file{fileId, friendId, "<avatar>", "", 0, ToxFile::RECEIVING}; ToxFile file{fileId, friendId, "<avatar>", "", filesize, ToxFile::RECEIVING};
file.fileKind = TOX_FILE_KIND_AVATAR; file.fileKind = TOX_FILE_KIND_AVATAR;
file.resumeFileId.resize(TOX_FILE_ID_LENGTH); file.resumeFileId.resize(TOX_FILE_ID_LENGTH);
tox_file_get_file_id(tox, friendId, fileId, reinterpret_cast<uint8_t*>(file.resumeFileId.data()), tox_file_get_file_id(tox, friendId, fileId, reinterpret_cast<uint8_t*>(file.resumeFileId.data()),

2
src/core/corefile.h
View File

@ -48,7 +48,7 @@ class CoreFile : public QObject
Q_OBJECT Q_OBJECT
public: public:
void handleAvatarOffer(uint32_t friendId, uint32_t fileId, bool accept); void handleAvatarOffer(uint32_t friendId, uint32_t fileId, bool accept, uint64_t filesize);
static CoreFilePtr makeCoreFile(Core* core, Tox* tox, CompatibleRecursiveMutex& coreLoopLock); static CoreFilePtr makeCoreFile(Core* core, Tox* tox, CompatibleRecursiveMutex& coreLoopLock);
void sendFile(uint32_t friendId, QString filename, QString filePath, void sendFile(uint32_t friendId, QString filename, QString filePath,

4
src/persistence/profile.cpp
View File

@ -472,11 +472,11 @@ void Profile::onSaveToxSave()
} }
// TODO(sudden6): handle this better maybe? // TODO(sudden6): handle this better maybe?
void Profile::onAvatarOfferReceived(uint32_t friendId, uint32_t fileId, const QByteArray& avatarHash) void Profile::onAvatarOfferReceived(uint32_t friendId, uint32_t fileId, const QByteArray& avatarHash, uint64_t filesize)
{ {
// accept if we don't have it already // accept if we don't have it already
const bool accept = getAvatarHash(core->getFriendPublicKey(friendId)) != avatarHash; const bool accept = getAvatarHash(core->getFriendPublicKey(friendId)) != avatarHash;
core->getCoreFile()->handleAvatarOffer(friendId, fileId, accept); core->getCoreFile()->handleAvatarOffer(friendId, fileId, accept, filesize);
} }
/** /**

2
src/persistence/profile.h
View File

@ -101,7 +101,7 @@ private slots:
void removeAvatar(const ToxPk& owner); void removeAvatar(const ToxPk& owner);
void onSaveToxSave(); void onSaveToxSave();
// TODO(sudden6): use ToxPk instead of friendId // TODO(sudden6): use ToxPk instead of friendId
void onAvatarOfferReceived(uint32_t friendId, uint32_t fileId, const QByteArray& avatarHash); void onAvatarOfferReceived(uint32_t friendId, uint32_t fileId, const QByteArray& avatarHash, uint64_t filesize);
private: private:
Profile(const QString& name, std::unique_ptr<ToxEncrypt> passkey, Paths& paths, Settings &settings_); Profile(const QString& name, std::unique_ptr<ToxEncrypt> passkey, Paths& paths, Settings &settings_);