pushwoosh-cordova-plugin 8.3.53 → 8.3.55

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.53",
+  "version": "8.3.55",
   "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.53">
+<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.55">
 
 	<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.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"/>
+        <framework src="com.pushwoosh:pushwoosh:6.7.47"/>
+		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.47"/>
+        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.47"/>
+		<framework src="com.pushwoosh:pushwoosh-badge:6.7.47"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.47"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.47"/>
+		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.47"/>
     </platform>
 
 	<!-- ios -->
@@ -143,7 +143,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="PushwooshXCFramework" spec="7.0.3" />
+                <pod name="PushwooshXCFramework" spec="7.0.4" />
                 <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.46" }
+        dependencies { implementation "com.pushwoosh:pushwoosh-calls:6.7.47" }
         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

@@ -11,6 +11,7 @@ public interface CallsAdapter {
     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 setIncomingCallTimeout(JSONArray data, final CallbackContext callbackContext);
     public boolean mute();
     public boolean unmute();
     public boolean speakerOn();

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

@@ -49,6 +49,12 @@ public class NoopCallsAdapter implements CallsAdapter{
         return false;
     }
 
+    @Override
+    public boolean setIncomingCallTimeout(JSONArray data, CallbackContext callbackContext) {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+
     @Override
     public boolean mute() {
         PWLog.error(TAG,"Method not implemented");

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

@@ -1103,6 +1103,11 @@ public class PushNotifications extends CordovaPlugin {
 		return callsAdapter.initializeVoIPParameters(data, callbackContext);
 	}
 
+	@CordovaMethod
+	private boolean setIncomingCallTimeout(JSONArray data, final CallbackContext callbackContext) {
+		return callsAdapter.setIncomingCallTimeout(data, callbackContext);
+	}
+
 	@CordovaMethod
 	private boolean mute() {
 		return callsAdapter.mute();

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

@@ -9,6 +9,7 @@ import android.media.AudioManager;
 import android.os.Bundle;
 
 import com.pushwoosh.Pushwoosh;
+import com.pushwoosh.calls.CallPermissionsCallback;
 import com.pushwoosh.calls.PushwooshCallReceiver;
 import com.pushwoosh.calls.PushwooshCallSettings;
 import com.pushwoosh.calls.PushwooshVoIPMessage;
@@ -40,11 +41,17 @@ public class PushwooshCallsAdapter implements CallsAdapter {
     }
 
     @Override
-    public boolean requestCallPermission(JSONArray data, CallbackContext callbackContext) {
+    public boolean requestCallPermission(JSONArray data, final CallbackContext callbackContext) {
         try {
-            PushwooshCallSettings.requestCallPermissions();
+            PushwooshCallSettings.requestCallPermissions(new CallPermissionsCallback() {
+                @Override
+                public void onPermissionResult(boolean granted, java.util.List<String> grantedPerms, java.util.List<String> deniedPerms) {
+                    callbackContext.success(granted ? 1 : 0);
+                }
+            });
         } catch (Exception e) {
             PWLog.error(TAG, "Failed to request call permissions: " + e.getMessage());
+            callbackContext.error("Failed to request call permissions: " + e.getMessage());
             return false;
         }
         return true;
@@ -120,6 +127,18 @@ public class PushwooshCallsAdapter implements CallsAdapter {
         }
     }
 
+    @Override
+    public boolean setIncomingCallTimeout(JSONArray data, CallbackContext callbackContext) {
+        try {
+            double timeout = data.getDouble(0);
+            PushwooshCallSettings.setIncomingCallTimeout(timeout);
+            return true;
+        } catch (Exception e) {
+            PWLog.error("Failed to set incoming call timeout: " + e.getMessage());
+            return false;
+        }
+    }
+
     @Override
     public boolean mute() {
         try {

package/src/ios/PushNotification.m

@@ -634,7 +634,9 @@ API_AVAILABLE(ios(10.0)) {
 #if PW_VOIP_ENABLED
 // MARK: - Voip settings
 - (void)requestCallPermission:(CDVInvokedUrlCommand *)command {
-    //stub, android only
+    //stub, android only - iOS doesn't require call permission
+    CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:YES];
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
 - (void)getCallPermissionStatus:(CDVInvokedUrlCommand *)command {
@@ -725,6 +727,28 @@ API_AVAILABLE(ios(10.0)) {
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
+// MARK: - Set Incoming Call Timeout
+- (void)setIncomingCallTimeout:(CDVInvokedUrlCommand *)command {
+    CDVPluginResult* pluginResult = nil;
+
+    NSNumber *timeoutNumber = [command.arguments objectAtIndex:0];
+
+    if ([timeoutNumber isKindOfClass:[NSNumber class]]) {
+        NSTimeInterval timeout = [timeoutNumber doubleValue];
+
+        if (@available(iOS 14.0, *)) {
+            [PushwooshVoIPImplementation setIncomingCallTimeout:timeout];
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:@"Incoming call timeout set"];
+        } else {
+            pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"VoIP requires iOS 14.0 or later"];
+        }
+    } else {
+        pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid timeout parameter"];
+    }
+
+    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 // MARK: - Incoming Call Payload
 - (void)voipDidReceiveIncomingCallWithPayload:(PWVoIPMessage *)payload {
     for (id callbackId in callbackIds[@"voipPushPayload"]) {
@@ -1330,16 +1354,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) {

package/types/PushNotification.d.ts

@@ -28,6 +28,7 @@ type InboxNotification = {
 	isActionPerformed?: boolean;
 }
 
+
 type AuthOptions = Record<string, number|string>
 
 type RemoteNotificationStatus = Record<string,string|number|boolean>
@@ -95,7 +96,7 @@ export interface PushNotification {
 	speakerOff(success?: () => void, error?: (err: Error | string) => void): void;
 	mute(success?: () => void, error?: (err: Error | string) => void): void;
 	unmute(success?: () => void, error?: (err: Error | string) => void): void;
-	requestCallPermission(): void;
+	requestCallPermission(success?: (granted: boolean) => void, error?: (err: Error | string) => void): 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

@@ -641,9 +641,11 @@ PushNotification.prototype.unmute = function(success, error) {
 // Android calls
 /**
  * Request call permission and register phone account
+ * @param {Function} success - Callback invoked with permission result
+ * @param {Function} error - Callback invoked if the operation fails
  */
-PushNotification.prototype.requestCallPermission = function() {
-	exec(null, null, "PushNotification", "requestCallPermission", []);
+PushNotification.prototype.requestCallPermission = function(success, error) {
+	exec(success, error, "PushNotification", "requestCallPermission", []);
 }
 
 /**
@@ -833,4 +835,8 @@ PushNotification.prototype.setVoipAppCode = function(appCode) {
 	exec(null, null, "PushNotification", "setVoipAppCode", [appCode]);
 }
 
+PushNotification.prototype.setIncomingCallTimeout = function(timeoutSeconds) {
+	exec(null, null, "PushNotification", "setIncomingCallTimeout", [timeoutSeconds]);
+}
+
 module.exports = new PushNotification();