From a032ac66b191f32b288e3a67d857e9aac8473482 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Sat, 22 Aug 2020 20:03:57 -0400 Subject: [PATCH] Update AddressManager links to NetworkingConstants. --- libraries/networking/src/AddressManager.cpp | 9 +++++---- libraries/networking/src/AddressManager.h | 4 ++-- libraries/networking/src/NetworkingConstants.h | 5 ++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 5f08f19d2b..a46b779546 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -27,16 +27,17 @@ #include "NodeList.h" #include "NetworkLogging.h" +#include "NetworkingConstants.h" #include "UserActivityLogger.h" #include "udt/PacketHeaders.h" -const QString DEFAULT_HIFI_ADDRESS = "file:///~/serverless/tutorial.json"; -const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json"; -const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json"; +const QString DEFAULT_VIRCADIA_ADDRESS = NetworkingConstants::DEFAULT_VIRCADIA_ADDRESS; +const QString DEFAULT_HOME_ADDRESS = NetworkingConstants::DEFAULT_HOME_ADDRESS; +const QString REDIRECT_HIFI_ADDRESS = NetworkingConstants::REDIRECT_HIFI_ADDRESS; const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager"; const QString SETTINGS_CURRENT_ADDRESS_KEY = "address"; -Setting::Handle currentAddressHandle(QStringList() << ADDRESS_MANAGER_SETTINGS_GROUP << "address", DEFAULT_HIFI_ADDRESS); +Setting::Handle currentAddressHandle(QStringList() << ADDRESS_MANAGER_SETTINGS_GROUP << "address", DEFAULT_VIRCADIA_ADDRESS); bool AddressManager::isConnected() { return DependencyManager::get()->getDomainHandler().isConnected(); diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 148c4f8580..fd173bfa9a 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -22,7 +22,7 @@ #include "AccountManager.h" -extern const QString DEFAULT_HIFI_ADDRESS; +extern const QString DEFAULT_VIRCADIA_ADDRESS; extern const QString REDIRECT_HIFI_ADDRESS; extern const QString DEFAULT_HOME_ADDRESS; @@ -300,7 +300,7 @@ public slots: * @param {location.LookupTrigger} trigger=StartupFromSettings - The reason for the function call. Helps ensure that user's * location history is correctly maintained. */ - void goToEntry(LookupTrigger trigger = LookupTrigger::StartupFromSettings) { handleUrl(DEFAULT_HIFI_ADDRESS, trigger); } + void goToEntry(LookupTrigger trigger = LookupTrigger::StartupFromSettings) { handleUrl(DEFAULT_VIRCADIA_ADDRESS, trigger); } /**jsdoc * Takes you to the specified user's location. diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index edc1c1a1ef..c20753f8b7 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -56,7 +56,10 @@ namespace NetworkingConstants { const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" }; const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.vircadia.dev/release-notes.html" }; const QUrl HELP_BUG_REPORT_URL{ "https://github.com/kasenvr/project-athena/issues" }; - + + const QString DEFAULT_VIRCADIA_ADDRESS = "file:///~/serverless/tutorial.json"; + const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json"; + const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json"; } const QString HIFI_URL_SCHEME_ABOUT = "about";