Skip to content

[Breaking] Exposed activity on clearHostOnActivityDestroy #3133

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

Merged
guyca merged 1 commit into from
May 1, 2018
Merged

[Breaking] Exposed activity on clearHostOnActivityDestroy #3133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.reactnativenavigation;

import android.app.Activity;
import android.app.Application;
import android.content.Intent;
import android.os.Bundle;
Expand Down Expand Up @@ -126,7 +127,7 @@ public String getBundleAssetName() {

public abstract boolean isDebug();

public boolean clearHostOnActivityDestroy() {
public boolean clearHostOnActivityDestroy(Activity activity) {
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/com/reactnativenavigation/controllers/SplashActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected void onResume() {
return;
}
NavigationApplication.instance.getEventEmitter().sendAppLaunchedEvent();
if (NavigationApplication.instance.clearHostOnActivityDestroy()) {
if (NavigationApplication.instance.clearHostOnActivityDestroy(this)) {
overridePendingTransition(0, 0);
finish();
}
Expand Down
6 changes: 3 additions & 3 deletions android/app/src/main/java/com/reactnativenavigation/react/NavigationReactGateway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@ public void onBackPressed() {
}

public void onDestroyApp(Activity activity) {
if (NavigationApplication.instance.clearHostOnActivityDestroy()) {
if (NavigationApplication.instance.clearHostOnActivityDestroy(activity)) {
getReactInstanceManager().onHostDestroy();
} else if (hasStartedCreatingContext() && isInitialized()) {
getReactInstanceManager().onHostDestroy(activity);
}
if (NavigationApplication.instance.clearHostOnActivityDestroy()) {
if (NavigationApplication.instance.clearHostOnActivityDestroy(activity)) {
host.clear();
}
}

public void onPauseActivity(Activity activity) {
if (NavigationApplication.instance.clearHostOnActivityDestroy()) {
if (NavigationApplication.instance.clearHostOnActivityDestroy(activity)) {
getReactInstanceManager().onHostPause();
} else if (hasStartedCreatingContext() && isInitialized()) {
getReactInstanceManager().onHostPause(activity);
Expand Down