#965

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/TopLevelApiTest.java

@@ -43,5 +43,9 @@ public class TopLevelApiTest extends BaseTest {
 		elementByText("onStart");
 		device().pressBack();
 		assertExists(By.text("componentWillUnmount"));
+		elementByText("OK").click();
+		assertExists(By.text("onStop"));
+		elementByText("OK").click();
+		assertMainShown();
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -3,10 +3,8 @@ package com.reactnativenavigation;
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
-import com.reactnativenavigation.react.DevPermissionRequest;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
@@ -18,10 +16,7 @@ public abstract class NavigationApplication extends Application implements React
 	public void onCreate() {
 		super.onCreate();
 		reactNativeHost = new NavigationReactNativeHost(this, isDebug());
-
-		ReactInstanceManager reactInstanceManager = reactNativeHost.getReactInstanceManager();
-		DevPermissionRequest devPermissionRequest = new DevPermissionRequest(this, isDebug());
-		activityLifecycle = new ActivityLifecycleDelegate(reactInstanceManager, devPermissionRequest);
+		activityLifecycle = new ActivityLifecycleDelegate(reactNativeHost.getReactInstanceManager(), isDebug());
 	}
 
 	@Override

lib/android/app/src/main/java/com/reactnativenavigation/controllers/ActivityLifecycleDelegate.java

@@ -15,9 +15,9 @@ public class ActivityLifecycleDelegate {
 	private final DevPermissionRequest devPermissionRequest;
 	private final AtomicBoolean appLaunchEmitted = new AtomicBoolean(false);
 
-	public ActivityLifecycleDelegate(ReactInstanceManager reactInstanceManager, DevPermissionRequest devPermissionRequest) {
+	public ActivityLifecycleDelegate(ReactInstanceManager reactInstanceManager, boolean isDebug) {
 		this.reactInstanceManager = reactInstanceManager;
-		this.devPermissionRequest = devPermissionRequest;
+		this.devPermissionRequest = new DevPermissionRequest(isDebug);
 	}
 
 	public void onActivityCreated(NavigationActivity activity) {
@@ -25,8 +25,8 @@ public class ActivityLifecycleDelegate {
 	}
 
 	public void onActivityResumed(NavigationActivity activity) {
-		if (devPermissionRequest.shouldAskPermission()) {
-			devPermissionRequest.askPermission();
+		if (devPermissionRequest.shouldAskPermission(activity)) {
+			devPermissionRequest.askPermission(activity);
 		} else {
 			reactInstanceManager.onHostResume(activity, activity);
 			prepareReactApp();

lib/android/app/src/main/java/com/reactnativenavigation/react/DevPermissionRequest.java

@@ -1,7 +1,7 @@
 package com.reactnativenavigation.react;
 
 import android.annotation.TargetApi;
-import android.app.Application;
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.provider.Settings;
@@ -12,31 +12,29 @@ import com.facebook.react.common.ReactConstants;
 
 public class DevPermissionRequest {
 
-	private final Application application;
 	private final boolean isDebug;
 
-	public DevPermissionRequest(Application application, boolean isDebug) {
-		this.application = application;
+	public DevPermissionRequest(boolean isDebug) {
 		this.isDebug = isDebug;
 	}
 
-	public boolean shouldAskPermission() {
+	public boolean shouldAskPermission(Activity activity) {
 		return isDebug &&
 				Build.VERSION.SDK_INT >= 23 &&
-				!Settings.canDrawOverlays(application);
+				!Settings.canDrawOverlays(activity);
 	}
 
 	@TargetApi(23)
-	public void askPermission() {
-		if (shouldAskPermission()) {
+	public void askPermission(Activity activity) {
+		if (shouldAskPermission(activity)) {
 			Intent serviceIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
 			serviceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			application.startActivity(serviceIntent);
+			activity.startActivity(serviceIntent);
 			String msg = "Overlay permissions needs to be granted in order for react native apps to run in dev mode";
 			Log.w(ReactConstants.TAG, "======================================\n\n");
 			Log.w(ReactConstants.TAG, msg);
 			Log.w(ReactConstants.TAG, "\n\n======================================");
-			Toast.makeText(application, msg, Toast.LENGTH_LONG).show();
+			Toast.makeText(activity, msg, Toast.LENGTH_LONG).show();
 		}
 	}
 }