pushwoosh-react-native-plugin 6.1.61 → 7.0.1

package/README.md

@@ -25,7 +25,8 @@
 
 - [Integration Guide](https://docs.pushwoosh.com/platform-docs/pushwoosh-sdk/cross-platform-frameworks/react-native/integrating-react-native-plugin) — step-by-step setup
 - [API Reference](docs/README.md) — full API documentation
-- [Sample Project](https://github.com/Pushwoosh/pushwoosh-react-native-plugin/tree/master/example/demoapp) — ready-to-run demo app
+- [Sample Project](https://github.com/Pushwoosh/pushwoosh-react-native-plugin/tree/master/example/demoapp) — ready-to-run demo app on the current React Native (New Architecture)
+- [Legacy Sample Project](https://github.com/Pushwoosh/pushwoosh-react-native-plugin/tree/master/example/demoapp-legacy) — the same demo on React Native 0.74 with the legacy architecture
 
 ## Features
 
@@ -76,6 +77,29 @@ The wizard will automatically add all required configuration.
 
 The Pushwoosh plugin already includes the `firebase-messaging` dependency, so you do not need to add it manually.
 
+### React Native versions and the New Architecture
+
+The plugin is a Turbo Native Module and also works on the legacy bridge. One package covers both:
+
+| React Native | Architecture | How the plugin runs |
+|---|---|---|
+| 0.74 – 0.81, `newArchEnabled=false` (default) | Legacy bridge | Bridge module |
+| 0.74 – 0.81, `newArchEnabled=true` / `RCT_NEW_ARCH_ENABLED=1` | New Architecture | Codegen TurboModule |
+| 0.82 and later | New Architecture only (bridgeless) | Codegen TurboModule |
+
+No interop layer is involved on the New Architecture. Events keep their API on both architectures:
+
+```javascript
+import { DeviceEventEmitter } from 'react-native';
+
+DeviceEventEmitter.addListener('pushOpened', (push) => { /* ... */ });
+DeviceEventEmitter.addListener('pushReceived', (push) => { /* ... */ });
+```
+
+`presentInboxUI()` presents a native screen (a view controller on iOS, an Activity on Android) outside the React view tree, so it does not depend on Fabric. React Native below 0.74 is supported by plugin versions 6.1.x.
+
+Both setups ship as samples with identical screens: `example/demoapp` (React Native 0.87, New Architecture) and `example/demoapp-legacy` (React Native 0.74, legacy architecture).
+
 ## AI-Assisted Integration
 
 Integrate the Pushwoosh React Native plugin using AI coding assistants (Claude Code, Cursor, GitHub Copilot, etc.).

package/index.d.ts

@@ -87,6 +87,10 @@ declare module 'pushwoosh-react-native-plugin' {
     isCommunicationEnabled(success: (isEnabled: boolean)=> void): void;
     setCommunicationEnabled(enabled: boolean, success?: () => void, fail?: (error: Error) => void): void;
 
+    //Rich Media presentation style
+    setRichMediaType(type: number): void;
+    getRichMediaType(callback: (type: number) => void): void;
+    RichMediaStyle: { MODAL: number; LEGACY: number };
   }
 
   const Pushwoosh: Pushwoosh;

package/index.js

@@ -201,9 +201,11 @@
  * @module pushwoosh-react-native-plugin
  */
 
-import { NativeModules } from 'react-native';
+import NativePushwoosh from './src/specs/NativePushwoosh';
 
-const PushwooshModule = NativeModules.Pushwoosh;
+// Resolved through TurboModuleRegistry: the codegen TurboModule on the New Architecture, the
+// bridge module on the legacy architecture.
+const PushwooshModule = NativePushwoosh;
 
 //Constant: RichMediaStyle
 //Rich Media presentation style constants.
@@ -348,7 +350,7 @@ class PushNotification {
 		if (!fail) {
 			fail = function(error) {};
 		}
-		PushwooshModule.register(success, fail);
+		PushwooshModule.registerForPushNotifications(success, fail);
 	}
 
 	//Function: unregister

package/package.json

@@ -1,9 +1,17 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.61",
+  "version": "7.0.1",
   "description": "This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).",
   "main": "index.js",
   "types": "index.d.ts",
+  "codegenConfig": {
+    "name": "RNPushwooshSpec",
+    "type": "modules",
+    "jsSrcsDir": "src/specs",
+    "android": {
+      "javaPackageName": "com.pushwoosh.reactnativeplugin"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Pushwoosh/pushwoosh-react-native-plugin.git"
@@ -17,6 +25,9 @@
   "bugs": {
     "url": "https://github.com/Pushwoosh/pushwoosh-react-native-plugin/issues"
   },
+  "peerDependencies": {
+    "react-native": ">=0.74.0"
+  },
   "rnpm": {
     "android": {
       "sourceDir": "./src/android"

package/pushwoosh-react-native-plugin.podspec

@@ -1,20 +1,24 @@
 Pod::Spec.new do |s|
   s.name             = "pushwoosh-react-native-plugin"
-  s.version          = "6.1.61"
+  s.version          = "7.0.1"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'
   s.license      = 'MIT'
   s.homepage     = 'n/a'
   s.source       = { :git => "https://github.com/Pushwoosh/pushwoosh-react-native-plugin.git" }
-  s.source_files = 'src/ios/PushwooshPlugin/Pushwoosh.{h,m}', 'src/ios/PushwooshPlugin/PWEventDispatcher.{h,m}'
+  s.source_files = 'src/ios/PushwooshPlugin/Pushwoosh.{h,mm}', 'src/ios/PushwooshPlugin/PWEventDispatcher.{h,m}'
   s.platform     = :ios, "13.0"
-  s.xcconfig = {
-    "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/Headers/Public/React"
-  }
   s.static_framework = true
 
-  s.dependency 'React'
+  # React Native 0.71+ adds React-Core and, when the New Architecture is on, the codegen and
+  # TurboModule dependencies together with the RCT_NEW_ARCH_ENABLED define.
+  if respond_to?(:install_modules_dependencies, true)
+    install_modules_dependencies(s)
+  else
+    s.dependency "React-Core"
+  end
+
   s.dependency 'PushwooshXCFramework', '7.2.6'
-  s.dependency 'PushwooshInboxUIXCFramework'
+  s.dependency 'PushwooshInboxUIXCFramework', '7.0.42'
 end

package/src/android/build.gradle

@@ -20,28 +20,135 @@ allprojects {
     }
 }
 
+// [major, minor] of the react-native the app resolves, or null when it cannot be found.
+// Every node_modules above the android project is a candidate: the template keeps react-native in
+// the one next door, a monorepo hoists it any number of levels up. The included build of the React
+// Native Gradle Plugin names the node_modules the app really resolves, though only a 0.74-style
+// settings.gradle exposes it - from 0.82 the include sits in pluginManagement and stays private.
+// `node --print` answers the way Metro does and comes last: it needs node on the Gradle PATH,
+// which an IDE launched from the Finder does not have.
+def reactNativeVersion() {
+    def candidates = []
+    for (def dir = rootProject.projectDir; dir != null; dir = dir.parentFile) {
+        candidates += new File(dir, "node_modules/react-native/package.json")
+    }
+    project.gradle.includedBuilds.each { included ->
+        candidates += new File(included.projectDir, "../../react-native/package.json")
+    }
+    try {
+        def resolved = ["node", "--print", "require.resolve('react-native/package.json')"]
+            .execute(null, rootProject.projectDir).text.trim()
+        if (!resolved.isEmpty()) {
+            candidates += new File(resolved)
+        }
+    } catch (Exception ignored) {
+    }
+
+    for (candidate in candidates) {
+        if (!candidate.isFile()) {
+            continue
+        }
+        def version = new groovy.json.JsonSlurper().parseText(candidate.text).version
+        def match = version =~ /^(\d+)\.(\d+)\./
+        if (match) {
+            return [match[0][1].toInteger(), match[0][2].toInteger()]
+        }
+    }
+    return null
+}
+
+// What the app asked for, or null when it did not ask. The React Native Gradle Plugin ORs the two
+// spellings, so either one set to true turns the New Architecture on and a plain
+// newArchEnabled=false does not veto a react-scoped true.
+def newArchProperty() {
+    def names = ["newArchEnabled", "react.newArchEnabled"]
+    if (names.any { project.hasProperty(it) && project.property(it).toString().toBoolean() }) {
+        return true
+    }
+    if (names.any { project.hasProperty(it) }) {
+        return false
+    }
+    return null
+}
+
+// The architecture is the app's choice; this answers it the way the React Native Gradle Plugin
+// does. Below 0.82 the app opts in with newArchEnabled; from 0.82 React Native is bridgeless only
+// and ignores the flag. Guessing wrong is silent and lands on the customer: src/oldarch compiled
+// into a bridgeless app leaves TurboModuleRegistry.get() answering null and every plugin call
+// throwing, with a green build. So an undecidable case fails the build instead.
+def resolveNewArchitectureEnabled() {
+    def version = reactNativeVersion()
+    if (version != null && (version[0] > 0 || version[1] >= 82)) {
+        return true
+    }
+
+    def asked = newArchProperty()
+    if (asked != null) {
+        return asked
+    }
+
+    if (version == null) {
+        throw new GradleException(
+            "pushwoosh-react-native-plugin: cannot tell which React Native architecture to build. " +
+            "No react-native/package.json was found from ${rootProject.projectDir} and neither " +
+            "newArchEnabled nor react.newArchEnabled is set. Set newArchEnabled in " +
+            "android/gradle.properties to the architecture the app runs.")
+    }
+    return false
+}
+
+// Once per configuration: the lookup walks the file system and may spawn node.
+if (!project.hasProperty("pushwooshNewArchEnabled")) {
+    project.ext.pushwooshNewArchEnabled = resolveNewArchitectureEnabled()
+}
+def isNewArchitectureEnabled = project.ext.pushwooshNewArchEnabled
+
 apply plugin: 'com.android.library'
+if (isNewArchitectureEnabled) {
+    // Generates NativePushwooshSpec from the spec in ../specs, configured by ../package.json
+    apply plugin: 'com.facebook.react'
+}
 
 android {
     compileSdkVersion 34
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 34
+        // What a consuming app must keep to run minified. The library itself is not minified, so
+        // proguardFiles here would configure nothing; consumerProguardFiles is what travels.
+        consumerProguardFiles 'proguard-rules.pro'
     }
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled) {
+                java.srcDirs += ["src/newarch/java"]
+            } else {
+                java.srcDirs += ["src/oldarch/java"]
+            }
+        }
+        // src/test runs under both architectures; the per-architecture suites assert what the
+        // switch above must have produced
+        test {
+            if (isNewArchitectureEnabled) {
+                java.srcDirs += ["src/testNewarch/java"]
+            } else {
+                java.srcDirs += ["src/testOldarch/java"]
+            }
         }
     }
 }
 
 ext {
-    pushwoosh = "6.12.0"
+    pushwoosh = "6.13.0"
 }
 
 dependencies {
-    implementation 'com.facebook.react:react-native:+'
+    implementation "com.facebook.react:react-android"
     implementation "com.pushwoosh:pushwoosh:${pushwoosh}"
     implementation "com.pushwoosh:pushwoosh-firebase:${pushwoosh}"
     implementation "com.pushwoosh:pushwoosh-huawei:${pushwoosh}"
@@ -54,5 +161,10 @@ dependencies {
     implementation "androidx.activity:activity:1.8.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
     implementation "com.google.firebase:firebase-messaging:23.1.0"
+
+    // Test-only, run with `make android-test`.
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "org.robolectric:robolectric:4.14.1"
+    testImplementation "org.mockito:mockito-core:5.14.2"
 }
 

package/src/android/proguard-rules.pro

@@ -15,3 +15,19 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Shipped to the consuming app through consumerProguardFiles.
+#
+# The Pushwoosh SDK stores its requests with WorkManager, which keeps them in a Room database.
+# room-runtime ships `-keep class * extends androidx.room.RoomDatabase`, which holds the generated
+# class but not the constructor Room instantiates it with, and the R8 full mode AGP 8 runs by
+# default drops that constructor. A minified Release app then dies on startup in androidx.startup
+# with "Failed to create an instance of class androidx.work.impl.WorkDatabase".
+-keep class * extends androidx.room.RoomDatabase { <init>(); }
+
+# The same shape one layer up: WorkManager instantiates the work request's input merger by name,
+# and work-runtime ships `-keep class * extends androidx.work.InputMerger`, which holds the class
+# but not that constructor. Under R8 full mode every worker the SDK enqueues then dies before it
+# runs with "Could not create Input Merger androidx.work.OverwritingInputMerger", so registering
+# for pushes reports neither a token nor an error - the app just never hears back.
+-keep class * extends androidx.work.InputMerger { <init>(); }

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

@@ -6,14 +6,13 @@ import android.util.Log;
 import java.util.ArrayList;
 import java.util.Iterator;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
 import com.pushwoosh.inbox.data.InboxMessage;
 import com.pushwoosh.internal.utils.JsonUtils;
 import com.pushwoosh.internal.utils.PWLog;
@@ -115,7 +114,7 @@ public final class ConversionUtil {
 	}
 
 	public static WritableMap toWritableMap(JSONObject jsonObject) {
-		WritableNativeMap result = new WritableNativeMap();
+		WritableMap result = Arguments.createMap();
 
 		Iterator<String> keys = jsonObject.keys();
 		while (keys.hasNext()) {
@@ -152,7 +151,7 @@ public final class ConversionUtil {
 	}
 
 	public static WritableArray toWritableArray(JSONArray array) {
-		WritableNativeArray result = new WritableNativeArray();
+		WritableArray result = Arguments.createArray();
 
 		for (int i = 0; i < array.length(); 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/PushwooshPackage.java

@@ -1,33 +1,46 @@
 package com.pushwoosh.reactnativeplugin;
 
+import androidx.annotation.Nullable;
+
+import com.facebook.react.BaseReactPackage;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
-public class PushwooshPackage implements ReactPackage {
-    // Deprecated from RN 0.47
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
+// BaseReactPackage already implements ReactPackage; it is repeated because the autolinking scan
+// of the React Native 0.74 CLI only recognises "implements ReactPackage" or "extends TurboReactPackage"
+public class PushwooshPackage extends BaseReactPackage implements ReactPackage {
 
+    @Nullable
     @Override
-    public List<com.facebook.react.uimanager.ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-       return Collections.emptyList();
+    public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+        if (PushwooshPlugin.MODULE_NAME.equals(name)) {
+            return new PushwooshPlugin(reactContext);
+        }
+        return null;
     }
 
     @Override
-    public List<NativeModule> createNativeModules(
-            ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<>();
-
-        modules.add(new PushwooshPlugin(reactContext));
-
-        return modules;
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return () -> {
+            // On the New Architecture PushwooshPluginSpec extends the codegen spec, which is a TurboModule
+            boolean isTurboModule = TurboModule.class.isAssignableFrom(PushwooshPlugin.class);
+            Map<String, ReactModuleInfo> modules = new HashMap<>();
+            modules.put(PushwooshPlugin.MODULE_NAME, new ReactModuleInfo(
+                    PushwooshPlugin.MODULE_NAME,
+                    PushwooshPlugin.class.getName(),
+                    false, // canOverrideExistingModule
+                    false, // needsEagerInit: the launch push is cached until JS calls init
+                    false, // isCxxModule
+                    isTurboModule
+            ));
+            return modules;
+        };
     }
 }
-

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

@@ -8,14 +8,14 @@ import android.graphics.Color;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableNativeArray;
+import com.facebook.react.bridge.WritableArray;
 import com.pushwoosh.Pushwoosh;
 import com.pushwoosh.RegisterForPushNotificationsResultData;
 import com.pushwoosh.badge.PushwooshBadge;
@@ -50,26 +50,50 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-public class PushwooshPlugin extends ReactContextBaseJavaModule implements LifecycleEventListener {
+public class PushwooshPlugin extends PushwooshPluginSpec implements LifecycleEventListener {
 
 	static final String TAG = "ReactNativePlugin";
+	// Same as the iOS class name: React Native resolves a TurboModule by class name first
+	public static final String MODULE_NAME = "PushwooshPlugin";
 	private static final String PUSH_OPEN_EVENT = "PwPushOpened";
 	private static final String PUSH_OPEN_JS_EVENT = "pushOpened";
 
 	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;
@@ -77,8 +101,6 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	public PushwooshPlugin(ReactApplicationContext reactContext) {
 		super(reactContext);
 
-		INSTANCE = this;
-
 		reactContext.addLifecycleEventListener(this);
 
 		Context applicationContext = AndroidPlatformModule.getApplicationContext();
@@ -91,7 +113,7 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 
 	@Override
 	public String getName() {
-		return "Pushwoosh";
+		return MODULE_NAME;
 	}
 
 	@ReactMethod
@@ -120,16 +142,22 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		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;
 			}
-		}
 
-		sInitialized = true;
+			// Under the same lock as the replay above: a push taking the lock between the replay
+			// and this flag would find the gate closed, skip its own send, and never be replayed
+			// either.
+			mInitialized = true;
+			INSTANCE = this;
+		}
 
 		if (success != null) {
 			success.invoke();
@@ -137,7 +165,7 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	}
 
 	@ReactMethod
-	public void register(final Callback success, final Callback error) {
+	public void registerForPushNotifications(final Callback success, final Callback error) {
 		Pushwoosh.getInstance().registerForPushNotifications(new RegisterForPushNotificationCallback(success, error));
 	}
 
@@ -162,13 +190,16 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	@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);
 		}
 	}
@@ -176,13 +207,16 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	@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);
 		}
 	}
@@ -193,7 +227,7 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	}
 
 	@ReactMethod
-	public void removeListeners(Integer count) {
+	public void removeListeners(double count) {
 		// Required for NativeEventEmitter. No need to do anything here.
 	}
 
@@ -313,22 +347,22 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 
 		JSONObject params  = ConversionUtil.toJsonObject(data);
 
+		// optString answers "" for a missing key, never null: without a message there is nothing
+		// to show, and empty user data has no business reaching the payload.
 		String message = params.optString("msg");
-		if (message == null){
+		if (message.isEmpty()){
+			PWLog.error(TAG, "createLocalNotification: msg is required");
 			return;
 		}
 		int seconds = params.optInt("seconds");
 		Bundle extras = new Bundle();
 		String userData = params.optString("userData");
-		if (userData!=null){
+		if (!userData.isEmpty()){
 		    extras.putString("u", userData);
 		}
 
-		LocalNotification.Builder builder = new LocalNotification.Builder();
-		if (extras != null){
-			builder.setExtras(extras);
-		}
-		LocalNotification notification = builder
+		LocalNotification notification = new LocalNotification.Builder()
+		.setExtras(extras)
 		.setMessage(message)
 		.setDelay(seconds)
 		.build();
@@ -351,8 +385,8 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	}
 
 	@ReactMethod
-	public void setApplicationIconBadgeNumber(int badgeNumber) {
-		PushwooshBadge.setBadgeNumber(badgeNumber);
+	public void setApplicationIconBadgeNumber(double badgeNumber) {
+		PushwooshBadge.setBadgeNumber((int) badgeNumber);
 	}
 
 	@ReactMethod
@@ -361,8 +395,8 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	}
 
 	@ReactMethod
-	public void addToApplicationIconBadgeNumber(int badgeNumber) {
-		PushwooshBadge.addBadgeNumber(badgeNumber);
+	public void addToApplicationIconBadgeNumber(double badgeNumber) {
+		PushwooshBadge.addBadgeNumber((int) badgeNumber);
 	}
 
 	@ReactMethod
@@ -381,18 +415,22 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	}
 
 	@ReactMethod
-	public void setColorLED(int color) {
-		PushwooshNotificationSettings.setColorLED(color);
+	public void setColorLED(double color) {
+		// The spec types a colour as a JS number, so it arrives as a double, and an opaque ARGB
+		// value does not fit a signed int: 0xFFFF0000 is 4294901760. A direct double -> int
+		// narrowing clamps that to Integer.MAX_VALUE, while going through long keeps the bits the
+		// SDK expects (-65536).
+		PushwooshNotificationSettings.setColorLED((int) (long) color);
 	}
 
 	@ReactMethod
-	public void setSoundType(int type) {
-		PushwooshNotificationSettings.setSoundNotificationType(SoundType.fromInt(type));
+	public void setSoundType(double type) {
+		PushwooshNotificationSettings.setSoundNotificationType(SoundType.fromInt((int) type));
 	}
 
 	@ReactMethod
-	public void setVibrateType(int type) {
-		PushwooshNotificationSettings.setVibrateNotificationType(VibrateType.fromInt(type));
+	public void setVibrateType(double type) {
+		PushwooshNotificationSettings.setVibrateNotificationType(VibrateType.fromInt((int) type));
 	}
 
 
@@ -455,7 +493,7 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 				try {
 					if (result.isSuccess() && result.getData() != null) {
 						ArrayList<InboxMessage> messagesList = new ArrayList<>(result.getData());
-						WritableNativeArray writableArray = new WritableNativeArray();
+						WritableArray writableArray = Arguments.createArray();
 						for (InboxMessage message : messagesList) {
 							writableArray.pushMap(ConversionUtil.inboxMessageToWritableMap(message));
 						}
@@ -551,8 +589,8 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	}
 
 	@ReactMethod
-	public void setRichMediaType(int type) {
-		RichMediaType richMediaType = type == 0 ? RichMediaType.MODAL : RichMediaType.DEFAULT;
+	public void setRichMediaType(double type) {
+		RichMediaType richMediaType = (int) type == 0 ? RichMediaType.MODAL : RichMediaType.DEFAULT;
 		RichMediaManager.setRichMediaType(richMediaType);
 	}
 
@@ -562,6 +600,17 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		callback.invoke(type.ordinal());
 	}
 
+	// iOS-only setting. Android shows a notification for a push that arrives in the foreground,
+	// which is what the iOS default reports; the methods exist so the spec is fully implemented.
+	@ReactMethod
+	public void setShowPushnotificationAlert(boolean showPushnotificationAlert) {
+	}
+
+	@ReactMethod
+	public void getShowPushnotificationAlert(Callback callback) {
+		callback.invoke(true);
+	}
+
 	///
 	/// LifecycleEventListener callbacks
 	///
@@ -580,11 +629,33 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 	public void onHostDestroy() {
 		PWLog.noise(TAG, "Host destroyed");
 
-		sPushCallbackRegistered = false;
-		sStartPushData = null;
+		// 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.
+	}
+
+	// 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");
+
+		getReactApplicationContext().removeLifecycleEventListener(this);
 
-		sReceivedPushCallbackRegistered = false;
-		sReceivedPushData = 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;
+			}
+		}
 	}
 
 	///
@@ -596,12 +667,21 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 
 		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 (plugin.mPushCallbackRegistered) {
+					plugin.mEventDispatcher.dispatchEvent(PUSH_OPEN_EVENT, ConversionUtil.toWritableMap(ConversionUtil.stringToJSONObject(pushData)));
+					push.sentToCallback = true;
 				}
-				if (sInitialized && INSTANCE != null) {
-					INSTANCE.sendEvent(PUSH_OPEN_JS_EVENT, ConversionUtil.stringToJSONObject(pushData));
+				if (plugin.mInitialized) {
+					plugin.sendEvent(PUSH_OPEN_JS_EVENT, ConversionUtil.stringToJSONObject(pushData));
+					push.sentAsEvent = true;
 				}
 			}
 		} catch (Exception e) {
@@ -614,17 +694,33 @@ public class PushwooshPlugin extends ReactContextBaseJavaModule implements Lifec
 		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/newarch/java/com/pushwoosh/reactnativeplugin/PushwooshPluginSpec.java

@@ -0,0 +1,10 @@
+package com.pushwoosh.reactnativeplugin;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+
+// New Architecture: NativePushwooshSpec is generated by codegen from src/specs/NativePushwoosh.ts.
+abstract class PushwooshPluginSpec extends NativePushwooshSpec {
+	PushwooshPluginSpec(ReactApplicationContext reactContext) {
+		super(reactContext);
+	}
+}

package/src/android/src/oldarch/java/com/pushwoosh/reactnativeplugin/PushwooshPluginSpec.java

@@ -0,0 +1,11 @@
+package com.pushwoosh.reactnativeplugin;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+
+// Legacy architecture: a plain bridge module whose methods are exported by @ReactMethod.
+abstract class PushwooshPluginSpec extends ReactContextBaseJavaModule {
+	PushwooshPluginSpec(ReactApplicationContext reactContext) {
+		super(reactContext);
+	}
+}

package/src/ios/PushwooshPlugin/Pushwoosh.h

@@ -24,6 +24,12 @@
 #import "PushwooshInboxUI.h"
 #endif
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <RNPushwooshSpec/RNPushwooshSpec.h>
+
+@interface PushwooshPlugin: RCTEventEmitter<NativePushwooshSpec, PushNotificationDelegate>
+#else
 @interface PushwooshPlugin: RCTEventEmitter<RCTBridgeModule, PushNotificationDelegate>
+#endif
 
 @end

package/src/ios/PushwooshPlugin/{Pushwoosh.m → Pushwoosh.mm}

@@ -1,5 +1,5 @@
 //
-//  Pushwoosh.m
+//  Pushwoosh.mm
 //  Pushwoosh React Native Plugin
 //  (c) Pushwoosh 2016
 //
@@ -69,6 +69,7 @@ static PWEmailsCompletion emailsCompletionHandler(NSUInteger addressCount, RCTRe
 }
 
 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 * const kRegistrationSuccesEvent = @"PWRegistrationSuccess";
@@ -144,17 +145,17 @@ static void pwplugin_getInitialURL(id self, SEL _cmd, RCTPromiseResolveBlock res
     }
 }
 
-void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, const char * signature) {
+void pushwoosh_swizzle(Class cls, SEL fromChange, SEL toChange, IMP impl, const char * signature) {
     Method method = nil;
-    method = class_getInstanceMethod(class, fromChange);
+    method = class_getInstanceMethod(cls, fromChange);
     
     if (method) {
         //method exists add a new method and swap with original
-        class_addMethod(class, toChange, impl, signature);
-        method_exchangeImplementations(class_getInstanceMethod(class, fromChange), class_getInstanceMethod(class, toChange));
+        class_addMethod(cls, toChange, impl, signature);
+        method_exchangeImplementations(class_getInstanceMethod(cls, fromChange), class_getInstanceMethod(cls, toChange));
     } else {
         //just add as orignal method
-        class_addMethod(class, fromChange, impl, signature);
+        class_addMethod(cls, fromChange, impl, signature);
     }
 }
 
@@ -173,7 +174,15 @@ void pushwoosh_swizzle(Class class, SEL fromChange, SEL toChange, IMP impl, cons
 
 #pragma mark - Pushwoosh RCTBridgeModule
 
-RCT_EXPORT_MODULE(Pushwoosh);
+// No custom name: React Native looks a TurboModule up by NSClassFromString(name) before it
+// consults the RCT_EXPORT_MODULE registry, and "Pushwoosh" is the native SDK's own class.
+RCT_EXPORT_MODULE();
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
+    return std::make_shared<facebook::react::NativePushwooshSpecJSI>(params);
+}
+#endif
 
 - (dispatch_queue_t)methodQueue {
     return dispatch_get_main_queue();
@@ -250,32 +259,43 @@ RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)suc
         success(@[]);
     }
     
-    if (gStartPushData) {
-        NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(gStartPushData[@"l"]);
+    // Once per launch push. Neither source clears itself here - gStartPushData is consumed by the
+    // legacy onPushOpen:, launchNotification belongs to the SDK - so a second init() (a consent
+    // flow initialising after the user agreed, an app switching application code, a Fast Refresh
+    // reload) used to replay the same push as pushReceived and pushOpened again and to re-arm a
+    // deep link that Linking.getInitialURL() had already consumed, sending the user back to the
+    // screen the push opened the first time.
+    if (!gStartPushReplayed) {
+        gStartPushReplayed = YES;
 
-        if (deepLink) {
-            if (!gPushDeepLinkURL) {
-                gPushDeepLinkURL = deepLink;
-            }
+        if (gStartPushData) {
+            NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(gStartPushData[@"l"]);
 
-            // Writing the link into launchOptions is what makes RCTLinking report it, but only a
-            // real bridge accepts the write. Bridgeless reads it from the swizzled getInitialURL.
-            if (pwplugin_isRealBridge(self.bridge)) {
-                NSMutableDictionary *launchOptions = self.bridge.launchOptions.mutableCopy;
-                launchOptions[UIApplicationLaunchOptionsURLKey] = deepLink;
-                [self.bridge setValue:launchOptions forKey:@"launchOptions"];
+            if (deepLink) {
+                if (!gPushDeepLinkURL) {
+                    gPushDeepLinkURL = deepLink;
+                }
+
+                // Writing the link into launchOptions is what makes RCTLinking report it, but only
+                // a real bridge accepts the write. Bridgeless reads it from the swizzled
+                // getInitialURL.
+                if (pwplugin_isRealBridge(self.bridge)) {
+                    NSMutableDictionary *launchOptions = self.bridge.launchOptions.mutableCopy;
+                    launchOptions[UIApplicationLaunchOptionsURLKey] = deepLink;
+                    [self.bridge setValue:launchOptions forKey:@"launchOptions"];
+                }
             }
+
+            [self sendJSEvent:kPushReceivedJSEvent withArgs:gStartPushData];
+            [self sendJSEvent:kPushOpenJSEvent withArgs:gStartPushData];
+        } else if([PushNotificationManager pushManager].launchNotification) {
+            [self sendJSEvent:kPushReceivedJSEvent withArgs:[PushNotificationManager pushManager].launchNotification];
+            [self sendJSEvent:kPushOpenJSEvent withArgs:[PushNotificationManager pushManager].launchNotification];
         }
-        
-        [self sendJSEvent:kPushReceivedJSEvent withArgs:gStartPushData];
-        [self sendJSEvent:kPushOpenJSEvent withArgs:gStartPushData];
-    } else if([PushNotificationManager pushManager].launchNotification) {
-        [self sendJSEvent:kPushReceivedJSEvent withArgs:[PushNotificationManager pushManager].launchNotification];
-        [self sendJSEvent:kPushOpenJSEvent withArgs:[PushNotificationManager pushManager].launchNotification];
     }
 }
 
-RCT_EXPORT_METHOD(register:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)error) {
+RCT_EXPORT_METHOD(registerForPushNotifications:(RCTResponseSenderBlock)success error:(RCTResponseSenderBlock)error) {
     [[PWEventDispatcher sharedDispatcher] subscribe:success toEvent:kRegistrationSuccesEvent];
     [[PWEventDispatcher sharedDispatcher] subscribe:error toEvent:kRegistrationErrorEvent];
     
@@ -410,13 +430,13 @@ RCT_EXPORT_METHOD(setUserId:(NSString*)userId success:(RCTResponseSenderBlock)su
     }];
 }
 
-RCT_EXPORT_METHOD(postEvent:(NSString*)event withAttributes:(NSDictionary*)attributes) {
+RCT_EXPORT_METHOD(postEvent:(NSString*)event attributes:(NSDictionary*)attributes) {
     [[PWInAppManager sharedManager] postEvent:event withAttributes:attributes];
 }
 
-RCT_EXPORT_METHOD(setApplicationIconBadgeNumber:(nonnull NSNumber*)badgeNumber) {
+RCT_EXPORT_METHOD(setApplicationIconBadgeNumber:(double)badgeNumber) {
     dispatch_async(dispatch_get_main_queue(), ^{
-        [UIApplication sharedApplication].applicationIconBadgeNumber = [badgeNumber integerValue];
+        [UIApplication sharedApplication].applicationIconBadgeNumber = (NSInteger)badgeNumber;
     });
 }
 
@@ -432,9 +452,9 @@ RCT_EXPORT_METHOD(getApplicationIconBadgeNumber:(RCTResponseSenderBlock)callback
     }
 }
 
-RCT_EXPORT_METHOD(addToApplicationIconBadgeNumber:(nonnull NSNumber*)badgeNumber) {
+RCT_EXPORT_METHOD(addToApplicationIconBadgeNumber:(double)badgeNumber) {
     dispatch_async(dispatch_get_main_queue(), ^{
-        [UIApplication sharedApplication].applicationIconBadgeNumber += [badgeNumber integerValue];
+        [UIApplication sharedApplication].applicationIconBadgeNumber += (NSInteger)badgeNumber;
     });
 }
     
@@ -448,7 +468,7 @@ RCT_EXPORT_METHOD(presentInboxUI:(NSDictionary *)styleDictionary) {
             inboxViewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", @"Close") style:UIBarButtonItemStylePlain target:self action:@selector(closeInbox)];
             [[PushwooshPlugin findRootViewController] presentViewController:[[UINavigationController alloc] initWithRootViewController:inboxViewController] animated:YES completion:nil];
             
-            __weak typeof (self) wself = self;
+            __weak __typeof__(self) wself = self;
             inboxViewController.onMessageClickBlock = ^(NSObject<PWInboxMessageProtocol> *message) {
                 if (message.type == PWInboxMessageTypeDeeplink) {
                     [wself closeInbox];
@@ -484,15 +504,19 @@ RCT_EXPORT_METHOD(messagesCount:(RCTResponseSenderBlock)callback) {
 
 RCT_EXPORT_METHOD(loadMessages:(RCTResponseSenderBlock)success fail:(RCTResponseSenderBlock)fail) {
     [PWInbox loadMessagesWithCompletion:^(NSArray<NSObject<PWInboxMessageProtocol> *> *messages, NSError *error) {
+        if (error) {
+            if (fail) {
+                fail(@[ objectOrNull([error localizedDescription]) ]);
+            }
+            return;
+        }
+
         if (success) {
-            NSMutableArray* array = [[NSMutableArray alloc] init];
-                for (NSObject<PWInboxMessageProtocol>* message in messages) {
-                    NSDictionary* dict = [self inboxMessageToDictionary:message];
-                    [array addObject:dict];
-                }
-            success( @[ array ]);
-        } else if (error != nil && fail != nil) {
-            fail(@[ error ]);
+            NSMutableArray *array = [[NSMutableArray alloc] init];
+            for (NSObject<PWInboxMessageProtocol> *message in messages) {
+                [array addObject:[self inboxMessageToDictionary:message]];
+            }
+            success(@[ array ]);
         }
     }];
 }
@@ -584,25 +608,50 @@ API_AVAILABLE(ios(10.0)) {
     NSString *currentHash = content.userInfo[@"p"];
     BOOL isNeedToImplementInPlugin = [[PushwooshPlugin getPluginImplementationInfoPlistKey] boolValue];
 
+    // 0 when this notification is not ours to present: someone else's, a repeat of the same
+    // message, or a Pushwoosh push the app asked us not to show an alert for.
+    UNNotificationPresentationOptions options = 0;
+
     if (isPushwooshMessage && isNeedToImplementInPlugin && ![lastPushwooshHash isEqualToString:currentHash]) {
         lastPushwooshHash = currentHash;
 
         if ([PushNotificationManager pushManager].showPushnotificationAlert) {
-            completionHandler(UNNotificationPresentationOptionSound | UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionAlert);
+            options = UNNotificationPresentationOptionSound | UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionAlert;
         } else {
             [[PushNotificationManager pushManager] handlePushReceived:content.userInfo];
         }
         
         [self sendJSEvent:kPushReceivedJSEvent withArgs:content.userInfo];
     }
-        
+
+    // UNUserNotificationCenter waits for exactly one answer: a second call is an error it logs,
+    // and no call at all leaves the notification unpresented. Both used to be reachable here -
+    // our own alert answered and the app's delegate answered again with the same handler, while a
+    // notification that is neither ours nor claimed by an app delegate was never answered at all.
+    // So whoever answers first decides and the rest is swallowed.
+    __block BOOL answered = NO;
+    void (^answerOnce)(UNNotificationPresentationOptions) = ^(UNNotificationPresentationOptions presentationOptions) {
+        if (answered) {
+            return;
+        }
+        answered = YES;
+        completionHandler(presentationOptions);
+    };
+
+    // The SDK's alert goes up straight away, as before.
+    if (options != 0) {
+        answerOnce(options);
+    }
+
+    // The app's own delegate still gets the callback either way. A Pushwoosh message is handed
+    // over with a delay, so the SDK presents its own alert first.
     if (_originalNotificationCenterDelegate != nil &&
         _originalNotificationCenterDelegateResponds.willPresentNotification) {
         
         dispatch_block_t presentationBlock = ^{
             [self->_originalNotificationCenterDelegate userNotificationCenter:center
                                                 willPresentNotification:notification
-                                                  withCompletionHandler:completionHandler];
+                                                  withCompletionHandler:answerOnce];
         };
         
         if (isPushwooshMessage) {
@@ -610,14 +659,10 @@ API_AVAILABLE(ios(10.0)) {
         } else {
             presentationBlock();
         }
+        return;
     }
-    
-    if (_originalNotificationCenterDelegate != nil &&
-        _originalNotificationCenterDelegateResponds.willPresentNotification) {
-        [_originalNotificationCenterDelegate userNotificationCenter:center
-                                            willPresentNotification:notification
-                                              withCompletionHandler:completionHandler];
-    }
+
+    answerOnce(options);
 }
 
 - (BOOL)isContentAvailablePush:(NSDictionary *)userInfo {
@@ -737,7 +782,8 @@ API_AVAILABLE(ios(10.0)) {
 
 - (NSString*)dateToString:(NSDate*)date {
     NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
-    [formatter setDateFormat:@"yyyy-MM-dd'T'H:mm:ssZ"];
+    [formatter setLocale:[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]];
+    [formatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZ"];
     return [formatter stringFromDate:date];
 }
 
@@ -979,6 +1025,25 @@ RCT_EXPORT_METHOD(enableHuaweiPushNotifications) {
     // available in Android only
 }
 
+#pragma mark - Android-only settings
+
+// Declared so the TurboModule spec is fully implemented on iOS: a call from JS is a no-op here
+// instead of a TypeError. The settings exist only in the Android SDK.
+
+RCT_EXPORT_METHOD(setMultiNotificationMode:(BOOL)on) {}
+
+RCT_EXPORT_METHOD(setLightScreenOnNotification:(BOOL)on) {}
+
+RCT_EXPORT_METHOD(setEnableLED:(BOOL)on) {}
+
+RCT_EXPORT_METHOD(setColorLED:(double)color) {}
+
+RCT_EXPORT_METHOD(setSoundType:(double)type) {}
+
+RCT_EXPORT_METHOD(setVibrateType:(double)type) {}
+
+RCT_EXPORT_METHOD(setNotificationIconBackgroundColor:(NSString *)color) {}
+
 RCT_EXPORT_METHOD(registerSMSNumber:(NSString *)phoneNumber) {
     [[Pushwoosh sharedInstance] registerSmsNumber:phoneNumber];
 }
@@ -987,8 +1052,8 @@ RCT_EXPORT_METHOD(registerWhatsappNumber:(NSString *)phoneNumber) {
     [[Pushwoosh sharedInstance] registerWhatsappNumber:phoneNumber];
 }
 
-RCT_EXPORT_METHOD(setRichMediaType:(nonnull NSNumber *)type) {
-    PWRichMediaPresentationStyle style = [type integerValue] == 0
+RCT_EXPORT_METHOD(setRichMediaType:(double)type) {
+    PWRichMediaPresentationStyle style = (NSInteger)type == 0
         ? PWRichMediaPresentationStyleModal
         : PWRichMediaPresentationStyleLegacy;
     [Pushwoosh.media setRichMediaPresentationStyle:style];
@@ -1052,6 +1117,7 @@ RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
 - (void)onPushReceived:(PushNotificationManager *)manager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
     if (onStart) {
         gStartPushData = pushNotification;
+        gStartPushReplayed = NO;
         // Save deep link URL for New Architecture (Linking.getInitialURL support)
         NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(pushNotification[@"l"]);
         if (deepLink) {
@@ -1062,6 +1128,7 @@ RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
 - (void)onPushAccepted:(PushNotificationManager *)manager withNotification:(NSDictionary *)pushNotification onStart:(BOOL)onStart {
     if (onStart) {
         gStartPushData = pushNotification;
+        gStartPushReplayed = NO;
         // Save deep link URL for New Architecture (Linking.getInitialURL support)
         NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(pushNotification[@"l"]);
         if (deepLink) {

package/src/package.json

@@ -0,0 +1,11 @@
+{
+  "private": true,
+  "codegenConfig": {
+    "name": "RNPushwooshSpec",
+    "type": "modules",
+    "jsSrcsDir": "specs",
+    "android": {
+      "javaPackageName": "com.pushwoosh.reactnativeplugin"
+    }
+  }
+}

package/src/specs/NativePushwoosh.ts

@@ -0,0 +1,73 @@
+import type {TurboModule} from 'react-native';
+import {TurboModuleRegistry} from 'react-native';
+
+// Codegen input. Parameter names become the Objective-C selector labels (init:success:error:)
+// and the Java parameter names, so they must match the native implementations.
+export interface Spec extends TurboModule {
+  setReverseProxy(url: string, headers: Object | null): void;
+  init(config: Object, success: (result: Object) => void, error: (message: string) => void): void;
+  // `register` is a C++ keyword, so codegen cannot emit a method of that name
+  registerForPushNotifications(success: (token: string) => void, error: (message: string) => void): void;
+  unregister(success: (token: string) => void, error: (message: string) => void): void;
+  onPushOpen(callback: (push: Object) => void): void;
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
+  setEmails(emails: Array<string>, success: () => void, error: (message: string) => void): void;
+  setUserEmails(
+    userId: string,
+    emails: Array<string>,
+    success: () => void,
+    error: (message: string) => void,
+  ): void;
+  registerSMSNumber(phoneNumber: string): void;
+  registerWhatsappNumber(phoneNumber: string): void;
+  setTags(tags: Object, success: () => void, error: (message: string) => void): void;
+  getTags(success: (tags: Object) => void, error: (message: string) => void): void;
+  setShowPushnotificationAlert(showPushnotificationAlert: boolean): void;
+  getShowPushnotificationAlert(callback: (showPushnotificationAlert: boolean) => void): void;
+  getPushToken(callback: (token: string) => void): void;
+  getHwid(callback: (hwid: string) => void): void;
+  getUserId(callback: (userId: string) => void): void;
+  setUserId(userId: string, success: () => void, error: (message: string) => void): void;
+  postEvent(event: string, attributes: Object): void;
+  setApplicationIconBadgeNumber(badgeNumber: number): void;
+  getApplicationIconBadgeNumber(callback: (badgeNumber: number) => void): void;
+  addToApplicationIconBadgeNumber(badgeNumber: number): void;
+  setMultiNotificationMode(on: boolean): void;
+  setLightScreenOnNotification(on: boolean): void;
+  setEnableLED(on: boolean): void;
+  setColorLED(color: number): void;
+  setSoundType(type: number): void;
+  setVibrateType(type: number): void;
+  presentInboxUI(style: Object | null): void;
+  messagesWithNoActionPerformedCount(callback: (count: number) => void): void;
+  unreadMessagesCount(callback: (count: number) => void): void;
+  messagesCount(callback: (count: number) => void): void;
+  loadMessages(success: (messages: Array<Object>) => void, fail: (message: string) => void): void;
+  readMessage(code: string): void;
+  readMessages(codes: Array<string>): void;
+  deleteMessage(code: string): void;
+  deleteMessages(codes: Array<string>): void;
+  performAction(code: string): void;
+  isCommunicationEnabled(callback: (enabled: boolean) => void): void;
+  setCommunicationEnabled(
+    enabled: boolean,
+    success: () => void,
+    error: (message: string) => void,
+  ): void;
+  setNotificationIconBackgroundColor(color: string): void;
+  setLanguage(language: string): void;
+  enableHuaweiPushNotifications(): void;
+  setRichMediaType(type: number): void;
+  getRichMediaType(callback: (type: number) => void): void;
+  createLocalNotification(params: Object): void;
+  clearLocalNotification(): void;
+  clearNotificationCenter(): void;
+}
+
+// `get`, not `getEnforcing`: importing the package on a build without the native module (Jest,
+// an unlinked app) must not throw; a method call does, as it always did.
+//
+// The module is named after its Objective-C class. React Native resolves a TurboModule by
+// NSClassFromString(name) first, and "Pushwoosh" is the native SDK's own class.
+export default TurboModuleRegistry.get<Spec>('PushwooshPlugin');