pushwoosh-react-native-plugin 7.0.0 → 7.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).",
   "main": "index.js",
   "types": "index.d.ts",

package/pushwoosh-react-native-plugin.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "pushwoosh-react-native-plugin"
-  s.version          = "7.0.0"
+  s.version          = "7.0.2"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'
@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
     s.dependency "React-Core"
   end
 
-  s.dependency 'PushwooshXCFramework', '7.2.6'
-  s.dependency 'PushwooshInboxUIXCFramework'
+  s.dependency 'PushwooshXCFramework', '7.2.7'
+  s.dependency 'PushwooshInboxUIXCFramework', '7.0.42'
 end

package/src/android/build.gradle

@@ -144,7 +144,7 @@ android {
 }
 
 ext {
-    pushwoosh = "6.13.0"
+    pushwoosh = "6.15.0"
 }
 
 dependencies {

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/ConversionUtil.java

@@ -31,8 +31,12 @@ public final class ConversionUtil {
 	}
 
 	public static JSONObject toJsonObject(ReadableMap readableMap) {
-		ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
 		JSONObject result = new JSONObject();
+		if (readableMap == null) {
+			PWLog.error(PushwooshPlugin.TAG, "Could not convert object: map is null.");
+			return result;
+		}
+		ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
 		while (iterator.hasNextKey()) {
 			String key = iterator.nextKey();
 			ReadableType type = readableMap.getType(key);
@@ -215,6 +219,10 @@ public final class ConversionUtil {
 	
 	public static ArrayList<String> messageCodesArrayToArrayList(ReadableArray readableArray) {
 		ArrayList<String> result = new ArrayList<>();
+		if (readableArray == null) {
+			PWLog.error(PushwooshPlugin.TAG, "Could not convert message codes: array is null.");
+			return result;
+		}
 		for (int i = 0; i < readableArray.size(); i++) {
 			ReadableType indexType = readableArray.getType(i);
 			try {

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/EventDispatcher.java

@@ -9,6 +9,7 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.pushwoosh.internal.utils.PWLog;
 
 public class EventDispatcher {
 
@@ -37,7 +38,15 @@ public class EventDispatcher {
 
             List<Callback> list = subscribers.get(event);
             for (Callback subscriber : list) {
-                subscriber.invoke(objects);
+                try {
+                    subscriber.invoke(objects);
+                } catch (Exception e) {
+                    // A callback bound to a runtime that is already gone throws, and React Native
+                    // throws on a second invocation of a callback as well. The subscribers behind
+                    // it, and the clear() below, have to happen anyway - otherwise the bad callback
+                    // stays in the list and takes down every dispatch that follows.
+                    PWLog.exception(e);
+                }
             }
 
             // A native module is supposed to invoke its callback only once!

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/InboxUiStyleManager.java

@@ -7,8 +7,10 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableType;
 import com.pushwoosh.inbox.ui.PushwooshInboxStyle;
 import com.pushwoosh.inbox.ui.model.customizing.formatter.InboxDateFormatter;
+import com.pushwoosh.internal.utils.PWLog;
 
 import java.io.IOException;
 import java.net.URL;
@@ -53,22 +55,45 @@ class InboxUiStyleManager {
     }
 
     private void setDateFormat(ReadableMap mapStyle) {
-        if (!mapStyle.hasKey(DATE_FORMAT_KEY)) {
-            return;
-        }
-        String dateFormat = mapStyle.getString(DATE_FORMAT_KEY);
+        String dateFormat = getString(mapStyle, DATE_FORMAT_KEY);
         if (dateFormat != null && !dateFormat.isEmpty()) {
-            ReactInboxDateFormatter inboxDateFormatter = new ReactInboxDateFormatter(dateFormat);
-            PushwooshInboxStyle.INSTANCE.setDateFormatter(inboxDateFormatter);
+            try {
+                PushwooshInboxStyle.INSTANCE.setDateFormatter(new ReactInboxDateFormatter(dateFormat));
+            } catch (IllegalArgumentException e) {
+                PWLog.error(PushwooshPlugin.TAG, "Invalid inbox dateFormat pattern: " + dateFormat, e);
+            }
         }
     }
 
     private void setTexts(ReadableMap mapStyle) {
         PushwooshInboxStyle PWInboxStyle = PushwooshInboxStyle.INSTANCE;
-        if (mapStyle.hasKey(LIST_ERROR_MESSAGE_KEY))
-            PWInboxStyle.setListErrorMessage(mapStyle.getString(LIST_ERROR_MESSAGE_KEY));
-        if (mapStyle.hasKey(LIST_EMPTY_MESSAGE_KEY))
-            PWInboxStyle.setListEmptyText(mapStyle.getString(LIST_EMPTY_MESSAGE_KEY));
+        String listErrorMessage = getString(mapStyle, LIST_ERROR_MESSAGE_KEY);
+        if (listErrorMessage != null)
+            PWInboxStyle.setListErrorMessage(listErrorMessage);
+        String listEmptyMessage = getString(mapStyle, LIST_EMPTY_MESSAGE_KEY);
+        if (listEmptyMessage != null)
+            PWInboxStyle.setListEmptyText(listEmptyMessage);
+    }
+
+    // A production ReadableNativeMap throws out of presentInboxUI() on a typed read of a
+    // mismatched or null value, so the type is checked before the value is taken.
+    private boolean hasTypedValue(ReadableMap mapStyle, String key, ReadableType type, String label) {
+        if (!mapStyle.hasKey(key)) {
+            return false;
+        }
+        if (mapStyle.getType(key) != type) {
+            PWLog.error(PushwooshPlugin.TAG, "Inbox style " + key + " must be " + label + "; ignored.");
+            return false;
+        }
+        return true;
+    }
+
+    private String getString(ReadableMap mapStyle, String key) {
+        return hasTypedValue(mapStyle, key, ReadableType.String, "a string") ? mapStyle.getString(key) : null;
+    }
+
+    private Integer getColor(ReadableMap mapStyle, String key) {
+        return hasTypedValue(mapStyle, key, ReadableType.Number, "a number") ? mapStyle.getInt(key) : null;
     }
 
     private void setImages(ReadableMap mapStyle) {
@@ -87,11 +112,15 @@ class InboxUiStyleManager {
     }
 
     private Drawable getImage(ReadableMap mapStyle, String key) {
-        if (!mapStyle.hasKey(key)) {
+        if (!hasTypedValue(mapStyle, key, ReadableType.Map, "an object with a uri")) {
+            return null;
+        }
+        ReadableMap imageMap = mapStyle.getMap(key);
+        if (!imageMap.hasKey(URI_KEY) || imageMap.getType(URI_KEY) != ReadableType.String) {
+            PWLog.error(PushwooshPlugin.TAG, "Inbox style " + key + "." + URI_KEY + " must be a string; ignored.");
             return null;
         }
-        ReadableMap defaultImageIcon = mapStyle.getMap(key);
-        String uri = defaultImageIcon.getString(URI_KEY);
+        String uri = imageMap.getString(URI_KEY);
         try {
             return getDrawable(uri);
         } catch (IOException e) {
@@ -113,36 +142,49 @@ class InboxUiStyleManager {
     private void setColors(ReadableMap mapStyle) {
         PushwooshInboxStyle PWInboxStyle = PushwooshInboxStyle.INSTANCE;
 
-        if (mapStyle.hasKey(ACCENT_COLOR_KEY))
-            PWInboxStyle.setAccentColor(mapStyle.getInt(ACCENT_COLOR_KEY));
-        if (mapStyle.hasKey(HIGHLIGHT_COLOR_KEY))
-            PWInboxStyle.setHighlightColor(mapStyle.getInt(HIGHLIGHT_COLOR_KEY));
-        if (mapStyle.hasKey(BACKGROUND_COLOR_KEY))
-            PWInboxStyle.setBackgroundColor(mapStyle.getInt(BACKGROUND_COLOR_KEY));
-        if (mapStyle.hasKey(DIVIDER_COLOR_KEY))
-            PWInboxStyle.setDividerColor(mapStyle.getInt(DIVIDER_COLOR_KEY));
-
-        if (mapStyle.hasKey(DATE_COLOR_KEY))
-            PWInboxStyle.setDateColor(mapStyle.getInt(DATE_COLOR_KEY));
-        if (mapStyle.hasKey(READ_DATE_COLOR_KEY))
-            PWInboxStyle.setReadDateColor(mapStyle.getInt(READ_DATE_COLOR_KEY));
-
-        if (mapStyle.hasKey(TITLE_COLOR_KEY))
-            PWInboxStyle.setTitleColor(mapStyle.getInt(TITLE_COLOR_KEY));
-        if (mapStyle.hasKey(READ_TITLE_COLOR_KEY))
-            PWInboxStyle.setReadTitleColor(mapStyle.getInt(READ_TITLE_COLOR_KEY));
-
-        if (mapStyle.hasKey(DESCRIPTION_COLOR_KEY))
-            PWInboxStyle.setDescriptionColor(mapStyle.getInt(DESCRIPTION_COLOR_KEY));
-        if (mapStyle.hasKey(READ_DESCRIPTION_COLOR_KEY))
-            PWInboxStyle.setReadDescriptionColor(mapStyle.getInt(READ_DESCRIPTION_COLOR_KEY));
-
-        if (mapStyle.hasKey(BAR_BACKGROUND_COLOR))
-            PWInboxStyle.setBarBackgroundColor(mapStyle.getInt(BAR_BACKGROUND_COLOR));
-        if (mapStyle.hasKey(BAR_ACCENT_COLOR))
-            PWInboxStyle.setBarAccentColor(mapStyle.getInt(BAR_ACCENT_COLOR));
-        if (mapStyle.hasKey(BAR_TEXT_COLOR))
-            PWInboxStyle.setBarTextColor(mapStyle.getInt(BAR_TEXT_COLOR));
+        Integer accentColor = getColor(mapStyle, ACCENT_COLOR_KEY);
+        if (accentColor != null)
+            PWInboxStyle.setAccentColor(accentColor);
+        Integer highlightColor = getColor(mapStyle, HIGHLIGHT_COLOR_KEY);
+        if (highlightColor != null)
+            PWInboxStyle.setHighlightColor(highlightColor);
+        Integer backgroundColor = getColor(mapStyle, BACKGROUND_COLOR_KEY);
+        if (backgroundColor != null)
+            PWInboxStyle.setBackgroundColor(backgroundColor);
+        Integer dividerColor = getColor(mapStyle, DIVIDER_COLOR_KEY);
+        if (dividerColor != null)
+            PWInboxStyle.setDividerColor(dividerColor);
+
+        Integer dateColor = getColor(mapStyle, DATE_COLOR_KEY);
+        if (dateColor != null)
+            PWInboxStyle.setDateColor(dateColor);
+        Integer readDateColor = getColor(mapStyle, READ_DATE_COLOR_KEY);
+        if (readDateColor != null)
+            PWInboxStyle.setReadDateColor(readDateColor);
+
+        Integer titleColor = getColor(mapStyle, TITLE_COLOR_KEY);
+        if (titleColor != null)
+            PWInboxStyle.setTitleColor(titleColor);
+        Integer readTitleColor = getColor(mapStyle, READ_TITLE_COLOR_KEY);
+        if (readTitleColor != null)
+            PWInboxStyle.setReadTitleColor(readTitleColor);
+
+        Integer descriptionColor = getColor(mapStyle, DESCRIPTION_COLOR_KEY);
+        if (descriptionColor != null)
+            PWInboxStyle.setDescriptionColor(descriptionColor);
+        Integer readDescriptionColor = getColor(mapStyle, READ_DESCRIPTION_COLOR_KEY);
+        if (readDescriptionColor != null)
+            PWInboxStyle.setReadDescriptionColor(readDescriptionColor);
+
+        Integer barBackgroundColor = getColor(mapStyle, BAR_BACKGROUND_COLOR);
+        if (barBackgroundColor != null)
+            PWInboxStyle.setBarBackgroundColor(barBackgroundColor);
+        Integer barAccentColor = getColor(mapStyle, BAR_ACCENT_COLOR);
+        if (barAccentColor != null)
+            PWInboxStyle.setBarAccentColor(barAccentColor);
+        Integer barTextColor = getColor(mapStyle, BAR_TEXT_COLOR);
+        if (barTextColor != null)
+            PWInboxStyle.setBarTextColor(barTextColor);
     }
 
     private class ReactInboxDateFormatter implements InboxDateFormatter {

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/PushwooshPlugin.java

@@ -61,17 +61,39 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 	private static final String PUSH_RECEIVED_EVENT = Pushwoosh.PUSH_RECEIVE_EVENT;
 	private static final String PUSH_RECEIVED_JS_EVENT = "pushReceived";
 
-	private static EventDispatcher mEventDispatcher = new EventDispatcher();
-
-	private static String sReceivedPushData;
-	private static boolean sReceivedPushCallbackRegistered = false;
-
-	private static String sStartPushData;
-	private static boolean sPushCallbackRegistered = false;
-
-	private static boolean sInitialized = false;
+	// Per bundle. The callbacks belong to the JS runtime that subscribed them and "JS has called
+	// init()" is true of that runtime alone, so this state goes away with the module React Native
+	// tears down - a late teardown has nothing left to reach into the next module with.
+	private final EventDispatcher mEventDispatcher = new EventDispatcher();
+	private boolean mInitialized = false;
+	private boolean mPushCallbackRegistered = false;
+	private boolean mReceivedPushCallbackRegistered = false;
+
+	// Per process. A push handed over before JS could take it outlives the React instance it
+	// arrived at: the next init() replays it.
+	private static PendingPush sReceivedPush;
+	private static PendingPush sStartPush;
 	private static final Object sStartPushLock = new Object();
 
+	// A push and what has already been done with it. Both paths to JS are replayed to a bundle
+	// that comes later - the device event by init(), the deprecated callback by onPushOpen() /
+	// onPushReceived() - and each of them only until the push has gone that way once. Without
+	// that, every new React instance was handed the last push of the process again: a pushOpened
+	// re-routing a deep link the app had already handled, and a launch push taking the place of
+	// the one-shot callback registration the new bundle was making.
+	private static final class PendingPush {
+		final String data;
+		boolean sentAsEvent;
+		boolean sentToCallback;
+
+		PendingPush(String data) {
+			this.data = data;
+		}
+	}
+
+	// The module JS is talking to, published on the first call from JS rather than in the
+	// constructor: TurboModuleManager.invalidate() constructs the module JS never required, and
+	// such a stillborn one must not take the live module's place.
 	private static PushwooshPlugin INSTANCE = null;
 
 	private InboxUiStyleManager inboxUiInboxUiStyleManager;
@@ -79,8 +101,6 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 	public PushwooshPlugin(ReactApplicationContext reactContext) {
 		super(reactContext);
 
-		INSTANCE = this;
-
 		reactContext.addLifecycleEventListener(this);
 
 		Context applicationContext = AndroidPlatformModule.getApplicationContext();
@@ -110,7 +130,7 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 
 	@ReactMethod
 	public void init(ReadableMap config, Callback success, Callback error) {
-		String appId = config.hasKey("pw_appid") ? config.getString("pw_appid") : null;
+		String appId = config != null && config.hasKey("pw_appid") ? config.getString("pw_appid") : null;
 
 		if (appId == null) {
 			if (error != null) {
@@ -122,18 +142,21 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 		Pushwoosh.getInstance().setAppId(appId);
 
 		synchronized (sStartPushLock) {
-			if (sReceivedPushData != null) {
-				sendEvent(PUSH_RECEIVED_JS_EVENT, ConversionUtil.stringToJSONObject(sReceivedPushData));
+			if (sReceivedPush != null && !sReceivedPush.sentAsEvent) {
+				sendEvent(PUSH_RECEIVED_JS_EVENT, ConversionUtil.stringToJSONObject(sReceivedPush.data));
+				sReceivedPush.sentAsEvent = true;
 			}
 
-			if (sStartPushData != null) {
-				sendEvent(PUSH_OPEN_JS_EVENT, ConversionUtil.stringToJSONObject(sStartPushData));
+			if (sStartPush != null && !sStartPush.sentAsEvent) {
+				sendEvent(PUSH_OPEN_JS_EVENT, ConversionUtil.stringToJSONObject(sStartPush.data));
+				sStartPush.sentAsEvent = true;
 			}
 
 			// Under the same lock as the replay above: a push taking the lock between the replay
-			// and this flag would find sInitialized false, skip its own send, and never be
-			// replayed either.
-			sInitialized = true;
+			// and this flag would find the gate closed, skip its own send, and never be replayed
+			// either.
+			mInitialized = true;
+			INSTANCE = this;
 		}
 
 		if (success != null) {
@@ -167,13 +190,16 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 	@ReactMethod
 	public void onPushOpen(Callback callback) {
 		synchronized (sStartPushLock) {
-			if (!sPushCallbackRegistered && sStartPushData != null) {
-				callback.invoke(ConversionUtil.toWritableMap(ConversionUtil.stringToJSONObject(sStartPushData)));
-				sPushCallbackRegistered = true;
+			INSTANCE = this;
+
+			if (!mPushCallbackRegistered && sStartPush != null && !sStartPush.sentToCallback) {
+				callback.invoke(ConversionUtil.toWritableMap(ConversionUtil.stringToJSONObject(sStartPush.data)));
+				sStartPush.sentToCallback = true;
+				mPushCallbackRegistered = true;
 				return;
 			}
 
-			sPushCallbackRegistered = true;
+			mPushCallbackRegistered = true;
 			mEventDispatcher.subscribe(PUSH_OPEN_EVENT, callback);
 		}
 	}
@@ -181,13 +207,16 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 	@ReactMethod
 	public void onPushReceived(Callback callback) {
 		synchronized (sStartPushLock) {
-			if (!sReceivedPushCallbackRegistered && sReceivedPushData != null) {
-				callback.invoke(ConversionUtil.toWritableMap(ConversionUtil.stringToJSONObject(sReceivedPushData)));
-				sReceivedPushCallbackRegistered = true;
+			INSTANCE = this;
+
+			if (!mReceivedPushCallbackRegistered && sReceivedPush != null && !sReceivedPush.sentToCallback) {
+				callback.invoke(ConversionUtil.toWritableMap(ConversionUtil.stringToJSONObject(sReceivedPush.data)));
+				sReceivedPush.sentToCallback = true;
+				mReceivedPushCallbackRegistered = true;
 				return;
 			}
 
-			sReceivedPushCallbackRegistered = true;
+			mReceivedPushCallbackRegistered = true;
 			mEventDispatcher.subscribe(PUSH_RECEIVED_EVENT, callback);
 		}
 	}
@@ -412,12 +441,11 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 		}
 
 		Activity currentActivity = getCurrentActivity();
-		Intent intent = new Intent(currentActivity, InboxActivity.class);
-		if (currentActivity != null) {
-			currentActivity.startActivity(intent);
-		}else {
+		if (currentActivity == null) {
 			PWLog.error(TAG, "current activity is null");
+			return;
 		}
+		currentActivity.startActivity(new Intent(currentActivity, InboxActivity.class));
 	}
 
 	@ReactMethod
@@ -535,6 +563,10 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 
 	@ReactMethod
 	public void setNotificationIconBackgroundColor(String color) {
+		if (color == null || color.isEmpty()) {
+			PWLog.error(TAG, "setNotificationIconBackgroundColor: color is required");
+			return;
+		}
 		int intColor;
 		try {
             intColor = Color.parseColor(color);
@@ -600,29 +632,32 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 	public void onHostDestroy() {
 		PWLog.noise(TAG, "Host destroyed");
 
-		// A push can be delivered on the FCM thread while the host is going down, and every other
-		// accessor of these fields holds the lock.
-		synchronized (sStartPushLock) {
-			// Only for the module this host is taking down. A restarted host builds a new
-			// PushwooshPlugin, and the order of the two events is not guaranteed, so a late
-			// teardown must not reset what the new module has already set up.
-			if (INSTANCE != this) {
-				return;
-			}
+		// Nothing is reset here: the host going down is the activity, not the JS runtime. React
+		// Native keeps the context and the JS bundle across activities, JS does not call init() or
+		// onPushOpen() a second time, and a push opened after the user left by Back has to reach
+		// that bundle. Everything JS set up is reset in invalidate(), where the runtime ends.
+	}
 
-			sPushCallbackRegistered = false;
-			sStartPushData = null;
+	// React Native tears the module down with its React instance (legacy ModuleHolder.destroy(),
+	// TurboModuleManager.invalidate()). Everything JS set up lives on this module and goes with it;
+	// only the module's place as the live one has to be given up here. The cached push stays - the
+	// next init() replays it.
+	@Override
+	public void invalidate() {
+		super.invalidate();
+		PWLog.noise(TAG, "Module invalidated");
 
-			sReceivedPushCallbackRegistered = false;
-			sReceivedPushData = null;
+		getReactApplicationContext().removeLifecycleEventListener(this);
 
-			// These are what openPush()/messageReceived() consult before sending to JS. Left
-			// standing, a push arriving after the host died was handed to a context with no JS
-			// runtime, the broad catch there swallowed the failure, and the push was gone for
-			// good - the cache that would have replayed it on the next init() had just been
-			// cleared above. Cleared, the same push is cached and the next init() replays it.
-			sInitialized = false;
-			INSTANCE = null;
+		// A push can be delivered on the FCM thread while the runtime is going down, and every
+		// other accessor of the field holds the lock.
+		synchronized (sStartPushLock) {
+			// Only if this module is still the live one. The next module publishes itself on the
+			// first call from JS and the order of the two events is not guaranteed, so a late
+			// teardown must not unseat a module that has already taken over.
+			if (INSTANCE == this) {
+				INSTANCE = null;
+			}
 		}
 	}
 
@@ -635,12 +670,21 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 
 		try {
 			synchronized (sStartPushLock) {
-				sStartPushData = pushData;
-				if (sPushCallbackRegistered) {
-					mEventDispatcher.dispatchEvent(PUSH_OPEN_EVENT, ConversionUtil.toWritableMap(ConversionUtil.stringToJSONObject(pushData)));
+				PendingPush push = new PendingPush(pushData);
+				sStartPush = push;
+
+				PushwooshPlugin plugin = INSTANCE;
+				if (plugin == null || !plugin.hasLiveRuntime()) {
+					return;
 				}
-				if (sInitialized && INSTANCE != null) {
-					INSTANCE.sendEvent(PUSH_OPEN_JS_EVENT, ConversionUtil.stringToJSONObject(pushData));
+
+				if (plugin.mPushCallbackRegistered) {
+					plugin.mEventDispatcher.dispatchEvent(PUSH_OPEN_EVENT, ConversionUtil.toWritableMap(ConversionUtil.stringToJSONObject(pushData)));
+					push.sentToCallback = true;
+				}
+				if (plugin.mInitialized) {
+					plugin.sendEvent(PUSH_OPEN_JS_EVENT, ConversionUtil.stringToJSONObject(pushData));
+					push.sentAsEvent = true;
 				}
 			}
 		} catch (Exception e) {
@@ -653,17 +697,33 @@ public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEve
 		mEventDispatcher.sendJSEvent(getReactApplicationContext(), event, ConversionUtil.toWritableMap(params));
 	}
 
+	// The React instance behind the module is still running. One on its way down is not: emitting
+	// into it throws, the catch around the callers swallows the failure, and the push is gone.
+	// Held back, it stays cached for the next init(). Callers hold sStartPushLock.
+	private boolean hasLiveRuntime() {
+		return getReactApplicationContext().hasActiveReactInstance();
+	}
+
 	static void messageReceived(String pushData) {
 		PWLog.info(TAG, "Push received: " + pushData);
 
 		try {
 			synchronized (sStartPushLock) {
-				sReceivedPushData = pushData;
-				if (sReceivedPushCallbackRegistered) {
-					mEventDispatcher.dispatchEvent(PUSH_RECEIVED_EVENT, ConversionUtil.toWritableMap(ConversionUtil.stringToJSONObject(pushData)));
+				PendingPush push = new PendingPush(pushData);
+				sReceivedPush = push;
+
+				PushwooshPlugin plugin = INSTANCE;
+				if (plugin == null || !plugin.hasLiveRuntime()) {
+					return;
+				}
+
+				if (plugin.mReceivedPushCallbackRegistered) {
+					plugin.mEventDispatcher.dispatchEvent(PUSH_RECEIVED_EVENT, ConversionUtil.toWritableMap(ConversionUtil.stringToJSONObject(pushData)));
+					push.sentToCallback = true;
 				}
-				if (sInitialized && INSTANCE != null) {
-					INSTANCE.sendEvent(PUSH_RECEIVED_JS_EVENT, ConversionUtil.stringToJSONObject(pushData));
+				if (plugin.mInitialized) {
+					plugin.sendEvent(PUSH_RECEIVED_JS_EVENT, ConversionUtil.stringToJSONObject(pushData));
+					push.sentAsEvent = true;
 				}
 			}
 		} catch (Exception e) {

package/src/android/src/main/java/com/pushwoosh/reactnativeplugin/internal/ReactNativePluginProvider.java

@@ -3,11 +3,18 @@ package com.pushwoosh.reactnativeplugin.internal;
 import com.pushwoosh.internal.PluginProvider;
 
 public class ReactNativePluginProvider implements PluginProvider {
+	private static final String PLUGIN_VERSION = "7.0.2";
+
 	@Override
 	public String getPluginType() {
 		return "React Native";
 	}
 
+	// No @Override: getPluginVersion() lands in PluginProvider only in the next Android SDK release.
+	public String getPluginVersion() {
+		return PLUGIN_VERSION;
+	}
+
 	@Override
 	public int richMediaStartDelay() {
 		return DEFAULT_RICH_MEDIA_START_DELAY;

package/src/ios/PushwooshPlugin/Pushwoosh.mm

@@ -72,6 +72,17 @@ static NSDictionary * gStartPushData = nil;
 static BOOL gStartPushReplayed = NO;  // Launch push already replayed into the JS events by init:
 static NSURL * gPushDeepLinkURL = nil;  // Deep link URL for New Architecture support
 static NSString * gEarlyHandledHash = nil;  // Last push hash the cold-start delegate accepted, to avoid double handling
+static NSString * gPendingWebLaunchLink = nil;  // http(s) link of the launch push, until the SDK hands it to RCTLinkingManager
+static NSUInteger gPendingWebLaunchLinkGeneration = 0;  // Bumped on every arm, so a stale delivery timeout leaves a newer link alone
+static NSString * gLastArmedWebLaunchLink = nil;  // Survives delivery, so re-arming the same push is recognised
+static BOOL gInitialURLAnswered = NO;  // JS called getInitialURL() since gLastArmedWebLaunchLink was first armed
+static BOOL gPluginInitialized = NO;  // init: ran, so JS is up and a tapped push is no longer a launch push
+static NSMutableArray<void (^)(NSString *)> * gInitialURLWaiters = nil;  // getInitialURL() calls held for the pending link
+static NSUInteger gInitialURLHoldGeneration = 0;  // Bumped on every settle, so a stale hold timeout leaves a newer hold alone
+// The SDK waits 0.2 s after accepting the push, then fetches apple-app-site-association with a 5 s timeout.
+static NSTimeInterval const kPWWebLaunchLinkDeliveryTimeout = 6.0;
+// Covers the SDK's delay and a cached or quick verdict without stalling an app whose link never reaches RN.
+static NSTimeInterval const kPWInitialURLHoldTimeout = 1.0;
 static NSString * const kRegistrationSuccesEvent = @"PWRegistrationSuccess";
 static NSString * const kRegistrationErrorEvent = @"PWRegistrationError";
 static NSString * const kPushReceivedEvent = @"PWPushReceived";
@@ -80,6 +91,25 @@ static NSString * const kPushOpenEvent = @"PWPushOpen";
 static NSString * const kPushOpenJSEvent = @"pushOpened";
 static NSString * const kPushReceivedJSEvent = @"pushReceived";
 
+static NSString * const kPWFrameworkType = @"React Native";
+static NSString * const kPWFrameworkVersion = @"7.0.2";
+
+/// Reports the framework type and the plugin version to the native core, on the cores that take them.
+/// Dispatched by selector name: setFrameworkType:version: lands in a core newer than the pinned one.
+static void pwplugin_setFrameworkTelemetry(NSString *type, NSString *version) {
+    Class configuration = [Pushwoosh configure];
+    SEL selector = NSSelectorFromString(@"setFrameworkType:version:");
+
+    if (![configuration respondsToSelector:selector]) {
+        return;
+    }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+    [configuration performSelector:selector withObject:type withObject:version];
+#pragma clang diagnostic pop
+}
+
 /// Returns the push link only when it is a deep link this app can route itself, otherwise nil.
 ///
 /// http/https links are left to the native SDK: it checks the host's apple-app-site-association
@@ -101,6 +131,78 @@ static NSURL * pwplugin_deepLinkURLFromPushLink(id link) {
     return url;
 }
 
+/// Returns the http(s) push link as `URL.absoluteString`, the form RCTLinkingManager posts, otherwise nil.
+static NSString * pwplugin_webLinkFromPushLink(id link) {
+    if (![link isKindOfClass:[NSString class]] || [link length] == 0) {
+        return nil;
+    }
+
+    NSURL *url = [NSURL URLWithString:link];
+    NSString *scheme = url.scheme.lowercaseString;
+    if ([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]) {
+        return url.absoluteString;
+    }
+
+    return nil;
+}
+
+/// Answers every getInitialURL() call held for the pending link: with `url` when it arrived, otherwise
+/// with what RCTLinkingManager itself reports. JS has read its initial URL either way.
+static void pwplugin_settleInitialURLWaiters(NSString *url) {
+    NSArray<void (^)(NSString *)> *waiters = gInitialURLWaiters;
+    gInitialURLWaiters = nil;
+    gInitialURLHoldGeneration++;
+    gInitialURLAnswered = YES;
+    for (void (^waiter)(NSString *) in waiters) {
+        waiter(url);
+    }
+}
+
+/// Arms the launch push's web link for the SDK's delivery window; called by every launch-push site.
+/// A push without a web link disarms it, so a later Safari open of the same URL is not caught.
+static void pwplugin_rememberWebLaunchLink(NSDictionary *push) {
+    NSString *link = pwplugin_webLinkFromPushLink(push[@"l"]);
+    // The SDK accepts the same launch push at init() again, possibly after JS read getInitialURL().
+    if (!link || ![link isEqualToString:gLastArmedWebLaunchLink]) {
+        gInitialURLAnswered = NO;
+    }
+    gLastArmedWebLaunchLink = link;
+    gPendingWebLaunchLink = link;
+    NSUInteger generation = ++gPendingWebLaunchLinkGeneration;
+
+    if (!link) {
+        if (gInitialURLWaiters) {
+            pwplugin_settleInitialURLWaiters(nil);
+        }
+        return;
+    }
+
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(kPWWebLaunchLinkDeliveryTimeout * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        if (generation == gPendingWebLaunchLinkGeneration) {
+            gPendingWebLaunchLink = nil;
+            if (gInitialURLWaiters) {
+                pwplugin_settleInitialURLWaiters(nil);
+            }
+        }
+    });
+}
+
+/// Catches the launch push's Universal Link on its way to RCTLinkingManager: resolves held getInitialURL()
+/// calls, or parks it for the first one; a link after getInitialURL() answered is left to the `url` event.
+static void pwplugin_handleOpenURLNotification(NSNotification *notification) {
+    id url = notification.userInfo[@"url"];
+    if (!gPendingWebLaunchLink || ![url isKindOfClass:[NSString class]] || ![url isEqualToString:gPendingWebLaunchLink]) {
+        return;
+    }
+
+    gPendingWebLaunchLink = nil;
+    if (gInitialURLWaiters) {
+        pwplugin_settleInitialURLWaiters(url);
+    } else if (!gInitialURLAnswered) {
+        gPushDeepLinkURL = [NSURL URLWithString:url];
+    }
+}
+
 // Bridgeless hands a module an RCTBridgeProxy: an NSProxy that carries none of NSObject's KVC and
 // turns an unknown selector into a logged no-op. object_getClass asks without messaging it.
 static BOOL pwplugin_isRealBridge(id bridge) {
@@ -124,25 +226,50 @@ static BOOL pwplugin_isRealBridge(id bridge) {
 - (void)pwplugin_original_getInitialURL:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject;
 @end
 
+static void pwplugin_originalGetInitialURL(id self, RCTPromiseResolveBlock resolve, RCTPromiseRejectBlock reject) {
+    SEL originalSelector = @selector(pwplugin_original_getInitialURL:reject:);
+    if ([self respondsToSelector:originalSelector]) {
+        void (*originalIMP)(id, SEL, RCTPromiseResolveBlock, RCTPromiseRejectBlock);
+        originalIMP = (void (*)(id, SEL, RCTPromiseResolveBlock, RCTPromiseRejectBlock))objc_msgSend;
+        originalIMP(self, originalSelector, resolve, reject);
+    } else {
+        resolve([NSNull null]);
+    }
+}
+
 // Swizzled getInitialURL for RCTLinkingManager (New Architecture support)
 static void pwplugin_getInitialURL(id self, SEL _cmd, RCTPromiseResolveBlock resolve, RCTPromiseRejectBlock reject) {
     // If we have a saved deep link URL from push notification, return it
     if (gPushDeepLinkURL) {
         NSURL *url = gPushDeepLinkURL;
         gPushDeepLinkURL = nil;  // Clear after use (one-time)
+        gInitialURLAnswered = YES;
         resolve(url.absoluteString);
         return;
     }
 
-    // Otherwise call the original implementation
-    SEL originalSelector = @selector(pwplugin_original_getInitialURL:reject:);
-    if ([self respondsToSelector:originalSelector]) {
-        void (*originalIMP)(id, SEL, RCTPromiseResolveBlock, RCTPromiseRejectBlock);
-        originalIMP = (void (*)(id, SEL, RCTPromiseResolveBlock, RCTPromiseRejectBlock))objc_msgSend;
-        originalIMP(self, originalSelector, resolve, reject);
-    } else {
-        resolve([NSNull null]);
+    if (gPendingWebLaunchLink && !gInitialURLAnswered) {
+        if (!gInitialURLWaiters) {
+            gInitialURLWaiters = [NSMutableArray array];
+            NSUInteger hold = gInitialURLHoldGeneration;
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(kPWInitialURLHoldTimeout * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                if (hold == gInitialURLHoldGeneration) {
+                    pwplugin_settleInitialURLWaiters(nil);
+                }
+            });
+        }
+        [gInitialURLWaiters addObject:[^(NSString *url) {
+            if (url) {
+                resolve(url);
+            } else {
+                pwplugin_originalGetInitialURL(self, resolve, reject);
+            }
+        } copy]];
+        return;
     }
+
+    gInitialURLAnswered = YES;
+    pwplugin_originalGetInitialURL(self, resolve, reject);
 }
 
 void pushwoosh_swizzle(Class cls, SEL fromChange, SEL toChange, IMP impl, const char * signature) {
@@ -210,7 +337,9 @@ RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)suc
         return;
     }
     
+    gPluginInitialized = YES;
     [PushNotificationManager initializeWithAppCode:appCode appName:nil];
+    pwplugin_setFrameworkTelemetry(kPWFrameworkType, kPWFrameworkVersion);
     [[PushNotificationManager pushManager] sendAppOpen];
     [PushNotificationManager pushManager].delegate = self;
 
@@ -1118,6 +1247,7 @@ RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
     if (onStart) {
         gStartPushData = pushNotification;
         gStartPushReplayed = NO;
+        pwplugin_rememberWebLaunchLink(pushNotification);
         // Save deep link URL for New Architecture (Linking.getInitialURL support)
         NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(pushNotification[@"l"]);
         if (deepLink) {
@@ -1129,6 +1259,7 @@ RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
     if (onStart) {
         gStartPushData = pushNotification;
         gStartPushReplayed = NO;
+        pwplugin_rememberWebLaunchLink(pushNotification);
         // Save deep link URL for New Architecture (Linking.getInitialURL support)
         NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(pushNotification[@"l"]);
         if (deepLink) {
@@ -1181,9 +1312,12 @@ static void pwplugin_acceptColdStartPushOnce(NSDictionary *userInfo) {
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center
 didReceiveNotificationResponse:(UNNotificationResponse *)response
          withCompletionHandler:(void (^)(void))completionHandler API_AVAILABLE(ios(10.0)) {
-    if ([response.notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
+    BOOL dismissed = [response.actionIdentifier isEqualToString:UNNotificationDismissActionIdentifier];
+    // After init the plugin's own delegate or the app accepts the tap; a dismissed push opened nothing.
+    if (!gPluginInitialized && !dismissed && [response.notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
         NSDictionary *userInfo = response.notification.request.content.userInfo;
         NSURL *appSchemeDeepLink = pwplugin_deepLinkURLFromPushLink(userInfo[@"l"]);
+        pwplugin_rememberWebLaunchLink(userInfo);
 
         if (appSchemeDeepLink) {
             // Routing it through the SDK too would deliver the deep link twice.
@@ -1216,6 +1350,19 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response
 
 static PWEarlyNotificationDelegate *gEarlyDelegate = nil;
 
+// Wraps the delegate the app set in didFinishLaunching. A scene-based app gets the launch push's
+// response before the main queue drains, so installing it any later loses the push.
+static void pwplugin_installEarlyNotificationDelegate(void) {
+    if (gEarlyDelegate) {
+        return;
+    }
+
+    UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+    gEarlyDelegate = [[PWEarlyNotificationDelegate alloc] init];
+    gEarlyDelegate.originalDelegate = center.delegate;
+    center.delegate = gEarlyDelegate;
+}
+
 @implementation RCTLinkingManager (PushwooshDeepLink)
 
 + (void)load {
@@ -1230,25 +1377,25 @@ static PWEarlyNotificationDelegate *gEarlyDelegate = nil;
             "v@:@@"
         );
 
-        // Set up early notification delegate to capture push on cold start
-        if (@available(iOS 10.0, *)) {
-            dispatch_async(dispatch_get_main_queue(), ^{
-                UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-                gEarlyDelegate = [[PWEarlyNotificationDelegate alloc] init];
-                gEarlyDelegate.originalDelegate = center.delegate;
-                center.delegate = gEarlyDelegate;
-            });
-        }
+        // RN keeps the notification name file-local; the string is its contract with the app delegate.
+        [[NSNotificationCenter defaultCenter] addObserverForName:@"RCTOpenURLNotification"
+                                                          object:nil
+                                                           queue:nil
+                                                      usingBlock:^(NSNotification *notification) {
+            pwplugin_handleOpenURLNotification(notification);
+        }];
 
-        // Also check launchOptions when app finishes launching
         [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidFinishLaunchingNotification
                                                           object:nil
                                                            queue:nil
                                                       usingBlock:^(NSNotification *notification) {
+            pwplugin_installEarlyNotificationDelegate();
+
             NSDictionary *launchOptions = notification.userInfo;
             NSDictionary *remoteNotification = launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey];
             if (remoteNotification) {
                 NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(remoteNotification[@"l"]);
+                pwplugin_rememberWebLaunchLink(remoteNotification);
                 if (deepLink) {
                     if (!gPushDeepLinkURL) {
                         gPushDeepLinkURL = deepLink;