Skip to content

Prevented error when paused Activity isn’t the current Activity #26144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
grahammendick wants to merge 2 commits into from
Closed

Prevented error when paused Activity isn’t the current Activity #26144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
907f5e2
Removed error when paused isn't current
grahammendick Aug 21, 2019
35d9ef5
Merge branch 'master' into shared-pause
grahammendick Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ public void onHostPause() {

/**
* Call this from {@link Activity#onPause()}. This notifies any listening modules so they can do
* any necessary cleanup. The passed Activity is the current Activity being paused. This will
* any necessary cleanup. The passed Activity is the current Activity being paused. This may not
* always be the foreground activity that would be returned by {@link
* ReactContext#getCurrentActivity()}.
*
Expand All @@ -507,15 +507,9 @@ public void onHostPause() {
@ThreadConfined(UI)
public void onHostPause(Activity activity) {
Assertions.assertNotNull(mCurrentActivity);
Assertions.assertCondition(
activity == mCurrentActivity,
"Pausing an activity that is not the current activity, this is incorrect! "
+ "Current activity: "
+ mCurrentActivity.getClass().getSimpleName()
+ " "
+ "Paused activity: "
+ activity.getClass().getSimpleName());
onHostPause();
if (activity == mCurrentActivity) {
onHostPause();
}
}

/**
Expand Down