Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements

interface/src/Application.cpp

@@ -244,7 +244,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
     connect(nodeList, SIGNAL(nodeAdded(SharedNodePointer)), &_voxels, SLOT(nodeAdded(SharedNodePointer)));
     connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_voxels, SLOT(nodeKilled(SharedNodePointer)));
-    connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_octreeProcessor, SLOT(nodeKilled(SharedNodePointer)));
     connect(nodeList, &NodeList::uuidChanged, this, &Application::updateWindowTitle);
     connect(nodeList, SIGNAL(uuidChanged(const QUuid&)), _myAvatar, SLOT(setSessionUUID(const QUuid&)));
     connect(nodeList, &NodeList::limitOfSilentDomainCheckInsReached, nodeList, &NodeList::reset);
@@ -3249,6 +3248,11 @@ void Application::nodeAdded(SharedNodePointer node) {
 }
 
 void Application::nodeKilled(SharedNodePointer node) {
+
+    // this is here because connecting NodeList::nodeKilled to OctreePacketProcessor::nodeKilled doesn't work:
+    // OctreePacketProcessor::nodeKilled is not called when NodeList::nodeKilled is emitted for some reason.
+    _octreeProcessor.nodeKilled(node);
+
     if (node->getType() == NodeType::VoxelServer) {
         QUuid nodeUUID = node->getUUID();
         // see if this is the first we've heard of this node...

interface/src/Menu.cpp

@@ -103,6 +103,7 @@ Menu::Menu() :
     _fastFPSAverage(ONE_SECOND_OF_FRAMES),
     _loginAction(NULL),
     _preferencesDialog(NULL),
+    _loginDialog(NULL),
     _snapshotsLocation()
 {
     Application *appInstance = Application::getInstance();
@@ -913,9 +914,11 @@ void sendFakeEnterEvent() {
 const float DIALOG_RATIO_OF_WINDOW = 0.30f;
 
 void Menu::loginForCurrentDomain() {
-    LoginDialog* loginDialog = new LoginDialog(Application::getInstance()->getWindow());
-    loginDialog->show();
-    loginDialog->resizeAndPosition(false);
+    if (!_loginDialog) {
+        _loginDialog = new LoginDialog(Application::getInstance()->getWindow());
+        _loginDialog->show();
+        _loginDialog->resizeAndPosition(false);
+    }
 }
 
 void Menu::editPreferences() {

interface/src/Menu.h

@@ -27,6 +27,7 @@
 #include "ui/PreferencesDialog.h"
 #include "ui/ChatWindow.h"
 #include "ui/JSConsole.h"
+#include "ui/LoginDialog.h"
 #include "ui/ScriptEditorWindow.h"
 
 const float ADJUST_LOD_DOWN_FPS = 40.0;
@@ -270,6 +271,7 @@ private:
     QPointer<PreferencesDialog> _preferencesDialog;
     QPointer<AttachmentsDialog> _attachmentsDialog;
     QPointer<AnimationsDialog> _animationsDialog;
+    QPointer<LoginDialog> _loginDialog;
     QAction* _chatAction;
     QString _snapshotsLocation;
 };

interface/src/ui/OAuthWebViewHandler.cpp

@@ -103,8 +103,9 @@ void OAuthWebViewHandler::displayWebviewForAuthorizationURL(const QUrl& authoriz
             codedAuthorizationURL.setQuery(authQuery);
         }
         
+        connect(_activeWebView.data(), &QWebView::urlChanged, this, &OAuthWebViewHandler::handleURLChanged);
+        
         _activeWebView->load(codedAuthorizationURL);
-        _activeWebView->show();
         
         connect(_activeWebView->page()->networkAccessManager(), &QNetworkAccessManager::sslErrors,
                 this, &OAuthWebViewHandler::handleSSLErrors);
@@ -137,3 +138,17 @@ void OAuthWebViewHandler::handleLoadFinished(bool success) {
 void OAuthWebViewHandler::handleWebViewDestroyed(QObject* destroyedObject) {
     _webViewRedisplayTimer.restart();
 }
+
+void OAuthWebViewHandler::handleURLChanged(const QUrl& url) {
+    // check if this is the authorization screen - if it is then we need to show the OAuthWebViewHandler
+    const QString ACCESS_TOKEN_URL_REGEX_STRING = "redirect_uri=[\\w:\\/\\.]+&access_token=";
+    QRegExp accessTokenRegex(ACCESS_TOKEN_URL_REGEX_STRING);
+    
+    if (accessTokenRegex.indexIn(url.toString()) != -1) {
+        _activeWebView->show();
+    } else if (url.toString() == DEFAULT_NODE_AUTH_URL.toString() + "/login") {
+        // this is a login request - we're going to close the webview and signal the AccountManager that we need a login
+        _activeWebView->close();
+        AccountManager::getInstance().checkAndSignalForAccessToken();        
+    }
+}

interface/src/ui/OAuthWebViewHandler.h

@@ -32,6 +32,7 @@ private slots:
     void handleSSLErrors(QNetworkReply* networkReply, const QList<QSslError>& errorList);
     void handleLoadFinished(bool success);
     void handleWebViewDestroyed(QObject* destroyedObject);
+    void handleURLChanged(const QUrl& url);
 private:
     QPointer<QWebView> _activeWebView;
     QElapsedTimer _webViewRedisplayTimer;

libraries/networking/src/ReceivedPacketProcessor.cpp

@@ -50,6 +50,8 @@ bool ReceivedPacketProcessor::process() {
     return isStillRunning();  // keep running till they terminate us
 }
 
-void ReceivedPacketProcessor::killNode(const SharedNodePointer& node) {
+void ReceivedPacketProcessor::nodeKilled(SharedNodePointer node) {
+    lock();
     _nodePacketCounts.remove(node->getUUID());
+    unlock();
 }

libraries/networking/src/ReceivedPacketProcessor.h

@@ -42,7 +42,7 @@ public:
     int packetsToProcessCount() const { return _packets.size(); }
 
 public slots:
-    void killNode(const SharedNodePointer& node);
+    void nodeKilled(SharedNodePointer node);
 
 protected:
     /// Callback for processing of recieved packets. Implement this to process the incoming packets.