Fix build

Signed-off-by: crueter <crueter@eden-emu.dev>

src/android/app/src/main/jni/native.cpp

@@ -4,7 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#define ENABLE_UPDATE_CHECKER 1
 #define VMA_IMPLEMENTATION
 #include "video_core/vulkan_common/vma.h"
 
@@ -1618,48 +1617,11 @@ JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isNightlyBuild(
 
 #ifdef ENABLE_UPDATE_CHECKER
 
-std::optional<UpdateChecker::Update> checkForUpdate() {
-    const bool is_prerelease = ((strstr(Common::g_build_version, "pre-alpha") != NULL) ||
-                                (strstr(Common::g_build_version, "alpha") != NULL) ||
-                                (strstr(Common::g_build_version, "beta") != NULL) ||
-                                (strstr(Common::g_build_version, "rc") != NULL));
-    const std::optional<UpdateChecker::Update> latest_release_tag =
-        UpdateChecker::GetLatestRelease(is_prerelease);
-
-    if (!latest_release_tag)
-        goto empty;
-
-    {
-        std::string tag, build;
-        if (Common::g_is_nightly_build) {
-            std::vector<std::string> result;
-
-            boost::split(result, latest_release_tag->tag, boost::is_any_of("."));
-            if (result.size() != 2)
-                goto empty;
-            tag = result[1];
-
-            boost::split(result, std::string{Common::g_build_version}, boost::is_any_of("-"));
-            if (result.empty())
-                goto empty;
-            build = result[0];
-        } else {
-            tag = latest_release_tag->tag;
-            build = Common::g_build_version;
-        }
-
-        if (tag != build)
-            return latest_release_tag.value();
-    }
-
-    empty:
-    return std::nullopt;
-}
 
 JNIEXPORT jobjectArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_checkForUpdate(
         JNIEnv* env,
         jobject obj) {
-    std::optional<UpdateChecker::Update> release = checkForUpdate();
+    std::optional<UpdateChecker::Update> release = UpdateChecker::GetUpdate();
     if (!release) return nullptr;
 
     const std::string tag = release->tag;

src/frontend_common/update_checker.cpp

@@ -5,10 +5,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "update_checker.h"
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+
+#include <fmt/format.h>
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
-#include <fmt/format.h>
+#include "update_checker.h"
 
 #include <httplib.h>
 
@@ -137,3 +140,42 @@ std::optional<UpdateChecker::Update> UpdateChecker::GetLatestRelease(bool includ
         return {};
     }
 }
+
+std::optional<UpdateChecker::Update> UpdateChecker::GetUpdate() {
+    const bool is_prerelease = ((strstr(Common::g_build_version, "pre-alpha") != NULL) ||
+                                (strstr(Common::g_build_version, "alpha") != NULL) ||
+                                (strstr(Common::g_build_version, "beta") != NULL) ||
+                                (strstr(Common::g_build_version, "rc") != NULL));
+    const std::optional<UpdateChecker::Update> latest_release_tag =
+        UpdateChecker::GetLatestRelease(is_prerelease);
+
+    if (!latest_release_tag)
+        goto empty;
+
+    {
+        std::string tag, build;
+        if (Common::g_is_nightly_build) {
+            std::vector<std::string> result;
+
+            boost::split(result, latest_release_tag->tag, boost::is_any_of("."));
+            if (result.size() != 2)
+                goto empty;
+            tag = result[1];
+
+            boost::split(result, std::string{Common::g_build_version}, boost::is_any_of("-"));
+            if (result.empty())
+                goto empty;
+            build = result[0];
+        } else {
+            tag = latest_release_tag->tag;
+            build = Common::g_build_version;
+        }
+
+        if (tag != build)
+            return latest_release_tag.value();
+    }
+
+empty:
+    return UpdateChecker::Update{};
+
+}

src/frontend_common/update_checker.h

@@ -19,4 +19,5 @@ typedef struct {
 
 std::optional<std::string> GetResponse(std::string url, std::string path);
 std::optional<Update> GetLatestRelease(bool include_prereleases);
+std::optional<Update> GetUpdate();
 } // namespace UpdateChecker

src/yuzu/main_window.cpp

@@ -517,42 +517,8 @@ MainWindow::MainWindow(bool has_broken_vulkan)
 
 #ifdef ENABLE_UPDATE_CHECKER
     if (UISettings::values.check_for_updates) {
-        update_future = QtConcurrent::run([]() -> UpdateChecker::Update {
-            const bool is_prerelease = ((strstr(Common::g_build_version, "pre-alpha") != NULL) ||
-                                        (strstr(Common::g_build_version, "alpha") != NULL) ||
-                                        (strstr(Common::g_build_version, "beta") != NULL) ||
-                                        (strstr(Common::g_build_version, "rc") != NULL));
-            const std::optional<UpdateChecker::Update> latest_release_tag =
-                UpdateChecker::GetLatestRelease(is_prerelease);
-
-            if (!latest_release_tag)
-                goto empty;
-
-            {
-                std::string tag, build;
-                if (Common::g_is_nightly_build) {
-                    std::vector<std::string> result;
-
-                    boost::split(result, latest_release_tag->tag, boost::is_any_of("."));
-                    if (result.size() != 2)
-                        goto empty;
-                    tag = result[1];
-
-                    boost::split(result, std::string{Common::g_build_version}, boost::is_any_of("-"));
-                    if (result.empty())
-                        goto empty;
-                    build = result[0];
-                } else {
-                    tag = latest_release_tag->tag;
-                    build = Common::g_build_version;
-                }
-
-                if (tag != build)
-                    return latest_release_tag.value();
-            }
-
-        empty:
-            return UpdateChecker::Update{};
+        update_future = QtConcurrent::run([]() -> std::optional<UpdateChecker::Update> {
+            return UpdateChecker::GetUpdate();
         });
         update_watcher.connect(&update_watcher, &QFutureWatcher<QString>::finished, this,
                                &MainWindow::OnEmulatorUpdateAvailable);
@@ -4046,8 +4012,8 @@ void MainWindow::OnCaptureScreenshot() {
 
 #ifdef ENABLE_UPDATE_CHECKER
 void MainWindow::OnEmulatorUpdateAvailable() {
-    UpdateChecker::Update version = update_future.result();
-    if (version.tag.empty())
+    std::optional<UpdateChecker::Update> version = update_future.result();
+    if (!version)
         return;
 
     QMessageBox update_prompt(this);
@@ -4056,14 +4022,14 @@ void MainWindow::OnEmulatorUpdateAvailable() {
     update_prompt.addButton(QMessageBox::Yes);
     update_prompt.addButton(QMessageBox::Ignore);
     update_prompt.setText(
-        tr("Download %1?").arg(QString::fromStdString(version.name)));
+        tr("Download %1?").arg(QString::fromStdString(version->name)));
     update_prompt.exec();
     if (update_prompt.button(QMessageBox::Yes) == update_prompt.clickedButton()) {
         auto const full_url = fmt::format("{}/{}/releases/tag/",
                                           std::string{Common::g_build_auto_update_website},
                                           std::string{Common::g_build_auto_update_repo}
                                           );
-        QDesktopServices::openUrl(QUrl(QString::fromStdString(full_url + version.tag)));
+        QDesktopServices::openUrl(QUrl(QString::fromStdString(full_url + version->tag)));
     }
 }
 #endif

src/yuzu/main_window.h

@@ -472,8 +472,8 @@ private:
     std::shared_ptr<InputCommon::InputSubsystem> input_subsystem;
 
 #ifdef ENABLE_UPDATE_CHECKER
-    QFuture<UpdateChecker::Update> update_future;
-    QFutureWatcher<UpdateChecker::Update> update_watcher;
+    QFuture<std::optional<UpdateChecker::Update>> update_future;
+    QFutureWatcher<std::optional<UpdateChecker::Update>> update_watcher;
 #endif
 
     MultiplayerState* multiplayer_state = nullptr;