From de5a0a714b84ce4348fcbcb9298ff95d5a806c88 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Mon, 10 Sep 2018 16:25:17 -0700
Subject: [PATCH 1/2] handle unable to connect to domain case

---
 interface/src/Application.h         | 2 +-
 interface/src/ConnectionMonitor.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/interface/src/Application.h b/interface/src/Application.h
index c82dae3b05..f1452080cb 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -346,6 +346,7 @@ public slots:
     bool importEntities(const QString& url);
     void updateThreadPoolCount() const;
     void updateSystemTabletMode();
+    void goToErrorDomainURL(QUrl errorDomainURL);
 
     Q_INVOKABLE void loadDialog();
     Q_INVOKABLE void loadScriptURLDialog() const;
@@ -474,7 +475,6 @@ private slots:
     void setSessionUUID(const QUuid& sessionUUID) const;
 
     void domainURLChanged(QUrl domainURL);
-    void goToErrorDomainURL(QUrl errorDomainURL);
     void updateWindowTitle() const;
     void nodeAdded(SharedNodePointer node) const;
     void nodeActivated(SharedNodePointer node);
diff --git a/interface/src/ConnectionMonitor.cpp b/interface/src/ConnectionMonitor.cpp
index 7d535d9eaf..8463539bac 100644
--- a/interface/src/ConnectionMonitor.cpp
+++ b/interface/src/ConnectionMonitor.cpp
@@ -11,6 +11,7 @@
 
 #include "ConnectionMonitor.h"
 
+#include "Application.h"
 #include "ui/DialogsManager.h"
 
 #include <DependencyManager.h>
@@ -21,6 +22,7 @@
 // should be longer to allow the application to initialize.
 static const int ON_INITIAL_LOAD_DISPLAY_AFTER_DISCONNECTED_FOR_X_MS = 10000;
 static const int DISPLAY_AFTER_DISCONNECTED_FOR_X_MS = 5000;
+static const QString ERROR_DOMAIN_URL =  "file:///~/serverless/redirect.json";
 
 void ConnectionMonitor::init() {
     // Connect to domain disconnected message
@@ -38,7 +40,7 @@ void ConnectionMonitor::init() {
 
     connect(&_timer, &QTimer::timeout, this, []() {
         qDebug() << "ConnectionMonitor: Showing connection failure window";
-        //DependencyManager::get<DialogsManager>()->setDomainConnectionFailureVisibility(true);
+        qApp->goToErrorDomainURL(ERROR_DOMAIN_URL);
     });
 }
 
@@ -48,5 +50,4 @@ void ConnectionMonitor::startTimer() {
 
 void ConnectionMonitor::stopTimer() {
     _timer.stop();
-    //DependencyManager::get<DialogsManager>()->setDomainConnectionFailureVisibility(false);
 }

From 2381d6bc027534dfab5fd560463c77fc0dac5f99 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Mon, 10 Sep 2018 17:07:49 -0700
Subject: [PATCH 2/2] using `REDIRECT_HIFI_ADDRESS`

recycling existing, defined variable for error redirection
---
 interface/src/ConnectionMonitor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/interface/src/ConnectionMonitor.cpp b/interface/src/ConnectionMonitor.cpp
index 8463539bac..6578abf285 100644
--- a/interface/src/ConnectionMonitor.cpp
+++ b/interface/src/ConnectionMonitor.cpp
@@ -16,6 +16,7 @@
 
 #include <DependencyManager.h>
 #include <DomainHandler.h>
+#include <AddressManager.h>
 #include <NodeList.h>
 
 // Because the connection monitor is created at startup, the time we wait on initial load
@@ -40,7 +41,7 @@ void ConnectionMonitor::init() {
 
     connect(&_timer, &QTimer::timeout, this, []() {
         qDebug() << "ConnectionMonitor: Showing connection failure window";
-        qApp->goToErrorDomainURL(ERROR_DOMAIN_URL);
+        qApp->goToErrorDomainURL(REDIRECT_HIFI_ADDRESS);
     });
 }