pushwoosh-cordova-plugin 8.3.50 → 8.3.52

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

package/package.json

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

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

@@ -864,6 +864,8 @@ public class PushNotifications extends CordovaPlugin {
 		callbackContextMap.put("reject", new ArrayList<CallbackContext>());
 		callbackContextMap.put("hangup", new ArrayList<CallbackContext>());
 		callbackContextMap.put("voipPushPayload", new ArrayList<CallbackContext>());
+		callbackContextMap.put("voipDidCancelCall", new ArrayList<CallbackContext>());
+		callbackContextMap.put("voipDidFailToCancelCall", new ArrayList<CallbackContext>());
 	}
 
 	@Override

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

@@ -1,5 +1,7 @@
 package com.pushwoosh.plugin.pushnotifications.calls;
 
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
@@ -7,7 +9,8 @@ import androidx.annotation.Nullable;
 
 import com.pushwoosh.calls.PushwooshVoIPMessage;
 import com.pushwoosh.calls.listener.CallEventListener;
-import com.pushwoosh.plugin.pushnotifications.PushNotifications;
+import com.pushwoosh.internal.platform.AndroidPlatformModule;
+import com.pushwoosh.internal.utils.PWLog;
 
 public class PWCordovaCallEventListener implements CallEventListener {
     private static final Object sCurrentCallLock = new Object();
@@ -19,6 +22,20 @@ public class PWCordovaCallEventListener implements CallEventListener {
         synchronized (sCurrentCallLock) {
             currentCallInfo = pushwooshVoIPMessage.getRawPayload();
         }
+        
+        try {
+            Context context = AndroidPlatformModule.getApplicationContext();
+            Intent launchIntent = context != null ? context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()) : null;
+
+            if (launchIntent != null) {
+                launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                context.startActivity(launchIntent);
+                PWLog.info("PWCordovaCallEventListener", "Launched main activity for call");
+            }
+        } catch (Exception e) {
+            PWLog.error("PWCordovaCallEventListener", "Failed to launch activity", e);
+        }
+
         PushwooshCallsAdapter.onAnswer(pushwooshVoIPMessage);
     }
 
@@ -56,6 +73,19 @@ public class PWCordovaCallEventListener implements CallEventListener {
         //stub
     }
 
+    @Override
+    public void onCallCancelled(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
+        PushwooshCallsAdapter.onCallCancelled(pushwooshVoIPMessage);
+        synchronized (sCurrentCallLock) {
+            currentCallInfo = null;
+        }
+    }
+
+    @Override
+    public void onCallCancellationFailed(@Nullable String callId, @Nullable String reason) {
+        PushwooshCallsAdapter.onCallCancellationFailed(callId, reason);
+    }
+
     public static Bundle getCurrentCallInfo() {
         synchronized (sCurrentCallLock) {
             return currentCallInfo;

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

@@ -180,20 +180,38 @@ public class PushwooshCallsAdapter implements CallsAdapter {
         PushNotifications.emitVoipEvent("hangup", parseVoIPMessage(voIPMessage));
     }
 
-  public static void onCreateIncomingConnection(Bundle bundle) {
+    public static void onCreateIncomingConnection(Bundle bundle) {
         PushwooshVoIPMessage voipMessage = new PushwooshVoIPMessage(bundle);
         PushNotifications.emitVoipEvent("voipPushPayload", parseVoIPMessage(voipMessage));
     }
 
+    public static void onCallCancelled(PushwooshVoIPMessage voIPMessage) {
+        PushNotifications.emitVoipEvent("voipDidCancelCall", parseVoIPMessage(voIPMessage));
+    }
+
+    public static void onCallCancellationFailed(String callId, String reason) {
+        org.json.JSONObject payload = new org.json.JSONObject();
+        try {
+            payload.put("callId", callId != null ? callId : "");
+            payload.put("reason", reason != null ? reason : "");
+        } catch (org.json.JSONException ignored) {}
+        PushNotifications.emitVoipEvent("voipDidFailToCancelCall", payload);
+    }
+
     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("callId", message.getCallId())
                     .put("rawPayload", rawPayloadJson)
                     .put("hasVideo", message.getHasVideo());
+
+            if (rawBundle != null && rawBundle.containsKey("handleType")) {
+                payload.put("handleType", rawBundle.get("handleType"));
+            }
         } catch (org.json.JSONException ignored) {}
         return payload;
     }

package/src/ios/PWLog.h

@@ -1,25 +1,19 @@
 //
 //  PWLog.h
 //  Pushwoosh SDK
-//  (c) Pushwoosh 2016
+//  (c) Pushwoosh 2025
 //
+//  Using PushwooshCore logging
 
 #import <Foundation/Foundation.h>
 
-typedef NS_ENUM(unsigned int, LogLevel) {
-	kLogNone = 0,
-	kLogError,
-	kLogWarning,
-	kLogInfo,
-	kLogDebug,
-	kLogVerbose
-};
+// Logging macros using NSLog
+#define PWLog(fmt, ...) NSLog(@"[Pushwoosh] %s: " fmt, __FUNCTION__, ##__VA_ARGS__)
+#define PWLogError(fmt, ...) NSLog(@"[Pushwoosh ERROR] %s: " fmt, __FUNCTION__, ##__VA_ARGS__)
+#define PWLogWarn(fmt, ...) NSLog(@"[Pushwoosh WARN] %s: " fmt, __FUNCTION__, ##__VA_ARGS__)
+#define PWLogInfo(fmt, ...) NSLog(@"[Pushwoosh INFO] %s: " fmt, __FUNCTION__, ##__VA_ARGS__)
+#define PWLogDebug(fmt, ...) NSLog(@"[Pushwoosh DEBUG] %s: " fmt, __FUNCTION__, ##__VA_ARGS__)
+#define PWLogVerbose(fmt, ...) NSLog(@"[Pushwoosh VERBOSE] %s: " fmt, __FUNCTION__, ##__VA_ARGS__)
 
-#define PWLog(...) PWLogInternal(__FUNCTION__, kLogInfo, __VA_ARGS__)
-#define PWLogError(...) PWLogInternal(__FUNCTION__, kLogError, __VA_ARGS__)
-#define PWLogWarn(...) PWLogInternal(__FUNCTION__, kLogWarning, __VA_ARGS__)
-#define PWLogInfo(...) PWLogInternal(__FUNCTION__, kLogInfo, __VA_ARGS__)
-#define PWLogDebug(...) PWLogInternal(__FUNCTION__, kLogDebug, __VA_ARGS__)
-#define PWLogVerbose(...) PWLogInternal(__FUNCTION__, kLogVerbose, __VA_ARGS__)
-
-void PWLogInternal(const char *function, LogLevel logLevel, NSString *format, ...);
+// Backward compatibility
+#define PWLogInternal(func, level, fmt, ...) NSLog(@"[Pushwoosh] %s: " fmt, func, ##__VA_ARGS__)

package/src/ios/PushNotification.m

@@ -13,7 +13,7 @@
 #import "PushNotification.h"
 #import "PWLog.h"
 #import <PushwooshInboxUI/PushwooshInboxUI.h>
-#import <PushwooshFramework/PWInAppManager.h>
+#import <PushwooshCore/PWInAppManager.h>
 #import <PushwooshFramework/PushNotificationManager.h>
 #import <PushwooshFramework/PWInbox.h>
 #import "PWBackward.h"
@@ -34,7 +34,6 @@
 
 #import <objc/runtime.h>
 
-
 #define WRITEJS(VAL) [NSString stringWithFormat:@"setTimeout(function() { %@; }, 0);", VAL]
 #define PW_COMMUNICATION_ENABLED_KEY @"PushwooshCommunicationEnabled"
 #define PW_COMMUNICATION_ENABLED_PLIST_KEY @"Pushwoosh_ALLOW_SERVER_COMMUNICATION"
@@ -121,7 +120,7 @@ API_AVAILABLE(ios(10))
 - (void)pluginInitialize {
     [super pluginInitialize];
     pw_PushNotificationPlugin = self;
-    
+
 #if PW_VOIP_ENABLED
     callbackIds = [[NSMutableDictionary alloc] initWithCapacity:5];
     [callbackIds setObject:[NSMutableArray array] forKey:@"initializeVoIPParameters"];
@@ -139,6 +138,13 @@ API_AVAILABLE(ios(10))
     [callbackIds setObject:[NSMutableArray array] forKey:@"playDTMF"];
     [callbackIds setObject:[NSMutableArray array] forKey:@"voipDidFailToRegisterTokenWithError"];
     [callbackIds setObject:[NSMutableArray array] forKey:@"voipDidRegisterTokenSuccessfully"];
+    [callbackIds setObject:[NSMutableArray array] forKey:@"voipDidCancelCall"];
+    [callbackIds setObject:[NSMutableArray array] forKey:@"voipDidFailToCancelCall"];
+
+    // Set delegate early so VoIP events work even before initializeVoIPParameters is called
+    if (@available(iOS 14.0, *)) {
+        PushwooshVoIPImplementation.delegate = self;
+    }
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveCallFromRecents:) name:@"RecentsCallNotification" object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAudioRouteChange:) name:AVAudioSessionRouteChangeNotification object:nil];
@@ -182,7 +188,7 @@ API_AVAILABLE(ios(10))
 
 - (void)setApiToken:(CDVInvokedUrlCommand *)command {
     NSString *token = command.arguments[0];
-    [[PWSettings settings] setApiToken:token];
+    [[PWPreferences preferences] setApiToken:token];
 }
 
 - (void)onDeviceReady:(CDVInvokedUrlCommand *)command {
@@ -756,7 +762,7 @@ API_AVAILABLE(ios(10.0)) {
     if(callbackIds[eventName] != nil) {
         [callbackIds[eventName] addObject:command.callbackId];
     }
-    
+
     if (pendingCallFromRecents && [eventName isEqual:@"sendCall"]) {
         NSDictionary *callData = pendingCallFromRecents;
         CDVPluginResult* pluginResult = nil;
@@ -900,6 +906,29 @@ API_AVAILABLE(ios(10.0)) {
     }
 }
 
+// MARK: - voipDidCancelCall callback
+- (void)voipDidCancelCallWithVoipMessage:(PWVoIPMessage *)voipMessage {
+    for (id callbackId in callbackIds[@"voipDidCancelCall"]) {
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:[self handleVoIPMessage:voipMessage]];
+        [pluginResult setKeepCallbackAsBool:YES];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
+    }
+}
+
+// MARK: - voipDidFailToCancelCall callback
+- (void)voipDidFailToCancelCallWithCallId:(NSString *)callId reason:(NSString *)reason {
+    for (id callbackId in callbackIds[@"voipDidFailToCancelCall"]) {
+        CDVPluginResult* pluginResult = nil;
+        NSDictionary *failureData = @{
+            @"callId": callId ?: @"",
+            @"reason": reason ?: @"Unknown reason"
+        };
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:failureData];
+        [pluginResult setKeepCallbackAsBool:YES];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
+    }
+}
+
 // MARK: - Answer Call
 - (void)answerCall:(CXProvider *)provider perform:(CXAnswerCallAction *)action voipMessage:(PWVoIPMessage *)voipMessage {
     [self setupAudioSession];
@@ -1020,6 +1049,8 @@ API_AVAILABLE(ios(10.0)) {
     [payload addEntriesFromDictionary:@{@"callerName": voipMessage.callerName}];
     [payload addEntriesFromDictionary:@{@"handleType": @(voipMessage.handleType)}];
     [payload addEntriesFromDictionary:@{@"hasVideo": @(voipMessage.hasVideo)}];
+    [payload addEntriesFromDictionary:@{@"callId": voipMessage.callId ?: @""}];
+    [payload addEntriesFromDictionary:@{@"cancelCall": @(voipMessage.cancelCall)}];
     return payload;
 }
 #endif

package/www/PushNotification.js

@@ -506,6 +506,8 @@ PushNotification.prototype.notificationCallback = function(notification) {
  *                             - "playDTMF": Triggered when a DTMF tone is played.
  *                             - "voipDidFailToRegisterTokenWithError": Triggered when VoIP token registration fails (iOS only).
  *                             - "voipDidRegisterTokenSuccessfully": Triggered when VoIP token registration succeeds (iOS only).
+ *                             - "voipDidCancelCall": Triggered when a call is remotely cancelled via VoIP push.
+ *                             - "voipDidFailToCancelCall": Triggered when a call cancellation attempt fails.
  *
  * @param {Function} success - Callback function to be invoked when the event occurs.
  * @param {Function} fail - Callback function to be invoked if the registration fails.
@@ -534,6 +536,8 @@ PushNotification.prototype.registerEvent = function(eventName, success, fail) {
  *                             - "playDTMF": Triggered when a DTMF tone is played.
  *                             - "voipDidFailToRegisterTokenWithError": Triggered when VoIP token registration fails (iOS only).
  *                             - "voipDidRegisterTokenSuccessfully": Triggered when VoIP token registration succeeds (iOS only).
+ *                             - "voipDidCancelCall": Triggered when a call is remotely cancelled via VoIP push.
+ *                             - "voipDidFailToCancelCall": Triggered when a call cancellation attempt fails.
  *
  * @param {Function} success - Callback function to be invoked when the event is successfully unregistered.
  * @param {Function} fail - Callback function to be invoked if the unregistration fails.