The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 15:31:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Android: Fix SettingsActivity back stack behavior after stop+start

Browse Source 
Fixes the behavior where the settings activity would go back to
the top-level menu after switching to a different app and back.
This commit is contained in:
JosJuice 2020-08-05 13:50:36 +02:00
parent c727f03590
commit 05e49b13ef
3 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
View File

@ -108,16 +108,13 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
mPresenter.onStop(isFinishing()); mPresenter.onStop(isFinishing());
} }
@Override
public void onBackPressed()
{
mPresenter.onBackPressed();
}
@Override @Override
public void showSettingsFragment(MenuTag menuTag, Bundle extras, boolean addToStack, public void showSettingsFragment(MenuTag menuTag, Bundle extras, boolean addToStack,
String gameID) String gameID)
{ {
if (!addToStack && getFragment() != null)
return;
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
if (addToStack) if (addToStack)
@ -132,7 +129,6 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
} }
transaction.addToBackStack(null); transaction.addToBackStack(null);
mPresenter.addToStack();
} }
transaction.replace(R.id.frame_content, SettingsFragment.newInstance(menuTag, gameID, extras), transaction.replace(R.id.frame_content, SettingsFragment.newInstance(menuTag, gameID, extras),
FRAGMENT_TAG); FRAGMENT_TAG);
@ -279,12 +275,6 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
Toast.makeText(this, message, Toast.LENGTH_SHORT).show(); Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
} }
@Override
public void popBackStack()
{
getSupportFragmentManager().popBackStackImmediate();
}
@Override @Override
public void onSettingChanged(String key) public void onSettingChanged(String key)
{ {

20
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
View File

@ -23,8 +23,6 @@ public final class SettingsActivityPresenter
private Settings mSettings = new Settings(); private Settings mSettings = new Settings();
private int mStackCount;
private boolean mShouldSave; private boolean mShouldSave;
private DirectoryStateReceiver directoryStateReceiver; private DirectoryStateReceiver directoryStateReceiver;
@ -147,24 +145,6 @@ public final class SettingsActivityPresenter
} }
} }
public void addToStack()
{
mStackCount++;
}
public void onBackPressed()
{
if (mStackCount > 0)
{
mView.popBackStack();
mStackCount--;
}
else
{
mView.finish();
}
}
public boolean handleOptionsItem(int itemId) public boolean handleOptionsItem(int itemId)
{ {
switch (itemId) switch (itemId)

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityView.java
View File

@ -56,11 +56,6 @@ public interface SettingsActivityView
*/ */
void showToastMessage(String message); void showToastMessage(String message);
/**
* Show the previous fragment.
*/
void popBackStack();
/** /**
* End the activity. * End the activity.
*/ */