pushwoosh-cordova-plugin 8.3.41 → 8.3.43

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.41",
+  "version": "8.3.43",
   "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.41">
+<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">
 
 	<name>Pushwoosh</name>
 
@@ -20,6 +20,8 @@
 	<preference name="IOS_FOREGROUND_ALERT_TYPE" default="ALERT" />
 	<preference name="ANDROID_FOREGROUND_PUSH" default="true" />
     <preference name="PW_VOIP_IOS_ENABLED" default="false" />
+    <preference name="PW_VOIP_ANDROID_ENABLED" default="false" />
+
 
 	<js-module src="www/PushNotification.js" name="PushNotification">
 		<clobbers target="plugins.pushNotification" />
@@ -55,6 +57,8 @@
 			</feature>
 		</config-file>
 
+    	<!-- core source files -->
+
 		<source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/PushNotifications.java"
 			target-dir="src/com/pushwoosh/plugin/pushnotifications" />
             
@@ -69,7 +73,15 @@
 
 		<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" />
+
+    	<!-- required call source files -->
+		<source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/CallsAdapter.java" target-dir="src/com/pushwoosh/plugin/pushnotifications" />
+    	<source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/NoopCallsAdapter.java" target-dir="src/com/pushwoosh/plugin/pushnotifications" />
+    	<source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/CallsAdapterFactory.java" target-dir="src/com/pushwoosh/plugin/pushnotifications" />
+
+    	<!-- gradle script to include pushwoosh-calls-related source files and dependencies -->
+    	<hook type="after_prepare" src="spec/set-voip-gradle-prop.js" />
+	    <framework src="src/android/add-android-voip.gradle" custom="true" type="gradleReference" />
 
         <framework src="build-extras-pushwoosh.gradle" custom="true" type="gradleReference" />
 
@@ -83,14 +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.30"/>
-		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.30"/>
-        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.30"/>
-		<framework src="com.pushwoosh:pushwoosh-badge:6.7.30"/>
-        <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"/>
-		<framework src="com.pushwoosh:pushwoosh-calls:6.7.30"/>
+        <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"/>
     </platform>
 
 	<!-- ios -->
@@ -132,7 +143,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="PushwooshXCFramework" spec="6.9.4" />
+                <pod name="PushwooshXCFramework" spec="6.10.2" />
                 <pod name="PushwooshInboxUIXCFramework" spec="6.1.2" />
             </pods>
         </podspec>

package/spec/set-voip-gradle-prop.js

@@ -0,0 +1,35 @@
+#!/usr/bin/env node
+const fs = require('fs');
+const path = require('path');
+
+module.exports = function (ctx) {
+  if (!ctx.opts.platforms.includes('android')) return;
+
+  const projectRoot = ctx.opts.projectRoot;
+  // Cordova tracks plugin vars in plugins/fetch.json — reliable source
+  const fetchPath = path.join(projectRoot, 'plugins', 'fetch.json');
+  if (!fs.existsSync(fetchPath)) return;
+
+  const fetch = JSON.parse(fs.readFileSync(fetchPath, 'utf8'));
+  const entry = fetch['pushwoosh-cordova-plugin'];
+  const vars = (entry && entry.variables) || {};
+  const val = String(vars.PW_VOIP_ANDROID_ENABLED || 'false').toLowerCase();
+
+  // Write to platforms/android/gradle.properties
+  const gradleProps = path.join(projectRoot, 'platforms', 'android', 'gradle.properties');
+  if (!fs.existsSync(path.dirname(gradleProps))) return; // android platform not added yet
+
+  let contents = fs.existsSync(gradleProps) ? fs.readFileSync(gradleProps, 'utf8') : '';
+  const line = `PW_VOIP_ANDROID_ENABLED=${val}\n`;
+  const re = /^PW_VOIP_ANDROID_ENABLED=.*$/m;
+
+  if (re.test(contents)) {
+    contents = contents.replace(re, line.trim());
+  } else {
+    if (contents.length && !contents.endsWith('\n')) contents += '\n';
+    contents += line;
+  }
+
+  fs.writeFileSync(gradleProps, contents, 'utf8');
+  console.log(`[pushwoosh-cordova-plugin] Wrote PW_VOIP_ANDROID_ENABLED=${val} to gradle.properties`);
+};

package/src/android/add-android-voip.gradle

@@ -0,0 +1,35 @@
+// Read from: -P, env, or (last-resort) literal placeholder
+def _rawVoip = (project.findProperty('PW_VOIP_ANDROID_ENABLED')
+        ?: System.getenv('PW_VOIP_ANDROID_ENABLED')
+        ?: '$PW_VOIP_ANDROID_ENABLED')  // stays literal if not set
+
+def voipEnabled = _rawVoip.toString().trim().toLowerCase() in ['1','true','yes','y']
+
+def pluginId = 'pushwoosh-cordova-plugin'
+def pluginDirCandidates = [
+        file("${rootDir}/../plugins/${pluginId}"),
+        file("${rootDir}/../../plugins/${pluginId}")
+]
+def pluginDir = pluginDirCandidates.find { it.exists() }
+def callsSrc = pluginDir ? new File(pluginDir, 'src/android/src/com/pushwoosh/plugin/pushnotifications/calls') : null
+
+def applyVoip = {
+    if (voipEnabled) {
+        println "[${pluginId}] PW_VOIP_ANDROID_ENABLED=true — enabling VoIP (dependency + sources)"
+        dependencies { implementation "com.pushwoosh:pushwoosh-calls:6.7.32" }
+        if (callsSrc?.exists()) {
+            android.sourceSets.main.java.srcDirs += callsSrc
+            println "[${pluginId}] Added optional sources: ${callsSrc}"
+        } else {
+            println "[${pluginId}] WARN optional sources not found at ${callsSrc}"
+        }
+    } else {
+        println "[${pluginId}] PW_VOIP_ANDROID_ENABLED=false — VoIP disabled"
+    }
+}
+
+if (project.hasProperty('cdvPluginPostBuildExtras')) {
+    cdvPluginPostBuildExtras << applyVoip
+} else {
+    afterEvaluate { applyVoip() }
+}

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

@@ -0,0 +1,16 @@
+package com.pushwoosh.plugin.pushnotifications;
+
+import org.apache.cordova.CallbackContext;
+import org.json.JSONArray;
+
+public interface CallsAdapter {
+    public boolean setVoipAppCode(JSONArray data, CallbackContext callbackContext);
+    public boolean requestCallPermission(JSONArray data, final CallbackContext callbackContext);
+    public boolean registerEvent(JSONArray data, final CallbackContext callbackContext);
+    public boolean endCall(JSONArray data, final CallbackContext callbackContext);
+    public boolean initializeVoIPParameters(JSONArray data, final CallbackContext callbackContext);
+    public boolean mute();
+    public boolean unmute();
+    public boolean speakerOn();
+    public boolean speakerOff();
+    }

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

@@ -0,0 +1,16 @@
+package com.pushwoosh.plugin.pushnotifications;
+
+import android.content.Context;
+
+public final class CallsAdapterFactory {
+    private static final String REAL_IMPL = "com.pushwoosh.plugin.pushnotifications.calls.PushwooshCallsAdapter";
+
+    public static CallsAdapter create(Context ctx) {
+        try {
+            Class<?> c = Class.forName(REAL_IMPL);
+            return (CallsAdapter) c.getDeclaredConstructor().newInstance();
+        } catch (Throwable ignored) {
+            return new NoopCallsAdapter();
+        }
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.pushwoosh.plugin.pushnotifications;
+
+import com.pushwoosh.internal.utils.PWLog;
+
+import org.apache.cordova.CallbackContext;
+import org.json.JSONArray;
+
+public class NoopCallsAdapter implements CallsAdapter{
+    private static final String TAG = "NoopCallsAdapter";
+    @Override
+    public boolean setVoipAppCode(JSONArray data, CallbackContext callbackContext) {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+
+    @Override
+    public boolean requestCallPermission(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 endCall(JSONArray data, CallbackContext callbackContext) {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+
+    @Override
+    public boolean initializeVoIPParameters(JSONArray data, CallbackContext callbackContext) {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+
+    @Override
+    public boolean mute() {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+
+    @Override
+    public boolean unmute() {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+
+    @Override
+    public boolean speakerOn() {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+
+    @Override
+    public boolean speakerOff() {
+        PWLog.error(TAG,"Method not implemented");
+        return false;
+    }
+}

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

@@ -10,36 +10,28 @@
 
 package com.pushwoosh.plugin.pushnotifications;
 
-import android.content.Context;
 import android.content.Intent;
-import android.media.AudioManager;
-import android.nfc.Tag;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.core.app.NotificationManagerCompat;
 import android.webkit.JavascriptInterface;
 
 import com.pushwoosh.Pushwoosh;
 import com.pushwoosh.RegisterForPushNotificationsResultData;
 import com.pushwoosh.badge.PushwooshBadge;
-import com.pushwoosh.calls.PushwooshCallReceiver;
-import com.pushwoosh.calls.PushwooshCallSettings;
-import com.pushwoosh.calls.PushwooshVoIPMessage;
 import com.pushwoosh.exception.GetTagsException;
 import com.pushwoosh.exception.PushwooshException;
 import com.pushwoosh.exception.RegisterForPushNotificationsException;
 import com.pushwoosh.exception.UnregisterForPushNotificationException;
 import com.pushwoosh.function.Callback;
 import com.pushwoosh.function.Result;
-import com.pushwoosh.inapp.PushwooshInApp;
+import com.pushwoosh.inapp.InAppManager;
 import com.pushwoosh.inbox.PushwooshInbox;
 import com.pushwoosh.inbox.data.InboxMessage;
 import com.pushwoosh.inbox.exception.InboxMessagesException;
 import com.pushwoosh.inbox.ui.presentation.view.activity.InboxActivity;
-import com.pushwoosh.internal.platform.AndroidPlatformModule;
 import com.pushwoosh.internal.platform.utils.GeneralUtils;
 import com.pushwoosh.internal.utils.JsonUtils;
 import com.pushwoosh.internal.utils.PWLog;
@@ -83,8 +75,10 @@ public class PushNotifications extends CordovaPlugin {
 	private static AtomicBoolean sAppReady = new AtomicBoolean();
 	private static PushNotifications sInstance;
 
-//	private CallbackContext callbackContext;
+	//	private CallbackContext callbackContext;
 	private static CordovaInterface cordovaInterface;
+	private static CallsAdapter callsAdapter;
+
 	private static HashMap<String, ArrayList<CallbackContext>> callbackContextMap = new HashMap<String, ArrayList<CallbackContext>>();
 
 	private final HashMap<String, CallbackContext> callbackIds = new HashMap<String, CallbackContext>();
@@ -110,10 +104,14 @@ public class PushNotifications extends CordovaPlugin {
 		exportedMethods = methods;
 	}
 
-	public static CordovaInterface getCordova() {
+	public static CordovaInterface getCordovaInterface() {
 		return cordovaInterface;
 	}
 
+	public static HashMap<String, ArrayList<CallbackContext>> getCallbackContextMap() {
+		return callbackContextMap;
+	}
+
 	public static HashMap<String, ArrayList<CallbackContext>> getCallbackContexts() {
 		return callbackContextMap;
 	}
@@ -544,7 +542,7 @@ public class PushNotifications extends CordovaPlugin {
 	private boolean setUserId(JSONArray data, final CallbackContext callbackContext) {
 		try	{
 			String userId = data.getString(0);
-			PushwooshInApp.getInstance().setUserId(userId);
+			Pushwoosh.getInstance().setUserId(userId);
 		} catch (JSONException e) {
 			PWLog.error(TAG, "No parameters passed (missing parameters)", e);
 		}
@@ -556,7 +554,7 @@ public class PushNotifications extends CordovaPlugin {
 		try	{
 			String event = data.getString(0);
 			JSONObject attributes = data.getJSONObject(1);
-			PushwooshInApp.getInstance().postEvent(event, Tags.fromJson(attributes));
+			InAppManager.getInstance().postEvent(event, Tags.fromJson(attributes));
 		} catch (JSONException e) {
 			PWLog.error(TAG, "No parameters passed (missing parameters)", e);
 		}
@@ -813,7 +811,7 @@ public class PushNotifications extends CordovaPlugin {
 			for (int i = 0; i < emailsArray.length(); i++) {
 				emails.add(emailsArray.getString(i));
 			}
-			
+
 			Pushwoosh.getInstance().setUser(userId, emails, result -> {
 				if (result.isSuccess()) {
 					callbackContext.success();
@@ -861,6 +859,7 @@ public class PushNotifications extends CordovaPlugin {
 	@Override
 	public void initialize(CordovaInterface cordova, CordovaWebView webView) {
 		cordovaInterface = cordova;
+		callsAdapter = CallsAdapterFactory.create(cordova.getActivity().getApplicationContext());
 		callbackContextMap.put("answer", new ArrayList<CallbackContext>());
 		callbackContextMap.put("reject", new ArrayList<CallbackContext>());
 		callbackContextMap.put("hangup", new ArrayList<CallbackContext>());
@@ -1047,7 +1046,7 @@ public class PushNotifications extends CordovaPlugin {
 	private boolean addJavaScriptInterface(JSONArray data, final CallbackContext callbackContext) {
 		try {
 			String name = data.getString(0);
-			PushwooshInApp.getInstance().addJavascriptInterface(new JavascriptInterfaceCordova(), name);
+			InAppManager.getInstance().addJavascriptInterface(new JavascriptInterfaceCordova(), name);
 		} catch (JSONException e) {
 			PWLog.error(TAG, "No parameters has been passed to addJavaScriptInterface function. Did you follow the guide correctly?", e);
 			return false;
@@ -1069,202 +1068,60 @@ public class PushNotifications extends CordovaPlugin {
 
 	@CordovaMethod
 	private boolean setVoipAppCode(JSONArray data, CallbackContext callbackContext) {
-		try {
-			String appCode = data.getString(0);
-			Pushwoosh.getInstance().addAlternativeAppCode(appCode);
-		} catch (JSONException e) {
-			PWLog.error(TAG, "No parameters passed (missing parameters)", e);
-			return false;
-		}
-		return true;
+		return callsAdapter.setVoipAppCode(data, callbackContext);
 	}
 
 	@CordovaMethod
 	private boolean requestCallPermission(JSONArray data, final CallbackContext callbackContext) {
-		try {
-			PushwooshCallSettings.requestCallPermissions();
-		} catch (Exception e) {
-			PWLog.error(TAG, "Failed to request call permissions: " + e.getMessage());
-			return false;
-		}
-        return true;
-    }
+		return callsAdapter.requestCallPermission(data, callbackContext);
+	}
 
 	@CordovaMethod
 	private boolean registerEvent(JSONArray data, final CallbackContext callbackContext) {
-		try {
-
-			String eventType = data.getString(0);
-			ArrayList<CallbackContext> callbackContextList = callbackContextMap.get(eventType);
-			if (callbackContextList != null) {
-				callbackContextList.add(callbackContext);
-			}
-			return true;
-		} catch (Exception e) {
-
-			return false;
-		}
+		return callsAdapter.registerEvent(data, callbackContext);
 	}
 
 	@CordovaMethod
 	private boolean endCall(JSONArray data, final CallbackContext callbackContext) {
-		Context context = AndroidPlatformModule.getApplicationContext();
-		Intent endCallIntent = new Intent(context, PushwooshCallReceiver.class);
-		endCallIntent.putExtras(PWCordovaCallEventListener.getCurrentCallInfo());
-		endCallIntent.setAction("ACTION_END_CALL");
-		getCordova().getActivity().getApplicationContext().sendBroadcast(endCallIntent);
-
-		return true;
+		return callsAdapter.endCall(data,callbackContext);
 	}
 
 	@CordovaMethod
 	private boolean initializeVoIPParameters(JSONArray data, final CallbackContext callbackContext) {
-		try {
-			String callSound = data.getString(1);
-			if (callSound!= null && !callSound.isEmpty()){
-				PushwooshCallSettings.setCallSound(callSound);
-			}
-			return true;
-		}  catch (Exception e) {
-			PWLog.error("Failed to fetch custom sound name");
-			return false;
-		}
+		return callsAdapter.initializeVoIPParameters(data, callbackContext);
 	}
 
 	@CordovaMethod
 	private boolean mute() {
-		try {
-			AudioManager audioManager = (AudioManager) this.cordova.getActivity().getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
-			audioManager.setMicrophoneMute(true);
-			return true;
-		} catch (Exception e) {
-			PWLog.error("Failed to mute audio channel");
-			return false;
-		}
+		return callsAdapter.mute();
 	}
 
 	@CordovaMethod
 	private boolean unmute() {
-		try {
-			AudioManager audioManager = (AudioManager) this.cordova.getActivity().getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
-			audioManager.setMicrophoneMute(false);
-			return true;
-		} catch (Exception e) {
-			PWLog.error("Failed to unmute audio channel");
-			return false;
-		}
+		return callsAdapter.unmute();
 	}
 
 	@CordovaMethod
 	private boolean speakerOn() {
-		try {
-		AudioManager audioManager = (AudioManager) this.cordova.getActivity().getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
-		audioManager.setSpeakerphoneOn(true);
-		return true;
-		} catch (Exception e) {
-			PWLog.error("Failed to turn speaker on");
-			return false;
-		}
+		return callsAdapter.speakerOn();
 	}
 
 	@CordovaMethod
 	private boolean speakerOff() {
-		try {
-			AudioManager audioManager = (AudioManager) this.cordova.getActivity().getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
-			audioManager.setSpeakerphoneOn(false);
-			return true;
-		} catch (Exception e) {
-			PWLog.error("Failed to turn speaker off");
-			return false;
-		}
+		return callsAdapter.speakerOff();
 	}
 
-	public static void onAnswer(PushwooshVoIPMessage voIPMessage) {
-		Context context = AndroidPlatformModule.getApplicationContext();
-		if (context == null) {
-			return;
-		}
-		Intent launchIntent = context.getPackageManager()
-				.getLaunchIntentForPackage(context.getPackageName());
-		if (launchIntent == null) {
-			return;
-		}
-		launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP);
-		context.startActivity(launchIntent);
-		ArrayList<CallbackContext> callbackContexts = getCallbackContexts().get("answer");
-		if (callbackContexts != null) {
-			for (final CallbackContext callbackContext : callbackContexts) {
-				getCordova().getThreadPool().execute(new Runnable() {
-					public void run() {;
-						PluginResult result = new PluginResult(
-								PluginResult.Status.OK, parseVoIPMessage(voIPMessage));
-						result.setKeepCallback(true);
-						callbackContext.sendPluginResult(result);
-					}
-				});
-			}
-		}
-	}
-
-	public static void onReject(PushwooshVoIPMessage voIPMessage) {
-		ArrayList<CallbackContext> callbackContexts = getCallbackContexts().get("reject");
-		if (callbackContexts != null) {
-			for (final CallbackContext callbackContext : callbackContexts) {
-				getCordova().getThreadPool().execute(new Runnable() {
-					public void run() {
-						PluginResult result = new PluginResult(
-								PluginResult.Status.OK, parseVoIPMessage(voIPMessage));
-						result.setKeepCallback(true);
-						callbackContext.sendPluginResult(result);
-					}
-				});
-			}
-		}
-	}
+	public static void emitVoipEvent(@NonNull String type, @NonNull JSONObject payload) {
+		ArrayList<CallbackContext> callbackContexts = getCallbackContexts().get(type);
+		if (callbackContexts == null) return;
 
-	public static void onDisconnect(PushwooshVoIPMessage voIPMessage) {
-		ArrayList<CallbackContext> callbackContexts = getCallbackContexts().get("hangup");
-		if (callbackContexts != null) {
-			for (final CallbackContext callbackContext : callbackContexts) {
-				getCordova().getThreadPool().execute(new Runnable() {
-					public void run() {
-						PluginResult result = new PluginResult(
-								PluginResult.Status.OK, parseVoIPMessage(voIPMessage));
-						result.setKeepCallback(true);
-						callbackContext.sendPluginResult(result);
-					}
-				});
-			}
-		}
-	}
-
-	public static void onCreateIncomingConnection(@Nullable Bundle bundle) {
-		ArrayList<CallbackContext> callbackContexts = getCallbackContexts().get("voipPushPayload");
-		if (callbackContexts != null) {
-			for (final CallbackContext callbackContext : callbackContexts) {
-				getCordova().getThreadPool().execute(new Runnable() {
-					public void run() {
-						JSONObject payload = JsonUtils.bundleToJson(bundle);
-						PluginResult result = new PluginResult(
-								PluginResult.Status.OK, payload);
-						result.setKeepCallback(true);
-						callbackContext.sendPluginResult(result);
-					}
-				});
-			}
-		}
-	}
-
-	private static JSONObject parseVoIPMessage(PushwooshVoIPMessage message) {
-		JSONObject payload = new JSONObject();
-		try {
-			payload.put("callerName", message.getCallerName())
-					.put("rawPayload", message.getRawPayload())
-					.put("hasVideo", message.getHasVideo());
-		} catch (JSONException e) {
-			PWLog.error("Failed to parse call notification payload");
+		for (final CallbackContext callbackContext : callbackContexts) {
+			getCordovaInterface().getThreadPool().execute(() -> {
+				PluginResult result = new PluginResult(PluginResult.Status.OK, payload);
+				result.setKeepCallback(true);
+				callbackContext.sendPluginResult(result);
+			});
 		}
-		return payload;
 	}
 
 	private static JSONObject inboxMessageToJson(InboxMessage message) {

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

@@ -1,4 +1,4 @@
-package com.pushwoosh.plugin.pushnotifications;
+package com.pushwoosh.plugin.pushnotifications.calls;
 
 import android.os.Bundle;
 
@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
 
 import com.pushwoosh.calls.PushwooshVoIPMessage;
 import com.pushwoosh.calls.listener.CallEventListener;
+import com.pushwoosh.plugin.pushnotifications.PushNotifications;
 
 public class PWCordovaCallEventListener implements CallEventListener {
     private static final Object sCurrentCallLock = new Object();
@@ -18,12 +19,12 @@ public class PWCordovaCallEventListener implements CallEventListener {
         synchronized (sCurrentCallLock) {
             currentCallInfo = pushwooshVoIPMessage.getRawPayload();
         }
-        PushNotifications.onAnswer(pushwooshVoIPMessage);
+        PushwooshCallsAdapter.onAnswer(pushwooshVoIPMessage);
     }
 
     @Override
     public void onReject(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
-        PushNotifications.onReject(pushwooshVoIPMessage);
+        PushwooshCallsAdapter.onReject(pushwooshVoIPMessage);
         synchronized (sCurrentCallLock) {
             currentCallInfo = null;
         }
@@ -31,7 +32,7 @@ public class PWCordovaCallEventListener implements CallEventListener {
 
     @Override
     public void onDisconnect(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
-        PushNotifications.onDisconnect(pushwooshVoIPMessage);
+        PushwooshCallsAdapter.onDisconnect(pushwooshVoIPMessage);
         synchronized (sCurrentCallLock) {
             currentCallInfo = null;
         }
@@ -42,7 +43,7 @@ public class PWCordovaCallEventListener implements CallEventListener {
         synchronized (sCurrentCallLock) {
             currentCallInfo = bundle;
         }
-        PushNotifications.onCreateIncomingConnection(bundle);
+        PushwooshCallsAdapter.onCreateIncomingConnection(bundle);
     }
 
     @Override