From 6822287d67014839e979b8719e4f83ea4b104a05 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 31 Oct 2018 16:13:01 -0700
Subject: [PATCH] sending to tutorial if dismiss login

---
 .../resources/qml/LoginDialog/SignInBody.qml  |  6 ++---
 interface/src/Application.cpp                 | 25 +++----------------
 libraries/networking/src/AddressManager.cpp   |  1 -
 libraries/networking/src/AddressManager.h     |  1 -
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/interface/resources/qml/LoginDialog/SignInBody.qml b/interface/resources/qml/LoginDialog/SignInBody.qml
index 04d0e72c00..7425d18b52 100644
--- a/interface/resources/qml/LoginDialog/SignInBody.qml
+++ b/interface/resources/qml/LoginDialog/SignInBody.qml
@@ -90,8 +90,7 @@ Item {
             loginButtonAtSignIn.text = "Log In";
             loginButtonAtSignIn.color = hifi.buttons.black;
             emailField.placeholderText = "Username or Email";
-            // var savedUsername = Settings.getValue("wallet/savedUsername", "");
-            var savedUsername = "";
+            var savedUsername = Settings.getValue("wallet/savedUsername", "");
             emailField.text = savedUsername === "Unknown user" ? "" : savedUsername;
             emailField.anchors.top = loginContainer.top;
             emailField.anchors.topMargin = !root.isTablet ? 0.2 * root.height : 0.24 * root.height;
@@ -196,8 +195,7 @@ Item {
                 width: banner.width
                 height: signInBody.textFieldHeight
                 font.family: signInBody.fontFamily
-                // text: Settings.getValue("wallet/savedUsername", "");
-                text: "";
+                text: Settings.getValue("wallet/savedUsername", "");
                 anchors {
                     top: parent.top
                     left: parent.left
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 2108665e28..c9c3e85f57 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5237,27 +5237,10 @@ void Application::resumeAfterLoginDialogActionTaken() {
         }
     }
 
-    QVariant testProperty = property(hifi::properties::TEST);
-    qDebug() << testProperty;
-    if (testProperty.isValid()) {
-        const auto testScript = property(hifi::properties::TEST).toUrl();
-
-        // Set last parameter to exit interface when the test script finishes, if so requested
-        DependencyManager::get<ScriptEngines>()->loadScript(testScript, false, false, false, false, quitWhenFinished);
-
-        // This is done so we don't get a "connection time-out" message when we haven't passed in a URL.
-        if (arguments().contains("--url")) {
-            auto reply = SandboxUtils::getStatus();
-            connect(reply, &QNetworkReply::finished, this, [this, reply] {
-                handleSandboxStatus(reply);
-            });
-        }
-    } else {
-        PROFILE_RANGE(render, "GetSandboxStatus");
-        auto reply = SandboxUtils::getStatus();
-        connect(reply, &QNetworkReply::finished, this, [this, reply] {
-            handleSandboxStatus(reply);
-        });
+    auto accountManager = DependencyManager::get<AccountManager>();
+    auto addressManager = DependencyManager::get<AddressManager>();
+    if (!accountManager->isLoggedIn()) {
+        addressManager->goToEntry();
     }
 
     const auto& nodeList = DependencyManager::get<NodeList>();
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 137ce2ad4a..21f25fd0ca 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -32,7 +32,6 @@
 
 const QString DEFAULT_HIFI_ADDRESS = "file:///~/serverless/tutorial.json";
 const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json";
-const QString LOGIN_SCREEN_HIFI_ADDRESS = "file:///~/serverless/login.json";
 const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
 const QString SETTINGS_CURRENT_ADDRESS_KEY = "address";
 
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index 07c8e0f934..5318822cdc 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -24,7 +24,6 @@
 
 extern const QString DEFAULT_HIFI_ADDRESS;
 extern const QString REDIRECT_HIFI_ADDRESS;
-extern const QString LOGIN_SCREEN_HIFI_ADDRESS;
 
 const QString SANDBOX_HIFI_ADDRESS = "hifi://localhost";
 const QString INDEX_PATH = "/";