Showing the changes to interface/src/Application.cpp (1 of 33 files). Show all
Unified · Split
| @@ -81,9 +81,10 @@ · 80 unmodified lines | ||
| 81 | 81 | #include "scripting/LocationScriptingInterface.h" |
| 82 | 82 | |
| 83 | 83 | #include "ui/InfoView.h" |
| 84 | +#include "ui/OAuthWebViewHandler.h" | |
| 84 | 85 | #include "ui/Snapshot.h" |
| 85 | −#include "ui/TextRenderer.h" | |
| 86 | 86 | #include "ui/Stats.h" |
| 87 | +#include "ui/TextRenderer.h" | |
| 87 | 88 | |
| 88 | 89 | using namespace std; |
| 89 | 90 | |
| @@ -361,12 +362,17 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 271 unmodified lines | ||
| 361 | 362 | QMutexLocker locker(&_settingsMutex); |
| 362 | 363 | _previousScriptLocation = _settings->value("LastScriptLocation", QVariant("")).toString(); |
| 363 | 364 | } |
| 364 | − | |
| 365 | + | |
| 365 | 366 | connect(_window, &MainWindow::windowGeometryChanged, |
| 366 | 367 | _runningScriptsWidget, &RunningScriptsWidget::setBoundary); |
| 367 | − | |
| 368 | − //When -url in command line, teleport to location | |
| 369 | − urlGoTo(argc, constArgv); | |
| 368 | + | |
| 369 | + //When -url in command line, teleport to location | |
| 370 | + urlGoTo(argc, constArgv); | |
| 371 | + | |
| 372 | + // call the OAuthWebviewHandler static getter so that its instance lives in our thread | |
| 373 | + OAuthWebViewHandler::getInstance(); | |
| 374 | + // make sure the High Fidelity root CA is in our list of trusted certs | |
| 375 | + OAuthWebViewHandler::addHighFidelityRootCAToSSLConfig(); | |
| 370 | 376 | } |
| 371 | 377 | |
| 372 | 378 | Application::~Application() { |
| @@ -3089,7 +3095,7 @@ void Application::updateWindowTitle(){ · 2716 unmodified lines | ||
| 3089 | 3095 | QString buildVersion = " (build " + applicationVersion() + ")"; |
| 3090 | 3096 | NodeList* nodeList = NodeList::getInstance(); |
| 3091 | 3097 | |
| 3092 | − QString username = AccountManager::getInstance().getUsername(); | |
| 3098 | + QString username = AccountManager::getInstance().getAccountInfo().getUsername(); | |
| 3093 | 3099 | QString title = QString() + (!username.isEmpty() ? username + " " : QString()) + nodeList->getSessionUUID().toString() |
| 3094 | 3100 | + " @ " + nodeList->getDomainHandler().getHostname() + buildVersion; |
| 3095 | 3101 | qDebug("Application title set to: %s", title.toStdString().c_str()); |
| @@ -3115,6 +3121,9 @@ void Application::domainChanged(const QString& domainHostname) { · 19 unmodified lines | ||
| 3115 | 3121 | |
| 3116 | 3122 | // reset the voxels renderer |
| 3117 | 3123 | _voxels.killLocalVoxels(); |
| 3124 | + | |
| 3125 | + // reset the auth URL for OAuth web view handler | |
| 3126 | + OAuthWebViewHandler::getInstance().clearLastAuthorizationURL(); | |
| 3118 | 3127 | } |
| 3119 | 3128 | |
| 3120 | 3129 | void Application::connectedToDomain(const QString& hostname) { |