From 93ff34baaa03d1b374f460ab8587071c05b408e2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 12 Sep 2014 11:21:38 -0700 Subject: [PATCH] force address bar lookup through handleLookupString --- interface/src/Application.cpp | 7 ++++--- libraries/networking/src/AddressManager.h | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 15aacc7f8d..89c3dcebd5 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -410,8 +410,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : this, &Application::changeDomainHostname); // when -url in command line, teleport to location - qDebug() << getCmdOption(argc, constArgv, "-url"); - addressManager.handleUrl(QUrl(getCmdOption(argc, constArgv, "-url"))); + addressManager.handleLookupString(getCmdOption(argc, constArgv, "-url")); // call the OAuthWebviewHandler static getter so that its instance lives in our thread OAuthWebViewHandler::getInstance(); @@ -3923,7 +3922,9 @@ void Application::uploadAttachment() { } void Application::openUrl(const QUrl& url) { - if (!AddressManager::getInstance().handleUrl(url)) { + if (url.scheme() == HIFI_URL_SCHEME) { + AddressManager::getInstance().handleLookupString(url.toString()); + } else { // address manager did not handle - ask QDesktopServices to handle QDesktopServices::openUrl(url); } diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 1afdf00e7d..dd5e5ad0a3 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -31,7 +31,6 @@ public: static QString pathForPositionAndOrientation(const glm::vec3& position, bool hasOrientation = false, const glm::quat& orientation = EMPTY_QUAT); - bool handleUrl(const QUrl& lookupUrl); void handleLookupString(const QString& lookupString); void attemptPlaceNameLookup(const QString& lookupString); public slots: @@ -45,6 +44,8 @@ signals: private: const JSONCallbackParameters& apiCallbackParameters(); + bool handleUrl(const QUrl& lookupUrl); + bool handleNetworkAddress(const QString& lookupString); bool handleRelativeViewpoint(const QString& pathSubsection); bool handleUsername(const QString& lookupString);