From 61299536663976aff4adfdec335ad88d7c5a3a28 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 2 May 2025 14:25:01 +0200 Subject: [PATCH] Android: Remove unused onSettingsFileNotFound and friends Old cruft from when the Android code was loading INI files manually. We don't have any handling for failing to load settings anymore. This change also updates related comments to reflect how things actually work nowadays. --- .../features/settings/model/Settings.kt | 5 +++++ .../features/settings/ui/SettingsActivity.kt | 5 ----- .../settings/ui/SettingsActivityView.kt | 15 +++------------ .../features/settings/ui/SettingsFragment.kt | 4 ---- .../settings/ui/SettingsFragmentPresenter.kt | 4 ---- .../settings/ui/SettingsFragmentView.kt | 18 ++++-------------- 6 files changed, 12 insertions(+), 39 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt index d9736fd84dd..cd5bdb51eb1 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.kt @@ -10,6 +10,11 @@ import org.dolphinemu.dolphinemu.R import org.dolphinemu.dolphinemu.features.input.model.MappingCommon import java.io.Closeable +/** + * Represents a set of settings stored in the native part of Dolphin. + * + * A set of settings can be either the global settings, or game settings for a particular game. + */ class Settings : Closeable { private var gameId: String = "" private var revision = 0 diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt index e222a8c78f1..63a3992487b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.kt @@ -230,11 +230,6 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { fragment?.onSettingsFileLoaded(settings) } - override fun onSettingsFileNotFound() { - val fragment: SettingsFragmentView? = fragment - fragment?.loadDefaultSettings() - } - override fun showToastMessage(message: String) { Toast.makeText(this, message, Toast.LENGTH_SHORT).show() } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityView.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityView.kt index 435d23fad63..1cd39f6fe4f 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityView.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityView.kt @@ -31,26 +31,17 @@ interface SettingsActivityView { fun showDialogFragment(fragment: DialogFragment) /** - * Called by a contained Fragment to get access to the Setting HashMap - * loaded from disk, so that each Fragment doesn't need to perform its own - * read operation. - * - * @return A possibly null HashMap of Settings. + * Identifies which set of settings is to be read from and written to. */ val settings: Settings /** - * Called when an asynchronous load operation completes. + * Called when a Settings object becomes available. * - * @param settings The (possibly null) result of the ini load operation. + * @param settings The settings that this Activity should access. */ fun onSettingsFileLoaded(settings: Settings) - /** - * Called when an asynchronous load operation fails. - */ - fun onSettingsFileNotFound() - /** * Display a popup text message on screen. * diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.kt index 651a86db514..6a294ee1392 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.kt @@ -116,10 +116,6 @@ class SettingsFragment : Fragment(), SettingsFragmentView { adapter!!.setSettings(settingsList) } - override fun loadDefaultSettings() { - presenter.loadDefaultSettings() - } - override fun loadSubMenu(menuKey: MenuTag) { if (menuKey == MenuTag.GPU_DRIVERS) { showGpuDriverDialog() diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt index 6e2371e7e49..e584e0a2ffe 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt @@ -100,10 +100,6 @@ class SettingsFragmentPresenter( } } - fun loadDefaultSettings() { - loadSettingsList() - } - private fun loadSettingsList() { val sl = ArrayList() when (menuTag) { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.kt index 896b3168836..076beaff6f1 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.kt @@ -14,10 +14,9 @@ import org.dolphinemu.dolphinemu.utils.GpuDriverInstallResult */ interface SettingsFragmentView { /** - * Called by the containing Activity to notify the Fragment that an - * asynchronous load operation completed. + * Called when a Settings object becomes available. * - * @param settings The (possibly null) result of the ini load operation. + * @param settings The settings that this Fragment should access. */ fun onSettingsFileLoaded(settings: Settings) @@ -28,12 +27,6 @@ interface SettingsFragmentView { */ fun showSettingsList(settingsList: ArrayList) - /** - * Called by the containing Activity when an asynchronous load operation fails. - * Instructs the Fragment to load the settings screen with defaults selected. - */ - fun loadDefaultSettings() - /** * @return The Fragment's containing activity. */ @@ -95,12 +88,9 @@ interface SettingsFragmentView { * @param value The current value of the Setting. */ fun hasMenuTagActionForValue(menuTag: MenuTag, value: Int): Boolean + /** - * Returns whether the input mapping dialog should detect inputs from all devices, - * not just the device configured for the controller. - */ - /** - * Sets whether the input mapping dialog should detect inputs from all devices, + * Controls whether the input mapping dialog should detect inputs from all devices, * not just the device configured for the controller. */ var isMappingAllDevices: Boolean