fix: disable update notify when user canceled

dragonflylee · Aug 30, 2024 · a878f04 · a878f04
1 parent 8bfc33d
commit a878f04
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/app/include/utils/config.hpp b/app/include/utils/config.hpp
@@ -61,6 +61,7 @@ class AppConfig : public brls::Singleton<AppConfig> {
         OVERCLOCK,
         APP_THEME,
         APP_LANG,
+        APP_UPDATE,
         KEYMAP,
         TRANSCODEC,
         FORCE_DIRECTPLAY,

diff --git a/app/src/main.cpp b/app/src/main.cpp
@@ -47,7 +47,8 @@ int main(int argc, char* argv[]) {
     }
 
     // Load cookies and settings
-    if (!AppConfig::instance().init()) {
+    auto& conf = AppConfig::instance();
+    if (!conf.init()) {
         return 0;
     }
 
@@ -107,7 +108,7 @@ int main(int argc, char* argv[]) {
 
     if (!brls::Application::getPlatform()->isApplicationMode()) {
         brls::Application::pushActivity(new HintActivity());
-    } else if (!AppConfig::instance().checkLogin()) {
+    } else if (!conf.checkLogin()) {
         brls::Application::pushActivity(new ServerList());
     } else if (itemId.empty()) {
         brls::Application::pushActivity(new MainActivity());
@@ -116,14 +117,15 @@ int main(int argc, char* argv[]) {
         //brls::sync([view]() { brls::Application::giveFocus(view); });
     }
 
-    AppVersion::checkUpdate();
+    std::string v = conf.getItem(AppConfig::APP_UPDATE, std::string("NaN"));
+    if (AppVersion::getVersion().compare(v)) AppVersion::checkUpdate();
+
     // Run the app
-    while (brls::Application::mainLoop())
-        ;
+    while (brls::Application::mainLoop());
 
     ThreadPool::instance().stop();
 
-    AppConfig::instance().checkRestart(argv);
+    conf.checkRestart(argv);
     // Exit
     return EXIT_SUCCESS;
 }
diff --git a/app/src/utils/config.cpp b/app/src/utils/config.cpp
@@ -38,6 +38,7 @@ std::unordered_map<AppConfig::Item, AppConfig::Option> AppConfig::settingMap = {
     {APP_THEME, {"app_theme", {"auto", "light", "dark"}}},
     {APP_LANG, {"app_lang", {brls::LOCALE_AUTO, brls::LOCALE_EN_US, brls::LOCALE_ZH_HANS, brls::LOCALE_ZH_HANT,
                                 brls::LOCALE_DE, "cs", "uk-UA"}}},
+    {APP_UPDATE, {"app_update"}},
     {KEYMAP, {"keymap", {"xbox", "ps", "keyboard"}}},
     {TRANSCODEC, {"transcodec", {"h264", "hevc", "av1"}}},
     {FORCE_DIRECTPLAY, {"force_directplay"}},

diff --git a/app/src/utils/version.cpp b/app/src/utils/version.cpp
@@ -94,8 +94,13 @@ void AppVersion::checkUpdate(int delay, bool showUpToDateDialog) {
 
             brls::sync([latest_ver]() {
                 std::string title = brls::getStr("main/setting/others/upgrade", latest_ver);
+                auto dialog = new brls::Dialog(title);
+                dialog->addButton("hints/cancel"_i18n, []() {
+                    auto& conf = AppConfig::instance();
+                    conf.setItem(AppConfig::APP_UPDATE, getVersion());
+                });
 #ifdef __SWITCH__
-                Dialog::cancelable(title, [latest_ver]() {
+                dialog->addButton("hints/ok"_i18n, [latest_ver]() {
                     AppVersion::updating->store(false);
                     ThreadPool::instance().submit([latest_ver]() {
                         std::string conf_dir = AppConfig::instance().configDir();
@@ -121,8 +126,9 @@ void AppVersion::checkUpdate(int delay, bool showUpToDateDialog) {
                 });
 #else
                 std::string url = fmt::format("https://github.com/{}/releases/tag/{}", git_repo, latest_ver);
-                Dialog::cancelable(title, [url] { brls::Application::getPlatform()->openBrowser(url); });
+                dialog->addButton("hints/ok"_i18n, [url] { brls::Application::getPlatform()->openBrowser(url); });
 #endif
+                dialog->open();
             });
         } catch (const std::exception& ex) {
             brls::Logger::error("checkUpdate failed: {}", ex.what());