diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp index 3e58e7699c..7ef5bb7786 100644 --- a/interface/src/ui/LoginDialog.cpp +++ b/interface/src/ui/LoginDialog.cpp @@ -46,10 +46,6 @@ LoginDialog::LoginDialog(QQuickItem *parent) : OffscreenQmlDialog(parent) { this, &LoginDialog::handleLoginFailed); connect(qApp, &Application::loginDialogFocusEnabled, this, &LoginDialog::focusEnabled); connect(qApp, &Application::loginDialogFocusDisabled, this, &LoginDialog::focusDisabled); - if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) { - connect(oculusPlatformPlugin.get(), &OculusPlatformPlugin::loginReady, this, &LoginDialog::onLoginThroughOculusReady); - connect(oculusPlatformPlugin.get(), &OculusPlatformPlugin::linkAccountReady, this, &LoginDialog::onLinkOculusReady); - } connect(this, SIGNAL(dismissedLoginDialog()), qApp, SLOT(onDismissedLoginDialog())); #endif } diff --git a/libraries/plugins/src/plugins/OculusPlatformPlugin.cpp b/libraries/plugins/src/plugins/OculusPlatformPlugin.cpp deleted file mode 100644 index f6343ebbec..0000000000 --- a/libraries/plugins/src/plugins/OculusPlatformPlugin.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// -// Created by Wayne Chen on 2018/12/20 -// Copyright 2018 High Fidelity Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2-0.html -// -#include "OculusPlatformPlugin.h" - -OculusPlatformPlugin::OculusPlatformPlugin() { -} - -OculusPlatformPlugin::~OculusPlatformPlugin() { -} diff --git a/libraries/plugins/src/plugins/OculusPlatformPlugin.h b/libraries/plugins/src/plugins/OculusPlatformPlugin.h index 49d6b73181..e6660d7d7a 100644 --- a/libraries/plugins/src/plugins/OculusPlatformPlugin.h +++ b/libraries/plugins/src/plugins/OculusPlatformPlugin.h @@ -15,17 +15,11 @@ using NonceUserIDCallback = std::function; class OculusPlatformPlugin { public: - OculusPlatformPlugin(); - virtual ~OculusPlatformPlugin(); + virtual ~OculusPlatformPlugin() = default; virtual const QString getName() const = 0; virtual void requestNonceAndUserID(NonceUserIDCallback callback) = 0; virtual void handleOVREvents() = 0; - -signals: - void loginReady(QString nonce, QString userID); - void linkAccountReady(QString nonce, QString userID); - void createAccountReady(QString nonce, QString userID); }; diff --git a/plugins/oculus/src/OculusPlatformPlugin.cpp b/plugins/oculus/src/OculusPlatformPlugin.cpp index f0dc4adb9d..8c64af08c3 100644 --- a/plugins/oculus/src/OculusPlatformPlugin.cpp +++ b/plugins/oculus/src/OculusPlatformPlugin.cpp @@ -91,8 +91,7 @@ void OculusAPIPlugin::handleOVREvents() { } if (_nonceChanged) { - _nonceUserIDCallback(_nonce, _user);` - _loginState = LoginState::INVALID_STATE; + _nonceUserIDCallback(_nonce, _user); _nonce = _user = ""; _nonceChanged = false; }