Showing the changes to interface/src/AndroidHelper.cpp (1 of 205 files). Show all
Unified · Split
| @@ -10,10 +10,9 @@ · 9 unmodified lines | ||
| 10 | 10 | // |
| 11 | 11 | #include "AndroidHelper.h" |
| 12 | 12 | #include <QDebug> |
| 13 | +#include <AccountManager.h> | |
| 13 | 14 | |
| 14 | −AndroidHelper::AndroidHelper() : | |
| 15 | −_accountManager () | |
| 16 | −{ | |
| 15 | +AndroidHelper::AndroidHelper() { | |
| 17 | 16 | } |
| 18 | 17 | |
| 19 | 18 | AndroidHelper::~AndroidHelper() { |
| @@ -27,24 +26,17 @@ void AndroidHelper::init() { · 7 unmodified lines | ||
| 27 | 26 | _accountManager->setIsAgent(true); |
| 28 | 27 | _accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL()); |
| 29 | 28 | _accountManager->setSessionID(DependencyManager::get<AccountManager>()->getSessionID()); |
| 30 | − | |
| 31 | 29 | connect(_accountManager.data(), &AccountManager::loginComplete, [](const QUrl& authURL) { |
| 32 | − DependencyManager::get<AccountManager>()->setAccountInfo(AndroidHelper::instance().getAccountManager()->getAccountInfo()); | |
| 33 | − DependencyManager::get<AccountManager>()->setAuthURL(authURL); | |
| 30 | + DependencyManager::get<AccountManager>()->setAccountInfo(AndroidHelper::instance().getAccountManager()->getAccountInfo()); | |
| 31 | + DependencyManager::get<AccountManager>()->setAuthURL(authURL); | |
| 34 | 32 | }); |
| 35 | 33 | |
| 36 | 34 | connect(_accountManager.data(), &AccountManager::logoutComplete, [] () { |
| 37 | − DependencyManager::get<AccountManager>()->logout(); | |
| 35 | + DependencyManager::get<AccountManager>()->logout(); | |
| 38 | 36 | }); |
| 39 | − | |
| 40 | 37 | _accountManager->moveToThread(&workerThread); |
| 41 | 38 | } |
| 42 | 39 | |
| 43 | −QSharedPointer<AccountManager> AndroidHelper::getAccountManager() { | |
| 44 | − Q_ASSERT(_accountManager); | |
| 45 | − return _accountManager; | |
| 46 | −} | |
| 47 | − | |
| 48 | 40 | void AndroidHelper::requestActivity(const QString &activityName, const bool backToScene) { |
| 49 | 41 | emit androidActivityRequested(activityName, backToScene); |
| 50 | 42 | } |
| @@ -53,10 +45,6 @@ void AndroidHelper::notifyLoadComplete() { · 2 unmodified lines | ||
| 53 | 45 | emit qtAppLoadComplete(); |
| 54 | 46 | } |
| 55 | 47 | |
| 56 | −void AndroidHelper::notifyLoginComplete(bool success) { | |
| 57 | − emit loginComplete(success); | |
| 58 | −} | |
| 59 | − | |
| 60 | 48 | void AndroidHelper::performHapticFeedback(const QString& feedbackConstant) { |
| 61 | 49 | emit hapticFeedbackRequested(feedbackConstant); |
| 62 | 50 | } |