@ua/react-native-airship 24.8.0 → 24.9.0

package/android/generated/jni/react/renderer/components/RNAirshipSpec/EventEmitters.cpp

@@ -15,7 +15,7 @@ namespace facebook::react {
 
 
 void RNAirshipMessageViewEventEmitter::onLoadStarted(OnLoadStarted $event) const {
-  dispatchEvent("topLoadStarted", [$event=std::move($event)](jsi::Runtime &runtime) {
+  dispatchEvent("topAirshipMessageViewLoadStarted", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     $payload.setProperty(runtime, "messageId", $event.messageId);
     return $payload;
@@ -24,7 +24,7 @@ void RNAirshipMessageViewEventEmitter::onLoadStarted(OnLoadStarted $event) const
 
 
 void RNAirshipMessageViewEventEmitter::onLoadFinished(OnLoadFinished $event) const {
-  dispatchEvent("topLoadFinished", [$event=std::move($event)](jsi::Runtime &runtime) {
+  dispatchEvent("topAirshipMessageViewLoadFinished", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     $payload.setProperty(runtime, "messageId", $event.messageId);
     return $payload;
@@ -33,7 +33,7 @@ void RNAirshipMessageViewEventEmitter::onLoadFinished(OnLoadFinished $event) con
 
 
 void RNAirshipMessageViewEventEmitter::onLoadError(OnLoadError $event) const {
-  dispatchEvent("topLoadError", [$event=std::move($event)](jsi::Runtime &runtime) {
+  dispatchEvent("topAirshipMessageViewLoadError", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     $payload.setProperty(runtime, "messageId", $event.messageId);
 $payload.setProperty(runtime, "retryable", $event.retryable);
@@ -44,7 +44,7 @@ $payload.setProperty(runtime, "error", $event.error);
 
 
 void RNAirshipMessageViewEventEmitter::onClose(OnClose $event) const {
-  dispatchEvent("topClose", [$event=std::move($event)](jsi::Runtime &runtime) {
+  dispatchEvent("topAirshipMessageViewClose", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     $payload.setProperty(runtime, "messageId", $event.messageId);
     return $payload;

package/android/gradle.properties

@@ -3,4 +3,4 @@ Airship_minSdkVersion=23
 Airship_targetSdkVersion=35
 Airship_compileSdkVersion=35
 Airship_ndkversion=26.1.10909125
-Airship_airshipProxyVersion=14.9.0
+Airship_airshipProxyVersion=14.10.1

package/android/src/main/AndroidManifest.xml

@@ -9,7 +9,8 @@
 
         <service
             android:name="com.urbanairship.reactnative.AirshipHeadlessEventService"
-            android:exported="false" />
+            android:exported="false"
+            android:stopWithTask="true" />
 
         <activity
             android:name="com.urbanairship.android.framework.proxy.CustomMessageCenterActivity"

package/android/src/main/java/com/urbanairship/reactnative/AirshipHeadlessEventService.kt

@@ -26,7 +26,7 @@ class AirshipHeadlessEventService : HeadlessJsTaskService() {
     }
 
     companion object {
-        private const val TASK_TIMEOUT: Long = 60000
+        private const val TASK_TIMEOUT: Long = 1000
         private const val TASK_KEY = "AirshipAndroidBackgroundEventTask"
 
         fun startService(context: Context): Boolean {

package/android/src/main/java/com/urbanairship/reactnative/ReactMessageView.kt

@@ -137,25 +137,25 @@ class ReactMessageView(context: Context) : FrameLayout(context), LifecycleEventL
         event.putString(MESSAGE_ID_KEY, messageId)
         event.putBoolean(RETRYABLE_KEY, retryable)
         event.putString(ERROR_KEY, error)
-        notify(if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) EVENT_LOAD_ERROR else EVENT_LOAD_ERROR_HANDLER_NAME, event)
+        notify(EVENT_LOAD_ERROR, event)
     }
 
     private fun notifyLoadFinished(messageId: String) {
         val event = Arguments.createMap()
         event.putString(MESSAGE_ID_KEY, messageId)
-        notify(if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) EVENT_LOAD_FINISHED else EVENT_LOAD_FINISHED_HANDLER_NAME, event)
+        notify(EVENT_LOAD_FINISHED, event)
     }
 
     private fun notifyLoadStarted(messageId: String) {
         val event = Arguments.createMap()
         event.putString(MESSAGE_ID_KEY, messageId)
-        notify(if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) EVENT_LOAD_STARTED else EVENT_LOAD_STARTED_HANDLER_NAME, event)
+        notify(EVENT_LOAD_STARTED, event)
     }
 
     private fun notifyClose(messageId: String) {
         val event = Arguments.createMap()
         event.putString(MESSAGE_ID_KEY, messageId)
-        notify(if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) EVENT_CLOSE else EVENT_CLOSE_HANDLER_NAME, event)
+        notify(EVENT_CLOSE, event)
     }
 
     private fun notify(eventName: String, event: WritableMap) {
@@ -183,21 +183,16 @@ class ReactMessageView(context: Context) : FrameLayout(context), LifecycleEventL
     }
 
     companion object {
-        const val EVENT_LOAD_STARTED_REGISTRATION_NAME = "topLoadStarted"
-        const val EVENT_LOAD_FINISHED_REGISTRATION_NAME = "topLoadFinished"
-        const val EVENT_LOAD_ERROR_REGISTRATION_NAME = "topLoadError"
-        const val EVENT_CLOSE_REGISTRATION_NAME = "topClose"
+        const val EVENT_LOAD_STARTED = "topAirshipMessageViewLoadStarted"
+        const val EVENT_LOAD_FINISHED = "topAirshipMessageViewLoadFinished"
+        const val EVENT_LOAD_ERROR = "topAirshipMessageViewLoadError"
+        const val EVENT_CLOSE = "topAirshipMessageViewClose"
 
         const val EVENT_LOAD_STARTED_HANDLER_NAME = "onLoadStarted"
         const val EVENT_LOAD_FINISHED_HANDLER_NAME = "onLoadFinished"
         const val EVENT_LOAD_ERROR_HANDLER_NAME = "onLoadError"
         const val EVENT_CLOSE_HANDLER_NAME = "onClose"
 
-        const val EVENT_LOAD_STARTED = "loadStarted"
-        const val EVENT_LOAD_FINISHED = "loadFinished"
-        const val EVENT_LOAD_ERROR = "loadError"
-        const val EVENT_CLOSE = "close"
-
         private const val MESSAGE_ID_KEY = "messageId"
         private const val RETRYABLE_KEY = "retryable"
         private const val ERROR_KEY = "error"

package/android/src/main/java/com/urbanairship/reactnative/ReactMessageViewManager.kt

@@ -55,27 +55,18 @@ class ReactMessageViewManager : SimpleViewManager<ReactMessageView>(),
     }
 
     override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any> {
-        val events = if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            listOf(
-                ReactMessageView.EVENT_CLOSE_REGISTRATION_NAME to ReactMessageView.EVENT_CLOSE_HANDLER_NAME,
-                ReactMessageView.EVENT_LOAD_ERROR_REGISTRATION_NAME to ReactMessageView.EVENT_LOAD_ERROR_HANDLER_NAME,
-                ReactMessageView.EVENT_LOAD_FINISHED_REGISTRATION_NAME to ReactMessageView.EVENT_LOAD_FINISHED_HANDLER_NAME,
-                ReactMessageView.EVENT_LOAD_STARTED_REGISTRATION_NAME to ReactMessageView.EVENT_LOAD_STARTED_HANDLER_NAME
-            )
-        } else {
-            listOf(
-                ReactMessageView.EVENT_CLOSE_HANDLER_NAME to ReactMessageView.EVENT_CLOSE_HANDLER_NAME,
-                ReactMessageView.EVENT_LOAD_ERROR_HANDLER_NAME to ReactMessageView.EVENT_LOAD_ERROR_HANDLER_NAME,
-                ReactMessageView.EVENT_LOAD_FINISHED_HANDLER_NAME to ReactMessageView.EVENT_LOAD_FINISHED_HANDLER_NAME,
-                ReactMessageView.EVENT_LOAD_STARTED_HANDLER_NAME to ReactMessageView.EVENT_LOAD_STARTED_HANDLER_NAME
-            )
-        }
+        val events = listOf(
+            ReactMessageView.EVENT_CLOSE to ReactMessageView.EVENT_CLOSE_HANDLER_NAME,
+            ReactMessageView.EVENT_LOAD_ERROR to ReactMessageView.EVENT_LOAD_ERROR_HANDLER_NAME,
+            ReactMessageView.EVENT_LOAD_FINISHED to ReactMessageView.EVENT_LOAD_FINISHED_HANDLER_NAME,
+            ReactMessageView.EVENT_LOAD_STARTED to ReactMessageView.EVENT_LOAD_STARTED_HANDLER_NAME
+        )
 
         val builder = MapBuilder.builder<String, Any>()
 
-        for ((name, handlerName) in events) {
+        for ((internalName, handlerName) in events) {
             builder.put(
-                name,
+                internalName,
                 MapBuilder.of(
                     "phasedRegistrationNames",
                     MapBuilder.of("bubbled", handlerName)

package/ios/AirshipReactNative.swift

@@ -39,7 +39,7 @@ public class AirshipReactNative: NSObject {
         AirshipProxy.shared
     }
 
-    public static let version: String = "24.8.0"
+    public static let version: String = "24.9.0"
 
     private let eventNotifier = EventNotifier()
 

package/ios/generated/RNAirshipSpec/EventEmitters.cpp

@@ -15,7 +15,7 @@ namespace facebook::react {
 
 
 void RNAirshipMessageViewEventEmitter::onLoadStarted(OnLoadStarted $event) const {
-  dispatchEvent("topLoadStarted", [$event=std::move($event)](jsi::Runtime &runtime) {
+  dispatchEvent("topAirshipMessageViewLoadStarted", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     $payload.setProperty(runtime, "messageId", $event.messageId);
     return $payload;
@@ -24,7 +24,7 @@ void RNAirshipMessageViewEventEmitter::onLoadStarted(OnLoadStarted $event) const
 
 
 void RNAirshipMessageViewEventEmitter::onLoadFinished(OnLoadFinished $event) const {
-  dispatchEvent("topLoadFinished", [$event=std::move($event)](jsi::Runtime &runtime) {
+  dispatchEvent("topAirshipMessageViewLoadFinished", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     $payload.setProperty(runtime, "messageId", $event.messageId);
     return $payload;
@@ -33,7 +33,7 @@ void RNAirshipMessageViewEventEmitter::onLoadFinished(OnLoadFinished $event) con
 
 
 void RNAirshipMessageViewEventEmitter::onLoadError(OnLoadError $event) const {
-  dispatchEvent("topLoadError", [$event=std::move($event)](jsi::Runtime &runtime) {
+  dispatchEvent("topAirshipMessageViewLoadError", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     $payload.setProperty(runtime, "messageId", $event.messageId);
 $payload.setProperty(runtime, "retryable", $event.retryable);
@@ -44,7 +44,7 @@ $payload.setProperty(runtime, "error", $event.error);
 
 
 void RNAirshipMessageViewEventEmitter::onClose(OnClose $event) const {
-  dispatchEvent("topClose", [$event=std::move($event)](jsi::Runtime &runtime) {
+  dispatchEvent("topAirshipMessageViewClose", [$event=std::move($event)](jsi::Runtime &runtime) {
     auto $payload = jsi::Object(runtime);
     $payload.setProperty(runtime, "messageId", $event.messageId);
     return $payload;

package/lib/module/RNAirshipMessageViewNativeComponent.ts

@@ -28,14 +28,14 @@ interface NativeProps extends ViewProps {
   messageId: string;
   onLoadStarted: BubblingEventHandler<
     MessageLoadStartedEvent,
-    'topLoadStarted'
+    'topAirshipMessageViewLoadStarted'
   >;
   onLoadFinished: BubblingEventHandler<
     MessageLoadFinishedEvent,
-    'topLoadFinished'
+    'topAirshipMessageViewLoadFinished'
   >;
-  onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topLoadError'>;
-  onClose: BubblingEventHandler<MessageClosedEvent, 'topClose'>;
+  onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topAirshipMessageViewLoadError'>;
+  onClose: BubblingEventHandler<MessageClosedEvent, 'topAirshipMessageViewClose'>;
 }
 
 export default codegenNativeComponent<NativeProps>('RNAirshipMessageView') as HostComponent<NativeProps>;

package/lib/typescript/src/RNAirshipMessageViewNativeComponent.d.ts

@@ -16,10 +16,10 @@ type MessageClosedEvent = Readonly<{
 }>;
 interface NativeProps extends ViewProps {
     messageId: string;
-    onLoadStarted: BubblingEventHandler<MessageLoadStartedEvent, 'topLoadStarted'>;
-    onLoadFinished: BubblingEventHandler<MessageLoadFinishedEvent, 'topLoadFinished'>;
-    onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topLoadError'>;
-    onClose: BubblingEventHandler<MessageClosedEvent, 'topClose'>;
+    onLoadStarted: BubblingEventHandler<MessageLoadStartedEvent, 'topAirshipMessageViewLoadStarted'>;
+    onLoadFinished: BubblingEventHandler<MessageLoadFinishedEvent, 'topAirshipMessageViewLoadFinished'>;
+    onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topAirshipMessageViewLoadError'>;
+    onClose: BubblingEventHandler<MessageClosedEvent, 'topAirshipMessageViewClose'>;
 }
 declare const _default: HostComponent<NativeProps>;
 export default _default;

package/lib/typescript/src/RNAirshipMessageViewNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNAirshipMessageViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/RNAirshipMessageViewNativeComponent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EACV,oBAAoB,EAErB,MAAM,2CAA2C,CAAC;AAEnD,KAAK,uBAAuB,GAAG,QAAQ,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,KAAK,wBAAwB,GAAG,QAAQ,CAAC;IACvC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,KAAK,qBAAqB,GAAG,QAAQ,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAEH,KAAK,kBAAkB,GAAG,QAAQ,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,UAAU,WAAY,SAAQ,SAAS;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,oBAAoB,CACjC,uBAAuB,EACvB,gBAAgB,CACjB,CAAC;IACF,cAAc,EAAE,oBAAoB,CAClC,wBAAwB,EACxB,iBAAiB,CAClB,CAAC;IACF,WAAW,EAAE,oBAAoB,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;IACzE,OAAO,EAAE,oBAAoB,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;CAC/D;wBAE6E,aAAa,CAAC,WAAW,CAAC;AAAxG,wBAAyG"}
+{"version":3,"file":"RNAirshipMessageViewNativeComponent.d.ts","sourceRoot":"","sources":["../../../src/RNAirshipMessageViewNativeComponent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,KAAK,EACV,oBAAoB,EAErB,MAAM,2CAA2C,CAAC;AAEnD,KAAK,uBAAuB,GAAG,QAAQ,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,KAAK,wBAAwB,GAAG,QAAQ,CAAC;IACvC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,KAAK,qBAAqB,GAAG,QAAQ,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAEH,KAAK,kBAAkB,GAAG,QAAQ,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAAC;AAEH,UAAU,WAAY,SAAQ,SAAS;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,oBAAoB,CACjC,uBAAuB,EACvB,kCAAkC,CACnC,CAAC;IACF,cAAc,EAAE,oBAAoB,CAClC,wBAAwB,EACxB,mCAAmC,CACpC,CAAC;IACF,WAAW,EAAE,oBAAoB,CAAC,qBAAqB,EAAE,gCAAgC,CAAC,CAAC;IAC3F,OAAO,EAAE,oBAAoB,CAAC,kBAAkB,EAAE,4BAA4B,CAAC,CAAC;CACjF;wBAE6E,aAAa,CAAC,WAAW,CAAC;AAAxG,wBAAyG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ua/react-native-airship",
-  "version": "24.8.0",
+  "version": "24.9.0",
   "description": "Airship plugin for React Native apps.",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/react-native-airship.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
 
   s.platforms    = { :ios => "15.0" }
   s.source       = { :git => "https://github.com/urbanairship/react-native-module.git", :tag => "#{s.version}" }
-
+  s.swift_version = "5.0"
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/generated/**/*.h"
 
@@ -40,5 +40,5 @@ Pod::Spec.new do |s|
     end
   end
   
-  s.dependency "AirshipFrameworkProxy", "14.9.0"
+  s.dependency "AirshipFrameworkProxy", "14.10.1"
 end

package/src/RNAirshipMessageViewNativeComponent.ts

@@ -28,14 +28,14 @@ interface NativeProps extends ViewProps {
   messageId: string;
   onLoadStarted: BubblingEventHandler<
     MessageLoadStartedEvent,
-    'topLoadStarted'
+    'topAirshipMessageViewLoadStarted'
   >;
   onLoadFinished: BubblingEventHandler<
     MessageLoadFinishedEvent,
-    'topLoadFinished'
+    'topAirshipMessageViewLoadFinished'
   >;
-  onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topLoadError'>;
-  onClose: BubblingEventHandler<MessageClosedEvent, 'topClose'>;
+  onLoadError: BubblingEventHandler<MessageLoadErrorEvent, 'topAirshipMessageViewLoadError'>;
+  onClose: BubblingEventHandler<MessageClosedEvent, 'topAirshipMessageViewClose'>;
 }
 
 export default codegenNativeComponent<NativeProps>('RNAirshipMessageView') as HostComponent<NativeProps>;