pushwoosh-react-native-plugin 6.1.59 → 6.1.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-react-native-plugin",
-  "version": "6.1.59",
+  "version": "6.1.61",
   "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          = "6.1.59"
+  s.version          = "6.1.61"
   s.summary          = "React Native Pushwoosh Push Notifications module"
   s.requires_arc = true
   s.author       = 'Pushwoosh'
@@ -15,6 +15,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'React'
-  s.dependency 'PushwooshXCFramework', '7.2.3'
+  s.dependency 'PushwooshXCFramework', '7.2.6'
   s.dependency 'PushwooshInboxUIXCFramework'
 end

package/src/android/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 ext {
-    pushwoosh = "6.10.2"
+    pushwoosh = "6.12.0"
 }
 
 dependencies {
@@ -49,6 +49,9 @@ dependencies {
     implementation "com.pushwoosh:pushwoosh-badge:${pushwoosh}"
     implementation "com.pushwoosh:pushwoosh-inbox:${pushwoosh}"
     implementation "com.pushwoosh:pushwoosh-inbox-ui:${pushwoosh}"
+    // InboxActivity calls androidx.activity.EdgeToEdge, added in 1.8.0; inbox-ui itself
+    // resolves 1.6.0, so the inbox screen dies with ClassNotFoundException without this
+    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"
 }

package/src/android/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /Users/arellomobile/Library/Android/sdk/tools/proguard/proguard-android.txt
+# in $HOME/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #

package/src/ios/PushwooshPlugin/Pushwoosh.m

@@ -70,6 +70,7 @@ static PWEmailsCompletion emailsCompletionHandler(NSUInteger addressCount, RCTRe
 
 static NSDictionary * gStartPushData = nil;
 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";
 static NSString * const kRegistrationErrorEvent = @"PWRegistrationError";
 static NSString * const kPushReceivedEvent = @"PWPushReceived";
@@ -78,6 +79,38 @@ static NSString * const kPushOpenEvent = @"PWPushOpen";
 static NSString * const kPushOpenJSEvent = @"pushOpened";
 static NSString * const kPushReceivedJSEvent = @"pushReceived";
 
+/// 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
+/// and either hands the link to the app's Universal Links handler (own domain) or opens the
+/// browser (anyone else's). Handing those to RCTLinking too made every external link land in JS
+/// as if it were an in-app destination.
+static NSURL * pwplugin_deepLinkURLFromPushLink(id link) {
+    if (![link isKindOfClass:[NSString class]] || [link length] == 0) {
+        return nil;
+    }
+
+    NSURL *url = [NSURL URLWithString:link];
+    NSString *scheme = url.scheme.lowercaseString;
+
+    if (scheme.length == 0 || [scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]) {
+        return nil;
+    }
+
+    return 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) {
+    if (bridge == nil) {
+        return NO;
+    }
+
+    Class bridgeProxyClass = NSClassFromString(@"RCTBridgeProxy");
+    return bridgeProxyClass == nil || object_getClass(bridge) != bridgeProxyClass;
+}
+
 @interface PushwooshPlugin (InnerPushwooshPlugin)
 
 - (void) application:(UIApplication *)application pwplugin_didRegisterWithDeviceToken:(NSData *)deviceToken;
@@ -146,6 +179,12 @@ RCT_EXPORT_MODULE(Pushwoosh);
     return dispatch_get_main_queue();
 }
 
+// Overriding init makes React Native infer main queue setup on its own; saying so keeps that
+// contract explicit, since the module claims the notification center delegate right away.
++ (BOOL)requiresMainQueueSetup {
+    return YES;
+}
+
 + (NSString *)getPluginImplementationInfoPlistKey {
     return [[NSBundle mainBundle] objectForInfoDictionaryKey:kPushwooshPluginImplementationInfoPlistKey];
 }
@@ -212,13 +251,20 @@ RCT_EXPORT_METHOD(init:(NSDictionary*)config success:(RCTResponseSenderBlock)suc
     }
     
     if (gStartPushData) {
-        NSString *link = gStartPushData[@"l"];
-        
-        //get deeplink from the payload and write it to the launchOptions for proper RCTLinking behavior
-        if (link) {
-            NSMutableDictionary *launchOptions = self.bridge.launchOptions.mutableCopy;
-            launchOptions[UIApplicationLaunchOptionsURLKey] = [NSURL URLWithString:link];
-            [self.bridge setValue:launchOptions forKey:@"launchOptions"];
+        NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(gStartPushData[@"l"]);
+
+        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];
@@ -979,9 +1025,15 @@ RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
 
 #pragma mark - RCTEventEmitter
 
+// RCTEventEmitter withholds events until JS subscribes through NativeEventEmitter, which is what
+// raises its listener count. The plugin's public API is DeviceEventEmitter, which never raises it,
+// so observation stays off and every event goes out.
+- (instancetype)init {
+    return [super initWithDisabledObservation];
+}
+
 - (void)sendJSEvent:(NSString*)event withArgs:(NSDictionary*)args {
-//    [self sendEventWithName:event body:args];
-    [self.bridge.eventDispatcher sendDeviceEventWithName:event body:args];
+    [self sendEventWithName:event body:args];
 }
 
 - (NSArray<NSString *> *)supportedEvents {
@@ -1001,9 +1053,9 @@ RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
     if (onStart) {
         gStartPushData = pushNotification;
         // Save deep link URL for New Architecture (Linking.getInitialURL support)
-        NSString *link = pushNotification[@"l"];
-        if (link) {
-            gPushDeepLinkURL = [NSURL URLWithString:link];
+        NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(pushNotification[@"l"]);
+        if (deepLink) {
+            gPushDeepLinkURL = deepLink;
         }
     }
 }
@@ -1011,9 +1063,9 @@ RCT_EXPORT_METHOD(getRichMediaType:(RCTResponseSenderBlock)callback) {
     if (onStart) {
         gStartPushData = pushNotification;
         // Save deep link URL for New Architecture (Linking.getInitialURL support)
-        NSString *link = pushNotification[@"l"];
-        if (link) {
-            gPushDeepLinkURL = [NSURL URLWithString:link];
+        NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(pushNotification[@"l"]);
+        if (deepLink) {
+            gPushDeepLinkURL = deepLink;
         }
     }
 }
@@ -1032,17 +1084,45 @@ API_AVAILABLE(ios(10.0))
 @property (nonatomic, weak) id<UNUserNotificationCenterDelegate> originalDelegate;
 @end
 
+// PLUGIN_NOTIFICATION_HANDLER suppresses the native delegate, and the plugin's own delegate is
+// installed in JS init — too late for a cold start, so nobody accepts the launch push. Both early
+// hooks below call this; the push hash keeps the second one from repeating it.
+static void pwplugin_acceptColdStartPushOnce(NSDictionary *userInfo) {
+    if (![userInfo isKindOfClass:[NSDictionary class]]) {
+        return;
+    }
+    if (![[[NSBundle mainBundle] objectForInfoDictionaryKey:kPushwooshPluginImplementationInfoPlistKey] boolValue]) {
+        return;
+    }
+    if (![PWMessage isPushwooshMessage:userInfo]) {
+        return;
+    }
+
+    NSString *hash = userInfo[@"p"];
+    if ([hash isKindOfClass:[NSString class]]) {
+        if ([gEarlyHandledHash isEqualToString:hash]) {
+            return;
+        }
+        gEarlyHandledHash = hash;
+    }
+
+    [[PushNotificationManager pushManager] handlePushAccepted:userInfo onStart:YES];
+}
+
 @implementation PWEarlyNotificationDelegate
 
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center
 didReceiveNotificationResponse:(UNNotificationResponse *)response
          withCompletionHandler:(void (^)(void))completionHandler API_AVAILABLE(ios(10.0)) {
-    // Capture deep link from push notification on cold start
     if ([response.notification.request.trigger isKindOfClass:[UNPushNotificationTrigger class]]) {
         NSDictionary *userInfo = response.notification.request.content.userInfo;
-        NSString *link = userInfo[@"l"];
-        if (link) {
-            gPushDeepLinkURL = [NSURL URLWithString:link];
+        NSURL *appSchemeDeepLink = pwplugin_deepLinkURLFromPushLink(userInfo[@"l"]);
+
+        if (appSchemeDeepLink) {
+            // Routing it through the SDK too would deliver the deep link twice.
+            gPushDeepLinkURL = appSchemeDeepLink;
+        } else {
+            pwplugin_acceptColdStartPushOnce(userInfo);
         }
     }
 
@@ -1101,9 +1181,13 @@ static PWEarlyNotificationDelegate *gEarlyDelegate = nil;
             NSDictionary *launchOptions = notification.userInfo;
             NSDictionary *remoteNotification = launchOptions[UIApplicationLaunchOptionsRemoteNotificationKey];
             if (remoteNotification) {
-                NSString *link = remoteNotification[@"l"];
-                if (link && !gPushDeepLinkURL) {
-                    gPushDeepLinkURL = [NSURL URLWithString:link];
+                NSURL *deepLink = pwplugin_deepLinkURLFromPushLink(remoteNotification[@"l"]);
+                if (deepLink) {
+                    if (!gPushDeepLinkURL) {
+                        gPushDeepLinkURL = deepLink;
+                    }
+                } else {
+                    pwplugin_acceptColdStartPushOnce(remoteNotification);
                 }
             }
         }];