kylefang/react-navigation
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-navigation.git synced 2026-02-10 22:47:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we access fragment manager only when view is attached (activity is foregrounded) (#52)

Browse Source 
This change makes us reach to fragment manager only when screen container is attached to window (and therefore we are sure that the current activity is react one). The problem reported in #33 was due to the fact we'd do that when container is instantiated which does not necessarily mean that react activity is in foreground. We didn't need to actually access fragment manager while not in foreground so this change removes fragmentManager as a member and we get it directly from context when needed.

Supposedly fixes #33
This commit is contained in:
Krzysztof Magiera
2018-12-20 11:02:39 +01:00
committed by GitHub
parent 675852f95b
commit 369987f68e
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
android/src/main/java/com/swmansion/rnscreens/ScreenContainer.java
View File

@@ -22,7 +22,6 @@ public class ScreenContainer extends ViewGroup {
private final ArrayList<Screen> mScreens = new ArrayList<>();
private final Set<Screen> mActiveScreens = new HashSet<>();
private final FragmentManager mFragmentManager;
private @Nullable FragmentTransaction mCurrentTransaction;
private boolean mNeedUpdate;
@@ -37,13 +36,6 @@ public class ScreenContainer extends ViewGroup {
public ScreenContainer(Context context) {
super(context);
Activity activity = ((ReactContext) context).getCurrentActivity();
if (activity instanceof FragmentActivity) {
mFragmentManager = ((FragmentActivity) activity).getSupportFragmentManager();
} else {
throw new IllegalStateException(
"In order to use RNScreens components your app's activity need to extend ReactFragmentActivity or ReactCompatActivity");
}
}
@Override
@@ -88,8 +80,14 @@ public class ScreenContainer extends ViewGroup {
private FragmentTransaction getOrCreateTransaction() {
if (mCurrentTransaction == null) {
mCurrentTransaction = mFragmentManager.beginTransaction();
mCurrentTransaction.setReorderingAllowed(true);
Activity activity = ((ReactContext) getContext()).getCurrentActivity();
if (activity instanceof FragmentActivity) {
mCurrentTransaction = ((FragmentActivity) activity).getSupportFragmentManager().beginTransaction();
mCurrentTransaction.setReorderingAllowed(true);
} else {
throw new IllegalStateException(
"In order to use RNScreens components your app's activity need to extend ReactFragmentActivity or ReactCompatActivity");
}
}
return mCurrentTransaction;
}
@@ -136,7 +134,7 @@ public class ScreenContainer extends ViewGroup {
}
private void updateIfNeeded() {
if (!mNeedUpdate || mFragmentManager.isDestroyed() || !mIsAttached) {
if (!mNeedUpdate || !mIsAttached) {
return;
}
mNeedUpdate = false;