pushwoosh-cordova-plugin 8.3.46 → 8.3.48

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.46
+cordova plugin add pushwoosh-cordova-plugin@8.3.48
 ```
 
 Using git:
 
 ```
-cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.46
+cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.48
 ```
 
 ### Guide

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.46",
+  "version": "8.3.48",
   "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.46">
+<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.48">
 
 	<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.33"/>
-		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.33"/>
-        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.33"/>
-		<framework src="com.pushwoosh:pushwoosh-badge:6.7.33"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.33"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.33"/>
-		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.33"/>
+        <framework src="com.pushwoosh:pushwoosh:6.7.41"/>
+		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.41"/>
+        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.41"/>
+		<framework src="com.pushwoosh:pushwoosh-badge:6.7.41"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.41"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.41"/>
+		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.41"/>
     </platform>
 
 	<!-- ios -->
@@ -143,7 +143,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="PushwooshXCFramework" spec="6.10.5" />
+                <pod name="PushwooshXCFramework" spec="6.11.3" />
                 <pod name="PushwooshInboxUIXCFramework" spec="6.1.2" />
             </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.33" }
+        dependencies { implementation "com.pushwoosh:pushwoosh-calls:6.7.41" }
         if (callsSrc?.exists()) {
             android.sourceSets.main.java.srcDirs += callsSrc
             println "[${pluginId}] Added optional sources: ${callsSrc}"

package/src/android/src/com/pushwoosh/plugin/pushnotifications/PushwooshNotificationServiceExtension.java

@@ -26,13 +26,13 @@ public class PushwooshNotificationServiceExtension extends NotificationServiceEx
 	}
 
 	@Override
-	public boolean onMessageReceived(final PushMessage pushMessage) {
+	protected boolean onMessageReceived(final PushMessage pushMessage) {
 		PushNotifications.messageReceived(pushMessage.toJson().toString());
 		return (!showForegroundPush && !super.onMessageReceived(pushMessage) && isAppOnForeground());
 	}
 
 	@Override
-	public void onMessageOpened(PushMessage pushMessage) {
+	protected void onMessageOpened(PushMessage pushMessage) {
 		PushNotifications.openPush(pushMessage.toJson().toString());
 	}
 }

package/src/android/src/com/pushwoosh/plugin/pushnotifications/calls/PushwooshCallsAdapter.java

@@ -180,15 +180,19 @@ public class PushwooshCallsAdapter implements CallsAdapter {
         PushNotifications.emitVoipEvent("hangup", parseVoIPMessage(voIPMessage));
     }
 
-    public static void onCreateIncomingConnection(Bundle bundle) {
-        PushNotifications.emitVoipEvent("voipPushPayload", JsonUtils.bundleToJson(bundle));
+  public static void onCreateIncomingConnection(Bundle bundle) {
+        PushwooshVoIPMessage voipMessage = new PushwooshVoIPMessage(bundle);
+        PushNotifications.emitVoipEvent("voipPushPayload", parseVoIPMessage(voipMessage));
     }
 
     private static org.json.JSONObject parseVoIPMessage(PushwooshVoIPMessage message) {
         org.json.JSONObject payload = new org.json.JSONObject();
         try {
+            Bundle rawBundle = message.getRawPayload();
+            org.json.JSONObject rawPayloadJson = JsonUtils.bundleToJsonWithUserData(rawBundle);
+            
             payload.put("callerName", message.getCallerName())
-                    .put("rawPayload", message.getRawPayload())
+                    .put("rawPayload", rawPayloadJson)
                     .put("hasVideo", message.getHasVideo());
         } catch (org.json.JSONException ignored) {}
         return payload;