History

Merge remote-tracking branch 'upstream/master' into android_new_login

Gabriel Calero committed 8 years ago

Commit 5afc9c62 parents 4a3001b aca261a205 files · +2739 −1303Browse files

Showing the changes to interface/src/AndroidHelper.cpp (1 of 205 files). Show all

Unified · Split

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