From 1c5154dc6080ba7b42b7c425a6cb5aa46414ccc6 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Thu, 11 Apr 2024 23:05:10 +0100 Subject: [PATCH] Quick and dirty telemetry removal to buy us time to fix #53 --- dist/languages/da_DK.ts | 5 - dist/languages/de.ts | 5 - dist/languages/el.ts | 5 - dist/languages/es_ES.ts | 5 - dist/languages/fi.ts | 5 - dist/languages/fr.ts | 5 - dist/languages/hu_HU.ts | 5 - dist/languages/id.ts | 5 - dist/languages/it.ts | 5 - dist/languages/ja_JP.ts | 5 - dist/languages/ko_KR.ts | 5 - dist/languages/lt_LT.ts | 5 - dist/languages/nb.ts | 5 - dist/languages/nl.ts | 5 - dist/languages/pl_PL.ts | 5 - dist/languages/pt_BR.ts | 5 - dist/languages/ro_RO.ts | 5 - dist/languages/ru_RU.ts | 5 - dist/languages/tr_TR.ts | 5 - dist/languages/vi_VN.ts | 5 - dist/languages/zh_CN.ts | 5 - dist/languages/zh_TW.ts | 5 - src/android/app/src/main/jni/config.cpp | 3 +- src/android/app/src/main/jni/default_ini.h | 2 +- src/lime/config.cpp | 3 +- src/lime/default_ini.h | 2 +- src/lime_qt/configuration/config.cpp | 7 +- .../configuration/configure_dialog.cpp | 1 - src/lime_qt/configuration/configure_web.cpp | 131 +------------- src/lime_qt/configuration/configure_web.h | 1 - src/lime_qt/configuration/configure_web.ui | 161 ------------------ src/lime_qt/main.cpp | 31 +--- 32 files changed, 9 insertions(+), 443 deletions(-) diff --git a/dist/languages/da_DK.ts b/dist/languages/da_DK.ts index 5b8591fb2..2db20d8e9 100644 --- a/dist/languages/da_DK.ts +++ b/dist/languages/da_DK.ts @@ -3893,11 +3893,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonym data bliver indsamlet</a>for at hjælpe med at forbedre Citra.<br/><br/>Har du lyst til at dele din brugsdata med os? - Telemetry diff --git a/dist/languages/de.ts b/dist/languages/de.ts index 9e1d47ff4..b41021c08 100644 --- a/dist/languages/de.ts +++ b/dist/languages/de.ts @@ -3895,11 +3895,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - Möchten Sie <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>anonyme Nutzungsdaten</a> an das Citra Team senden und so helfen, Citra weiter zu verbessern? - Telemetry diff --git a/dist/languages/el.ts b/dist/languages/el.ts index 8b43e905e..f17975288 100644 --- a/dist/languages/el.ts +++ b/dist/languages/el.ts @@ -3894,11 +3894,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Συλλέγονται ανώνυμα δεδομένα</a> για τη βελτίωση του Citra. <br/><br/>Θέλετε να μοιραστείτε τα δεδομένα χρήσης σας με εμάς; - Telemetry diff --git a/dist/languages/es_ES.ts b/dist/languages/es_ES.ts index 815d48013..bad353b36 100644 --- a/dist/languages/es_ES.ts +++ b/dist/languages/es_ES.ts @@ -3896,11 +3896,6 @@ Por favor, compruebe la instalación de FFmpeg usada para la compilación. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Se recogen datos anónimos</a> para ayudar a mejorar Citra. <br/><br/>¿Quieres compartir tus datos de uso con nosotros? - Telemetry diff --git a/dist/languages/fi.ts b/dist/languages/fi.ts index 9b51542da..dd35acde8 100644 --- a/dist/languages/fi.ts +++ b/dist/languages/fi.ts @@ -3893,11 +3893,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonyymiä tietoa kerätään</a>parantaaksemme Citraa. <br/><br/>Haluaisitko jakaa käyttötetoa meidän kanssa? - Telemetry diff --git a/dist/languages/fr.ts b/dist/languages/fr.ts index 50d259246..ffd6f79b1 100644 --- a/dist/languages/fr.ts +++ b/dist/languages/fr.ts @@ -3896,11 +3896,6 @@ Veuillez vérifier votre installation FFmpeg utilisée pour la compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Des données anonymes sont collectées</a> afin d'aider à l'amélioration de Citra. <br/><br/>Souhaitez vous communiquer vos données avec nous ? - Telemetry diff --git a/dist/languages/hu_HU.ts b/dist/languages/hu_HU.ts index 3c4f353fe..f46ade37d 100644 --- a/dist/languages/hu_HU.ts +++ b/dist/languages/hu_HU.ts @@ -3892,11 +3892,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - - Telemetry diff --git a/dist/languages/id.ts b/dist/languages/id.ts index 87f5852f9..bd4fc5c34 100644 --- a/dist/languages/id.ts +++ b/dist/languages/id.ts @@ -3895,11 +3895,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Data anonim dikumpulkan</a>untuk membantu Citra menjadi lebih baik. <br/><br/>Apakah Anda ingin membagikan penggunaan data Anda dengan kami? - Telemetry diff --git a/dist/languages/it.ts b/dist/languages/it.ts index c85467f0a..f69cec615 100644 --- a/dist/languages/it.ts +++ b/dist/languages/it.ts @@ -3896,11 +3896,6 @@ Verifica l'installazione di FFmpeg usata per la compilazione. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Vengono raccolti dati anonimi </a> per aiutare lo sviluppo di Citra. <br/><br/>Vuoi condividere i tuoi dati di utilizzo con noi? - Telemetry diff --git a/dist/languages/ja_JP.ts b/dist/languages/ja_JP.ts index 32a50cefe..ba1b7c3c3 100644 --- a/dist/languages/ja_JP.ts +++ b/dist/languages/ja_JP.ts @@ -3897,11 +3897,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>匿名のデータ</a>がCitraの改善のために収集されます<br/><br/>利用状況データの提供に同意しますか？ - Telemetry diff --git a/dist/languages/ko_KR.ts b/dist/languages/ko_KR.ts index c44965af1..2e75fc3ea 100644 --- a/dist/languages/ko_KR.ts +++ b/dist/languages/ko_KR.ts @@ -3896,11 +3896,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - Citra를 개선하기위해 <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>익명데이터가 수집됩니다</a>. <br/><br/>사용 데이터를 공유하시겠습니까? - Telemetry diff --git a/dist/languages/lt_LT.ts b/dist/languages/lt_LT.ts index bf983dbe1..e3108da21 100644 --- a/dist/languages/lt_LT.ts +++ b/dist/languages/lt_LT.ts @@ -3891,11 +3891,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anoniminiai duomenys yra renkami </a> kad padėtumėte Citra komandai. <br/><br/>Ar norite pasidalinti savo duomenimis su mumis? - Telemetry diff --git a/dist/languages/nb.ts b/dist/languages/nb.ts index 332aab69a..d6fb8588f 100644 --- a/dist/languages/nb.ts +++ b/dist/languages/nb.ts @@ -3894,11 +3894,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonym data samles inn</a> for å forbedre Citra. <br/><br/>Vil du dele dine brukerdata med oss? - Telemetry diff --git a/dist/languages/nl.ts b/dist/languages/nl.ts index 855ab24ed..bddcfbc49 100644 --- a/dist/languages/nl.ts +++ b/dist/languages/nl.ts @@ -3896,11 +3896,6 @@ Controleer de FFmpeg-installatie die wordt gebruikt voor de compilatie. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonieme gegevens worden verzameld</a> om Citra te helpen verbeteren. <br/><br/> Wilt u uw gebruiksgegevens met ons delen? - Telemetry diff --git a/dist/languages/pl_PL.ts b/dist/languages/pl_PL.ts index 15f38469e..f38ece200 100644 --- a/dist/languages/pl_PL.ts +++ b/dist/languages/pl_PL.ts @@ -3893,11 +3893,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonimowe dane są zbierane</a> w celu wsparcia rozwoju Citry. <br/><br/>Czy chciałbyś się z nami podzielić danymi użytkowania? - Telemetry diff --git a/dist/languages/pt_BR.ts b/dist/languages/pt_BR.ts index d6aea8210..0fc4fbeb3 100644 --- a/dist/languages/pt_BR.ts +++ b/dist/languages/pt_BR.ts @@ -3895,11 +3895,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Dados anônimos são recolhidos</a> para ajudar a melhorar o Citra. <br/><br/>Gostaria de compartilhar os seus dados de utilização conosco? - Telemetry diff --git a/dist/languages/ro_RO.ts b/dist/languages/ro_RO.ts index d9a229e43..adf933954 100644 --- a/dist/languages/ro_RO.ts +++ b/dist/languages/ro_RO.ts @@ -3894,11 +3894,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Date anonime sunt colectate</a> pentru a ajuta îmbunătățirea lui Citra. <br/><br/> Doriți să partajați uzul de datele cu noi? - Telemetry diff --git a/dist/languages/ru_RU.ts b/dist/languages/ru_RU.ts index c4489deed..95fc8daa1 100644 --- a/dist/languages/ru_RU.ts +++ b/dist/languages/ru_RU.ts @@ -3898,11 +3898,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - Для оказания помощи в улучшении приложения Citra <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>проводится сбор анонимных данных</a>. <br/><br/>Поделиться данными об использовании? - Telemetry diff --git a/dist/languages/tr_TR.ts b/dist/languages/tr_TR.ts index 3ff61ed58..6ac5353ee 100644 --- a/dist/languages/tr_TR.ts +++ b/dist/languages/tr_TR.ts @@ -3893,11 +3893,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Citrayı geliştirmeye yardımcı olmak için</a> anonim veri toplandı. <br/><br/>Kullanım verinizi bizimle paylaşmak ister misiniz? - Telemetry diff --git a/dist/languages/vi_VN.ts b/dist/languages/vi_VN.ts index 060857944..64784a498 100644 --- a/dist/languages/vi_VN.ts +++ b/dist/languages/vi_VN.ts @@ -3893,11 +3893,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Dữ liệu ẩn danh được thu thập</a> để giúp cải thiện Citra. <br/><br/>Bạn có muốn chia sẻ dữ liệu của bạn với chúng tôi? - Telemetry diff --git a/dist/languages/zh_CN.ts b/dist/languages/zh_CN.ts index 885b304c3..e7c0b3a6c 100644 --- a/dist/languages/zh_CN.ts +++ b/dist/languages/zh_CN.ts @@ -3896,11 +3896,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>我们收集匿名数据</a>来帮助改进 Citra 。<br/><br/>您愿意和我们分享你的使用数据吗？ - Telemetry diff --git a/dist/languages/zh_TW.ts b/dist/languages/zh_TW.ts index 466f8070d..43de7b0c8 100644 --- a/dist/languages/zh_TW.ts +++ b/dist/languages/zh_TW.ts @@ -3894,11 +3894,6 @@ Please check your FFmpeg installation used for compilation. GMainWindow - - - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous data is collected</a> to help improve Citra. <br/><br/>Would you like to share your usage data with us? - <a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>收集匿名的使用資料</a>可以用來改善 Citra。<br/><br/>您同意將您的使用資料分享給 Citra 嗎？ - Telemetry diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index f2210f225..2ac5d5954 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -266,8 +266,7 @@ void Config::ReadValues() { // Web Service NetSettings::values.enable_telemetry = sdl2_config->GetBoolean("WebService", "enable_telemetry", false); - NetSettings::values.web_api_url = - sdl2_config->GetString("WebService", "web_api_url", "https://api.citra-emu.org"); + NetSettings::values.web_api_url = sdl2_config->GetString("WebService", "web_api_url", ""); NetSettings::values.citra_username = sdl2_config->GetString("WebService", "citra_username", ""); NetSettings::values.citra_token = sdl2_config->GetString("WebService", "citra_token", ""); } diff --git a/src/android/app/src/main/jni/default_ini.h b/src/android/app/src/main/jni/default_ini.h index 31df12c5f..198dae62d 100644 --- a/src/android/app/src/main/jni/default_ini.h +++ b/src/android/app/src/main/jni/default_ini.h @@ -357,7 +357,7 @@ gdbstub_port=24689 # 0 (default): No, 1: Yes enable_telemetry = # URL for Web API -web_api_url = https://api.citra-emu.org +web_api_url = # Username and token for Citra Web Service # See https://profile.citra-emu.org/ for more info citra_username = diff --git a/src/lime/config.cpp b/src/lime/config.cpp index cfd0f57b9..10fd17e02 100644 --- a/src/lime/config.cpp +++ b/src/lime/config.cpp @@ -328,8 +328,7 @@ void Config::ReadValues() { // Web Service NetSettings::values.enable_telemetry = sdl2_config->GetBoolean("WebService", "enable_telemetry", false); - NetSettings::values.web_api_url = - sdl2_config->GetString("WebService", "web_api_url", "https://api.citra-emu.org"); + NetSettings::values.web_api_url = sdl2_config->GetString("WebService", "web_api_url", ""); NetSettings::values.citra_username = sdl2_config->GetString("WebService", "citra_username", ""); NetSettings::values.citra_token = sdl2_config->GetString("WebService", "citra_token", ""); diff --git a/src/lime/default_ini.h b/src/lime/default_ini.h index be3c67948..a99fdc81e 100644 --- a/src/lime/default_ini.h +++ b/src/lime/default_ini.h @@ -365,7 +365,7 @@ renderer_debug = # 0 (default): No, 1: Yes enable_telemetry = # URL for Web API -web_api_url = https://api.citra-emu.org +web_api_url = # Username and token for Citra Web Service # See https://profile.citra-emu.org/ for more info citra_username = diff --git a/src/lime_qt/configuration/config.cpp b/src/lime_qt/configuration/config.cpp index 1ca4b3fe0..5dce0620a 100644 --- a/src/lime_qt/configuration/config.cpp +++ b/src/lime_qt/configuration/config.cpp @@ -839,9 +839,7 @@ void Config::ReadWebServiceValues() { NetSettings::values.enable_telemetry = ReadSetting(QStringLiteral("enable_telemetry"), false).toBool(); NetSettings::values.web_api_url = - ReadSetting(QStringLiteral("web_api_url"), QStringLiteral("https://api.citra-emu.org")) - .toString() - .toStdString(); + ReadSetting(QStringLiteral("web_api_url"), QStringLiteral("")).toString().toStdString(); NetSettings::values.citra_username = ReadSetting(QStringLiteral("citra_username")).toString().toStdString(); NetSettings::values.citra_token = @@ -1319,8 +1317,7 @@ void Config::SaveWebServiceValues() { WriteSetting(QStringLiteral("enable_telemetry"), NetSettings::values.enable_telemetry, false); WriteSetting(QStringLiteral("web_api_url"), - QString::fromStdString(NetSettings::values.web_api_url), - QStringLiteral("https://api.citra-emu.org")); + QString::fromStdString(NetSettings::values.web_api_url), QStringLiteral("")); WriteSetting(QStringLiteral("citra_username"), QString::fromStdString(NetSettings::values.citra_username)); WriteSetting(QStringLiteral("citra_token"), diff --git a/src/lime_qt/configuration/configure_dialog.cpp b/src/lime_qt/configuration/configure_dialog.cpp index 4e967ebb0..46e7c9bc4 100644 --- a/src/lime_qt/configuration/configure_dialog.cpp +++ b/src/lime_qt/configuration/configure_dialog.cpp @@ -57,7 +57,6 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, Cor ui->tabWidget->addTab(ui_tab.get(), tr("UI")); hotkeys_tab->Populate(registry); - web_tab->SetWebServiceConfigEnabled(enable_web_config); PopulateSelectionList(); diff --git a/src/lime_qt/configuration/configure_web.cpp b/src/lime_qt/configuration/configure_web.cpp index da4796382..a707abd62 100644 --- a/src/lime_qt/configuration/configure_web.cpp +++ b/src/lime_qt/configuration/configure_web.cpp @@ -11,41 +11,12 @@ #include "network/network_settings.h" #include "ui_configure_web.h" -static constexpr char token_delimiter{':'}; - -static std::string GenerateDisplayToken(const std::string& username, const std::string& token) { - if (username.empty() || token.empty()) { - return {}; - } - - const std::string unencoded_display_token{username + token_delimiter + token}; - QByteArray b{unencoded_display_token.c_str()}; - QByteArray b64 = b.toBase64(); - return b64.toStdString(); -} - -static std::string UsernameFromDisplayToken(const std::string& display_token) { - const std::string unencoded_display_token{ - QByteArray::fromBase64(display_token.c_str()).toStdString()}; - return unencoded_display_token.substr(0, unencoded_display_token.find(token_delimiter)); -} - -static std::string TokenFromDisplayToken(const std::string& display_token) { - const std::string unencoded_display_token{ - QByteArray::fromBase64(display_token.c_str()).toStdString()}; - return unencoded_display_token.substr(unencoded_display_token.find(token_delimiter) + 1); -} - ConfigureWeb::ConfigureWeb(QWidget* parent) : QWidget(parent), ui(std::make_unique()) { ui->setupUi(this); - connect(ui->button_regenerate_telemetry_id, &QPushButton::clicked, this, - &ConfigureWeb::RefreshTelemetryID); - connect(ui->button_verify_login, &QPushButton::clicked, this, &ConfigureWeb::VerifyLogin); - connect(&verify_watcher, &QFutureWatcher::finished, this, &ConfigureWeb::OnLoginVerified); #ifndef USE_DISCORD_PRESENCE - ui->discord_group->setVisible(false); + ui->discord_group->setEnabled(false); #endif SetConfiguration(); } @@ -53,113 +24,13 @@ ConfigureWeb::ConfigureWeb(QWidget* parent) ConfigureWeb::~ConfigureWeb() = default; void ConfigureWeb::SetConfiguration() { - ui->web_credentials_disclaimer->setWordWrap(true); - ui->telemetry_learn_more->setOpenExternalLinks(true); - ui->telemetry_learn_more->setText(tr("Learn more")); - - ui->web_signup_link->setOpenExternalLinks(true); - ui->web_signup_link->setText( - tr("Sign up")); - ui->web_token_info_link->setOpenExternalLinks(true); - ui->web_token_info_link->setText( - tr("What is my token?")); - - ui->toggle_telemetry->setChecked(NetSettings::values.enable_telemetry); - - if (NetSettings::values.citra_username.empty()) { - ui->username->setText(tr("Unspecified")); - } else { - ui->username->setText(QString::fromStdString(NetSettings::values.citra_username)); - } - - ui->edit_token->setText(QString::fromStdString( - GenerateDisplayToken(NetSettings::values.citra_username, NetSettings::values.citra_token))); - - // Connect after setting the values, to avoid calling OnLoginChanged now - connect(ui->edit_token, &QLineEdit::textChanged, this, &ConfigureWeb::OnLoginChanged); - ui->label_telemetry_id->setText( - tr("Telemetry ID: 0x%1").arg(QString::number(Core::GetTelemetryId(), 16).toUpper())); - user_verified = true; - ui->toggle_discordrpc->setChecked(UISettings::values.enable_discord_presence.GetValue()); } void ConfigureWeb::ApplyConfiguration() { - NetSettings::values.enable_telemetry = ui->toggle_telemetry->isChecked(); UISettings::values.enable_discord_presence = ui->toggle_discordrpc->isChecked(); - if (user_verified) { - NetSettings::values.citra_username = - UsernameFromDisplayToken(ui->edit_token->text().toStdString()); - NetSettings::values.citra_token = - TokenFromDisplayToken(ui->edit_token->text().toStdString()); - } else { - QMessageBox::warning( - this, tr("Token not verified"), - tr("Token was not verified. The change to your token has not been saved.")); - } -} - -void ConfigureWeb::RefreshTelemetryID() { - const u64 new_telemetry_id{Core::RegenerateTelemetryId()}; - ui->label_telemetry_id->setText( - tr("Telemetry ID: 0x%1").arg(QString::number(new_telemetry_id, 16).toUpper())); -} - -void ConfigureWeb::OnLoginChanged() { - if (ui->edit_token->text().isEmpty()) { - user_verified = true; - - const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("checked")).pixmap(16); - ui->label_token_verified->setPixmap(pixmap); - } else { - user_verified = false; - - const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("failed")).pixmap(16); - ui->label_token_verified->setPixmap(pixmap); - } -} - -void ConfigureWeb::VerifyLogin() { - ui->button_verify_login->setDisabled(true); - ui->button_verify_login->setText(tr("Verifying...")); - verify_watcher.setFuture(QtConcurrent::run( - [username = UsernameFromDisplayToken(ui->edit_token->text().toStdString()), - token = TokenFromDisplayToken(ui->edit_token->text().toStdString())] { - return Core::VerifyLogin(username, token); - })); -} - -void ConfigureWeb::OnLoginVerified() { - ui->button_verify_login->setEnabled(true); - ui->button_verify_login->setText(tr("Verify")); - if (verify_watcher.result()) { - user_verified = true; - - const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("checked")).pixmap(16); - ui->label_token_verified->setPixmap(pixmap); - ui->username->setText( - QString::fromStdString(UsernameFromDisplayToken(ui->edit_token->text().toStdString()))); - } else { - const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("failed")).pixmap(16); - ui->label_token_verified->setPixmap(pixmap); - ui->username->setText(tr("Unspecified")); - QMessageBox::critical(this, tr("Verification failed"), - tr("Verification failed. Check that you have entered your token " - "correctly, and that your internet connection is working.")); - } } void ConfigureWeb::RetranslateUI() { ui->retranslateUi(this); } - -void ConfigureWeb::SetWebServiceConfigEnabled(bool enabled) { - ui->label_disable_info->setVisible(!enabled); - ui->groupBoxWebConfig->setEnabled(enabled); -} diff --git a/src/lime_qt/configuration/configure_web.h b/src/lime_qt/configuration/configure_web.h index a9b2566f8..46f29bd2c 100644 --- a/src/lime_qt/configuration/configure_web.h +++ b/src/lime_qt/configuration/configure_web.h @@ -22,7 +22,6 @@ public: void ApplyConfiguration(); void RetranslateUI(); void SetConfiguration(); - void SetWebServiceConfigEnabled(bool enabled); private: void RefreshTelemetryID(); diff --git a/src/lime_qt/configuration/configure_web.ui b/src/lime_qt/configuration/configure_web.ui index fdae590bf..a68936c59 100644 --- a/src/lime_qt/configuration/configure_web.ui +++ b/src/lime_qt/configuration/configure_web.ui @@ -14,163 +14,6 @@ Form - - - - - - Lime3DS Web Service - - - - - - Currently not supported by Lime. By providing your username and token, you agree to allow Citra to collect additional usage data, which may include user identifying information. - - - - - - - - - - 0 - 0 - - - - Qt::RightToLeft - - - Verify - - - - - - - Sign up - - - - - - - - - - Token: - - - - - - - - - - Username: - - - - - - - 80 - - - QLineEdit::Password - - - - - - - What is my token? - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Web Service configuration can only be changed when a public room isn't being hosted. - - - true - - - - - - - Telemetry - - - - - - Share anonymous usage data with the Lime3DS team - - - - - - - Learn more - - - - - - - - - Telemetry ID: - - - - - - - - 0 - 0 - - - - Qt::RightToLeft - - - Regenerate - - - - - - - - - - @@ -203,10 +46,6 @@ - edit_token - button_verify_login - toggle_telemetry - button_regenerate_telemetry_id toggle_discordrpc diff --git a/src/lime_qt/main.cpp b/src/lime_qt/main.cpp index ddd2860bc..3b87fdae0 100644 --- a/src/lime_qt/main.cpp +++ b/src/lime_qt/main.cpp @@ -123,33 +123,6 @@ __declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001; constexpr int default_mouse_timeout = 2500; -/** - * "Callouts" are one-time instructional messages shown to the user. In the config settings, there - * is a bitfield "callout_flags" options, used to track if a message has already been shown to the - * user. This is 32-bits - if we have more than 32 callouts, we should retire and recycle old ones. - */ -enum class CalloutFlag : uint32_t { - Telemetry = 0x1, -}; - -void GMainWindow::ShowTelemetryCallout() { - if (UISettings::values.callout_flags.GetValue() & - static_cast(CalloutFlag::Telemetry)) { - return; - } - - UISettings::values.callout_flags = - UISettings::values.callout_flags.GetValue() | static_cast(CalloutFlag::Telemetry); - const QString telemetry_message = - tr("Anonymous " - "data is collected to help improve Citra. " - "

Would you like to share your usage data with us?"); - if (QMessageBox::question(this, tr("Telemetry"), telemetry_message) == QMessageBox::Yes) { - NetSettings::values.enable_telemetry = true; - system.ApplySettings(); - } -} - const int GMainWindow::max_recent_files_item; static QString PrettyProductName() { @@ -263,8 +236,8 @@ GMainWindow::GMainWindow(Core::System& system_) game_list->LoadCompatibilityList(); game_list->PopulateAsync(UISettings::values.game_dirs); - // Show one-time "callout" messages to the user - ShowTelemetryCallout(); + NetSettings::values.enable_telemetry = false; + system.ApplySettings(); mouse_hide_timer.setInterval(default_mouse_timeout); connect(&mouse_hide_timer, &QTimer::timeout, this, &GMainWindow::HideMouseCursor);