Handle deep links when app is created

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

@@ -0,0 +1,30 @@
+package com.reactnativenavigation.controllers;
+
+import android.content.Intent;
+import android.net.Uri;
+
+import static android.content.Intent.ACTION_VIEW;
+
+public class DeepLinkHandler {
+    private static Uri deepLink;
+
+    static void saveDeepLinkData(Uri deepLink) {
+        DeepLinkHandler.deepLink = deepLink;
+    }
+
+    static boolean hasDeepLinkData() {
+        return deepLink != null;
+    }
+
+    static void setDeepLinkData(Intent intent) {
+        if (deepLink != null) {
+            intent.setData(deepLink);
+            intent.setAction(ACTION_VIEW);
+            clear();
+        }
+    }
+
+    private static void clear() {
+        deepLink = null;
+    }
+}

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

@@ -1,26 +0,0 @@
-package com.reactnativenavigation.controllers;
-
-import android.content.Intent;
-import android.net.Uri;
-
-import static android.content.Intent.ACTION_VIEW;
-
-public class Linking {
-    private static Uri initialUri;
-
-    static void saveInitialUri(Uri initialUri) {
-        Linking.initialUri = initialUri;
-    }
-
-    static void setInitialUri(Intent intent) {
-        if (initialUri != null) {
-            intent.setData(initialUri);
-            intent.setAction(ACTION_VIEW);
-            clear();
-        }
-    }
-
-    private static void clear() {
-        initialUri = null;
-    }
-}

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

@@ -81,10 +81,17 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         }
 
         currentActivity = this;
+        setDeepLinkData();
         NavigationApplication.instance.getReactGateway().onResumeActivity(this, this);
         EventBus.instance.register(this);
     }
 
+    private void setDeepLinkData() {
+        if (DeepLinkHandler.hasDeepLinkData()) {
+            DeepLinkHandler.setDeepLinkData(getIntent());
+        }
+    }
+
     @Override
     protected void onPause() {
         super.onPause();

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

@@ -36,7 +36,7 @@ public class NavigationCommandsHandler {
         } else {
             intent = new Intent(NavigationApplication.instance, NavigationActivity.class);
         }
-        Linking.setInitialUri(intent);
+        DeepLinkHandler.setDeepLinkData(intent);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra(ACTIVITY_PARAMS_BUNDLE, params);
         NavigationApplication.instance.startActivity(intent);

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

@@ -16,7 +16,7 @@ public abstract class SplashActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setSplashLayout();
-        Linking.saveInitialUri(getIntent().getData());
+        DeepLinkHandler.saveDeepLinkData(getIntent().getData());
     }
 
     @Override
@@ -24,6 +24,9 @@ public abstract class SplashActivity extends AppCompatActivity {
         super.onResume();
 
         if (NavigationApplication.instance.getReactGateway().hasStartedCreatingContext()) {
+            if (DeepLinkHandler.hasDeepLinkData()) {
+                finish();
+            }
             return;
         }