Showing the changes to interface/src/AndroidHelper.cpp (1 of 129 files). Show all
Unified · Split
| @@ -10,7 +10,6 @@ · 9 unmodified lines | ||
| 10 | 10 | // |
| 11 | 11 | #include "AndroidHelper.h" |
| 12 | 12 | #include <QDebug> |
| 13 | −#include <AccountManager.h> | |
| 14 | 13 | #include "Application.h" |
| 15 | 14 | |
| 16 | 15 | #if defined(qApp) |
| @@ -22,25 +21,6 @@ AndroidHelper::AndroidHelper() { · 5 unmodified lines | ||
| 22 | 21 | } |
| 23 | 22 | |
| 24 | 23 | AndroidHelper::~AndroidHelper() { |
| 25 | − workerThread.quit(); | |
| 26 | − workerThread.wait(); | |
| 27 | −} | |
| 28 | − | |
| 29 | −void AndroidHelper::init() { | |
| 30 | − workerThread.start(); | |
| 31 | − _accountManager = QSharedPointer<AccountManager>(new AccountManager, &QObject::deleteLater); | |
| 32 | − _accountManager->setIsAgent(true); | |
| 33 | − _accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL()); | |
| 34 | − _accountManager->setSessionID(DependencyManager::get<AccountManager>()->getSessionID()); | |
| 35 | − connect(_accountManager.data(), &AccountManager::loginComplete, [](const QUrl& authURL) { | |
| 36 | − DependencyManager::get<AccountManager>()->setAccountInfo(AndroidHelper::instance().getAccountManager()->getAccountInfo()); | |
| 37 | − DependencyManager::get<AccountManager>()->setAuthURL(authURL); | |
| 38 | − }); | |
| 39 | − | |
| 40 | − connect(_accountManager.data(), &AccountManager::logoutComplete, [] () { | |
| 41 | − DependencyManager::get<AccountManager>()->logout(); | |
| 42 | − }); | |
| 43 | − _accountManager->moveToThread(&workerThread); | |
| 44 | 24 | } |
| 45 | 25 | |
| 46 | 26 | void AndroidHelper::requestActivity(const QString &activityName, const bool backToScene, QList<QString> args) { |