pushwoosh-cordova-plugin 8.3.43 → 8.3.45

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.43",
+  "version": "8.3.45",
   "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.43">
+<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.45">
 
 	<name>Pushwoosh</name>
 
@@ -42,7 +42,7 @@
 
 			<meta-data android:name="com.pushwoosh.internal.plugin_provider"	android:value="com.pushwoosh.plugin.internal.PhonegapPluginProvider" />
 
-            <meta-data android:name="com.pushwoosh.CALL_EVENT_LISTENER" android:value="com.pushwoosh.plugin.pushnotifications.PWCordovaCallEventListener" />
+            <meta-data android:name="com.pushwoosh.CALL_EVENT_LISTENER" android:value="com.pushwoosh.plugin.pushnotifications.calls.PWCordovaCallEventListener" />
 
             <service android:name="com.pushwoosh.plugin.pushnotifications.CustomFirebaseMessagingService" android:exported="false">
                 <intent-filter>
@@ -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.32"/>
-		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.32"/>
-        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.32"/>
-		<framework src="com.pushwoosh:pushwoosh-badge:6.7.32"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.32"/>
-        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.32"/>
-		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.32"/>
+        <framework src="com.pushwoosh:pushwoosh:6.7.35"/>
+		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.35"/>
+        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.35"/>
+		<framework src="com.pushwoosh:pushwoosh-badge:6.7.35"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.35"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.35"/>
+		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.35"/>
     </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.2" />
+                <pod name="PushwooshXCFramework" spec="6.10.5" />
                 <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.32" }
+        dependencies { implementation "com.pushwoosh:pushwoosh-calls:6.7.35" }
         if (callsSrc?.exists()) {
             android.sourceSets.main.java.srcDirs += callsSrc
             println "[${pluginId}] Added optional sources: ${callsSrc}"

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

@@ -6,7 +6,9 @@ import org.json.JSONArray;
 public interface CallsAdapter {
     public boolean setVoipAppCode(JSONArray data, CallbackContext callbackContext);
     public boolean requestCallPermission(JSONArray data, final CallbackContext callbackContext);
+    public boolean getCallPermissionStatus(JSONArray data, final CallbackContext callbackContext);
     public boolean registerEvent(JSONArray data, final CallbackContext callbackContext);
+    public boolean unregisterEvent(JSONArray data, final CallbackContext callbackContext);
     public boolean endCall(JSONArray data, final CallbackContext callbackContext);
     public boolean initializeVoIPParameters(JSONArray data, final CallbackContext callbackContext);
     public boolean mute();

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

@@ -19,12 +19,24 @@ public class NoopCallsAdapter implements CallsAdapter{
         return false;
     }
 
+    @Override
+    public boolean getCallPermissionStatus(JSONArray data, CallbackContext callbackContext) {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+
     @Override
     public boolean registerEvent(JSONArray data, CallbackContext callbackContext) {
         PWLog.error(TAG,"Method not implemented");
         return false;
     }
 
+    @Override
+    public boolean unregisterEvent(JSONArray data, CallbackContext callbackContext) {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+
     @Override
     public boolean endCall(JSONArray data, CallbackContext callbackContext) {
         PWLog.error(TAG,"Method not implemented");

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

@@ -1076,11 +1076,21 @@ public class PushNotifications extends CordovaPlugin {
 		return callsAdapter.requestCallPermission(data, callbackContext);
 	}
 
+	@CordovaMethod
+	private boolean getCallPermissionStatus(JSONArray data, final CallbackContext callbackContext) {
+		return callsAdapter.getCallPermissionStatus(data, callbackContext);
+	}
+
 	@CordovaMethod
 	private boolean registerEvent(JSONArray data, final CallbackContext callbackContext) {
 		return callsAdapter.registerEvent(data, callbackContext);
 	}
 
+	@CordovaMethod
+	private boolean unregisterEvent(JSONArray data, final CallbackContext callbackContext) {
+		return callsAdapter.unregisterEvent(data, callbackContext);
+	}
+
 	@CordovaMethod
 	private boolean endCall(JSONArray data, final CallbackContext callbackContext) {
 		return callsAdapter.endCall(data,callbackContext);

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

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

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

@@ -50,6 +50,18 @@ public class PushwooshCallsAdapter implements CallsAdapter {
         return true;
     }
 
+    @Override
+    public boolean getCallPermissionStatus(JSONArray data, CallbackContext callbackContext) {
+        try {
+            int status = PushwooshCallSettings.getCallPermissionStatus();
+            callbackContext.success(status);
+            return true;
+        } catch (Exception e) {
+            PWLog.error(TAG, "Failed to get call permission status: " + e.getMessage());
+            return false;
+        }
+    }
+
     @Override
     public boolean registerEvent(JSONArray data, CallbackContext callbackContext) {
         try {
@@ -61,7 +73,24 @@ public class PushwooshCallsAdapter implements CallsAdapter {
             }
             return true;
         } catch (Exception e) {
+            return false;
+        }
+    }
 
+    @Override
+    public boolean unregisterEvent(JSONArray data, CallbackContext callbackContext) {
+        try {
+            String eventType = data.getString(0);
+            ArrayList<CallbackContext> callbackContextList = getCallbackContextMap().get(eventType);
+            if (callbackContextList != null) {
+                callbackContextList.clear();
+                callbackContext.success("Successfully unregistered from " + eventType + " event");
+            } else {
+                callbackContext.error("Event " + eventType + " not found or not supported");
+            }
+            return true;
+        } catch (Exception e) {
+            PWLog.error(TAG, "Failed to unregister event: " + e.getMessage());
             return false;
         }
     }

package/src/ios/PushNotification.m

@@ -13,7 +13,6 @@
 #import "PushNotification.h"
 #import "PWLog.h"
 #import <PushwooshInboxUI/PushwooshInboxUI.h>
-#import <PushwooshFramework/PWGDPRManager.h>
 #import <PushwooshFramework/PWInAppManager.h>
 #import <PushwooshFramework/PushNotificationManager.h>
 #import <PushwooshFramework/PWInbox.h>
@@ -37,6 +36,8 @@
 
 
 #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"
 
 NSMutableDictionary *callbackIds;
 NSDictionary* pendingCallFromRecents;
@@ -120,6 +121,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"];
@@ -135,6 +137,8 @@ API_AVAILABLE(ios(10))
     [callbackIds setObject:[NSMutableArray array] forKey:@"speakerOn"];
     [callbackIds setObject:[NSMutableArray array] forKey:@"speakerOff"];
     [callbackIds setObject:[NSMutableArray array] forKey:@"playDTMF"];
+    [callbackIds setObject:[NSMutableArray array] forKey:@"voipDidFailToRegisterTokenWithError"];
+    [callbackIds setObject:[NSMutableArray array] forKey:@"voipDidRegisterTokenSuccessfully"];
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(receiveCallFromRecents:) name:@"RecentsCallNotification" object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleAudioRouteChange:) name:AVAudioSessionRouteChangeNotification object:nil];
@@ -627,6 +631,10 @@ API_AVAILABLE(ios(10.0)) {
     //stub, android only
 }
 
+- (void)getCallPermissionStatus:(CDVInvokedUrlCommand *)command {
+    //stub, android only
+}
+
 - (void)setVoipAppCode:(CDVInvokedUrlCommand *)command {
     NSString *voipAppCode = command.arguments[0];
     [PushwooshVoIPImplementation setPushwooshVoIPAppId:voipAppCode];
@@ -758,6 +766,21 @@ API_AVAILABLE(ios(10.0)) {
     }
 }
 
+// MARK: - Unregister event func
+- (void)unregisterEvent:(CDVInvokedUrlCommand*)command {
+    NSString* eventName = [command.arguments objectAtIndex:0];
+    
+    if(callbackIds[eventName] != nil) {
+        [callbackIds[eventName] removeAllObjects];
+        
+        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:[NSString stringWithFormat:@"Successfully unregistered from %@ event", eventName]];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    } else {
+        CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:[NSString stringWithFormat:@"Event %@ not found or not supported", eventName]];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }
+}
+
 // MARK: - Send Call
 - (void)sendCall:(CDVInvokedUrlCommand*)command {
     BOOL hasId = ![[command.arguments objectAtIndex:1] isEqual:[NSNull null]];
@@ -849,6 +872,34 @@ API_AVAILABLE(ios(10.0)) {
     }
 }
 
+// MARK: - voipDidFailToRegisterTokenWithError callback
+- (void)voipDidFailToRegisterTokenWithError:(NSError *)error {
+    for (id callbackId in callbackIds[@"voipDidFailToRegisterTokenWithError"]) {
+        CDVPluginResult* pluginResult = nil;
+        NSDictionary *errorData = @{
+            @"error": error.localizedDescription ?: @"Unknown error",
+            @"code": @(error.code),
+            @"domain": error.domain ?: @"Unknown domain"
+        };
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:errorData];
+        [pluginResult setKeepCallbackAsBool:YES];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
+    }
+}
+
+// MARK: - voipDidRegisterTokenSuccessfully callback
+- (void)voipDidRegisterTokenSuccessfully {
+    for (id callbackId in callbackIds[@"voipDidRegisterTokenSuccessfully"]) {
+        CDVPluginResult* pluginResult = nil;
+        NSDictionary *successData = @{
+            @"message": @"VoIP token registered successfully"
+        };
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:successData];
+        [pluginResult setKeepCallbackAsBool:YES];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
+    }
+}
+
 // MARK: - Answer Call
 - (void)answerCall:(CXProvider *)provider perform:(CXAnswerCallAction *)action voipMessage:(PWVoIPMessage *)voipMessage {
     [self setupAudioSession];
@@ -1042,22 +1093,49 @@ API_AVAILABLE(ios(10.0)) {
     [[PWInAppManager sharedManager] addJavascriptInterface:bridge withName:name];
 }
 
-- (void)setCommunicationEnabled:(CDVInvokedUrlCommand *)command {
-    self.callbackIds[@"setCommunicationEnabled"] = command.callbackId;
+- (BOOL)getCommunicationEnabledState {
+    NSBundle *bundle = [NSBundle mainBundle];
+    NSObject *plistValue = [bundle objectForInfoDictionaryKey:PW_COMMUNICATION_ENABLED_PLIST_KEY];
     
-    NSNumber *enabledObject = [command.arguments firstObject];
+    if (plistValue != nil) {
+        if ([plistValue isKindOfClass:[NSNumber class]]) {
+            return [(NSNumber *)plistValue boolValue];
+        } else if ([plistValue isKindOfClass:[NSString class]]) {
+            NSString *stringValue = [(NSString *)plistValue lowercaseString];
+            return [stringValue isEqualToString:@"true"] || [stringValue isEqualToString:@"yes"] || [stringValue isEqualToString:@"1"];
+        }
+    }
+    
+    if ([[NSUserDefaults standardUserDefaults] objectForKey:PW_COMMUNICATION_ENABLED_KEY] != nil) {
+        return [[NSUserDefaults standardUserDefaults] boolForKey:PW_COMMUNICATION_ENABLED_KEY];
+    }
     
+    return YES;
+}
+
+- (void)setCommunicationEnabled:(CDVInvokedUrlCommand *)command {
+    NSNumber *enabledObject = [command.arguments firstObject];
     BOOL enabled = [enabledObject boolValue];
     
-    [[PWGDPRManager sharedManager] setCommunicationEnabled:enabled completion:^(NSError *error) {
-        if (!error) {
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"setCommunicationEnabled"]];
-        } else {
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:error.localizedDescription];
-            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.callbackIds[@"setCommunicationEnabled"]];
-        }
-    }];
+    [[NSUserDefaults standardUserDefaults] setBool:enabled forKey:PW_COMMUNICATION_ENABLED_KEY];
+    
+    CDVPluginResult *pluginResult = nil;
+    
+    if (enabled) {
+        [[Pushwoosh sharedInstance] startServerCommunication];
+    } else {
+        [[Pushwoosh sharedInstance] stopServerCommunication];
+    }
+    
+    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
+- (void)isCommunicationEnabled:(CDVInvokedUrlCommand *)command {
+    BOOL isEnabled = [self getCommunicationEnabledState];
+    
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:(isEnabled ? 1 : 0)];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void)setEmail:(CDVInvokedUrlCommand *)command {
@@ -1118,11 +1196,6 @@ API_AVAILABLE(ios(10.0)) {
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
-- (void)isCommunicationEnabled:(CDVInvokedUrlCommand *)command {
-    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:[[PWGDPRManager sharedManager] isCommunicationEnabled]];
-    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-}
-
 - (void)enableHuaweiPushNotifications:(CDVInvokedUrlCommand *)command {
     // Stub
     

package/types/PushNotification.d.ts

@@ -96,5 +96,6 @@ export interface PushNotification {
 	mute(success?: () => void, error?: (err: Error | string) => void): void;
 	unmute(success?: () => void, error?: (err: Error | string) => void): void;
 	requestCallPermission(): void;
+	getCallPermissionStatus(success?: (status: number) => void, error?: (err: Error | string) => void): void;
 	endCall(success?: () => void, error?: (err: Error | string) => void): void;
 }

package/www/PushNotification.js

@@ -504,6 +504,8 @@ PushNotification.prototype.notificationCallback = function(notification) {
  *                             - "incomingCallSuccess": Triggered when an incoming call is successfully displayed.
  *                             - "incomingCallFailure": Triggered when displaying the incoming call fails.
  *                             - "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).
  *
  * @param {Function} success - Callback function to be invoked when the event occurs.
  * @param {Function} fail - Callback function to be invoked if the registration fails.
@@ -512,6 +514,34 @@ PushNotification.prototype.registerEvent = function(eventName, success, fail) {
 	exec(success, fail, "PushNotification", "registerEvent", [eventName]);
 };
 
+/**
+ * Unregisters a callback for a specific VoIP-related event.
+ *
+ * This method allows you to unsubscribe from a previously registered VoIP event.
+ * After unregistering, the event callback will no longer be invoked when the event occurs.
+ *
+ * @param {string} eventName - The name of the event to unregister from.
+ *                             This should match the event name used in registerEvent().
+ *                             Supported event names include:
+ *                             - "answer": Triggered when the call is answered.
+ *                             - "hangup": Triggered when the call is hung up.
+ *                             - "reject": Triggered when the call is rejected.
+ *                             - "muted": Triggered when the call is muted or unmuted.
+ *                             - "held": Triggered when the call is put on or off hold.
+ *                             - "voipPushPayload": Triggered when a VoIP push notification is received.
+ *                             - "incomingCallSuccess": Triggered when an incoming call is successfully displayed.
+ *                             - "incomingCallFailure": Triggered when displaying the incoming call fails.
+ *                             - "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).
+ *
+ * @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.
+ */
+PushNotification.prototype.unregisterEvent = function(eventName, success, fail) {
+	exec(success, fail, "PushNotification", "unregisterEvent", [eventName]);
+};
+
 /**
  * Initializes VoIP call parameters for the native calling system.
  *
@@ -612,6 +642,19 @@ PushNotification.prototype.requestCallPermission = function() {
 	exec(null, null, "PushNotification", "requestCallPermission", []);
 }
 
+/**
+ * Get call permission status
+ * Returns a Promise or calls success callback with status:
+ *   0 - Permission not requested yet
+ *   1 - Permission granted by user
+ *   2 - Permission denied by user
+ * @param {Function} success - Callback invoked with permission status
+ * @param {Function} error - Callback invoked if the operation fails
+ */
+PushNotification.prototype.getCallPermissionStatus = function(success, error) {
+	exec(success, error, "PushNotification", "getCallPermissionStatus", []);
+}
+
 /**
  * Notifies Pushwoosh that the call has ended
  * @param {Function} success - Callback invoked when the call ends.