Android: Remove SettingsActivityView parameters from Settings

No longer used for anything.

6 files changed, 12 insertions, 13 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index d798a25393..b9a9eab46e 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -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()
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
index 339434e8e3..fa185b7afd 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
+++ b/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());
         }
       });
     }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.kt
index 11278360cf..d22431752b 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.kt
+++ b/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
     }
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
index a67dd63acc..0bb935f3df 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
@@ -9,7 +9,6 @@ import android.widget.Toast;
 import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.features.input.model.MappingCommon;
-import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivityView;
 import org.dolphinemu.dolphinemu.services.GameFileCacheManager;
 
 import java.io.Closeable;
@@ -78,10 +77,10 @@ public class Settings implements Closeable
   public void loadSettings()
   {
     // The value of isWii doesn't matter if we don't have any SettingsActivity
-    loadSettings(null, true);
+    loadSettings(true);
   }
 
-  public void loadSettings(SettingsActivityView view, boolean isWii)
+  public void loadSettings(boolean isWii)
   {
     mIsWii = isWii;
     mSettingsLoaded = true;
@@ -98,14 +97,14 @@ public class Settings implements Closeable
     mLoadedRecursiveIsoPathsValue = BooleanSetting.MAIN_RECURSIVE_ISO_PATHS.getBoolean();
   }
 
-  public void loadSettings(SettingsActivityView view, String gameId, int revision, boolean isWii)
+  public void loadSettings(String gameId, int revision, boolean isWii)
   {
     mGameId = gameId;
     mRevision = revision;
-    loadSettings(view, isWii);
+    loadSettings(isWii);
   }
 
-  public void saveSettings(SettingsActivityView view, Context context)
+  public void saveSettings(Context context)
   {
     if (!isGameSpecific())
     {
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
index 1b50754fdd..00561daffb 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
@@ -70,7 +70,7 @@ public final class SettingsActivityPresenter
     {
       if (!TextUtils.isEmpty(mGameId))
       {
-        mSettings.loadSettings(mView, mGameId, mRevision, mIsWii);
+        mSettings.loadSettings(mGameId, mRevision, mIsWii);
 
         if (mSettings.gameIniContainsJunk())
         {
@@ -79,7 +79,7 @@ public final class SettingsActivityPresenter
       }
       else
       {
-        mSettings.loadSettings(mView, mIsWii);
+        mSettings.loadSettings(mIsWii);
       }
     }
 
@@ -110,7 +110,7 @@ public final class SettingsActivityPresenter
     if (mSettings != null && finishing && mShouldSave)
     {
       Log.debug("[SettingsActivity] Settings activity stopping. Saving settings to INI...");
-      mSettings.saveSettings(mView, mActivity);
+      mSettings.saveSettings(mActivity);
     }
   }
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.kt
index ffa117ffab..c8aa483d58 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.kt
@@ -34,7 +34,7 @@ object Analytics {
             BooleanSetting.MAIN_ANALYTICS_PERMISSION_ASKED.setBoolean(settings, true)
 
             // Context is set to null to avoid toasts
-            settings.saveSettings(null, null)
+            settings.saveSettings(null)
         }
     }