pushwoosh-cordova-plugin 8.3.39 → 8.3.40

package/example/newdemo/package.json

@@ -13,8 +13,8 @@
   "author": "Apache Cordova Team",
   "license": "Apache-2.0",
   "devDependencies": {
-    "cordova-android": "^12.0.1",
-    "cordova-ios": "^7.1.0",
+    "cordova-android": "^14.0.1",
+    "cordova-ios": "^7.1.1",
     "pushwoosh-cordova-plugin": "file:../.."
   },
   "cordova": {
@@ -26,7 +26,8 @@
       "pushwoosh-cordova-plugin": {
         "LOG_LEVEL": "DEBUG",
         "IOS_FOREGROUND_ALERT_TYPE": "NONE",
-        "ANDROID_FOREGROUND_PUSH": "false"
+        "ANDROID_FOREGROUND_PUSH": "false",
+        "PW_VOIP_IOS_ENABLED": "true"
       }
     }
   }

package/example/newdemo/www/index.html

@@ -54,6 +54,12 @@
 
                     <div class="gap"></div>
 
+                    <div class="container_btns">
+                        <button class="btn_get" id="endCall">END CALL</button>
+                    </div>
+
+                    <div class="gap"></div>
+
                     <div class="container_lang">
                         <button class="btn" id="setLangBtn">SET LANGUAGE</button>
                         <div class="input-container">

package/example/newdemo/www/js/index.js

@@ -29,9 +29,59 @@ function onDeviceReady() {
 
     pushwooshInitialize(pushwoosh);
 
+    pushwoosh.setVoipAppCode("7BCDB-76CBE");
+    pushwoosh.initializeVoIPParameters(true, "ring.caf", 2, function(success) {
+        console.log("Success:", success);
+    }, function(error) {
+        console.error("Error:", error);
+    });
+
+
+    pushwoosh.requestCallPermission();
+    pushwoosh.registerEvent("answer",
+        function(payload){
+            console.log("Answer call from " + payload.callerName);
+        },
+        function(error) {
+            console.log("ERROR");
+
+        }
+    );
+
+    pushwoosh.registerEvent("reject",
+        function(payload){
+            console.log("Reject call from " + payload.callerName);
+        },
+        function(error) {
+            console.log("ERROR");
+
+        }
+    );
+
+    pushwoosh.registerEvent("hangup",
+        function(payload){
+            console.log("Reject call from " + payload.callerName);
+        },
+        function(error) {
+            console.log("ERROR");
+
+        }
+    );
+
+    pushwoosh.registerEvent("voipPushPayload",
+        function(payload){
+            console.log("Received call with " + JSON.stringify(payload));
+        },
+        function(error) {
+            console.log("ERROR");
+
+        }
+    );
+
     registerForPushNotificationAction(pushwoosh);
 
     setTagsAction(pushwoosh);
+    endCallAction(pushwoosh);
     setLanguageAction(pushwoosh);
     setUserIdAction(pushwoosh);
     sendPostEventAction(pushwoosh);
@@ -44,6 +94,18 @@ function onDeviceReady() {
     clearNotificationCenterAction(pushwoosh);
 }
 
+function endCallAction(pushwoosh) {
+    document.getElementById('endCall').addEventListener('click', function() {
+        pushwoosh.endCall(
+            function() {
+                console.warn('setTags success');
+            },
+            function(error) {
+                console.warn('setTags failed');
+            });
+    });
+}
+
 function setTagsAction(pushwoosh) {
     document.getElementById('setTags').addEventListener('click', function() {
         var key = document.getElementById("textField1").value;
@@ -392,8 +454,7 @@ function pushwooshInitialize(pushwoosh) {
  *            \__/
  */
     pushwoosh.onDeviceReady({        
-        appid: "XXXXX-XXXXX",
-        projectid: "XXXXXXXXXXXXXXX",
-        serviceName: "XXXX"
+        appid: "11C10-EF18D",
+        projectid: "245850018966"
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.39",
+  "version": "8.3.40",
   "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.39">
+<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.40">
 
 	<name>Pushwoosh</name>
 
@@ -19,6 +19,7 @@
 	<preference name="LOG_LEVEL" default="DEBUG" />
 	<preference name="IOS_FOREGROUND_ALERT_TYPE" default="ALERT" />
 	<preference name="ANDROID_FOREGROUND_PUSH" default="true" />
+    <preference name="PW_VOIP_IOS_ENABLED" default="false" />
 
 	<js-module src="www/PushNotification.js" name="PushNotification">
 		<clobbers target="plugins.pushNotification" />
@@ -38,7 +39,9 @@
 			<meta-data android:name="com.pushwoosh.notification_service_extension" android:value="com.pushwoosh.plugin.pushnotifications.PushwooshNotificationServiceExtension" />
 
 			<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" />
+
             <service android:name="com.pushwoosh.plugin.pushnotifications.CustomFirebaseMessagingService" android:exported="false">
                 <intent-filter>
                     <action android:name="com.google.firebase.MESSAGING_EVENT"/>
@@ -66,16 +69,19 @@
 
 		<source-file src="src/android/src/com/pushwoosh/plugin/internal/PhonegapPluginProvider.java"
 			target-dir="src/com/pushwoosh/plugin/internal" />
+		<source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/PWCordovaCallEventListener.java" target-dir="src/com/pushwoosh/plugin/pushnotifications" />
 
         <framework src="build-extras-pushwoosh.gradle" custom="true" type="gradleReference" />
 
 		<framework src="androidx.work:work-runtime:2.7.1" />
 		<framework src="androidx.annotation:annotation:1.4.0" />
-        <framework src="androidx.appcompat:appcompat:1.4.0" />
+        <framework src="androidx.appcompat:appcompat:1.6.1" />
+        <framework src="androidx.core:core-ktx:1.10.1"/>
         <framework src="androidx.recyclerview:recyclerview:1.2.1" />
         <framework src="androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" />
         <framework src="com.github.bumptech.glide:glide:4.10.0" />
-        <framework src="org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.60" />
+        <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.30"/>
 		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.30"/>
@@ -84,7 +90,8 @@
         <framework src="com.pushwoosh:pushwoosh-inbox:6.7.30"/>
         <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.30"/>
 		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.30"/>
-	</platform>
+		<framework src="com.pushwoosh:pushwoosh-calls:6.7.30"/>
+    </platform>
 
 	<!-- ios -->
 	<platform name="ios">
@@ -130,6 +137,8 @@
             </pods>
         </podspec>
 
+        <hook type="after_plugin_install" src="spec/add-voip-pod.js" />
+
 		<header-file src="src/ios/PushNotification.h" />
 		<source-file src="src/ios/PushNotification.m" />
         <header-file src="src/ios/PWBackward.h" />

package/spec/add-voip-pod.js

@@ -0,0 +1,49 @@
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+module.exports = function (context) {
+    let pwVoipEnabled = context.opts?.cli_variables?.PW_VOIP_IOS_ENABLED;
+
+    if (typeof pwVoipEnabled === 'undefined') {
+        try {
+            const packageJsonPath = path.join(context.opts.projectRoot, 'package.json');
+            if (fs.existsSync(packageJsonPath)) {
+                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+                pwVoipEnabled =
+                    packageJson?.cordova?.plugins?.['pushwoosh-cordova-plugin']?.PW_VOIP_IOS_ENABLED;
+            }
+        } catch (_) {}
+    }
+
+    if (pwVoipEnabled !== 'true') {
+        return;
+    }
+
+    const iosPlatformPath = path.join(context.opts.projectRoot, 'platforms', 'ios');
+    const podfilePath = path.join(iosPlatformPath, 'Podfile');
+
+    if (!fs.existsSync(podfilePath)) {
+        return;
+    }
+
+    let podfileContent = fs.readFileSync(podfilePath, 'utf8');
+    const voipPodLine = `pod 'PushwooshXCFramework/PushwooshVoIP'`;
+
+    if (!podfileContent.includes(voipPodLine)) {
+        const lines = podfileContent.split('\n');
+        const index = lines.findIndex(line =>
+            line.trim().startsWith(`pod 'PushwooshXCFramework'`) &&
+            !line.includes(`/`)
+        );
+
+        if (index !== -1) {
+            lines.splice(index + 1, 0, voipPodLine);
+            fs.writeFileSync(podfilePath, lines.join('\n'));
+
+            try {
+                execSync('pod install', { cwd: iosPlatformPath, stdio: 'inherit' });
+            } catch (_) {}
+        }
+    }
+};

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

@@ -0,0 +1,63 @@
+package com.pushwoosh.plugin.pushnotifications;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.pushwoosh.calls.PushwooshVoIPMessage;
+import com.pushwoosh.calls.listener.CallEventListener;
+
+public class PWCordovaCallEventListener implements CallEventListener {
+    private static final Object sCurrentCallLock = new Object();
+    private static Bundle currentCallInfo = null;
+
+
+    @Override
+    public void onAnswer(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage, int i) {
+        synchronized (sCurrentCallLock) {
+            currentCallInfo = pushwooshVoIPMessage.getRawPayload();
+        }
+        PushNotifications.onAnswer(pushwooshVoIPMessage);
+    }
+
+    @Override
+    public void onReject(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
+        PushNotifications.onReject(pushwooshVoIPMessage);
+        synchronized (sCurrentCallLock) {
+            currentCallInfo = null;
+        }
+    }
+
+    @Override
+    public void onDisconnect(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
+        PushNotifications.onDisconnect(pushwooshVoIPMessage);
+        synchronized (sCurrentCallLock) {
+            currentCallInfo = null;
+        }
+    }
+
+    @Override
+    public void onCreateIncomingConnection(@Nullable Bundle bundle) {
+        synchronized (sCurrentCallLock) {
+            currentCallInfo = bundle;
+        }
+        PushNotifications.onCreateIncomingConnection(bundle);
+    }
+
+    @Override
+    public void onCallAdded(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
+        //stub
+    }
+
+    @Override
+    public void onCallRemoved(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
+        //stub
+    }
+
+    public static Bundle getCurrentCallInfo() {
+        synchronized (sCurrentCallLock) {
+            return currentCallInfo;
+        }
+    }
+}