mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Add Toxme support in Toxuri handle
This commit is contained in:
parent
7179ed4722
commit
bb9b1a4e32
|
@ -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())
|
||||||
|
{
|
||||||
|
toxId = ToxDNS::resolveToxAddress(toxaddr, true).toString();
|
||||||
|
if (toxId.isEmpty())
|
||||||
|
{
|
||||||
|
QMessageBox::warning(0, "qTox", toxaddr + " is not a valid Tox address.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (toxid.isEmpty())
|
ToxURIDialog dialog(0, toxaddr, QObject::tr("%1 here! Tox me maybe?",
|
||||||
{
|
"Default message in Tox URI friend requests. Write something appropriate!")
|
||||||
QMessageBox::warning(0, "qTox", toxaddr + " is not a valid Tox address.");
|
.arg(Nexus::getCore()->getUsername()));
|
||||||
}
|
if (dialog.exec() == QDialog::Accepted)
|
||||||
else
|
Core::getInstance()->requestFriendship(toxId, dialog.getRequestMessage());
|
||||||
{
|
|
||||||
ToxURIDialog dialog(0, toxaddr, QObject::tr("%1 here! Tox me maybe?",
|
|
||||||
"Default message in Tox URI friend requests. Write something appropriate!")
|
|
||||||
.arg(Nexus::getCore()->getUsername()));
|
|
||||||
if (dialog.exec() == QDialog::Accepted)
|
|
||||||
Core::getInstance()->requestFriendship(toxid, dialog.getRequestMessage());
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user