Use a single AccountManager for android.

Gabriel Calero committed 8 years ago

Commit 0f08bd81 parent ce8bd1310 files · +114 −27Browse files

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

Unified · Split

 AndroidHelper::AndroidHelper() :
 _accountManager ()
 {
-    workerThread.start();
 }
 AndroidHelper::~AndroidHelper() {
     workerThread.wait();
 }
+void AndroidHelper::init() {
+    qDebug() << "[LOGIN] AndroidHelper::init";
+    workerThread.start();
+    _accountManager = DependencyManager::get<AccountManager>();
+    _accountManager->moveToThread(&workerThread);
+}
 QSharedPointer<AccountManager> AndroidHelper::getAccountManager() {
-    if (!_accountManager) {
+    assert(_accountManager);
-        _accountManager = QSharedPointer<AccountManager>(new AccountManager, &QObject::deleteLater);
-        _accountManager->setIsAgent(true);
-        _accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL());
-        _accountManager->moveToThread(&workerThread);
-    }
     return _accountManager;
 }
-void AndroidHelper::requestActivity(const QString &activityName) {
+void AndroidHelper::requestActivity(const QString &activityName, const bool backToScene) {
-    emit androidActivityRequested(activityName);
+    emit androidActivityRequested(activityName, backToScene);
 }
 void AndroidHelper::notifyLoadComplete() {
     emit hapticFeedbackRequested(feedbackConstant);
 }
+void AndroidHelper::showLoginDialog() {
+    emit androidActivityRequested("Login", true);
+}