Merge pull request #11641 from JosJuice/android-remove-old-config

Android: Remove support for the old config system

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

@@ -400,7 +400,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
       WindowManager.LayoutParams attributes = getWindow().getAttributes();
 
       attributes.layoutInDisplayCutoutMode =
-              BooleanSetting.MAIN_EXPAND_TO_CUTOUT_AREA.getBoolean(mSettings) ?
+              BooleanSetting.MAIN_EXPAND_TO_CUTOUT_AREA.getBoolean() ?
                       WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES :
                       WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER;
 
@@ -423,7 +423,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
   protected void onStop()
   {
     super.onStop();
-    mSettings.saveSettings(null, null);
+    mSettings.saveSettings(null);
   }
 
   public void onTitleChanged()
@@ -437,7 +437,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
 
     setTitle(NativeLibrary.GetCurrentTitleDescription());
 
-    mEmulationFragment.refreshInputOverlay(mSettings);
+    mEmulationFragment.refreshInputOverlay();
   }
 
   @Override
@@ -521,7 +521,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
 
   private void updateOrientation()
   {
-    setRequestedOrientation(IntSetting.MAIN_EMULATION_ORIENTATION.getInt(mSettings));
+    setRequestedOrientation(IntSetting.MAIN_EMULATION_ORIENTATION.getInt());
   }
 
   private boolean closeSubmenu()
@@ -589,11 +589,11 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
 
     // Populate the switch value for joystick center on touch
     menu.findItem(R.id.menu_emulation_joystick_rel_center)
-            .setChecked(BooleanSetting.MAIN_JOYSTICK_REL_CENTER.getBoolean(mSettings));
+            .setChecked(BooleanSetting.MAIN_JOYSTICK_REL_CENTER.getBoolean());
     if (wii)
     {
       menu.findItem(R.id.menu_emulation_ir_recenter)
-              .setChecked(BooleanSetting.MAIN_IR_ALWAYS_RECENTER.getBoolean(mSettings));
+              .setChecked(BooleanSetting.MAIN_IR_ALWAYS_RECENTER.getBoolean());
     }
 
     popup.setOnMenuItemClickListener(this::onOptionsItemSelected);
@@ -794,7 +794,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
   private void toggleRecenter(boolean state)
   {
     BooleanSetting.MAIN_IR_ALWAYS_RECENTER.setBoolean(mSettings, state);
-    mEmulationFragment.refreshOverlayPointer(mSettings);
+    mEmulationFragment.refreshOverlayPointer();
   }
 
   private void editControlsPlacement()
@@ -831,7 +831,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
     MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.emulation_toggle_controls);
 
-    int currentController = InputOverlay.getConfiguredControllerType(mSettings);
+    int currentController = InputOverlay.getConfiguredControllerType();
 
     if (currentController == InputOverlay.OVERLAY_GAMECUBE)
     {
@@ -840,7 +840,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
 
       for (int i = 0; i < gcEnabledButtons.length; i++)
       {
-        gcEnabledButtons[i] = BooleanSetting.valueOf(gcSettingBase + i).getBoolean(mSettings);
+        gcEnabledButtons[i] = BooleanSetting.valueOf(gcSettingBase + i).getBoolean();
       }
       builder.setMultiChoiceItems(R.array.gcpadButtons, gcEnabledButtons,
               (dialog, indexSelected, isChecked) -> BooleanSetting
@@ -854,7 +854,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
       for (int i = 0; i < wiiClassicEnabledButtons.length; i++)
       {
         wiiClassicEnabledButtons[i] =
-                BooleanSetting.valueOf(classicSettingBase + i).getBoolean(mSettings);
+                BooleanSetting.valueOf(classicSettingBase + i).getBoolean();
       }
       builder.setMultiChoiceItems(R.array.classicButtons, wiiClassicEnabledButtons,
               (dialog, indexSelected, isChecked) -> BooleanSetting
@@ -868,7 +868,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
 
       for (int i = 0; i < wiiEnabledButtons.length; i++)
       {
-        wiiEnabledButtons[i] = BooleanSetting.valueOf(wiiSettingBase + i).getBoolean(mSettings);
+        wiiEnabledButtons[i] = BooleanSetting.valueOf(wiiSettingBase + i).getBoolean();
       }
       if (currentController == InputOverlay.OVERLAY_WIIMOTE_NUNCHUK)
       {
@@ -887,15 +887,15 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
     builder.setNeutralButton(R.string.emulation_toggle_all,
                     (dialogInterface, i) -> mEmulationFragment.toggleInputOverlayVisibility(mSettings))
             .setPositiveButton(R.string.ok, (dialogInterface, i) ->
-                    mEmulationFragment.refreshInputOverlay(mSettings))
+                    mEmulationFragment.refreshInputOverlay())
             .show();
   }
 
   public void chooseDoubleTapButton()
   {
-    int currentValue = IntSetting.MAIN_DOUBLE_TAP_BUTTON.getInt(mSettings);
+    int currentValue = IntSetting.MAIN_DOUBLE_TAP_BUTTON.getInt();
 
-    int buttonList = InputOverlay.getConfiguredControllerType(mSettings) ==
+    int buttonList = InputOverlay.getConfiguredControllerType() ==
             InputOverlay.OVERLAY_WIIMOTE_CLASSIC ? R.array.doubleTapWithClassic : R.array.doubleTap;
 
     int checkedItem = -1;
@@ -914,7 +914,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
                     (DialogInterface dialog, int which) -> IntSetting.MAIN_DOUBLE_TAP_BUTTON.setInt(
                             mSettings, InputOverlayPointer.DOUBLE_TAP_OPTIONS.get(which)))
             .setPositiveButton(R.string.ok,
-                    (dialogInterface, i) -> mEmulationFragment.initInputPointer(mSettings))
+                    (dialogInterface, i) -> mEmulationFragment.initInputPointer())
             .show();
   }
 
@@ -925,7 +925,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
     final Slider scaleSlider = dialogBinding.inputScaleSlider;
     final TextView scaleValue = dialogBinding.inputScaleValue;
     scaleSlider.setValueTo(150);
-    scaleSlider.setValue(IntSetting.MAIN_CONTROL_SCALE.getInt(mSettings));
+    scaleSlider.setValue(IntSetting.MAIN_CONTROL_SCALE.getInt());
     scaleSlider.setStepSize(1);
     scaleSlider.addOnChangeListener(
             (slider, progress, fromUser) -> scaleValue.setText(((int) progress + 50) + "%"));
@@ -935,7 +935,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
     final Slider sliderOpacity = dialogBinding.inputOpacitySlider;
     final TextView valueOpacity = dialogBinding.inputOpacityValue;
     sliderOpacity.setValueTo(100);
-    sliderOpacity.setValue(IntSetting.MAIN_CONTROL_OPACITY.getInt(mSettings));
+    sliderOpacity.setValue(IntSetting.MAIN_CONTROL_OPACITY.getInt());
     sliderOpacity.setStepSize(1);
     sliderOpacity.addOnChangeListener(
             (slider, progress, fromUser) -> valueOpacity.setText(((int) progress) + "%"));
@@ -948,13 +948,13 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
             {
               IntSetting.MAIN_CONTROL_SCALE.setInt(mSettings, (int) scaleSlider.getValue());
               IntSetting.MAIN_CONTROL_OPACITY.setInt(mSettings, (int) sliderOpacity.getValue());
-              mEmulationFragment.refreshInputOverlay(mSettings);
+              mEmulationFragment.refreshInputOverlay();
             })
             .setNeutralButton(R.string.default_values, (dialog, which) ->
             {
               IntSetting.MAIN_CONTROL_SCALE.delete(mSettings);
               IntSetting.MAIN_CONTROL_OPACITY.delete(mSettings);
-              mEmulationFragment.refreshInputOverlay(mSettings);
+              mEmulationFragment.refreshInputOverlay();
             })
             .show();
   }
@@ -962,7 +962,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
   private void addControllerIfNotNone(List<CharSequence> entries, List<Integer> values,
           IntSetting controller, int entry, int value)
   {
-    if (controller.getInt(mSettings) != 0)
+    if (controller.getInt() != 0)
     {
       entries.add(getString(entry));
       values.add(value);
@@ -992,7 +992,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
 
     IntSetting controllerSetting = NativeLibrary.IsEmulatingWii() ?
             IntSetting.MAIN_OVERLAY_WII_CONTROLLER : IntSetting.MAIN_OVERLAY_GC_CONTROLLER;
-    int currentValue = controllerSetting.getInt(mSettings);
+    int currentValue = controllerSetting.getInt();
 
     int checkedItem = -1;
     for (int i = 0; i < values.size(); i++)
@@ -1013,7 +1013,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
             .setPositiveButton(R.string.ok, (dialogInterface, i) ->
             {
               editor.apply();
-              mEmulationFragment.refreshInputOverlay(mSettings);
+              mEmulationFragment.refreshInputOverlay();
             })
             .setNeutralButton(R.string.emulation_more_controller_settings,
                     (dialogInterface, i) -> SettingsActivity.launch(this, MenuTag.SETTINGS))
@@ -1025,11 +1025,11 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
     new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.emulation_ir_mode)
             .setSingleChoiceItems(R.array.irModeEntries,
-                    IntSetting.MAIN_IR_MODE.getInt(mSettings),
+                    IntSetting.MAIN_IR_MODE.getInt(),
                     (dialog, indexSelected) ->
                             IntSetting.MAIN_IR_MODE.setInt(mSettings, indexSelected))
             .setPositiveButton(R.string.ok, (dialogInterface, i) ->
-                    mEmulationFragment.refreshOverlayPointer(mSettings))
+                    mEmulationFragment.refreshOverlayPointer())
             .show();
   }
 
@@ -1065,7 +1065,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
     new MaterialAlertDialogBuilder(this)
             .setTitle(getString(R.string.emulation_touch_overlay_reset))
             .setPositiveButton(R.string.yes,
-                    (dialogInterface, i) -> mEmulationFragment.resetInputOverlay(mSettings))
+                    (dialogInterface, i) -> mEmulationFragment.resetInputOverlay())
             .setNegativeButton(R.string.cancel, null)
             .show();
   }
@@ -1160,7 +1160,7 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
 
   public void initInputPointer()
   {
-    mEmulationFragment.initInputPointer(mSettings);
+    mEmulationFragment.initInputPointer();
   }
 
   @Override

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.kt

@@ -59,7 +59,7 @@ class GameAdapter(private val mActivity: FragmentActivity) : RecyclerView.Adapte
         val gameFile = mGameFiles[position]
 
         holder.apply {
-            if (BooleanSetting.MAIN_SHOW_GAME_TITLES.booleanGlobal) {
+            if (BooleanSetting.MAIN_SHOW_GAME_TITLES.boolean) {
                 binding.textGameTitle.text = gameFile.title
                 binding.textGameTitle.visibility = View.VISIBLE
                 binding.textGameTitleInner.visibility = View.GONE

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

@@ -92,7 +92,7 @@ public class GamePropertiesDialog extends DialogFragment
         {
           settings.loadSettings();
           StringSetting.MAIN_DEFAULT_ISO.setString(settings, path);
-          settings.saveSettings(null, getContext());
+          settings.saveSettings(getContext());
         }
       });
     }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.kt

@@ -160,7 +160,7 @@ class CheatsActivity : AppCompatActivity(), PanelSlideListener {
 
     fun loadGameSpecificSettings(): Settings {
         val settings = Settings()
-        settings.loadSettings(null, gameId, revision, isWii)
+        settings.loadSettings(gameId, revision, isWii)
         return settings
     }
 

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/SettingDisabledWarningFragment.kt

@@ -42,8 +42,8 @@ abstract class SettingDisabledWarningFragment(
     override fun onResume() {
         super.onResume()
         val activity = requireActivity() as CheatsActivity
-        activity.loadGameSpecificSettings().use { settings ->
-            val cheatsEnabled = setting.getBoolean(settings)
+        activity.loadGameSpecificSettings().use {
+            val cheatsEnabled = setting.getBoolean()
             requireView().visibility = if (cheatsEnabled) View.GONE else View.VISIBLE
         }
     }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/ControlGroupEnabledSetting.java

@@ -2,6 +2,8 @@
 
 package org.dolphinemu.dolphinemu.features.input.model;
 
+import androidx.annotation.NonNull;
+
 import org.dolphinemu.dolphinemu.features.input.model.controlleremu.ControlGroup;
 import org.dolphinemu.dolphinemu.features.settings.model.AbstractBooleanSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
@@ -16,19 +18,19 @@ public class ControlGroupEnabledSetting implements AbstractBooleanSetting
   }
 
   @Override
-  public boolean getBoolean(Settings settings)
+  public boolean getBoolean()
   {
     return mControlGroup.getEnabled();
   }
 
   @Override
-  public void setBoolean(Settings settings, boolean newValue)
+  public void setBoolean(@NonNull Settings settings, boolean newValue)
   {
     mControlGroup.setEnabled(newValue);
   }
 
   @Override
-  public boolean isOverridden(Settings settings)
+  public boolean isOverridden()
   {
     return false;
   }
@@ -40,7 +42,7 @@ public class ControlGroupEnabledSetting implements AbstractBooleanSetting
   }
 
   @Override
-  public boolean delete(Settings settings)
+  public boolean delete(@NonNull Settings settings)
   {
     boolean newValue = mControlGroup.getDefaultEnabledValue() != ControlGroup.DEFAULT_ENABLED_NO;
     mControlGroup.setEnabled(newValue);

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingBooleanSetting.java

@@ -2,6 +2,8 @@
 
 package org.dolphinemu.dolphinemu.features.input.model;
 
+import androidx.annotation.NonNull;
+
 import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.AbstractBooleanSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
@@ -16,19 +18,19 @@ public class InputMappingBooleanSetting implements AbstractBooleanSetting
   }
 
   @Override
-  public boolean getBoolean(Settings settings)
+  public boolean getBoolean()
   {
     return mNumericSetting.getBooleanValue();
   }
 
   @Override
-  public void setBoolean(Settings settings, boolean newValue)
+  public void setBoolean(@NonNull Settings settings, boolean newValue)
   {
     mNumericSetting.setBooleanValue(newValue);
   }
 
   @Override
-  public boolean isOverridden(Settings settings)
+  public boolean isOverridden()
   {
     return false;
   }
@@ -40,7 +42,7 @@ public class InputMappingBooleanSetting implements AbstractBooleanSetting
   }
 
   @Override
-  public boolean delete(Settings settings)
+  public boolean delete(@NonNull Settings settings)
   {
     mNumericSetting.setBooleanValue(mNumericSetting.getBooleanDefaultValue());
     return true;

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingDoubleSetting.java

@@ -2,6 +2,8 @@
 
 package org.dolphinemu.dolphinemu.features.input.model;
 
+import androidx.annotation.NonNull;
+
 import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.AbstractFloatSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
@@ -17,19 +19,19 @@ public class InputMappingDoubleSetting implements AbstractFloatSetting
   }
 
   @Override
-  public float getFloat(Settings settings)
+  public float getFloat()
   {
     return (float) mNumericSetting.getDoubleValue();
   }
 
   @Override
-  public void setFloat(Settings settings, float newValue)
+  public void setFloat(@NonNull Settings settings, float newValue)
   {
     mNumericSetting.setDoubleValue(newValue);
   }
 
   @Override
-  public boolean isOverridden(Settings settings)
+  public boolean isOverridden()
   {
     return false;
   }
@@ -41,7 +43,7 @@ public class InputMappingDoubleSetting implements AbstractFloatSetting
   }
 
   @Override
-  public boolean delete(Settings settings)
+  public boolean delete(@NonNull Settings settings)
   {
     mNumericSetting.setDoubleValue(mNumericSetting.getDoubleDefaultValue());
     return true;

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/InputMappingIntSetting.java

@@ -2,6 +2,8 @@
 
 package org.dolphinemu.dolphinemu.features.input.model;
 
+import androidx.annotation.NonNull;
+
 import org.dolphinemu.dolphinemu.features.input.model.controlleremu.NumericSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.AbstractIntSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
@@ -16,19 +18,19 @@ public class InputMappingIntSetting implements AbstractIntSetting
   }
 
   @Override
-  public int getInt(Settings settings)
+  public int getInt()
   {
     return mNumericSetting.getIntValue();
   }
 
   @Override
-  public void setInt(Settings settings, int newValue)
+  public void setInt(@NonNull Settings settings, int newValue)
   {
     mNumericSetting.setIntValue(newValue);
   }
 
   @Override
-  public boolean isOverridden(Settings settings)
+  public boolean isOverridden()
   {
     return false;
   }
@@ -40,7 +42,7 @@ public class InputMappingIntSetting implements AbstractIntSetting
   }
 
   @Override
-  public boolean delete(Settings settings)
+  public boolean delete(@NonNull Settings settings)
   {
     mNumericSetting.setIntValue(mNumericSetting.getIntDefaultValue());
     return true;

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/view/InputDeviceSetting.java

@@ -24,13 +24,13 @@ public class InputDeviceSetting extends StringSingleChoiceSetting
   }
 
   @Override
-  public String getSelectedChoice(Settings settings)
+  public String getSelectedChoice()
   {
     return mController.getDefaultDevice();
   }
 
   @Override
-  public String getSelectedValue(Settings settings)
+  public String getSelectedValue()
   {
     return mController.getDefaultDevice();
   }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.kt

@@ -44,7 +44,7 @@ class RiivolutionBootActivity : AppCompatActivity() {
         val revision = intent.getIntExtra(ARG_REVISION, -1)
         val discNumber = intent.getIntExtra(ARG_DISC_NUMBER, -1)
 
-        var loadPath = StringSetting.MAIN_LOAD_PATH.stringGlobal
+        var loadPath = StringSetting.MAIN_LOAD_PATH.string
         if (loadPath.isEmpty()) loadPath = DirectoryInitialization.getUserDirectory() + "/Load"
 
         binding.textSdRoot.text = getString(R.string.riivolution_sd_root, "$loadPath/Riivolution")

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

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 
 public interface AbstractBooleanSetting extends AbstractSetting
 {
-  boolean getBoolean(@NonNull Settings settings);
+  boolean getBoolean();
 
   void setBoolean(@NonNull Settings settings, boolean newValue);
 }

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

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 
 public interface AbstractFloatSetting extends AbstractSetting
 {
-  float getFloat(@NonNull Settings settings);
+  float getFloat();
 
   void setFloat(@NonNull Settings settings, float newValue);
 }

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

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 
 public interface AbstractIntSetting extends AbstractSetting
 {
-  int getInt(@NonNull Settings settings);
+  int getInt();
 
   void setInt(@NonNull Settings settings, int newValue);
 }

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

@@ -1,37 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.features.settings.model;
-
-import androidx.annotation.NonNull;
-
-public class AbstractLegacySetting implements AbstractSetting
-{
-  protected final String mFile;
-  protected final String mSection;
-  protected final String mKey;
-
-  public AbstractLegacySetting(String file, String section, String key)
-  {
-    mFile = file;
-    mSection = section;
-    mKey = key;
-  }
-
-  @Override
-  public boolean isOverridden(@NonNull Settings settings)
-  {
-    return settings.isGameSpecific() && settings.getSection(mFile, mSection).exists(mKey);
-  }
-
-  @Override
-  public boolean isRuntimeEditable()
-  {
-    return false;
-  }
-
-  @Override
-  public boolean delete(@NonNull Settings settings)
-  {
-    return settings.getSection(mFile, mSection).delete(mKey);
-  }
-}

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

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 
 public interface AbstractSetting
 {
-  boolean isOverridden(@NonNull Settings settings);
+  boolean isOverridden();
 
   boolean isRuntimeEditable();
 

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

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 public interface AbstractStringSetting extends AbstractSetting
 {
   @NonNull
-  String getString(@NonNull Settings settings);
+  String getString();
 
   void setString(@NonNull Settings settings, @NonNull String newValue);
 }

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

@@ -25,7 +25,7 @@ public class AdHocBooleanSetting implements AbstractBooleanSetting
   }
 
   @Override
-  public boolean isOverridden(@NonNull Settings settings)
+  public boolean isOverridden()
   {
     return NativeConfig.isOverridden(mFile, mSection, mKey);
   }
@@ -43,7 +43,7 @@ public class AdHocBooleanSetting implements AbstractBooleanSetting
   }
 
   @Override
-  public boolean getBoolean(@NonNull Settings settings)
+  public boolean getBoolean()
   {
     return NativeConfig.getBoolean(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey, mDefaultValue);
   }

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

@@ -25,7 +25,7 @@ public class AdHocStringSetting implements AbstractStringSetting
   }
 
   @Override
-  public boolean isOverridden(@NonNull Settings settings)
+  public boolean isOverridden()
   {
     return NativeConfig.isOverridden(mFile, mSection, mKey);
   }
@@ -43,7 +43,7 @@ public class AdHocStringSetting implements AbstractStringSetting
   }
 
   @NonNull @Override
-  public String getString(@NonNull Settings settings)
+  public String getString()
   {
     return NativeConfig.getString(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey, mDefaultValue);
   }

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

@@ -296,12 +296,9 @@ public enum BooleanSetting implements AbstractBooleanSetting
   }
 
   @Override
-  public boolean isOverridden(@NonNull Settings settings)
+  public boolean isOverridden()
   {
-    if (settings.isGameSpecific() && !NativeConfig.isSettingSaveable(mFile, mSection, mKey))
-      return settings.getSection(mFile, mSection).exists(mKey);
-    else
-      return NativeConfig.isOverridden(mFile, mSection, mKey);
+    return NativeConfig.isOverridden(mFile, mSection, mKey);
   }
 
   @Override
@@ -322,62 +319,41 @@ public enum BooleanSetting implements AbstractBooleanSetting
   @Override
   public boolean delete(@NonNull Settings settings)
   {
-    if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
+    if (!NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
-    }
-    else
-    {
-      return settings.getSection(mFile, mSection).delete(mKey);
+      throw new UnsupportedOperationException(
+              "Unsupported setting: " + mFile + ", " + mSection + ", " + mKey);
     }
+
+    return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
   }
 
   @Override
-  public boolean getBoolean(@NonNull Settings settings)
+  public boolean getBoolean()
   {
-    if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
-    {
-      return NativeConfig.getBoolean(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey,
-              mDefaultValue);
-    }
-    else
-    {
-      return settings.getSection(mFile, mSection).getBoolean(mKey, mDefaultValue);
-    }
+    return NativeConfig.getBoolean(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey, mDefaultValue);
   }
 
   @Override
   public void setBoolean(@NonNull Settings settings, boolean newValue)
   {
-    if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
+    if (!NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      NativeConfig.setBoolean(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
-    }
-    else
-    {
-      settings.getSection(mFile, mSection).setBoolean(mKey, newValue);
+      throw new UnsupportedOperationException(
+              "Unsupported setting: " + mFile + ", " + mSection + ", " + mKey);
     }
+
+    NativeConfig.setBoolean(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
   }
 
-  public void setBoolean(int layerType, boolean newValue)
+  public void setBoolean(int layer, boolean newValue)
   {
-    if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
+    if (!NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      NativeConfig.setBoolean(layerType, mFile, mSection, mKey, newValue);
+      throw new UnsupportedOperationException(
+              "Unsupported setting: " + mFile + ", " + mSection + ", " + mKey);
     }
-    else
-    {
-      throw new UnsupportedOperationException("The old config system doesn't support layers");
-    }
-  }
 
-  public boolean getBooleanGlobal()
-  {
-    return NativeConfig.getBoolean(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey, mDefaultValue);
-  }
-
-  public void setBooleanGlobal(int layer, boolean newValue)
-  {
     NativeConfig.setBoolean(layer, mFile, mSection, mKey, newValue);
   }