Android: Centralize setting definitions

Except controller settings, because those would be annoying
to fit into the same system, and I only need the non-controller
settings to be brought over for the next commits to work.

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java

@@ -33,6 +33,7 @@ import androidx.fragment.app.FragmentManager;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.features.settings.model.Setting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
 import org.dolphinemu.dolphinemu.fragments.EmulationFragment;
@@ -855,7 +856,7 @@ public final class EmulationActivity extends AppCompatActivity
             {
               editor.putInt("wiiController", indexSelected);
 
-              File wiimoteNewFile = SettingsFile.getSettingsFile(SettingsFile.FILE_NAME_WIIMOTE);
+              File wiimoteNewFile = SettingsFile.getSettingsFile(Settings.FILE_WIIMOTE);
               IniFile wiimoteNewIni = new IniFile(wiimoteNewFile);
               wiimoteNewIni.setString("Wiimote1", "Extension",
                       getResources().getStringArray(R.array.controllersValues)[indexSelected]);
@@ -889,7 +890,7 @@ public final class EmulationActivity extends AppCompatActivity
               else
                 mMotionListener.disable();
 
-              File wiimoteNewFile = SettingsFile.getSettingsFile(SettingsFile.FILE_NAME_WIIMOTE);
+              File wiimoteNewFile = SettingsFile.getSettingsFile(Settings.FILE_WIIMOTE);
               IniFile wiimoteNewIni = new IniFile(wiimoteNewFile);
               wiimoteNewIni.setBoolean("Wiimote1", "IMUIR/Enabled", indexSelected != 1);
               wiimoteNewIni.save(wiimoteNewFile);

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java

@@ -8,15 +8,13 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
-import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.features.settings.model.Setting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag;
 import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity;
-import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
 import org.dolphinemu.dolphinemu.ui.platform.Platform;
 import org.dolphinemu.dolphinemu.utils.DirectoryInitialization;
-import org.dolphinemu.dolphinemu.utils.IniFile;
 import org.dolphinemu.dolphinemu.utils.Log;
 
 import java.io.File;
@@ -65,14 +63,10 @@ public class GamePropertiesDialog extends DialogFragment
                           .getSupportFragmentManager(), "game_details");
                   break;
                 case 1:
-                  File dolphinFile = SettingsFile.getSettingsFile(SettingsFile.FILE_NAME_DOLPHIN);
-                  IniFile dolphinIni = new IniFile(dolphinFile);
-                  dolphinIni.setString(Settings.SECTION_INI_CORE, SettingsFile.KEY_DEFAULT_ISO,
-                          path);
-                  dolphinIni.save(dolphinFile);
-
-                  NativeLibrary.ReloadConfig();
-                  Toast.makeText(getContext(), "Default ISO set", Toast.LENGTH_SHORT).show();
+                  Settings settings = new Settings();
+                  settings.loadSettings(null);
+                  Setting.MAIN_DEFAULT_ISO.setString(settings, path);
+                  settings.saveSettings(null, getContext());
                   break;
                 case 2:
                   SettingsActivity.launch(getContext(), MenuTag.CONFIG, gameId);

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractSetting.java

@@ -0,0 +1,6 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public interface AbstractSetting
+{
+  boolean delete(Settings settings);
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java

@@ -0,0 +1,8 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public interface BooleanSetting extends AbstractSetting
+{
+  boolean getBoolean(Settings settings, boolean defaultValue);
+
+  void setBoolean(Settings settings, boolean newValue);
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java

@@ -0,0 +1,8 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public interface FloatSetting extends AbstractSetting
+{
+  float getFloat(Settings settings, float defaultValue);
+
+  void setFloat(Settings settings, float newValue);
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java

@@ -0,0 +1,8 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public interface IntSetting extends AbstractSetting
+{
+  int getInt(Settings settings, int defaultValue);
+
+  void setInt(Settings settings, int newValue);
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/LegacySetting.java

@@ -0,0 +1,69 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public class LegacySetting implements StringSetting, BooleanSetting, IntSetting, FloatSetting
+{
+  private final String mFile;
+  private final String mSection;
+  private final String mKey;
+
+  public LegacySetting(String file, String section, String key)
+  {
+    mFile = file;
+    mSection = section;
+    mKey = key;
+  }
+
+  @Override
+  public boolean delete(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).delete(mKey);
+  }
+
+  @Override
+  public String getString(Settings settings, String defaultValue)
+  {
+    return settings.getSection(mFile, mSection).getString(mKey, defaultValue);
+  }
+
+  @Override
+  public boolean getBoolean(Settings settings, boolean defaultValue)
+  {
+    return settings.getSection(mFile, mSection).getBoolean(mKey, defaultValue);
+  }
+
+  @Override
+  public int getInt(Settings settings, int defaultValue)
+  {
+    return settings.getSection(mFile, mSection).getInt(mKey, defaultValue);
+  }
+
+  @Override
+  public float getFloat(Settings settings, float defaultValue)
+  {
+    return settings.getSection(mFile, mSection).getFloat(mKey, defaultValue);
+  }
+
+  @Override
+  public void setString(Settings settings, String newValue)
+  {
+    settings.getSection(mFile, mSection).setString(mKey, newValue);
+  }
+
+  @Override
+  public void setBoolean(Settings settings, boolean newValue)
+  {
+    settings.getSection(mFile, mSection).setBoolean(mKey, newValue);
+  }
+
+  @Override
+  public void setInt(Settings settings, int newValue)
+  {
+    settings.getSection(mFile, mSection).setInt(mKey, newValue);
+  }
+
+  @Override
+  public void setFloat(Settings settings, float newValue)
+  {
+    settings.getSection(mFile, mSection).setFloat(mKey, newValue);
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Setting.java

@@ -0,0 +1,186 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public enum Setting implements StringSetting, BooleanSetting, IntSetting, FloatSetting
+{
+  // These entries have the same names and order as in C++, just for consistency.
+
+  MAIN_CPU_CORE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUCore"),
+  MAIN_DSP_HLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DSPHLE"),
+  MAIN_CPU_THREAD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUThread"),
+  MAIN_DEFAULT_ISO(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DefaultISO"),
+  MAIN_GC_LANGUAGE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SelectedLanguage"),
+  MAIN_OVERRIDE_REGION_SETTINGS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE,
+          "OverrideRegionSettings"),
+  MAIN_AUDIO_STRETCH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AudioStretch"),
+  MAIN_SLOT_A(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotA"),
+  MAIN_SLOT_B(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotB"),
+  MAIN_WII_SD_CARD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "WiiSDCard"),
+  MAIN_WIIMOTE_CONTINUOUS_SCANNING(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE,
+          "WiimoteContinuousScanning"),
+  MAIN_WIIMOTE_ENABLE_SPEAKER(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE,
+          "WiimoteEnableSpeaker"),
+  MAIN_EMULATION_SPEED(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EmulationSpeed"),
+  MAIN_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "Overclock"),
+  MAIN_OVERCLOCK_ENABLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "OverclockEnable"),
+  MAIN_GFX_BACKEND(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "GFXBackend"),
+  MAIN_AUTO_DISC_CHANGE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AutoDiscChange"),
+  MAIN_ALLOW_SD_WRITES(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "WiiSDCardAllowWrites"),
+  MAIN_ENABLE_SAVESTATES(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EnableSaveStates"),
+
+  MAIN_DSP_JIT(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "EnableJIT"),
+  MAIN_AUDIO_VOLUME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "Volume"),
+
+  MAIN_DUMP_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "DumpPath"),
+  MAIN_LOAD_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "LoadPath"),
+  MAIN_RESOURCEPACK_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "ResourcePackPath"),
+  MAIN_FS_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "NANDRootPath"),
+  MAIN_SD_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "WiiSDCardPath"),
+
+  MAIN_USE_PANIC_HANDLERS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_INTERFACE,
+          "UsePanicHandlers"),
+  MAIN_OSD_MESSAGES(Settings.FILE_DOLPHIN, Settings.SECTION_INI_INTERFACE,
+          "OnScreenDisplayMessages"),
+
+  MAIN_ANALYTICS_ENABLED(Settings.FILE_DOLPHIN, Settings.SECTION_ANALYTICS, "Enabled"),
+  MAIN_ANALYTICS_PERMISSION_ASKED(Settings.FILE_DOLPHIN, Settings.SECTION_ANALYTICS,
+          "PermissionAsked"),
+
+  MAIN_RECURSIVE_ISO_PATHS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL,
+          "RecursiveISOPaths"),
+
+  MAIN_LAST_PLATFORM_TAB(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "LastPlatformTab"),
+
+  GFX_WIDESCREEN_HACK(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "wideScreenHack"),
+  GFX_ASPECT_RATIO(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "AspectRatio"),
+  GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "SafeTextureCacheColorSamples"),
+  GFX_SHOW_FPS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowFPS"),
+  GFX_ENABLE_GPU_TEXTURE_DECODING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "EnableGPUTextureDecoding"),
+  GFX_ENABLE_PIXEL_LIGHTING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "EnablePixelLighting"),
+  GFX_FAST_DEPTH_CALC(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "FastDepthCalc"),
+  GFX_MSAA(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "MSAA"),
+  GFX_EFB_SCALE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "InternalResolution"),
+  GFX_DISABLE_FOG(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "DisableFog"),
+  GFX_BACKEND_MULTITHREADING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "BackendMultithreading"),
+  GFX_WAIT_FOR_SHADERS_BEFORE_STARTING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "WaitForShadersBeforeStarting"),
+  GFX_SHADER_COMPILATION_MODE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "ShaderCompilationMode"),
+
+  GFX_ENHANCE_FORCE_FILTERING(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "ForceFiltering"),
+  GFX_ENHANCE_MAX_ANISOTROPY(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS, "MaxAnisotropy"),
+  GFX_ENHANCE_POST_SHADER(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "PostProcessingShader"),
+  GFX_ENHANCE_FORCE_TRUE_COLOR(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "ForceTrueColor"),
+  GFX_ENHANCE_DISABLE_COPY_FILTER(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "DisableCopyFilter"),
+  GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "ArbitraryMipmapDetection"),
+
+  GFX_STEREO_MODE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoMode"),
+  GFX_STEREO_DEPTH(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoDepth"),
+  GFX_STEREO_CONVERGENCE_PERCENTAGE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY,
+          "StereoConvergencePercentage"),
+  GFX_STEREO_SWAP_EYES(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoSwapEyes"),
+
+  GFX_HACK_EFB_ACCESS_ENABLE(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "EFBAccessEnable"),
+  GFX_HACK_SKIP_EFB_COPY_TO_RAM(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS,
+          "EFBToTextureEnable"),
+  GFX_HACK_SKIP_XFB_COPY_TO_RAM(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS,
+          "XFBToTextureEnable"),
+  GFX_HACK_DEFER_EFB_COPIES(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "DeferEFBCopies"),
+  GFX_HACK_IMMEDIATE_XFB(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "ImmediateXFBEnable"),
+  GFX_HACK_SKIP_DUPLICATE_XFBS(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "SkipDuplicateXFBs"),
+  GFX_HACK_COPY_EFB_SCALED(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "EFBScaledCopy"),
+  GFX_HACK_EFB_EMULATE_FORMAT_CHANGES(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS,
+          "EFBEmulateFormatChanges"),
+
+  LOGGER_WRITE_TO_FILE(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "WriteToFile"),
+  LOGGER_VERBOSITY(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "Verbosity"),
+
+  // These settings are not yet in the new config system in C++ - please move them once they are
+
+  MAIN_JIT_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitOff"),
+  MAIN_JIT_LOAD_STORE_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitLoadStoreOff"),
+  MAIN_JIT_LOAD_STORE_FLOATING_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG,
+          "JitLoadStoreFloatingOff"),
+  MAIN_JIT_LOAD_STORE_PAIRED_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG,
+          "JitLoadStorePairedOff"),
+  MAIN_JIT_FLOATING_POINT_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitFloatingPointOff"),
+  MAIN_JIT_INTEGER_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitIntegerOff"),
+  MAIN_JIT_PAIRED_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitPairedOff"),
+  MAIN_JIT_SYSTEM_REGISTERS_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG,
+          "JitSystemRegistersOff"),
+  MAIN_JIT_BRANCH_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitBranchOff"),
+  MAIN_JIT_REGISTER_CACHE_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitRegisterCacheOff");
+
+  private final String mFile;
+  private final String mSection;
+  private final String mKey;
+
+  Setting(String file, String section, String key)
+  {
+    mFile = file;
+    mSection = section;
+    mKey = key;
+  }
+
+  @Override
+  public boolean delete(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).delete(mKey);
+  }
+
+  @Override
+  public String getString(Settings settings, String defaultValue)
+  {
+    return settings.getSection(mFile, mSection).getString(mKey, defaultValue);
+  }
+
+  @Override
+  public boolean getBoolean(Settings settings, boolean defaultValue)
+  {
+    return settings.getSection(mFile, mSection).getBoolean(mKey, defaultValue);
+  }
+
+  @Override
+  public int getInt(Settings settings, int defaultValue)
+  {
+    return settings.getSection(mFile, mSection).getInt(mKey, defaultValue);
+  }
+
+  @Override
+  public float getFloat(Settings settings, float defaultValue)
+  {
+    return settings.getSection(mFile, mSection).getFloat(mKey, defaultValue);
+  }
+
+  @Override
+  public void setString(Settings settings, String newValue)
+  {
+    settings.getSection(mFile, mSection).setString(mKey, newValue);
+  }
+
+  @Override
+  public void setBoolean(Settings settings, boolean newValue)
+  {
+    settings.getSection(mFile, mSection).setBoolean(mKey, newValue);
+  }
+
+  @Override
+  public void setInt(Settings settings, int newValue)
+  {
+    settings.getSection(mFile, mSection).setInt(mKey, newValue);
+  }
+
+  @Override
+  public void setFloat(Settings settings, float newValue)
+  {
+    settings.getSection(mFile, mSection).setFloat(mKey, newValue);
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java

@@ -2,6 +2,7 @@ package org.dolphinemu.dolphinemu.features.settings.model;
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.widget.Toast;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivityView;
@@ -9,13 +10,17 @@ import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
 import org.dolphinemu.dolphinemu.services.GameFileCacheService;
 import org.dolphinemu.dolphinemu.utils.IniFile;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 public class Settings
 {
+  public static final String FILE_DOLPHIN = "Dolphin";
+  public static final String FILE_GFX = "GFX";
+  public static final String FILE_LOGGER = "Logger";
+  public static final String FILE_GCPAD = "GCPadNew";
+  public static final String FILE_WIIMOTE = "WiimoteNew";
+
   public static final String SECTION_INI_ANDROID = "Android";
   public static final String SECTION_INI_GENERAL = "General";
   public static final String SECTION_INI_CORE = "Core";
@@ -39,22 +44,19 @@ public class Settings
   public static final String SECTION_CONTROLS = "Controls";
   public static final String SECTION_PROFILE = "Profile";
 
-  private static final int DSP_HLE = 0;
-  private static final int DSP_LLE_RECOMPILER = 1;
-  private static final int DSP_LLE_INTERPRETER = 2;
-
   public static final String SECTION_ANALYTICS = "Analytics";
 
   public static final String GAME_SETTINGS_PLACEHOLDER_FILE_NAME = "";
 
   private String gameId;
 
-  private static final String[] configFiles = new String[]{SettingsFile.FILE_NAME_DOLPHIN,
-          SettingsFile.FILE_NAME_GFX, SettingsFile.FILE_NAME_LOGGER,
-          SettingsFile.FILE_NAME_WIIMOTE};
+  private static final String[] configFiles = new String[]{FILE_DOLPHIN, FILE_GFX, FILE_LOGGER,
+          FILE_WIIMOTE};
 
   private HashMap<String, IniFile> mIniFiles = new HashMap<>();
 
+  private boolean mLoadedRecursiveIsoPathsValue = false;
+
   private IniFile getGameSpecificFile()
   {
     if (TextUtils.isEmpty(gameId) || mIniFiles.size() != 1)
@@ -93,6 +95,8 @@ public class Settings
     {
       loadCustomGameSettings(gameId, view);
     }
+
+    mLoadedRecursiveIsoPathsValue = Setting.MAIN_RECURSIVE_ISO_PATHS.getBoolean(this, false);
   }
 
   private void loadDolphinSettings(SettingsActivityView view)
@@ -123,62 +127,37 @@ public class Settings
     loadSettings(view);
   }
 
-  public void saveSettings(SettingsActivityView view, Context context, Set<String> modifiedSettings)
+  public void saveSettings(SettingsActivityView view, Context context)
   {
     if (TextUtils.isEmpty(gameId))
     {
-      view.showToastMessage("Saved settings to INI files");
+      if (context != null)
+        Toast.makeText(context, "Saved settings to INI files", Toast.LENGTH_SHORT).show();
 
       for (Map.Entry<String, IniFile> entry : mIniFiles.entrySet())
       {
         SettingsFile.saveFile(entry.getKey(), entry.getValue(), view);
       }
 
-      if (modifiedSettings.contains(SettingsFile.KEY_DSP_ENGINE))
-      {
-        File dolphinFile = SettingsFile.getSettingsFile(SettingsFile.FILE_NAME_DOLPHIN);
-        IniFile dolphinIni = new IniFile(dolphinFile);
-
-        switch (dolphinIni.getInt(Settings.SECTION_INI_ANDROID, SettingsFile.KEY_DSP_ENGINE,
-                DSP_HLE))
-        {
-          case DSP_HLE:
-            dolphinIni.setBoolean(Settings.SECTION_INI_CORE, SettingsFile.KEY_DSP_HLE, true);
-            dolphinIni.setBoolean(Settings.SECTION_INI_DSP, SettingsFile.KEY_DSP_ENABLE_JIT, true);
-            break;
-
-          case DSP_LLE_RECOMPILER:
-            dolphinIni.setBoolean(Settings.SECTION_INI_CORE, SettingsFile.KEY_DSP_HLE, false);
-            dolphinIni.setBoolean(Settings.SECTION_INI_DSP, SettingsFile.KEY_DSP_ENABLE_JIT, true);
-            break;
-
-          case DSP_LLE_INTERPRETER:
-            dolphinIni.setBoolean(Settings.SECTION_INI_CORE, SettingsFile.KEY_DSP_HLE, false);
-            dolphinIni.setBoolean(Settings.SECTION_INI_DSP, SettingsFile.KEY_DSP_ENABLE_JIT, false);
-            break;
-        }
-
-        dolphinIni.save(dolphinFile);
-      }
-
       // Notify the native code of the changes
       NativeLibrary.ReloadConfig();
       NativeLibrary.ReloadWiimoteConfig();
       NativeLibrary.ReloadLoggerConfig();
       NativeLibrary.UpdateGCAdapterScanThread();
 
-      if (modifiedSettings.contains(SettingsFile.KEY_RECURSIVE_ISO_PATHS))
+      if (mLoadedRecursiveIsoPathsValue != Setting.MAIN_RECURSIVE_ISO_PATHS.getBoolean(this, false))
       {
         // Refresh game library
         GameFileCacheService.startRescan(context);
       }
-
-      modifiedSettings.clear();
     }
     else
     {
       // custom game settings
-      view.showToastMessage("Saved settings for " + gameId);
+
+      if (context != null)
+        Toast.makeText(context, "Saved settings for " + gameId, Toast.LENGTH_SHORT).show();
+
       SettingsFile.saveCustomGameSettings(gameId, getGameSpecificFile());
     }
   }
@@ -214,6 +193,6 @@ public class Settings
     if (TextUtils.isEmpty(gameId))
       return false;
 
-    return getSection(SettingsFile.FILE_NAME_DOLPHIN, SECTION_INI_INTERFACE).exists("ThemeName");
+    return getSection(Settings.FILE_DOLPHIN, SECTION_INI_INTERFACE).exists("ThemeName");
   }
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java

@@ -0,0 +1,8 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public interface StringSetting extends AbstractSetting
+{
+  String getString(Settings settings, String defaultValue);
+
+  void setString(Settings settings, String newValue);
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/CheckBoxSetting.java

@@ -1,26 +1,29 @@
 package org.dolphinemu.dolphinemu.features.settings.model.view;
 
+import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 
 public class CheckBoxSetting extends SettingsItem
 {
+  protected BooleanSetting mSetting;
   protected boolean mDefaultValue;
 
-  public CheckBoxSetting(String file, String section, String key, int titleId, int descriptionId,
+  public CheckBoxSetting(BooleanSetting setting, int titleId, int descriptionId,
           boolean defaultValue)
   {
-    super(file, section, key, titleId, descriptionId);
+    super(titleId, descriptionId);
+    mSetting = setting;
     mDefaultValue = defaultValue;
   }
 
   public boolean isChecked(Settings settings)
   {
-    return settings.getSection(getFile(), getSection()).getBoolean(getKey(), mDefaultValue);
+    return mSetting.getBoolean(settings, mDefaultValue);
   }
 
   public void setChecked(Settings settings, boolean checked)
   {
-    settings.getSection(getFile(), getSection()).setBoolean(getKey(), checked);
+    mSetting.setBoolean(settings, checked);
   }
 
   @Override

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/ConfirmRunnable.java

@@ -9,7 +9,7 @@ public final class ConfirmRunnable extends SettingsItem
   public ConfirmRunnable(int titleId, int descriptionId, int alertText, int confirmationText,
           Runnable runnable)
   {
-    super(null, null, null, titleId, descriptionId);
+    super(titleId, descriptionId);
     mAlertText = alertText;
     mConfirmationText = confirmationText;
     mRunnable = runnable;

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.java

@@ -1,28 +1,31 @@
 package org.dolphinemu.dolphinemu.features.settings.model.view;
 
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
+import org.dolphinemu.dolphinemu.features.settings.model.StringSetting;
 
 public final class FilePicker extends SettingsItem
 {
+  private StringSetting mSetting;
   private String mDefaultValue;
   private int mRequestType;
 
-  public FilePicker(String file, String section, String key, int titleId, int descriptionId,
+  public FilePicker(StringSetting setting, int titleId, int descriptionId,
           String defaultVault, int requestType)
   {
-    super(file, section, key, titleId, descriptionId);
+    super(titleId, descriptionId);
+    mSetting = setting;
     mDefaultValue = defaultVault;
     mRequestType = requestType;
   }
 
   public String getSelectedValue(Settings settings)
   {
-    return settings.getSection(getFile(), getSection()).getString(getKey(), mDefaultValue);
+    return mSetting.getString(settings, mDefaultValue);
   }
 
   public void setSelectedValue(Settings settings, String selection)
   {
-    settings.getSection(getFile(), getSection()).setString(getKey(), selection);
+    mSetting.setString(settings, selection);
   }
 
   public int getRequestType()

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.java

@@ -1,26 +1,28 @@
 package org.dolphinemu.dolphinemu.features.settings.model.view;
 
+import org.dolphinemu.dolphinemu.features.settings.model.FloatSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 
 public class FloatSliderSetting extends SliderSetting
 {
+  protected FloatSetting mSetting;
   protected float mDefaultValue;
 
-  public FloatSliderSetting(String file, String section, String key, int titleId, int descriptionId,
-          int max, String units, float defaultValue)
+  public FloatSliderSetting(FloatSetting setting, int titleId, int descriptionId, int max,
+          String units, float defaultValue)
   {
-    super(file, section, key, titleId, descriptionId, max, units);
+    super(titleId, descriptionId, max, units);
+    mSetting = setting;
     mDefaultValue = defaultValue;
   }
 
   public int getSelectedValue(Settings settings)
   {
-    float value = settings.getSection(getFile(), getSection()).getFloat(getKey(), mDefaultValue);
-    return Math.round(value);
+    return Math.round(mSetting.getFloat(settings, mDefaultValue));
   }
 
   public void setSelectedValue(Settings settings, float selection)
   {
-    settings.getSection(getFile(), getSection()).setFloat(getKey(), selection);
+    mSetting.setFloat(settings, selection);
   }
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/HeaderSetting.java

@@ -2,9 +2,9 @@ package org.dolphinemu.dolphinemu.features.settings.model.view;
 
 public final class HeaderSetting extends SettingsItem
 {
-  public HeaderSetting(String key, int titleId, int descriptionId)
+  public HeaderSetting(int titleId, int descriptionId)
   {
-    super(null, null, key, titleId, descriptionId);
+    super(titleId, descriptionId);
   }
 
   @Override

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java

@@ -10,17 +10,29 @@ import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 
 public class InputBindingSetting extends SettingsItem
 {
-  private String gameId;
+  private String mFile;
+  private String mSection;
+  private String mKey;
+
+  private String mGameId;
 
   public InputBindingSetting(String file, String section, String key, int titleId, String gameId)
   {
-    super(file, section, key, titleId, 0);
-    this.gameId = gameId;
+    super(titleId, 0);
+    mFile = file;
+    mSection = section;
+    mKey = key;
+    mGameId = gameId;
+  }
+
+  public String getKey()
+  {
+    return mKey;
   }
 
   public String getValue(Settings settings)
   {
-    return settings.getSection(getFile(), getSection()).getString(getKey(), "");
+    return settings.getSection(mFile, mSection).getString(mKey, "");
   }
 
   /**
@@ -60,10 +72,10 @@ public class InputBindingSetting extends SettingsItem
             preferences =
             PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext());
     SharedPreferences.Editor editor = preferences.edit();
-    editor.putString(getKey() + gameId, ui);
+    editor.putString(mKey + mGameId, ui);
     editor.apply();
 
-    settings.getSection(getFile(), getSection()).setString(getKey(), bind);
+    settings.getSection(mFile, mSection).setString(mKey, bind);
   }
 
   public void clearValue(Settings settings)
@@ -79,6 +91,6 @@ public class InputBindingSetting extends SettingsItem
 
   public String getGameId()
   {
-    return gameId;
+    return mGameId;
   }
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.java

@@ -1,25 +1,28 @@
 package org.dolphinemu.dolphinemu.features.settings.model.view;
 
+import org.dolphinemu.dolphinemu.features.settings.model.IntSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 
 public final class IntSliderSetting extends SliderSetting
 {
+  private IntSetting mSetting;
   private int mDefaultValue;
 
-  public IntSliderSetting(String file, String section, String key, int titleId, int descriptionId,
-          int max, String units, int defaultValue)
+  public IntSliderSetting(IntSetting setting, int titleId, int descriptionId, int max,
+          String units, int defaultValue)
   {
-    super(file, section, key, titleId, descriptionId, max, units);
+    super(titleId, descriptionId, max, units);
+    mSetting = setting;
     mDefaultValue = defaultValue;
   }
 
   public int getSelectedValue(Settings settings)
   {
-    return settings.getSection(getFile(), getSection()).getInt(getKey(), mDefaultValue);
+    return mSetting.getInt(settings, mDefaultValue);
   }
 
   public void setSelectedValue(Settings settings, int selection)
   {
-    settings.getSection(getFile(), getSection()).setInt(getKey(), selection);
+    mSetting.setInt(settings, selection);
   }
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InvertedCheckBoxSetting.java

@@ -1,24 +1,25 @@
 package org.dolphinemu.dolphinemu.features.settings.model.view;
 
+import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 
 public final class InvertedCheckBoxSetting extends CheckBoxSetting
 {
-  public InvertedCheckBoxSetting(String file, String section, String key, int titleId,
+  public InvertedCheckBoxSetting(BooleanSetting setting, int titleId,
           int descriptionId, boolean defaultValue)
   {
-    super(file, section, key, titleId, descriptionId, !defaultValue);
+    super(setting, titleId, descriptionId, !defaultValue);
   }
 
   @Override
   public boolean isChecked(Settings settings)
   {
-    return !settings.getSection(getFile(), getSection()).getBoolean(getKey(), mDefaultValue);
+    return !mSetting.getBoolean(settings, mDefaultValue);
   }
 
   @Override
   public void setChecked(Settings settings, boolean checked)
   {
-    settings.getSection(getFile(), getSection()).setBoolean(getKey(), !checked);
+    mSetting.setBoolean(settings, !checked);
   }
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/LogCheckBoxSetting.java

@@ -0,0 +1,22 @@
+package org.dolphinemu.dolphinemu.features.settings.model.view;
+
+import org.dolphinemu.dolphinemu.features.settings.model.LegacySetting;
+import org.dolphinemu.dolphinemu.features.settings.model.Settings;
+
+public class LogCheckBoxSetting extends CheckBoxSetting
+{
+  String mKey;
+
+  public LogCheckBoxSetting(String key, int titleId, int descriptionId,
+          boolean defaultValue)
+  {
+    super(new LegacySetting(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_LOGS, key), titleId,
+            descriptionId, defaultValue);
+    mKey = key;
+  }
+
+  public String getKey()
+  {
+    return mKey;
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/PercentSliderSetting.java

@@ -1,25 +1,25 @@
 package org.dolphinemu.dolphinemu.features.settings.model.view;
 
+import org.dolphinemu.dolphinemu.features.settings.model.FloatSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 
 public final class PercentSliderSetting extends FloatSliderSetting
 {
-  public PercentSliderSetting(String file, String section, String key, int titleId,
-          int descriptionId, int max, String units, float defaultValue)
+  public PercentSliderSetting(FloatSetting setting, int titleId, int descriptionId, int max,
+          String units, float defaultValue)
   {
-    super(file, section, key, titleId, descriptionId, max, units, defaultValue / 100);
+    super(setting, titleId, descriptionId, max, units, defaultValue / 100);
   }
 
   @Override
   public int getSelectedValue(Settings settings)
   {
-    float value = settings.getSection(getFile(), getSection()).getFloat(getKey(), mDefaultValue);
-    return Math.round(value * 100);
+    return Math.round(mSetting.getFloat(settings, mDefaultValue) * 100);
   }
 
   @Override
   public void setSelectedValue(Settings settings, float selection)
   {
-    settings.getSection(getFile(), getSection()).setFloat(getKey(), selection / 100);
+    mSetting.setFloat(settings, selection / 100);
   }
 }