Showing the changes to interface/src/Application.cpp (1 of 109 files). Show all
Unified · Split
| @@ -385,7 +385,7 @@ static const int INTERVAL_TO_CHECK_HMD_WORN_STATUS = 500; // milliseconds · 384 unmodified lines | ||
| 385 | 385 | static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop"; |
| 386 | 386 | static const QString ACTIVE_DISPLAY_PLUGIN_SETTING_NAME = "activeDisplayPlugin"; |
| 387 | 387 | static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system"; |
| 388 | −static const QString AUTO_LOGOUT_SETTING_NAME = "wallet/autoLogout"; | |
| 388 | +static const QString KEEP_ME_LOGGED_IN_SETTING_NAME = "keepMeLoggedIn"; | |
| 389 | 389 | |
| 390 | 390 | const std::vector<std::pair<QString, Application::AcceptURLMethod>> Application::_acceptedExtensions { |
| 391 | 391 | { SVO_EXTENSION, &Application::importSVOFromURL }, |
| @@ -2563,8 +2563,8 @@ void Application::cleanupBeforeQuit() { · 2171 unmodified lines | ||
| 2563 | 2563 | } |
| 2564 | 2564 | DependencyManager::destroy<ScriptEngines>(); |
| 2565 | 2565 | |
| 2566 | − bool autoLogout = Setting::Handle<bool>(AUTO_LOGOUT_SETTING_NAME, false).get(); | |
| 2567 | − if (autoLogout) { | |
| 2566 | + bool keepMeLoggedIn = Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, false).get(); | |
| 2567 | + if (!keepMeLoggedIn) { | |
| 2568 | 2568 | DependencyManager::get<AccountManager>()->removeAccountFromFile(); |
| 2569 | 2569 | } |
| 2570 | 2570 | |
| @@ -2969,13 +2969,13 @@ void Application::initializeUi() { · 398 unmodified lines | ||
| 2969 | 2969 | QUrl{ "hifi/commerce/wallet/PassphraseChange.qml" }, |
| 2970 | 2970 | QUrl{ "hifi/commerce/wallet/PassphraseModal.qml" }, |
| 2971 | 2971 | QUrl{ "hifi/commerce/wallet/PassphraseSelection.qml" }, |
| 2972 | − QUrl{ "hifi/commerce/wallet/Security.qml" }, | |
| 2973 | − QUrl{ "hifi/commerce/wallet/SecurityImageChange.qml" }, | |
| 2974 | − QUrl{ "hifi/commerce/wallet/SecurityImageModel.qml" }, | |
| 2975 | − QUrl{ "hifi/commerce/wallet/SecurityImageSelection.qml" }, | |
| 2976 | 2972 | QUrl{ "hifi/commerce/wallet/Wallet.qml" }, |
| 2977 | 2973 | QUrl{ "hifi/commerce/wallet/WalletHome.qml" }, |
| 2978 | 2974 | QUrl{ "hifi/commerce/wallet/WalletSetup.qml" }, |
| 2975 | + QUrl{ "hifi/dialogs/security/Security.qml" }, | |
| 2976 | + QUrl{ "hifi/dialogs/security/SecurityImageChange.qml" }, | |
| 2977 | + QUrl{ "hifi/dialogs/security/SecurityImageModel.qml" }, | |
| 2978 | + QUrl{ "hifi/dialogs/security/SecurityImageSelection.qml" }, | |
| 2979 | 2979 | }, callback); |
| 2980 | 2980 | qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem"); |
| 2981 | 2981 | qmlRegisterType<Preference>("Hifi", 1, 0, "Preference"); |