|
@@ -299,7 +299,7 @@ public class MainActivity extends Activity {
|
|
|
|
|
|
if(action != null && action.equals("SHOW_HOME")){
|
|
|
if(this.mDisplayedFragment != null && !this.mDisplayedFragment.getClass().equals(HomeFragment.class)){
|
|
|
- getFragmentManager().popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
|
|
|
+ getFragmentManager().popBackStackImmediate(HomeFragment.class.getName(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
|
|
|
displayView(MainMenuItem.HOME.getValue());
|
|
|
|
|
|
getIntent().setAction(null);
|
|
@@ -434,9 +434,9 @@ public class MainActivity extends Activity {
|
|
|
|
|
|
FragmentManager fragmentManager = getFragmentManager();
|
|
|
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
|
|
|
- fragmentTransaction.replace(R.id.content_frame, fragment, null);
|
|
|
+ fragmentTransaction.replace(R.id.content_frame, fragment, fragment.getClass().getName());
|
|
|
|
|
|
- fragmentTransaction.addToBackStack(null);
|
|
|
+ fragmentTransaction.addToBackStack(fragment.getClass().getName());
|
|
|
|
|
|
fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
|
|
|
fragmentTransaction.commit();
|