Merge pull request #10 from lorenc-tomasz/1.2.9

1.2.9

Author: lorenc-tomasz

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.9
+
+- [Android] Fix an uncommon issue with this.getCurrentActivity returning null inside of showInAppMessageIfAvailable
+
 # 1.2.8
 
 - Fix `sharedInstanceWithToken` method definition

android/src/main/java/com/kevinejohn/RNMixpanel/RNMixpanelModule.java

@@ -20,6 +20,8 @@
 import java.util.Map;
 import java.util.UUID;
 
+import android.app.Activity;
+
 /**
  * Mixpanel React Native module.
  * Note that synchronized(instance) is used in methods because that's what MixpanelAPI.java recommends you do if you are keeping instances.
@@ -270,6 +272,9 @@ public void initPushHandling (final String token, final String apiToken, Promise
             // REMOVED: https://github.com/mixpanel/mixpanel-android/pull/582
             // is not needed any more as it uses FCM
             // instance.getPeople().initPushHandling(token);
+            // MixpanelAPI.initPushHandling is deprecated.
+            // Mixpanel now uses Firebase Cloud Messaging.
+            // initPushHandling will be removed in a future version.
         }
         promise.resolve(null);
     }
@@ -474,7 +479,12 @@ public void showNotificationIfAvailable(final String apiToken, Promise promise)
             return;
         }
         synchronized(instance) {
-            instance.getPeople().showNotificationIfAvailable(this.getCurrentActivity());
+            Activity activity = this.getCurrentActivity();
+            MixpanelAPI.People people = instance.getPeople();
+
+            if(activity != null && people != null){
+                people.showNotificationIfAvailable(activity);
+            }
         }
         promise.resolve(null);
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mixpanel",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "A React Native wrapper for Mixpanel tracking",
   "main": "index.js",
   "repository": {