pushwoosh-cordova-plugin 8.3.52 → 8.3.54

package/README.md

@@ -14,13 +14,13 @@ Cross-Platform push notifications by Pushwoosh for Cordova / PhoneGap
 Using npm:
 
 ```
-cordova plugin add pushwoosh-cordova-plugin@8.3.52
+cordova plugin add pushwoosh-cordova-plugin@8.3.54
 ```
 
 Using git:
 
 ```
-cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.52
+cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.54
 ```
 
 ### Guide

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.52",
+  "version": "8.3.54",
   "description": "\n    This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).\n    ",
   "main":"www/PushNotification.js",
   "typings":"types/index.d.ts",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pushwoosh-cordova-plugin" version="8.3.52">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pushwoosh-cordova-plugin" version="8.3.54">
 
 	<name>Pushwoosh</name>
 
@@ -95,13 +95,13 @@
         <framework src="org.jetbrains.kotlin:kotlin-stdlib:1.1.60" />
         <framework src="com.google.android.material:material:1.12.0"/>
 
-        <framework src="com.pushwoosh:pushwoosh:6.7.45"/>
-		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.45"/>
-        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.45"/>
-		<framework src="com.pushwoosh:pushwoosh-badge:6.7.45"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.45"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.45"/>
-		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.45"/>
+        <framework src="com.pushwoosh:pushwoosh:6.7.46"/>
+		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.46"/>
+        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.46"/>
+		<framework src="com.pushwoosh:pushwoosh-badge:6.7.46"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.46"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.46"/>
+		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.46"/>
     </platform>
 
 	<!-- ios -->
@@ -143,8 +143,8 @@
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="PushwooshXCFramework" spec="7.0.2" />
-                <pod name="PushwooshInboxUIXCFramework" spec="7.0.2" />
+                <pod name="PushwooshXCFramework" spec="7.0.3" />
+                <pod name="PushwooshInboxUIXCFramework" spec="7.0.3" />
             </pods>
         </podspec>
 

package/src/android/add-android-voip.gradle

@@ -16,7 +16,7 @@ def callsSrc = pluginDir ? new File(pluginDir, 'src/android/src/com/pushwoosh/pl
 def applyVoip = {
     if (voipEnabled) {
         println "[${pluginId}] PW_VOIP_ANDROID_ENABLED=true — enabling VoIP (dependency + sources)"
-        dependencies { implementation "com.pushwoosh:pushwoosh-calls:6.7.45" }
+        dependencies { implementation "com.pushwoosh:pushwoosh-calls:6.7.46" }
         if (callsSrc?.exists()) {
             android.sourceSets.main.java.srcDirs += callsSrc
             println "[${pluginId}] Added optional sources: ${callsSrc}"

package/src/ios/PushNotification.m

@@ -1330,16 +1330,40 @@ void pwplugin_didRegisterWithDeviceToken(id self, SEL _cmd, id application, NSDa
     if ([self respondsToSelector:@selector(application: pwplugin_didRegisterWithDeviceToken:)]) {
         [self application:application pwplugin_didRegisterWithDeviceToken:deviceToken];
     }
-    
+
     [[Pushwoosh sharedInstance] handlePushRegistration:deviceToken];
+
+    PushNotification *pushHandler = pw_PushNotificationPlugin;
+    if (pushHandler && pushHandler.callbackIds[@"registerDevice"]) {
+        const unsigned char *tokenBytes = (const unsigned char *)[deviceToken bytes];
+        NSMutableString *token = [NSMutableString string];
+        for (NSInteger i = 0; i < [deviceToken length]; i++) {
+            [token appendFormat:@"%02x", (unsigned int)tokenBytes[i]];
+        }
+
+        NSMutableDictionary *results = [PushNotificationManager getRemoteNotificationStatus];
+        results[@"pushToken"] = token;
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:results];
+        [pushHandler.commandDelegate sendPluginResult:pluginResult callbackId:pushHandler.callbackIds[@"registerDevice"]];
+        pushHandler.callbackIds[@"registerDevice"] = nil;
+    }
 }
 
 void pwplugin_didFailToRegisterForRemoteNotificationsWithError(id self, SEL _cmd, UIApplication *application, NSError *error) {
     if ([self respondsToSelector:@selector(application:pwplugin_didFailToRegisterForRemoteNotificationsWithError:)]) {
         [self application:application pwplugin_didFailToRegisterForRemoteNotificationsWithError:error];
     }
-    
+
     [[Pushwoosh sharedInstance] handlePushRegistrationFailure:error];
+
+    PushNotification *pushHandler = pw_PushNotificationPlugin;
+    if (pushHandler && pushHandler.callbackIds[@"registerDevice"]) {
+        NSMutableDictionary *results = [NSMutableDictionary dictionary];
+        results[@"error"] = [NSString stringWithFormat:@"%@", error];
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:results];
+        [pushHandler.commandDelegate sendPluginResult:pluginResult callbackId:pushHandler.callbackIds[@"registerDevice"]];
+        pushHandler.callbackIds[@"registerDevice"] = nil;
+    }
 }
 
 BOOL pwplugin_didRegisterUserNotificationSettings(id self, SEL _cmd, id application, id notificationSettings) {