pushwoosh-cordova-plugin 8.3.54 → 8.3.56

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pushwoosh-cordova-plugin",
-  "version": "8.3.54",
+  "version": "8.3.56",
   "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.54">
+<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.56">
 
 	<name>Pushwoosh</name>
 
@@ -65,6 +65,9 @@
         <source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/InboxUiStyleManager.java"
             target-dir="src/com/pushwoosh/plugin/pushnotifications" />
 
+		<source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/VoIPEventStorage.java"
+			target-dir="src/com/pushwoosh/plugin/pushnotifications" />
+
 		<source-file src="src/android/src/com/pushwoosh/plugin/pushnotifications/PushwooshNotificationServiceExtension.java"
 			target-dir="src/com/pushwoosh/plugin/pushnotifications" />
             
@@ -95,13 +98,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.48"/>
+		<framework src="com.pushwoosh:pushwoosh-amazon:6.7.48"/>
+        <framework src="com.pushwoosh:pushwoosh-firebase:6.7.48"/>
+		<framework src="com.pushwoosh:pushwoosh-badge:6.7.48"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox:6.7.48"/>
+        <framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.48"/>
+		<framework src="com.pushwoosh:pushwoosh-huawei:6.7.48"/>
     </platform>
 
 	<!-- ios -->
@@ -143,7 +146,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.6" />
                 <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.48" }
         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

@@ -10,6 +10,7 @@
 
 package com.pushwoosh.plugin.pushnotifications;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -33,6 +34,7 @@ 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.utils.GeneralUtils;
+import com.pushwoosh.internal.platform.AndroidPlatformModule;
 import com.pushwoosh.internal.utils.JsonUtils;
 import com.pushwoosh.internal.utils.PWLog;
 import com.pushwoosh.notification.LocalNotification;
@@ -75,7 +77,6 @@ public class PushNotifications extends CordovaPlugin {
 	private static AtomicBoolean sAppReady = new AtomicBoolean();
 	private static PushNotifications sInstance;
 
-	//	private CallbackContext callbackContext;
 	private static CordovaInterface cordovaInterface;
 	private static CallsAdapter callsAdapter;
 
@@ -108,6 +109,25 @@ public class PushNotifications extends CordovaPlugin {
 		return cordovaInterface;
 	}
 
+	/**
+	 * Checks if Cordova WebView is ready to receive events.
+	 * Returns false if CordovaInterface is null, Activity is null/finishing/destroyed.
+	 */
+	private static boolean isCordovaReady() {
+		if (cordovaInterface == null) {
+			return false;
+		}
+		try {
+			android.app.Activity activity = cordovaInterface.getActivity();
+			if (activity == null || activity.isFinishing() || activity.isDestroyed()) {
+				return false;
+			}
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
 	public static HashMap<String, ArrayList<CallbackContext>> getCallbackContextMap() {
 		return callbackContextMap;
 	}
@@ -125,11 +145,26 @@ public class PushNotifications extends CordovaPlugin {
 
 	@Override
 	public void onDestroy() {
+		PWLog.noise(TAG, "onDestroy()");
+
 		super.onDestroy();
-		PWLog.noise("OnDestroy");
 		sAppReady.set(false);
 	}
 
+	@Override
+	public void initialize(CordovaInterface cordova, CordovaWebView webView) {
+		PWLog.noise(TAG, "initialize()");
+		
+		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>());
+		callbackContextMap.put("voipPushPayload", new ArrayList<CallbackContext>());
+		callbackContextMap.put("voipDidCancelCall", new ArrayList<CallbackContext>());
+		callbackContextMap.put("voipDidFailToCancelCall", new ArrayList<CallbackContext>());
+	}
+
 	private JSONObject getPushFromIntent(Intent intent) {
 		if (null == intent) {
 			return null;
@@ -152,6 +187,8 @@ public class PushNotifications extends CordovaPlugin {
 
 	@CordovaMethod
 	private boolean onDeviceReady(JSONArray data, CallbackContext callbackContext) {
+		PWLog.noise(TAG, "onDeviceReady()");
+
 		JSONObject params = null;
 		try {
 			params = data.getJSONObject(0);
@@ -160,34 +197,37 @@ public class PushNotifications extends CordovaPlugin {
 			return false;
 		}
 
+		String appid = null;
 		try {
-
-			String appid = null;
 			if (params.has("appid")) {
 				appid = params.getString("appid");
 			} else {
 				appid = params.getString("pw_appid");
 			}
+		} catch (JSONException e) {
+			PWLog.error(TAG, "Missing appid parameter. Did you follow the guide correctly?", e);
+			return false;
+		}
 
-			Pushwoosh.getInstance().setAppId(appid);
-			Pushwoosh.getInstance().setSenderId(params.getString("projectid"));
+		String projectid = params.optString("projectid", "");
 
+		Pushwoosh.getInstance().setAppId(appid);
+		Pushwoosh.getInstance().setSenderId(projectid);
 
-			synchronized (sStartPushLock) {
-				if (sReceivedPushData != null) {
-					doOnPushReceived(sReceivedPushData);
-				}
+		try {
+			processPendingPushNotifications();
+		} catch (Exception e) {
+			PWLog.error(TAG, "Failed to process pending push notifications", e);
+		}
 
-				if (sStartPushData != null) {
-					doOnPushOpened(sStartPushData);
-				}
-			}
+		sAppReady.set(true);
 
-			sAppReady.set(true);
+		try {
+			processPersistedVoIPEvents();
 		} catch (Exception e) {
-			PWLog.error(TAG, "Missing pw_appid parameter. Did you follow the guide correctly?", e);
-			return false;
+			PWLog.error(TAG, "Failed to process persisted VoIP events", e);
 		}
+
 		return true;
 	}
 
@@ -856,18 +896,6 @@ public class PushNotifications extends CordovaPlugin {
 		return true;
 	}
 
-	@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>());
-		callbackContextMap.put("voipPushPayload", new ArrayList<CallbackContext>());
-		callbackContextMap.put("voipDidCancelCall", new ArrayList<CallbackContext>());
-		callbackContextMap.put("voipDidFailToCancelCall", new ArrayList<CallbackContext>());
-	}
-
 	@Override
 	public boolean execute(String action, JSONArray data, CallbackContext callbackId) {
 		PWLog.debug(TAG, "Plugin Method Called: " + action);
@@ -1103,6 +1131,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();
@@ -1123,17 +1156,75 @@ public class PushNotifications extends CordovaPlugin {
 		return callsAdapter.speakerOff();
 	}
 
+	private void processPendingPushNotifications() {
+		PWLog.noise(TAG, "processPendingPushNotifications()");
+		synchronized (sStartPushLock) {
+			if (sReceivedPushData != null) {
+				doOnPushReceived(sReceivedPushData);
+			}
+
+			if (sStartPushData != null) {
+				doOnPushOpened(sStartPushData);
+			}
+		}
+	}
+
+	private void processPersistedVoIPEvents() {
+		PWLog.noise(TAG, "processPersistedVoIPEvents()");
+		Context context = AndroidPlatformModule.getApplicationContext();
+		if (context == null) {
+			return;
+		}
+
+		List<VoIPEventStorage.StoredEvent> storedEvents = VoIPEventStorage.loadEvents(context);
+		if (storedEvents.isEmpty()) {
+			return;
+		}
+
+		PWLog.info(TAG, "Processing " + storedEvents.size() + " persisted VoIP events");
+
+		for (VoIPEventStorage.StoredEvent event : storedEvents) {
+			emitVoipEvent(event.type, event.payload);
+		}
+
+		VoIPEventStorage.clearEvents(context);
+	}
+
+	private static void bufferVoipEvent(@NonNull String type, @NonNull JSONObject payload) {
+		Context context = AndroidPlatformModule.getApplicationContext();
+		if (context != null) {
+			VoIPEventStorage.saveEvent(context, type, payload);
+		}
+	}
+
 	public static void emitVoipEvent(@NonNull String type, @NonNull JSONObject payload) {
+		PWLog.noise(TAG, "emitVoipEvent(), event type: " + type);
+
+		if (!isCordovaReady()) {
+			PWLog.info(TAG, "Buffering VoIP event '" + type + "': Cordova not ready");
+			bufferVoipEvent(type, payload);
+			return;
+		}
+
 		ArrayList<CallbackContext> callbackContexts = getCallbackContexts().get(type);
-		if (callbackContexts == null) return;
+		if (callbackContexts != null && !callbackContexts.isEmpty()) {
+			for (final CallbackContext callbackContext : callbackContexts) {
+				getCordovaInterface().getThreadPool().execute(() -> {
+					PluginResult result = new PluginResult(PluginResult.Status.OK, payload);
+					result.setKeepCallback(true);
+					callbackContext.sendPluginResult(result);
+				});
+			}
+			return;
+		}
 
-		for (final CallbackContext callbackContext : callbackContexts) {
-			getCordovaInterface().getThreadPool().execute(() -> {
-				PluginResult result = new PluginResult(PluginResult.Status.OK, payload);
-				result.setKeepCallback(true);
-				callbackContext.sendPluginResult(result);
-			});
+		if (!sAppReady.get()) {
+			PWLog.info(TAG, "Buffering VoIP event '" + type + "': JS not ready");
+			bufferVoipEvent(type, payload);
+			return;
 		}
+
+		PWLog.warn(TAG, "No callback contexts registered for event: " + type);
 	}
 
 	private static JSONObject inboxMessageToJson(InboxMessage message) {
@@ -1160,4 +1251,4 @@ public class PushNotifications extends CordovaPlugin {
 		}
 		return object;
 	}
-}
+}

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

@@ -0,0 +1,130 @@
+package com.pushwoosh.plugin.pushnotifications;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import androidx.annotation.NonNull;
+import com.pushwoosh.internal.utils.PWLog;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * VoIP Event Buffering Storage
+ *
+ * Provides persistent storage for VoIP events when WebView/JavaScript is not ready.
+ */
+public class VoIPEventStorage {
+    private static final String TAG = "VoIPEventStorage";
+    private static final String PREFS_NAME = "pushwoosh_voip_events";
+    private static final String KEY_BUFFERED_EVENTS = "buffered_events";
+    private static final long TTL_MILLIS = 24 * 60 * 60 * 1000; // 24 hours
+    private static final Object STORAGE_LOCK = new Object();
+
+    /**
+     * Represents a stored VoIP event with metadata
+     */
+    public static class StoredEvent {
+        public String type;
+        public JSONObject payload;
+        public long timestamp;
+
+        public StoredEvent(String type, JSONObject payload, long timestamp) {
+            this.type = type;
+            this.payload = payload;
+            this.timestamp = timestamp;
+        }
+
+        public boolean isExpired() {
+            return (System.currentTimeMillis() - timestamp) > TTL_MILLIS;
+        }
+    }
+
+    /**
+     * Save VoIP event to persistent storage
+     */
+    public static boolean saveEvent(@NonNull Context context, @NonNull String type, @NonNull JSONObject payload) {
+        PWLog.noise(TAG, "saveEvent()");
+
+        try {
+            synchronized (STORAGE_LOCK) {
+                SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+                String existingData = prefs.getString(KEY_BUFFERED_EVENTS, "[]");
+                JSONArray events = new JSONArray(existingData);
+
+                JSONObject event = new JSONObject();
+                event.put("type", type);
+                event.put("payload", payload);
+                event.put("timestamp", System.currentTimeMillis());
+
+                events.put(event);
+
+                boolean success = prefs.edit()
+                    .putString(KEY_BUFFERED_EVENTS, events.toString())
+                    .commit();
+                
+                return success;
+            }
+
+        } catch (Exception e) {
+            PWLog.error(TAG, "Failed to save VoIP event", e);
+            return false;
+        }
+    }
+
+    private static StoredEvent parseStoredEvent(@NonNull JSONObject eventObj) throws Exception {
+        String type = eventObj.getString("type");
+        JSONObject payload = eventObj.getJSONObject("payload");
+        long timestamp = eventObj.getLong("timestamp");
+        return new StoredEvent(type, payload, timestamp);
+    }
+
+    /**
+     * Load all non-expired events from storage.
+     */
+    public static List<StoredEvent> loadEvents(@NonNull Context context) {
+        PWLog.noise(TAG, "loadEvents()");
+
+        List<StoredEvent> result = new ArrayList<>();
+
+        try {
+            synchronized (STORAGE_LOCK) {
+                SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+                String data = prefs.getString(KEY_BUFFERED_EVENTS, "[]");
+                JSONArray events = new JSONArray(data);
+
+                for (int i = 0; i < events.length(); i++) {
+                    try {
+                        StoredEvent event = parseStoredEvent(events.getJSONObject(i));
+
+                        if (event.isExpired()) {
+                            continue;
+                        }
+
+                        result.add(event);
+                    } catch (Exception e) {
+                        PWLog.error(TAG, "Failed to parse VoIP event at index " + i + ", skipping", e);
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            PWLog.error(TAG, "Failed to load VoIP events", e);
+        }
+
+        return result;
+    }
+
+    public static void clearEvents(@NonNull Context context) {
+        PWLog.noise(TAG, "clearEvents()");
+
+        try {
+            synchronized (STORAGE_LOCK) {
+                SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+                prefs.edit().remove(KEY_BUFFERED_EVENTS).commit();
+            }
+        } catch (Exception e) {
+            PWLog.error(TAG, "Failed to clear VoIP events", e);
+        }
+    }
+}

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

@@ -13,82 +13,109 @@ import com.pushwoosh.internal.platform.AndroidPlatformModule;
 import com.pushwoosh.internal.utils.PWLog;
 
 public class PWCordovaCallEventListener implements CallEventListener {
+    
+    private static final String TAG = "PWCordovaCallEventListener";
     private static final Object sCurrentCallLock = new Object();
     private static Bundle currentCallInfo = null;
 
+    private void setCurrentCallInfo(Bundle bundle) {
+        synchronized (sCurrentCallLock) {
+            currentCallInfo = bundle;
+        }
+    }
 
-    @Override
-    public void onAnswer(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage, int i) {
+    private void clearCurrentCallInfo() {
         synchronized (sCurrentCallLock) {
-            currentCallInfo = pushwooshVoIPMessage.getRawPayload();
+            currentCallInfo = null;
         }
-        
+    }
+
+    public static Bundle getCurrentCallInfo() {
+        synchronized (sCurrentCallLock) {
+            return currentCallInfo;
+        }
+    }
+
+    private void launchMainActivity() {
+        PWLog.noise(TAG, "launchMainActivity()");
         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");
+            if (context == null) {
+                PWLog.error(TAG, "cant launch activity: context is null");
+                return;
+            }
+            Intent launchIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+            if (launchIntent == null) {
+                PWLog.error(TAG, "cant launch activity: launchIntent is null");
+                return;
             }
+
+            launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            context.startActivity(launchIntent);
         } catch (Exception e) {
-            PWLog.error("PWCordovaCallEventListener", "Failed to launch activity", e);
+            PWLog.error(TAG, "Failed to launch activity", e);
         }
+    }
+
+
+    @Override
+    public void onCreateIncomingConnection(@Nullable Bundle bundle) {
+        PWLog.noise(TAG, "onCreateIncomingConnection()");
+
+        setCurrentCallInfo(bundle);
+        PushwooshCallsAdapter.onCreateIncomingConnection(bundle);
+    }
 
+
+    @Override
+    public void onAnswer(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage, int i) {
+        PWLog.noise(TAG, "onAnswer()");
+
+        setCurrentCallInfo(pushwooshVoIPMessage.getRawPayload());
         PushwooshCallsAdapter.onAnswer(pushwooshVoIPMessage);
+        launchMainActivity();
     }
 
     @Override
     public void onReject(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
+        PWLog.noise(TAG, "onReject()");
+
         PushwooshCallsAdapter.onReject(pushwooshVoIPMessage);
-        synchronized (sCurrentCallLock) {
-            currentCallInfo = null;
-        }
+        clearCurrentCallInfo();
     }
 
     @Override
     public void onDisconnect(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
-        PushwooshCallsAdapter.onDisconnect(pushwooshVoIPMessage);
-        synchronized (sCurrentCallLock) {
-            currentCallInfo = null;
-        }
-    }
+        PWLog.noise(TAG, "onDisconnect()");
 
-    @Override
-    public void onCreateIncomingConnection(@Nullable Bundle bundle) {
-        synchronized (sCurrentCallLock) {
-            currentCallInfo = bundle;
-        }
-        PushwooshCallsAdapter.onCreateIncomingConnection(bundle);
+        PushwooshCallsAdapter.onDisconnect(pushwooshVoIPMessage);
+        clearCurrentCallInfo();
     }
 
     @Override
     public void onCallAdded(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
+        PWLog.noise(TAG, "onCallAdded()");
         //stub
     }
 
     @Override
     public void onCallRemoved(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
+        PWLog.noise(TAG, "onCallRemoved()");
         //stub
     }
 
     @Override
     public void onCallCancelled(@NonNull PushwooshVoIPMessage pushwooshVoIPMessage) {
+        PWLog.noise(TAG, "onCallCancelled()");
+
         PushwooshCallsAdapter.onCallCancelled(pushwooshVoIPMessage);
-        synchronized (sCurrentCallLock) {
-            currentCallInfo = null;
-        }
+        clearCurrentCallInfo();
     }
 
     @Override
     public void onCallCancellationFailed(@Nullable String callId, @Nullable String reason) {
-        PushwooshCallsAdapter.onCallCancellationFailed(callId, reason);
-    }
+        PWLog.noise(TAG, "onCallCancellationFailed()");
 
-    public static Bundle getCurrentCallInfo() {
-        synchronized (sCurrentCallLock) {
-            return currentCallInfo;
-        }
+        PushwooshCallsAdapter.onCallCancellationFailed(callId, reason);
     }
 }

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;
@@ -29,6 +30,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
 
     @Override
     public boolean setVoipAppCode(JSONArray data, CallbackContext callbackContext) {
+        PWLog.noise(TAG, "setVoipAppCode()");
         try {
             String appCode = data.getString(0);
             Pushwoosh.getInstance().addAlternativeAppCode(appCode);
@@ -40,11 +42,18 @@ public class PushwooshCallsAdapter implements CallsAdapter {
     }
 
     @Override
-    public boolean requestCallPermission(JSONArray data, CallbackContext callbackContext) {
+    public boolean requestCallPermission(JSONArray data, final CallbackContext callbackContext) {
+        PWLog.noise(TAG, "requestCallPermission()");
         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;
@@ -52,6 +61,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
 
     @Override
     public boolean getCallPermissionStatus(JSONArray data, CallbackContext callbackContext) {
+        PWLog.noise(TAG, "getCallPermissionStatus()");
         try {
             int status = PushwooshCallSettings.getCallPermissionStatus();
             callbackContext.success(status);
@@ -64,6 +74,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
 
     @Override
     public boolean registerEvent(JSONArray data, CallbackContext callbackContext) {
+        PWLog.noise(TAG, "registerEvent()");
         try {
 
             String eventType = data.getString(0);
@@ -79,6 +90,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
 
     @Override
     public boolean unregisterEvent(JSONArray data, CallbackContext callbackContext) {
+        PWLog.noise(TAG, "unregisterEvent()");
         try {
             String eventType = data.getString(0);
             ArrayList<CallbackContext> callbackContextList = getCallbackContextMap().get(eventType);
@@ -97,6 +109,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
 
     @Override
     public boolean endCall(JSONArray data, CallbackContext callbackContext) {
+        PWLog.noise(TAG, "endCall()");
         Context context = AndroidPlatformModule.getApplicationContext();
         Intent endCallIntent = new Intent(context, PushwooshCallReceiver.class);
         endCallIntent.putExtras(PWCordovaCallEventListener.getCurrentCallInfo());
@@ -108,6 +121,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
 
     @Override
     public boolean initializeVoIPParameters(JSONArray data, CallbackContext callbackContext) {
+        PWLog.noise(TAG, "initializeVoIPParameters()");
         try {
             String callSound = data.getString(1);
             if (callSound!= null && !callSound.isEmpty()){
@@ -120,8 +134,22 @@ public class PushwooshCallsAdapter implements CallsAdapter {
         }
     }
 
+    @Override
+    public boolean setIncomingCallTimeout(JSONArray data, CallbackContext callbackContext) {
+        PWLog.noise(TAG, "setIncomingCallTimeout()");
+        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() {
+        PWLog.noise(TAG, "mute()");
         try {
             AudioManager audioManager = (AudioManager) getCordovaInterface().getActivity().getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
             audioManager.setMicrophoneMute(true);
@@ -134,6 +162,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
 
     @Override
     public boolean unmute() {
+        PWLog.noise(TAG, "unmute()");
         try {
             AudioManager audioManager = (AudioManager) getCordovaInterface().getActivity().getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
             audioManager.setMicrophoneMute(false);
@@ -146,6 +175,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
 
     @Override
     public boolean speakerOn() {
+        PWLog.noise(TAG, "speakerOn()");
         try {
             AudioManager audioManager = (AudioManager) getCordovaInterface().getActivity().getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
             audioManager.setSpeakerphoneOn(true);
@@ -158,6 +188,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
 
     @Override
     public boolean speakerOff() {
+        PWLog.noise(TAG, "speakerOff()");
         try {
             AudioManager audioManager = (AudioManager) getCordovaInterface().getActivity().getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
             audioManager.setSpeakerphoneOn(false);
@@ -169,27 +200,33 @@ public class PushwooshCallsAdapter implements CallsAdapter {
     }
 
     public static void onAnswer(PushwooshVoIPMessage voIPMessage) {
+        PWLog.noise(TAG, "onAnswer()");
         PushNotifications.emitVoipEvent("answer", parseVoIPMessage(voIPMessage));
     }
 
     public static void onReject(PushwooshVoIPMessage voIPMessage) {
+        PWLog.noise(TAG, "onReject()");
         PushNotifications.emitVoipEvent("reject", parseVoIPMessage(voIPMessage));
     }
 
     public static void onDisconnect(PushwooshVoIPMessage voIPMessage) {
+        PWLog.noise(TAG, "onDisconnect()");
         PushNotifications.emitVoipEvent("hangup", parseVoIPMessage(voIPMessage));
     }
 
     public static void onCreateIncomingConnection(Bundle bundle) {
+        PWLog.noise(TAG, "onCreateIncomingConnection()");
         PushwooshVoIPMessage voipMessage = new PushwooshVoIPMessage(bundle);
         PushNotifications.emitVoipEvent("voipPushPayload", parseVoIPMessage(voipMessage));
     }
 
     public static void onCallCancelled(PushwooshVoIPMessage voIPMessage) {
+        PWLog.noise(TAG, "onCallCancelled()");
         PushNotifications.emitVoipEvent("voipDidCancelCall", parseVoIPMessage(voIPMessage));
     }
 
     public static void onCallCancellationFailed(String callId, String reason) {
+        PWLog.noise(TAG, "onCallCancellationFailed()");
         org.json.JSONObject payload = new org.json.JSONObject();
         try {
             payload.put("callId", callId != null ? callId : "");
@@ -199,6 +236,7 @@ public class PushwooshCallsAdapter implements CallsAdapter {
     }
 
     private static org.json.JSONObject parseVoIPMessage(PushwooshVoIPMessage message) {
+        PWLog.noise(TAG, "parseVoIPMessage()");
         org.json.JSONObject payload = new org.json.JSONObject();
         try {
             Bundle rawBundle = message.getRawPayload();

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"]) {

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();