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

Add Toxme support in Toxuri handle

Browse Source
This commit is contained in:
Diadlo 2015-12-31 14:35:22 +03:00 committed by tux3
parent 7179ed4722
commit bb9b1a4e32
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/net/toxuri.cpp
View File

@ -20,6 +20,7 @@
#include "src/net/toxuri.h" #include "src/net/toxuri.h"
#include "src/net/toxdns.h" #include "src/net/toxdns.h"
#include "src/net/toxme.h"
#include "src/widget/tool/friendrequestdialog.h" #include "src/widget/tool/friendrequestdialog.h"
#include "src/nexus.h" #include "src/nexus.h"
#include "src/core/core.h" #include "src/core/core.h"
@ -62,20 +63,22 @@ bool handleToxURI(const QString &toxURI)
else else
toxaddr = toxURI.mid(4); toxaddr = toxURI.mid(4);
QString toxid = ToxDNS::resolveToxAddress(toxaddr, true).toString(); QString toxId = Toxme::lookup(toxaddr).toString();
if (toxId.isEmpty())
if (toxid.isEmpty()) {
toxId = ToxDNS::resolveToxAddress(toxaddr, true).toString();
if (toxId.isEmpty())
{ {
QMessageBox::warning(0, "qTox", toxaddr + " is not a valid Tox address."); QMessageBox::warning(0, "qTox", toxaddr + " is not a valid Tox address.");
return false;
} }
else }
{
ToxURIDialog dialog(0, toxaddr, QObject::tr("%1 here! Tox me maybe?", ToxURIDialog dialog(0, toxaddr, QObject::tr("%1 here! Tox me maybe?",
"Default message in Tox URI friend requests. Write something appropriate!") "Default message in Tox URI friend requests. Write something appropriate!")
.arg(Nexus::getCore()->getUsername())); .arg(Nexus::getCore()->getUsername()));
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
Core::getInstance()->requestFriendship(toxid, dialog.getRequestMessage()); Core::getInstance()->requestFriendship(toxId, dialog.getRequestMessage());
}
return true; return true;
} }