inject devPermissionRequest

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

@@ -8,22 +8,18 @@ import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
+import com.reactnativenavigation.react.DevPermissionRequestImpl;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {
 	public static NavigationApplication instance;
 
 	public static class Config {
-		public final ReactNativeHost reactNativeHost;
-		public final ActivityLifecycleDelegate activityLifecycleDelegate;
-
-		public Config(ReactNativeHost reactNativeHost, ActivityLifecycleDelegate activityLifecycleDelegate) {
-			this.reactNativeHost = reactNativeHost;
-			this.activityLifecycleDelegate = activityLifecycleDelegate;
-		}
+		public ReactNativeHost reactNativeHost;
+		public ActivityLifecycleDelegate activityLifecycleDelegate;
 	}
 
-	public Config config;
+	private Config config;
 
 	@Override
 	public void onCreate() {
@@ -34,7 +30,7 @@ public abstract class NavigationApplication extends Application implements React
 		registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
 			@Override
 			public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-				config.activityLifecycleDelegate.onActivityCreated(activity);
+				getConfig().activityLifecycleDelegate.onActivityCreated(activity);
 			}
 
 			@Override
@@ -44,12 +40,12 @@ public abstract class NavigationApplication extends Application implements React
 
 			@Override
 			public void onActivityResumed(Activity activity) {
-				config.activityLifecycleDelegate.onActivityResumed(activity, (DefaultHardwareBackBtnHandler) activity);
+				getConfig().activityLifecycleDelegate.onActivityResumed(activity, (DefaultHardwareBackBtnHandler) activity);
 			}
 
 			@Override
 			public void onActivityPaused(Activity activity) {
-				config.activityLifecycleDelegate.onActivityPaused(activity);
+				getConfig().activityLifecycleDelegate.onActivityPaused(activity);
 			}
 
 			@Override
@@ -64,14 +60,18 @@ public abstract class NavigationApplication extends Application implements React
 
 			@Override
 			public void onActivityDestroyed(Activity activity) {
-				config.activityLifecycleDelegate.onActivityDestroyed(activity);
+				getConfig().activityLifecycleDelegate.onActivityDestroyed(activity);
 			}
 		});
 	}
 
+	public final Config getConfig() {
+		return config;
+	}
+
 	@Override
 	public ReactNativeHost getReactNativeHost() {
-		return config.reactNativeHost;
+		return getConfig().reactNativeHost;
 	}
 
 	public abstract boolean isDebug();
@@ -82,8 +82,9 @@ public abstract class NavigationApplication extends Application implements React
 	 * @return the Config
 	 */
 	protected Config createConfig() {
-		ReactNativeHost reactNativeHost = new NavigationReactNativeHost(this, isDebug());
-		ActivityLifecycleDelegate activityLifecycleDelegate = new ActivityLifecycleDelegate(reactNativeHost.getReactInstanceManager());
-		return new Config(reactNativeHost, activityLifecycleDelegate);
+		Config config = new Config();
+		config.reactNativeHost = new NavigationReactNativeHost(this, isDebug());
+		config.activityLifecycleDelegate = new ActivityLifecycleDelegate(config.reactNativeHost.getReactInstanceManager(), new DevPermissionRequestImpl());
+		return config;
 	}
 }

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

@@ -5,18 +5,20 @@ import android.app.Activity;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
+import com.reactnativenavigation.react.DevPermissionRequest;
 import com.reactnativenavigation.react.NavigationEventEmitter;
-import com.reactnativenavigation.react.ReactDevPermission;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class ActivityLifecycleDelegate {
 
 	private final ReactInstanceManager reactInstanceManager;
+	private final DevPermissionRequest devPermissionRequest;
 	private final AtomicBoolean appLaunchEmitted = new AtomicBoolean(false);
 
-	public ActivityLifecycleDelegate(ReactInstanceManager reactInstanceManager) {
+	public ActivityLifecycleDelegate(ReactInstanceManager reactInstanceManager, DevPermissionRequest devPermissionRequest) {
 		this.reactInstanceManager = reactInstanceManager;
+		this.devPermissionRequest = devPermissionRequest;
 	}
 
 	public void onActivityCreated(Activity activity) {
@@ -24,8 +26,8 @@ public class ActivityLifecycleDelegate {
 	}
 
 	public void onActivityResumed(Activity activity, DefaultHardwareBackBtnHandler backBtnHandler) {
-		if (ReactDevPermission.shouldAskPermission()) {
-			ReactDevPermission.askPermission(activity);
+		if (devPermissionRequest.shouldAskPermission()) {
+			devPermissionRequest.askPermission();
 		} else {
 			reactInstanceManager.onHostResume(activity, backBtnHandler);
 			prepareReactApp();

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

@@ -0,0 +1,8 @@
+package com.reactnativenavigation.react;
+
+public interface DevPermissionRequest {
+
+	boolean shouldAskPermission();
+
+	void askPermission();
+}

android/app/src/main/java/com/reactnativenavigation/react/ReactDevPermission.java → android/app/src/main/java/com/reactnativenavigation/react/DevPermissionRequestImpl.java

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.react;
 
 import android.annotation.TargetApi;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.provider.Settings;
@@ -11,24 +10,26 @@ import android.widget.Toast;
 import com.facebook.react.common.ReactConstants;
 import com.reactnativenavigation.NavigationApplication;
 
-public class ReactDevPermission {
+public class DevPermissionRequestImpl implements DevPermissionRequest {
 
-	public static boolean shouldAskPermission() {
+	public boolean shouldAskPermission() {
 		return NavigationApplication.instance.isDebug() &&
 				Build.VERSION.SDK_INT >= 23 &&
 				!Settings.canDrawOverlays(NavigationApplication.instance);
 	}
 
+	@Override
 	@TargetApi(23)
-	public static void askPermission(Context context) {
+	public void askPermission() {
 		if (shouldAskPermission()) {
 			Intent serviceIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
-			context.startActivity(serviceIntent);
+			serviceIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+			NavigationApplication.instance.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(context, msg, Toast.LENGTH_LONG).show();
+			Toast.makeText(NavigationApplication.instance, msg, Toast.LENGTH_LONG).show();
 		}
 	}
 }

android/app/src/test/java/com/reactnativenavigation/NavigationActivityTest.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation;
 
 import android.view.View;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
@@ -10,8 +9,8 @@ import org.robolectric.android.controller.ActivityController;
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
 public class NavigationActivityTest extends BaseTest {
+
 	@Test
-	@Ignore
 	public void holdsContentView() throws Exception {
 		NavigationActivity activity = Robolectric.setupActivity(NavigationActivity.class);
 		assertThat(activity.getContentView()).isNull();

android/app/src/test/java/com/reactnativenavigation/NavigationApplicationTest.java

@@ -28,12 +28,11 @@ public class NavigationApplicationTest extends BaseTest {
 
 	@Test
 	public void holdsConfiguration() throws Exception {
-		assertThat(NavigationApplication.instance.config).isInstanceOf(NavigationApplication.Config.class);
+		assertThat(NavigationApplication.instance.getConfig()).isInstanceOf(NavigationApplication.Config.class);
 	}
 
 	@Test
 	public void configProvidesActivityLifecycleDelegate() throws Exception {
-		NavigationApplication.Config config = NavigationApplication.instance.config;
-		assertThat(config.activityLifecycleDelegate).isInstanceOf(ActivityLifecycleDelegate.class);
+		assertThat(NavigationApplication.instance.getConfig().activityLifecycleDelegate).isInstanceOf(ActivityLifecycleDelegate.class);
 	}
 }

android/app/src/test/java/com/reactnativenavigation/TestApplication.java

@@ -1,6 +1,7 @@
 package com.reactnativenavigation;
 
 import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
+import com.reactnativenavigation.mocks.TestDevPermissionRequest;
 import com.reactnativenavigation.mocks.TestReactNativeHost;
 
 public class TestApplication extends NavigationApplication {
@@ -12,8 +13,9 @@ public class TestApplication extends NavigationApplication {
 
 	@Override
 	protected Config createConfig() {
-		TestReactNativeHost host = new TestReactNativeHost(this, isDebug());
-		ActivityLifecycleDelegate delegate = new ActivityLifecycleDelegate(host.getReactInstanceManager());
-		return new Config(host, delegate);
+		Config config = new Config();
+		config.reactNativeHost = new TestReactNativeHost(this, isDebug());
+		config.activityLifecycleDelegate = new ActivityLifecycleDelegate(config.reactNativeHost.getReactInstanceManager(), new TestDevPermissionRequest());
+		return config;
 	}
 }

android/app/src/test/java/com/reactnativenavigation/mocks/TestDevPermissionRequest.java

@@ -0,0 +1,15 @@
+package com.reactnativenavigation.mocks;
+
+import com.reactnativenavigation.react.DevPermissionRequest;
+
+public class TestDevPermissionRequest implements DevPermissionRequest {
+	@Override
+	public boolean shouldAskPermission() {
+		return false;
+	}
+
+	@Override
+	public void askPermission() {
+		// nothing
+	}
+}