From 3fe3f674d0875dfa801995e7b0caea6398784459 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Wed, 12 Sep 2018 15:45:06 -0700
Subject: [PATCH] adding fix for getting DomainHandler into error state

---
 libraries/networking/src/DomainHandler.cpp | 15 ++++++++++-----
 libraries/networking/src/DomainHandler.h   |  5 +++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index 59e3de922f..a432b41a0d 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -55,6 +55,9 @@ DomainHandler::DomainHandler(QObject* parent) :
 
     // stop the refresh timer if we connect to a domain
     connect(this, &DomainHandler::connectedToDomain, &_apiRefreshTimer, &QTimer::stop);
+
+    // stop the refresh timer if we connect to a domain
+    connect(this, &DomainHandler::redirectToErrorDomainURL, &_apiRefreshTimer, &QTimer::stop);
 }
 
 void DomainHandler::disconnect() {
@@ -99,7 +102,6 @@ void DomainHandler::softReset() {
 
     clearSettings();
 
-    _isInErrorState = false;
     _connectionDenialsSinceKeypairRegen = 0;
     _checkInPacketsSinceLastReply = 0;
 
@@ -107,11 +109,14 @@ void DomainHandler::softReset() {
     QMetaObject::invokeMethod(&_settingsTimer, "stop");
 
     // restart the API refresh timer in case we fail to connect and need to refresh information
-    QMetaObject::invokeMethod(&_apiRefreshTimer, "start");
+    if (!_isInErrorState)
+        QMetaObject::invokeMethod(&_apiRefreshTimer, "start");
+    _isInErrorState = false;
 }
 
 void DomainHandler::hardReset() {
-    emit resetting();
+    if (!_isInErrorState)
+        emit resetting();
 
     softReset();
 
@@ -338,6 +343,7 @@ void DomainHandler::loadedErrorDomain(std::map<QString, QString> namedPaths) {
 void DomainHandler::setRedirectErrorState(QUrl errorUrl, int reasonCode) {
     _errorDomainURL = errorUrl;
     _lastDomainConnectionError = reasonCode;
+    _isInErrorState = true;
     emit redirectToErrorDomainURL(_errorDomainURL);
 }
 
@@ -480,9 +486,8 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer<Rec
         emit domainConnectionRefused(reasonMessage, (int)reasonCode, extraInfo);
 #else
         if (reasonCode == ConnectionRefusedReason::ProtocolMismatch || reasonCode == ConnectionRefusedReason::NotAuthorized) {
-            _isInErrorState = true;
             // ingest the error - this is a "hard" connection refusal.
-            emit redirectToErrorDomainURL(_errorDomainURL);
+            setRedirectErrorState(_errorDomainURL, (int)reasonCode);
         } else {
             emit domainConnectionRefused(reasonMessage, (int)reasonCode, extraInfo);
         }
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index ab20936f43..6381dbb546 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -87,8 +87,6 @@ public:
     void connectedToServerless(std::map<QString, QString> namedPaths);
 
     void loadedErrorDomain(std::map<QString, QString> namedPaths);
-    // sets domain handler in error state.
-    void setRedirectErrorState(QUrl errorUrl, int reasonCode);
 
     QString getViewPointFromNamedPath(QString namedPath);
 
@@ -172,6 +170,9 @@ public slots:
     void processICEResponsePacket(QSharedPointer<ReceivedMessage> icePacket);
     void processDomainServerConnectionDeniedPacket(QSharedPointer<ReceivedMessage> message);
 
+    // sets domain handler in error state.
+    void setRedirectErrorState(QUrl errorUrl, int reasonCode);
+
 private slots:
     void completedHostnameLookup(const QHostInfo& hostInfo);
     void completedIceServerHostnameLookup();