From e0c109d6cab94e004c5de2ad0fc23421564e525b Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 24 Oct 2016 14:45:41 -0700 Subject: [PATCH] Simplify ConnectionMonitor to only rely on domainConnectionRefused instead of authRequired --- interface/src/ConnectionMonitor.cpp | 1 - libraries/networking/src/DomainHandler.cpp | 1 - libraries/networking/src/DomainHandler.h | 2 -- 3 files changed, 4 deletions(-) diff --git a/interface/src/ConnectionMonitor.cpp b/interface/src/ConnectionMonitor.cpp index 30e5b5e694..fcb1908994 100644 --- a/interface/src/ConnectionMonitor.cpp +++ b/interface/src/ConnectionMonitor.cpp @@ -29,7 +29,6 @@ void ConnectionMonitor::init() { connect(&domainHandler, &DomainHandler::resetting, this, &ConnectionMonitor::startTimer); connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, &ConnectionMonitor::startTimer); connect(&domainHandler, &DomainHandler::connectedToDomain, this, &ConnectionMonitor::stopTimer); - connect(&domainHandler, &DomainHandler::authRequired, this, &ConnectionMonitor::stopTimer); connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &ConnectionMonitor::stopTimer); _timer.setSingleShot(true); diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index a914fcdf40..eecc1515f5 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -425,7 +425,6 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointercheckAndSignalForAccessToken(); _hasCheckedForAccessToken = true; - emit authRequired(); } static const int CONNECTION_DENIALS_FOR_KEYPAIR_REGEN = 3; diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h index 240157d7da..7f89b47197 100644 --- a/libraries/networking/src/DomainHandler.h +++ b/libraries/networking/src/DomainHandler.h @@ -117,8 +117,6 @@ signals: void connectedToDomain(const QString& hostname); void disconnectedFromDomain(); - void authRequired(); - void iceSocketAndIDReceived(); void icePeerSocketsReceived();