When starting the app, pass through extras included in the launch intent (#433)

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

@@ -1,30 +0,0 @@
-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/IntentDataHandler.java

@@ -0,0 +1,30 @@
+package com.reactnativenavigation.controllers;
+
+import android.content.Intent;
+
+import static android.content.Intent.ACTION_VIEW;
+
+public class IntentDataHandler {
+    private static Intent intent;
+
+    static void saveIntentData(Intent intent) {
+        IntentDataHandler.intent = intent;
+    }
+
+    static boolean hasIntentData() {
+        return intent != null;
+    }
+
+    static void setIntentData(Intent intent) {
+        if (IntentDataHandler.intent != null) {
+            intent.setData(IntentDataHandler.intent.getData());
+            intent.putExtras(IntentDataHandler.intent);
+            intent.setAction(ACTION_VIEW);
+            clear();
+        }
+    }
+
+    private static void clear() {
+        intent = null;
+    }
+}

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

@@ -95,8 +95,8 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     }
 
     private void setDeepLinkData() {
-        if (DeepLinkHandler.hasDeepLinkData()) {
-            DeepLinkHandler.setDeepLinkData(getIntent());
+        if (IntentDataHandler.hasIntentData()) {
+            IntentDataHandler.setIntentData(getIntent());
         }
     }
 

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);
         }
-        DeepLinkHandler.setDeepLinkData(intent);
+        IntentDataHandler.setIntentData(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();
-        DeepLinkHandler.saveDeepLinkData(getIntent().getData());
+        IntentDataHandler.saveIntentData(getIntent());
     }
 
     @Override