Merge pull request #9010 from JosJuice/android-settingsadapter-redundant-static

Android: Remove some static variables from SettingsAdapter

6 files changed, 40 insertions, 37 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
index 5d76d69363..2e297050ee 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
@@ -182,7 +182,8 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
     // If the user picked a file, as opposed to just backing out.
     if (resultCode == MainActivity.RESULT_OK)
     {
-      mPresenter.onFileConfirmed(FileBrowserHelper.getSelectedPath(result));
+      String path = FileBrowserHelper.getSelectedPath(result);
+      getFragment().getAdapter().onFilePickerConfirmation(path);
 
       // Prevent duplicate Toasts.
       if (!mPresenter.shouldSave())
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 71c47cbe01..34e8ba2a10 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
@@ -231,9 +231,4 @@ public final class SettingsActivityPresenter
       mView.showSettingsFragment(menuTag, bundle, true, gameId);
     }
   }
-
-  public void onFileConfirmed(String file)
-  {
-    SettingsAdapter.onFilePickerConfirmation(file);
-  }
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
index e2b387a049..1f2a7ab9dd 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
@@ -56,7 +56,6 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
         implements DialogInterface.OnClickListener, SeekBar.OnSeekBarChangeListener
 {
   private SettingsFragmentView mView;
-  private static SettingsFragmentView sView;
   private Context mContext;
   private ArrayList<SettingsItem> mSettings;
 
@@ -67,14 +66,9 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
   private AlertDialog mDialog;
   private TextView mTextSliderValue;
 
-  // TODO: Properly restore these two on activity recreation
-  private static FilePicker sFilePicker;
-  private static SettingsItem sItem;
-
   public SettingsAdapter(SettingsFragmentView view, Context context)
   {
     mView = view;
-    sView = view;
     mContext = context;
     mClickedPosition = -1;
   }
@@ -303,19 +297,18 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
 
   public void onFilePickerDirectoryClick(SettingsItem item)
   {
-    sFilePicker = (FilePicker) item;
-    sItem = item;
+    mClickedItem = item;
 
     FileBrowserHelper.openDirectoryPicker(mView.getActivity(), FileBrowserHelper.GAME_EXTENSIONS);
   }
 
   public void onFilePickerFileClick(SettingsItem item)
   {
-    sFilePicker = (FilePicker) item;
-    sItem = item;
+    mClickedItem = item;
+    FilePicker filePicker = (FilePicker) item;
 
     HashSet<String> extensions;
-    switch (sFilePicker.getRequestType())
+    switch (filePicker.getRequestType())
     {
       case MainPresenter.REQUEST_SD_FILE:
         extensions = FileBrowserHelper.RAW_EXTENSION;
@@ -330,17 +323,22 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
         throw new InvalidParameterException("Unhandled request code");
     }
 
-    FileBrowserHelper.openFilePicker(mView.getActivity(), sFilePicker.getRequestType(), false,
+    FileBrowserHelper.openFilePicker(mView.getActivity(), filePicker.getRequestType(), false,
             extensions);
   }
 
-  public static void onFilePickerConfirmation(String file)
+  public void onFilePickerConfirmation(String file)
   {
-    NativeLibrary.SetConfig(sFilePicker.getFile(), sItem.getSection(), sItem.getKey(), file);
+    FilePicker filePicker = (FilePicker) mClickedItem;
+
+    NativeLibrary.SetConfig(filePicker.getFile(), filePicker.getSection(), filePicker.getKey(),
+            file);
     NativeLibrary.ReloadConfig();
+
+    mClickedItem = null;
   }
 
-  public static void resetPaths()
+  public void resetPaths()
   {
     StringSetting defaultISO =
             new StringSetting(SettingsFile.KEY_DEFAULT_ISO, Settings.SECTION_INI_CORE, "");
@@ -360,23 +358,23 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
             new StringSetting(SettingsFile.KEY_WII_SD_CARD_PATH, Settings.SECTION_INI_GENERAL,
                     SettingsFragmentPresenter.getDefaultSDPath());
 
-    sView.putSetting(defaultISO);
-    sView.putSetting(NANDRootPath);
-    sView.putSetting(dumpPath);
-    sView.putSetting(loadPath);
-    sView.putSetting(resourcePackPath);
-    sView.putSetting(sdPath);
+    mView.putSetting(defaultISO);
+    mView.putSetting(NANDRootPath);
+    mView.putSetting(dumpPath);
+    mView.putSetting(loadPath);
+    mView.putSetting(resourcePackPath);
+    mView.putSetting(sdPath);
 
-    sView.onSettingChanged(null);
+    mView.onSettingChanged(null);
   }
 
-  public static void setAllLogTypes(String value)
+  public void setAllLogTypes(String value)
   {
     for (Map.Entry<String, String> entry : SettingsFragmentPresenter.LOG_TYPE_NAMES.entrySet())
     {
-      sView.putSetting(new StringSetting(entry.getKey(), Settings.SECTION_LOGGER_LOGS, value));
+      mView.putSetting(new StringSetting(entry.getKey(), Settings.SECTION_LOGGER_LOGS, value));
     }
-    sView.onSettingChanged(null);
+    mView.onSettingChanged(null);
   }
 
   private void handleMenuTag(MenuTag menuTag, int value)
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
index 69444b90c0..28fae8ac3d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
@@ -169,6 +169,12 @@ public final class SettingsFragment extends Fragment implements SettingsFragment
   }
 
   @Override
+  public SettingsAdapter getAdapter()
+  {
+    return mAdapter;
+  }
+
+  @Override
   public void loadSubMenu(MenuTag menuKey)
   {
     mActivity.showSettingsFragment(menuKey, null, true, getArguments().getString(ARGUMENT_GAME_ID));
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
index 5c0ce066a4..b72f2597b0 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
@@ -355,7 +355,7 @@ public final class SettingsFragmentPresenter
             Settings.SECTION_INI_GENERAL, R.string.SD_card_path, 0, getDefaultSDPath(),
             MainPresenter.REQUEST_SD_FILE, wiiSDCardPath));
     sl.add(new ConfirmRunnable(R.string.reset_paths, 0, R.string.reset_paths_confirmation, 0,
-            SettingsAdapter::resetPaths));
+            mView.getAdapter()::resetPaths));
   }
 
   private void addGameCubeSettings(ArrayList<SettingsItem> sl)
@@ -739,11 +739,9 @@ public final class SettingsFragmentPresenter
             R.string.log_verbosity, 0, getLogVerbosityEntries(), getLogVerbosityValues(), 1,
             logVerbosity));
     sl.add(new ConfirmRunnable(R.string.log_enable_all, 0, R.string.log_enable_all_confirmation, 0,
-            () -> SettingsAdapter.setAllLogTypes("True")));
-    sl.add(
-            new ConfirmRunnable(R.string.log_disable_all, 0, R.string.log_disable_all_confirmation,
-                    0,
-                    () -> SettingsAdapter.setAllLogTypes("False")));
+            () -> mView.getAdapter().setAllLogTypes("True")));
+    sl.add(new ConfirmRunnable(R.string.log_disable_all, 0, R.string.log_disable_all_confirmation,
+            0, () -> mView.getAdapter().setAllLogTypes("False")));
 
     sl.add(new HeaderSetting(null, null, R.string.log_types, 0));
     for (Map.Entry<String, String> entry : LOG_TYPE_NAMES.entrySet())
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.java
index 6de8b0f110..7c976535b2 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.java
@@ -41,6 +41,11 @@ public interface SettingsFragmentView
   FragmentActivity getActivity();
 
   /**
+   * @return The Fragment's SettingsAdapter.
+   */
+  SettingsAdapter getAdapter();
+
+  /**
    * Tell the Fragment to tell the containing Activity to show a new
    * Fragment containing a submenu of settings.
    *