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

calculate tox id length from definition in tox.h instead of setting it manually

Browse Source
This commit is contained in:
marcel 2014-07-06 02:29:57 +02:00
parent a7b243fe14
commit 4372fea9ea
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
widget/form/addfriendform.cpp
View File

@ -2,8 +2,9 @@
#include <QFont> #include <QFont>
#include <QMessageBox> #include <QMessageBox>
#include <tox/tox.h>
#define TOX_ID_SIZE 76 #define TOX_ID_LENGTH 2*TOX_FRIEND_ADDRESS_SIZE
AddFriendForm::AddFriendForm() : dns(this) AddFriendForm::AddFriendForm() : dns(this)
{ {
@ -50,7 +51,7 @@ void AddFriendForm::show(Ui::Widget &ui)
bool AddFriendForm::isToxId(const QString &value) const bool AddFriendForm::isToxId(const QString &value) const
{ {
const QRegularExpression hexRegExp("^[A-Fa-f0-9]+$"); const QRegularExpression hexRegExp("^[A-Fa-f0-9]+$");
return value.length() == TOX_ID_SIZE && value.contains(hexRegExp); return value.length() == TOX_ID_LENGTH && value.contains(hexRegExp);
} }
void AddFriendForm::showWarning(const QString &message) const void AddFriendForm::showWarning(const QString &message) const
@ -117,12 +118,12 @@ void AddFriendForm::handleDnsLookup()
} }
idx += idKeyWord.length(); idx += idKeyWord.length();
if (entry.length() < idx + static_cast<int>(TOX_ID_SIZE)) { if (entry.length() < idx + static_cast<int>(TOX_ID_LENGTH)) {
showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS")); showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS"));
return; return;
} }
const QString friendAdress = entry.mid(idx, TOX_ID_SIZE); const QString friendAdress = entry.mid(idx, TOX_ID_LENGTH);
if (!isToxId(friendAdress)) { if (!isToxId(friendAdress)) {
showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS")); showWarning(tr("The DNS lookup does not contain a valid Tox ID", "Error with the DNS"));
return; return;