diff options
| -rw-r--r-- | lib/connection.cpp | 8 | ||||
| -rw-r--r-- | lib/jobs/turnserverjob.cpp | 58 | ||||
| -rw-r--r-- | lib/jobs/turnserverjob.h | 41 |
3 files changed, 4 insertions, 103 deletions
diff --git a/lib/connection.cpp b/lib/connection.cpp index 853b2a8a..05dec7f9 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -34,7 +34,7 @@ #include "jobs/syncjob.h" #include "jobs/mediathumbnailjob.h" #include "jobs/downloadfilejob.h" -#include "jobs/turnserverjob.h" +#include "csapi/voip.h" #include <QtNetwork/QDnsLookup> #include <QtCore/QFile> @@ -1193,9 +1193,9 @@ void Connection::setCacheState(bool newValue) void Connection::getTurnServers() { - auto job = callApi<TurnServerJob>(); - connect( job, &TurnServerJob::success, [=] { - emit turnServersChanged(job->toJson()); + auto job = callApi<GetTurnServerJob>(); + connect( job, &GetTurnServerJob::success, [=] { + emit turnServersChanged(job->data()); }); } diff --git a/lib/jobs/turnserverjob.cpp b/lib/jobs/turnserverjob.cpp deleted file mode 100644 index fffb7ee9..00000000 --- a/lib/jobs/turnserverjob.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2017 Marius Gripsgard <marius@ubports.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "turnserverjob.h" -#include "util.h" - -using namespace QMatrixClient; - -class TurnServerJob::Private -{ - public: - QJsonObject _turnObject; -}; - -TurnServerJob::TurnServerJob() - : BaseJob(HttpVerb::Get, "TurnServerJob", - QStringLiteral("/_matrix/client/r0/voip/turnServer")) - , d(new Private) -{ -} - -TurnServerJob::~TurnServerJob() -{ - delete d; -} - -QJsonObject TurnServerJob::toJson() const -{ - return d->_turnObject; -} - -BaseJob::Status TurnServerJob::parseJson(const QJsonDocument& data) -{ - QJsonObject json = data.object(); - - if( json.contains("uris") ) - { - d->_turnObject = json; - return Success; - } - - return { UserDefinedError, "turnServer object does not include uris" }; -} diff --git a/lib/jobs/turnserverjob.h b/lib/jobs/turnserverjob.h deleted file mode 100644 index adbef3ba..00000000 --- a/lib/jobs/turnserverjob.h +++ /dev/null @@ -1,41 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2017 Marius Gripsgard <marius@ubports.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#include "basejob.h" -#include <QtCore/QJsonObject> - -namespace QMatrixClient -{ - class TurnServerJob: public BaseJob - { - public: - TurnServerJob(); - virtual ~TurnServerJob(); - - QJsonObject toJson() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - Private* d; - }; -} // namespace QMatrixClient |