Fixes #718: fix rotation/sleep issues with EQ fragment

1 files changed, 22 insertions, 1 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
index 17cfdb42..ca6dd168 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
@@ -225,7 +225,12 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
 				bottomBar.setVisibility(View.GONE);
 				nowPlayingToolbar.setVisibility(View.VISIBLE);
 				setSupportActionBar(nowPlayingToolbar);
-				nowPlayingFragment.setPrimaryFragment(true);
+
+				if(secondaryFragment == null) {
+					nowPlayingFragment.setPrimaryFragment(true);
+				} else {
+					secondaryFragment.setPrimaryFragment(true);
+				}
 
 				drawerToggle.setDrawerIndicatorEnabled(false);
 				getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -467,6 +472,9 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
 	public void onSaveInstanceState(Bundle savedInstanceState) {
 		super.onSaveInstanceState(savedInstanceState);
 		savedInstanceState.putString(Constants.MAIN_NOW_PLAYING, nowPlayingFragment.getTag());
+		if(secondaryFragment != null) {
+			savedInstanceState.putString(Constants.MAIN_NOW_PLAYING_SECONDARY, secondaryFragment.getTag());
+		}
 		savedInstanceState.putInt(Constants.MAIN_SLIDE_PANEL_STATE, slideUpPanel.getPanelState().hashCode());
 	}
 	@Override
@@ -476,6 +484,19 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
 		String id = savedInstanceState.getString(Constants.MAIN_NOW_PLAYING);
 		FragmentManager fm = getSupportFragmentManager();
 		nowPlayingFragment = (NowPlayingFragment) fm.findFragmentByTag(id);
+
+		String secondaryId = savedInstanceState.getString(Constants.MAIN_NOW_PLAYING_SECONDARY);
+		if(secondaryId != null) {
+			secondaryFragment = (SubsonicFragment) fm.findFragmentByTag(secondaryId);
+
+			nowPlayingFragment.setPrimaryFragment(false);
+			secondaryFragment.setPrimaryFragment(true);
+
+			FragmentTransaction trans = getSupportFragmentManager().beginTransaction();
+			trans.hide(nowPlayingFragment);
+			trans.commit();
+		}
+
 		if(drawerToggle != null && backStack.size() > 0) {
 			drawerToggle.setDrawerIndicatorEnabled(false);
 		}