Merge pull request #84 from AppsFlyerSDK/dev/getCurrentActivity-fix

getCurrentActivity fix
AppsFlyerSDK · May 19, 2019 · 64332f0 · 64332f0
2 parents 789dd38 + 9a8f918
commit 64332f0
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerModule.java b/android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerModule.java
@@ -2,6 +2,7 @@
 
 
 import android.app.Application;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -130,8 +131,13 @@ private String callSdkInternal(ReadableMap _options) {
                 (isConversionData == true) ? registerConversionListener() : null,
                 application.getApplicationContext());
 
+        Intent intent = null;
+        Activity currentActivity = getCurrentActivity();
+
+        if (currentActivity != null) {
+            intent = currentActivity.getIntent();
+        }
 
-        Intent intent = this.getCurrentActivity().getIntent();
         //Generally we already do this validation into the SDK, anyways, we want to show it to clients
         if (intent != null && Intent.ACTION_VIEW.equals(intent.getAction())) {
             AppsFlyerLib.getInstance().setPluginDeepLinkData(intent);
@@ -240,7 +246,11 @@ private String trackEventInternal(final String eventName, ReadableMap eventData)
             data = new HashMap<>();
         }
 
-        AppsFlyerLib.getInstance().trackEvent(getCurrentActivity().getBaseContext(), eventName, data);
+        Activity currentActivity = getCurrentActivity();
+
+        if (currentActivity != null) {
+            AppsFlyerLib.getInstance().trackEvent(currentActivity.getBaseContext(), eventName, data);
+        }
 
         return null;
     }
@@ -287,10 +297,16 @@ public void trackEventWithPromise(
     @ReactMethod
     public void sendDeepLinkData(String url) {
         if (url != null) {
-            Intent intent = getCurrentActivity().getIntent();
-            Uri uri = Uri.parse(url);
-            intent.setData(uri);
-            AppsFlyerLib.getInstance().sendDeepLinkData(this.getCurrentActivity());
+
+            Intent intent = null;
+            Activity currentActivity = getCurrentActivity();
+
+            if (currentActivity != null) {
+                intent = currentActivity.getIntent();
+                Uri uri = Uri.parse(url);
+                intent.setData(uri);
+                AppsFlyerLib.getInstance().sendDeepLinkData(this.getCurrentActivity());
+            }
         }
     }