fake onNewIntent to handle deep links when app is in foreground (#766)

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

@@ -1,26 +1,60 @@
 package com.reactnativenavigation.controllers;
 
 import android.content.Intent;
+import android.support.annotation.Nullable;
+
+import com.reactnativenavigation.NavigationApplication;
 
 import static android.content.Intent.ACTION_VIEW;
 
-public class IntentDataHandler {
+class IntentDataHandler {
     private static Intent intent;
 
+    static void onStartApp(Intent intent) {
+        setIntentData(intent);
+    }
+
+    static void onResume(Intent intent) {
+        if (hasIntentData()) {
+            setIntentData(intent);
+        } else {
+            saveIntentData(intent);
+        }
+    }
+
     static void saveIntentData(Intent intent) {
         IntentDataHandler.intent = intent;
     }
 
-    static boolean hasIntentData() {
+    static void onPostResume(Intent intent) {
+        if (hasIntentData()) {
+            fakeOnNewIntentForLinkingModule(intent);
+            clear();
+        }
+    }
+
+    static void onPause(@Nullable Intent intent) {
+        if (intent != null) {
+            intent.setData(null);
+        }
+        clear();
+    }
+
+    private static void fakeOnNewIntentForLinkingModule(Intent intent) {
+        if (intent != null) {
+            NavigationApplication.instance.getReactGateway().onNewIntent(intent);
+        }
+    }
+
+    private static boolean hasIntentData() {
         return intent != null;
     }
 
-    static void setIntentData(Intent intent) {
-        if (IntentDataHandler.intent != null) {
+    private static void setIntentData(@Nullable Intent intent) {
+        if (intent != null && IntentDataHandler.intent != null) {
             intent.setData(IntentDataHandler.intent.getData());
             intent.putExtras(IntentDataHandler.intent);
             intent.setAction(ACTION_VIEW);
-            clear();
         }
     }
 

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

@@ -106,16 +106,11 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         }
 
         currentActivity = this;
-        setDeepLinkData();
+        IntentDataHandler.onResume(getIntent());
         NavigationApplication.instance.getReactGateway().onResumeActivity(this, this);
         NavigationApplication.instance.getActivityCallbacks().onActivityResumed(this);
         EventBus.instance.register(this);
-    }
-
-    private void setDeepLinkData() {
-        if (IntentDataHandler.hasIntentData()) {
-            IntentDataHandler.setIntentData(getIntent());
-        }
+        IntentDataHandler.onPostResume(getIntent());
     }
 
     @Override
@@ -129,6 +124,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     protected void onPause() {
         super.onPause();
         currentActivity = null;
+        IntentDataHandler.onPause(getIntent());
         NavigationApplication.instance.getReactGateway().onPauseActivity();
         NavigationApplication.instance.getActivityCallbacks().onActivityPaused(this);
         EventBus.instance.unregister(this);

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

@@ -42,7 +42,7 @@ public class NavigationCommandsHandler {
         } else {
             intent = new Intent(NavigationApplication.instance, NavigationActivity.class);
         }
-        IntentDataHandler.setIntentData(intent);
+        IntentDataHandler.onStartApp(intent);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(ACTIVITY_PARAMS_BUNDLE, params);
         NavigationApplication.instance.startActivity(intent);