From 67c3197ee53282a61789dece0878a643b4b7a959 Mon Sep 17 00:00:00 2001 From: nyx-ynx Date: Mon, 6 Oct 2025 08:18:42 -0700 Subject: [PATCH] [kotlin] Don't check for updates if `ENABLE_UPDARE_CHECKERE` is OFF --- .../src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt | 5 +++++ .../main/java/org/yuzu/yuzu_emu/YuzuApplication.kt | 4 +++- .../java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt | 3 ++- src/android/app/src/main/jni/native.cpp | 11 +++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt index 5755e40b1f..5cb8c5458a 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt @@ -215,6 +215,11 @@ object NativeLibrary { */ external fun getUpdateUrl(version: String): String + /** + * Returns whether the update checker is enabled through CMAKE options. + */ + external fun isUpdateCheckerEnabled(): Boolean + enum class CoreError { ErrorSystemFiles, ErrorSavestate, diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt index e0b3fa5e41..c4089a65d1 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt @@ -64,7 +64,9 @@ class YuzuApplication : Application() { Log.logDeviceInfo() // Initialize CA certificates for HTTPS - initializeCACertificates() + if (NativeLibrary.isUpdateCheckerEnabled()) { + initializeCACertificates() + } createNotificationChannels() } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt index 072a449184..0e5ebaf844 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt @@ -196,7 +196,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider { val firstTimeSetup = PreferenceManager.getDefaultSharedPreferences(applicationContext) .getBoolean(Settings.PREF_FIRST_APP_LAUNCH, true) - if (!firstTimeSetup) { + + if (!firstTimeSetup && NativeLibrary.isUpdateCheckerEnabled()) { checkForUpdates() } setInsets() diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 0cae1c0d6f..2c0a15250a 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -1064,6 +1064,17 @@ JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_updatePowerState( g_has_battery.store(hasBattery, std::memory_order_relaxed); } +// return #ifdef ENABLE_UPDATE_CHECKER +JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isUpdateCheckerEnabled( + JNIEnv* env, + jobject obj) { +#ifdef ENABLE_UPDATE_CHECKER + return JNI_TRUE; +#else + return JNI_FALSE; +#endif + } + #ifdef ENABLE_UPDATE_CHECKER JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_setCACertificatePath( JNIEnv* env,