VERY experimental Nintendo Switch 2 emulator
C++
android: Rework config lifecycle
t895a830d9af3eb5
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.ktindex 9ebd6c732a..f2ba2504c4 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@@ -230,8 +230,6 @@ object NativeLibrary {*/external fun onTouchReleased(finger_id: Int)- external fun reloadSettings()-external fun initGameIni(gameID: String?)external fun setAppDirectory(directory: String)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.ktindex 2bf0e1b0db..d005c656e0 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt@@ -7,7 +7,7 @@ import android.text.TextUtilsimport android.widget.Toastimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.YuzuApplication-import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile+import org.yuzu.yuzu_emu.utils.NativeConfigobject Settings {private val context get() = YuzuApplication.appContext@@ -19,7 +19,7 @@ object Settings {context.getString(R.string.ini_saved),Toast.LENGTH_SHORT).show()- SettingsFile.saveFile(SettingsFile.FILE_NAME_CONFIG)+ NativeConfig.saveSettings()} else {// TODO: Save custom game settingsToast.makeText(diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.ktindex c73edd50e2..48bdbdd75f 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt@@ -21,7 +21,6 @@ import androidx.navigation.navArgsimport com.google.android.material.color.MaterialColorsimport kotlinx.coroutines.flow.collectLatestimport kotlinx.coroutines.launch-import org.yuzu.yuzu_emu.NativeLibraryimport java.io.IOExceptionimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding@@ -165,11 +164,12 @@ class SettingsActivity : AppCompatActivity() {settingsViewModel.shouldSave = false// Delete settings file because the user may have changed values that do not exist in the UI+ NativeConfig.unloadConfig()val settingsFile = SettingsFile.getSettingsFile(SettingsFile.FILE_NAME_CONFIG)if (!settingsFile.delete()) {throw IOException("Failed to delete $settingsFile")}- NativeLibrary.reloadSettings()+ NativeConfig.initializeConfig()Toast.makeText(applicationContext,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.ktindex ace5dddea6..bd2f4cd256 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@@ -625,6 +625,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {}// Clear existing user data+ NativeConfig.unloadConfig()File(DirectoryInitialization.userDirectory!!).deleteRecursively()// Copy archive to internal storage@@ -643,6 +644,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {// Reinitialize relevant dataNativeLibrary.initializeSystem(true)+ NativeConfig.initializeConfig()gamesViewModel.reloadGames(false)return@newInstance getString(R.string.user_data_import_success)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.ktindex 5e9a1176ad..21270fc843 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt@@ -16,6 +16,7 @@ object DirectoryInitialization {if (!areDirectoriesReady) {initializeInternalStorage()NativeLibrary.initializeSystem(false)+ NativeConfig.initializeConfig()areDirectoriesReady = true}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.ktindex 9425f8b991..87e579fa7a 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.kt@@ -4,6 +4,30 @@package org.yuzu.yuzu_emu.utilsobject NativeConfig {+ /**+ * Creates a Config object and opens the emulation config.+ */+ @Synchronized+ external fun initializeConfig()++ /**+ * Destroys the stored config object. This automatically saves the existing config.+ */+ @Synchronized+ external fun unloadConfig()++ /**+ * Reads values saved to the config file and saves them.+ */+ @Synchronized+ external fun reloadSettings()++ /**+ * Saves settings values in memory to disk.+ */+ @Synchronized+ external fun saveSettings()+external fun getBoolean(key: String, getDefault: Boolean): Booleanexternal fun setBoolean(key: String, value: Boolean)