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 pull request #4394

Browse Source 
Yuri (1):
      fix(message size): Replaced TOX_MAX_*_LENGTH with API calls.
This commit is contained in:
sudden6 2017-05-14 12:53:41 +02:00
commit 50768abbab
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/core.cpp
View File

@ -582,7 +582,7 @@ QString Core::getFriendRequestErrorMessage(const ToxId& friendId, const QString&
"Error while sending friendship request"); "Error while sending friendship request");
} }
if (message.length() > TOX_MAX_FRIEND_REQUEST_LENGTH) { if (message.length() > static_cast<int>(tox_max_friend_request_length())) {
return tr("Your message is too long!", "Error while sending friendship request"); return tr("Your message is too long!", "Error while sending friendship request");
} }
@ -1100,7 +1100,7 @@ uint32_t Core::getGroupNumberPeers(int groupId) const
*/ */
QString Core::getGroupPeerName(int groupId, int peerId) const QString Core::getGroupPeerName(int groupId, int peerId) const
{ {
uint8_t nameArray[TOX_MAX_NAME_LENGTH]; uint8_t nameArray[tox_max_name_length()];
TOX_ERR_CONFERENCE_PEER_QUERY error; TOX_ERR_CONFERENCE_PEER_QUERY error;
size_t length = tox_conference_peer_get_name_size(tox, groupId, peerId, &error); size_t length = tox_conference_peer_get_name_size(tox, groupId, peerId, &error);
if (!parsePeerQueryError(error)) { if (!parsePeerQueryError(error)) {
@ -1161,7 +1161,8 @@ QStringList Core::getGroupPeerNames(int groupId) const
QStringList names; QStringList names;
for (uint32_t i = 0; i < nPeers; ++i) { for (uint32_t i = 0; i < nPeers; ++i) {
uint8_t name[TOX_MAX_NAME_LENGTH] = {0}; uint8_t name[tox_max_name_length()];
memset(name, 0, tox_max_name_length());
size_t length = tox_conference_peer_get_name_size(tox, groupId, i, &error); size_t length = tox_conference_peer_get_name_size(tox, groupId, i, &error);
bool ok = tox_conference_peer_get_name(tox, groupId, i, name, &error); bool ok = tox_conference_peer_get_name(tox, groupId, i, name, &error);
if (ok && parsePeerQueryError(error)) { if (ok && parsePeerQueryError(error)) {
@ -1410,7 +1411,7 @@ QString Core::getPeerName(const ToxPk& id) const
return name; return name;
} }
uint8_t* cname = new uint8_t[nameSize < TOX_MAX_NAME_LENGTH ? TOX_MAX_NAME_LENGTH : nameSize]; uint8_t* cname = new uint8_t[nameSize < tox_max_name_length() ? tox_max_name_length() : nameSize];
if (!tox_friend_get_name(tox, friendId, cname, nullptr)) { if (!tox_friend_get_name(tox, friendId, cname, nullptr)) {
qWarning() << "getPeerName: Can't get name of friend " + QString().setNum(friendId); qWarning() << "getPeerName: Can't get name of friend " + QString().setNum(friendId);
delete[] cname; delete[] cname;

4
src/widget/form/chatform.cpp
View File

@ -610,7 +610,7 @@ void ChatForm::dropEvent(QDropEvent* ev)
QFile file(info.absoluteFilePath()); QFile file(info.absoluteFilePath());
QString urlString = url.toString(); QString urlString = url.toString();
if (url.isValid() && !url.isLocalFile() && urlString.length() < TOX_MAX_MESSAGE_LENGTH) { if (url.isValid() && !url.isLocalFile() && urlString.length() < static_cast<int>(tox_max_message_length())) {
SendMessageStr(urlString); SendMessageStr(urlString);
continue; continue;
} }
@ -949,7 +949,7 @@ void ChatForm::SendMessageStr(QString msg)
msg.remove(0, ACTION_PREFIX.length()); msg.remove(0, ACTION_PREFIX.length());
} }
QStringList splittedMsg = Core::splitMessage(msg, TOX_MAX_MESSAGE_LENGTH); QStringList splittedMsg = Core::splitMessage(msg, tox_max_message_length());
QDateTime timestamp = QDateTime::currentDateTime(); QDateTime timestamp = QDateTime::currentDateTime();
for (const QString& part : splittedMsg) { for (const QString& part : splittedMsg) {

4
src/widget/form/profileform.cpp
View File

@ -57,8 +57,8 @@ ProfileForm::ProfileForm(QWidget* parent)
core = Core::getInstance(); core = Core::getInstance();
bodyUI->userNameLabel->setToolTip(tr("Tox user names cannot exceed %1 characters.") bodyUI->userNameLabel->setToolTip(tr("Tox user names cannot exceed %1 characters.")
.arg(TOX_MAX_NAME_LENGTH)); .arg(tox_max_name_length()));
bodyUI->userName->setMaxLength(TOX_MAX_NAME_LENGTH); bodyUI->userName->setMaxLength(tox_max_name_length());
// tox // tox
toxId = new ClickableTE(); toxId = new ClickableTE();

2
src/widget/friendwidget.cpp
View File

@ -432,7 +432,7 @@ void FriendWidget::mouseMoveEvent(QMouseEvent* ev)
void FriendWidget::setAlias(const QString& _alias) void FriendWidget::setAlias(const QString& _alias)
{ {
QString alias = _alias.left(128); // same as TOX_MAX_NAME_LENGTH QString alias = _alias.left(tox_max_name_length());
Friend* f = FriendList::findFriend(friendId); Friend* f = FriendList::findFriend(friendId);
f->setAlias(alias); f->setAlias(alias);
Settings::getInstance().setFriendAlias(f->getPublicKey(), alias); Settings::getInstance().setFriendAlias(f->getPublicKey(), alias);