@qusaieilouti99/call-manager 0.1.185 → 0.1.187

package/android/src/main/java/com/margelo/nitro/qusaieilouti99/callmanager/CallEngine.kt

@@ -1,5 +1,6 @@
 package com.margelo.nitro.qusaieilouti99.callmanager
 
+import android.app.Activity
 import android.app.ActivityManager
 import android.app.Notification
 import android.app.NotificationChannel
@@ -38,6 +39,7 @@ import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.atomic.AtomicBoolean
 import android.app.KeyguardManager
 import java.util.UUID
+import android.provider.Settings // Import for Settings.canDrawOverlays and ACTION_MANAGE_OVERLAY_PERMISSION
 
 /**
  * Core call‐management engine. Manages self-managed telecom calls,
@@ -252,7 +254,7 @@ object CallEngine {
 
     val activeOrHeldCall = activeCalls.values.find {
       it.state == CallState.ACTIVE || it.state == CallState.HELD
-    }
+    )
     if (activeOrHeldCall != null && !canMakeMultipleCalls) {
       Log.d(TAG, "Active/Held call exists when receiving incoming call. Auto-rejecting: $callId")
       rejectIncomingCallCollision(callId, "Another call is already active or held")
@@ -1042,6 +1044,13 @@ object CallEngine {
       putExtra("LOCK_SCREEN_MODE", true)
     }
 
+    // ONLY CHECK permission, DO NOT REQUEST HERE
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !checkOverlayPermissionGranted(context)) {
+        Log.w(TAG, "Cannot show CallActivity overlay without SYSTEM_ALERT_WINDOW permission. Falling back to standard notification.")
+        showStandardNotification(context, callId, callerName, callType, callerPicUrl)
+        return
+    }
+
     try {
       val powerManager = context.getSystemService(Context.POWER_SERVICE) as PowerManager
       val wakeLock = powerManager.newWakeLock(
@@ -1052,7 +1061,7 @@ object CallEngine {
       context.startActivity(overlayIntent)
       Log.d(TAG, "Successfully launched CallActivity overlay")
     } catch (e: Exception) {
-      Log.e(TAG, "Overlay failed, falling back to standard notification: ${e.message}")
+      Log.e(TAG, "Overlay failed (after permission check), falling back to standard notification: ${e.message}")
       showStandardNotification(context, callId, callerName, callType, callerPicUrl)
     }
   }
@@ -1362,4 +1371,51 @@ object CallEngine {
     availableCallEndpoints = emptyList()
     wasManuallySetAudioRoute = false
   }
+
+  // --- Refactored SYSTEM_ALERT_WINDOW permission functions ---
+
+  /**
+   * Checks if the SYSTEM_ALERT_WINDOW permission (Draw Over Other Apps) is granted.
+   * This function only checks; it does not launch any UI for permission request.
+   * @param context The application context.
+   * @return True if the permission is granted or not required (API < 23), false otherwise.
+   */
+  fun checkOverlayPermissionGranted(context: Context): Boolean {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      Settings.canDrawOverlays(context)
+    } else {
+      true // Permissions granted at install time for older Android versions
+    }
+  }
+
+  /**
+   * Launches the system settings screen where the user can grant the SYSTEM_ALERT_WINDOW permission.
+   * This function should be called after your app has explained to the user why the permission is needed.
+   * @param context The context to start the activity. Ideally, an Activity context is used,
+   *                but if an Application context is used, FLAG_ACTIVITY_NEW_TASK will be added.
+   * @return True if the settings activity was successfully launched, false otherwise.
+   */
+  fun launchOverlayPermissionSettings(context: Context): Boolean {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+      Log.d(TAG, "SYSTEM_ALERT_WINDOW permission automatically granted on API < 23. No settings to launch.")
+      return true
+    }
+
+    Log.d(TAG, "Launching SYSTEM_ALERT_WINDOW permission settings.")
+    try {
+      val intent = Intent(
+        Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+        Uri.parse("package:" + context.packageName)
+      )
+      if (context !is Activity) {
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        Log.d(TAG, "Added FLAG_ACTIVITY_NEW_TASK as context is not an Activity.")
+      }
+      context.startActivity(intent)
+      return true // Successfully launched settings
+    } catch (e: Exception) {
+      Log.e(TAG, "Failed to launch SYSTEM_ALERT_WINDOW permission settings: ${e.message}", e)
+      return false // Failed to launch
+    }
+  }
 }

package/android/src/main/java/com/margelo/nitro/qusaieilouti99/callmanager/CallManager.kt

@@ -123,4 +123,20 @@ class CallManager : HybridCallManagerSpec() {
           metadata
         )
     }
+
+    // --- New Hybrid Method for SYSTEM_ALERT_WINDOW permission CHECK ---
+    override fun hasOverlayPermissionAndroid(): Boolean {
+        Log.d(TAG, "hasOverlayPermissionAndroid requested (check only)")
+        ensureInitialized()
+        val context = requireNotNull(CallEngine.getContext()) { "CallEngine must be initialized with context" }
+        return CallEngine.checkOverlayPermissionGranted(context)
+    }
+
+    // --- Repurposed Hybrid Method for SYSTEM_ALERT_WINDOW permission LAUNCH ---
+    override fun requestOverlayPermissionAndroid(): Boolean {
+        Log.d(TAG, "requestOverlayPermissionAndroid requested (launch settings)")
+        ensureInitialized()
+        val context = requireNotNull(CallEngine.getContext()) { "CallEngine must be initialized with context" }
+        return CallEngine.launchOverlayPermissionSettings(context)
+    }
 }

package/ios/CallEngine.swift

@@ -25,6 +25,9 @@ class CallEngine {
     // Track video calls that need speaker activation
     private var videoCallsNeedingSpeaker: Set<String> = []
 
+    // NEW: Track calls being answered via the startCall method
+    private var answeringIncomingViaStartCall: Set<String> = [] // NEW
+
     private init() {
         logger.info("CallEngine singleton created")
     }
@@ -200,6 +203,30 @@ class CallEngine {
                    metadata: String? = nil)
     {
         logger.info("startCall (join ongoing): \(callId), type=\(callType)")
+
+        // --- MODIFICATION START ---
+        // Check if the callId corresponds to an existing incoming call
+        if let existingCallInfo = activeCalls[callId], existingCallInfo.state == .incoming {
+            logger.info("startCall: Detected attempt to answer existing incoming call \(callId). Redirecting to answer flow.")
+
+            // Update metadata for the existing incoming call if provided
+            if let m = metadata {
+                callMetadata[callId] = m
+                logger.info("metadata updated for incoming call \(callId)")
+            }
+
+            // Mark this call as one being answered via startCall
+            answeringIncomingViaStartCall.insert(callId)
+
+            // Trigger the CallKit answer action. This will lead to `callKitManager(_:didAnswerCall:)` being called.
+            callKitManager.answerCall(callId: callId)
+
+            // Return early as we've redirected to the answer flow.
+            return
+        }
+        // --- MODIFICATION END ---
+
+
         if let m = metadata {
             callMetadata[callId] = m
             logger.info("metadata cached for \(callId)")
@@ -447,7 +474,16 @@ class CallEngine {
 
 extension CallEngine: CallKitManagerDelegate {
     func callKitManager(_ manager: CallKitManager, didAnswerCall callId: String) {
-        coreCallAnswered(callId: callId, isLocalAnswer: true)
+        // MODIFICATION START
+        if answeringIncomingViaStartCall.contains(callId) {
+            logger.info("📞 CallKit answered: \(callId). This was initiated by startCall, treating as non-local answer.")
+            answeringIncomingViaStartCall.remove(callId)
+            coreCallAnswered(callId: callId, isLocalAnswer: false) // isLocalAnswer: false for OUTGOING_CALL_ANSWERED
+        } else {
+            logger.info("📞 CallKit answered: \(callId). Standard local answer.")
+            coreCallAnswered(callId: callId, isLocalAnswer: true) // isLocalAnswer: true for CALL_ANSWERED
+        }
+        // MODIFICATION END
     }
 
     func callKitManager(_ manager: CallKitManager, didEndCall callId: String) {

package/ios/CallManager.swift

@@ -153,4 +153,14 @@ public class CallManager: HybridCallManagerSpec {
     logger.info("🎯 hasActiveCall ▶ js → native")
     return CallEngine.shared.hasActiveCalls()
   }
+
+  public func requestOverlayPermissionAndroid() throws -> Bool {
+    logger.info("🎯 requestOverlayPermissionAndroid ▶ js → native")
+    return true
+  }
+
+  public func hasOverlayPermissionAndroid() throws -> Bool {
+    logger.info("🎯 hasOverlayPermissionAndroid ▶ js → native")
+    return true
+  }
 }

package/lib/module/CallManager.nitro.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","CallManagerHybridObject","createHybridObject"],"sourceRoot":"../../src","sources":["CallManager.nitro.ts"],"mappings":";;AAAA;AACA,SAA4BA,YAAY,QAAQ,4BAA4B;;AAG5E;;AAKA;;AAyDA,OAAO,MAAMC,uBAAuB,GAClCD,YAAY,CAACE,kBAAkB,CAAc,aAAa,CAAC","ignoreList":[]}
+{"version":3,"names":["NitroModules","CallManagerHybridObject","createHybridObject"],"sourceRoot":"../../src","sources":["CallManager.nitro.ts"],"mappings":";;AAAA;AACA,SAA4BA,YAAY,QAAQ,4BAA4B;;AAG5E;;AAKA;;AA4DA,OAAO,MAAMC,uBAAuB,GAClCD,YAAY,CAACE,kBAAkB,CAAc,aAAa,CAAC","ignoreList":[]}

package/lib/typescript/src/CallManager.nitro.d.ts

@@ -27,6 +27,8 @@ export interface CallManager extends HybridObject<{
     addListener(listener: (event: CallEventType, payload: string) => void): () => void;
     registerVoIPTokenListener(listener: (payload: string) => void): () => void;
     hasActiveCall(): boolean;
+    requestOverlayPermissionAndroid(): boolean;
+    hasOverlayPermissionAndroid(): boolean;
 }
 export declare const CallManagerHybridObject: CallManager;
 //# sourceMappingURL=CallManager.nitro.d.ts.map

package/lib/typescript/src/CallManager.nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CallManager.nitro.d.ts","sourceRoot":"","sources":["../../../src/CallManager.nitro.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,4BAA4B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGrD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IAEzD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,IAAI,IAAI,CAAC;IACxB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAGnC,eAAe,IAAI,eAAe,CAAC;IACnC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,eAAe,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAE1C,WAAW,IAAI,IAAI,CAAC;IACpB,iBAAiB,CACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAAC;IACR,SAAS,CACP,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAAC;IACR,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/C,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAGvE,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAAC;IAGR,WAAW,CAET,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GACxD,MAAM,IAAI,CAAC;IAEd,yBAAyB,CAEvB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAClC,MAAM,IAAI,CAAC;IAEd,aAAa,IAAI,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,uBAAuB,aACyB,CAAC"}
+{"version":3,"file":"CallManager.nitro.d.ts","sourceRoot":"","sources":["../../../src/CallManager.nitro.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAgB,MAAM,4BAA4B,CAAC;AAC7E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGrD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,WACf,SAAQ,YAAY,CAAC;IAAE,GAAG,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;IAEzD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,eAAe,IAAI,IAAI,CAAC;IACxB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAGnC,eAAe,IAAI,eAAe,CAAC;IACnC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,eAAe,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAE1C,WAAW,IAAI,IAAI,CAAC;IACpB,iBAAiB,CACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAAC;IACR,SAAS,CACP,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAAC;IACR,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/C,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAGvE,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,IAAI,CAAC;IAGR,WAAW,CAET,QAAQ,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GACxD,MAAM,IAAI,CAAC;IAEd,yBAAyB,CAEvB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAClC,MAAM,IAAI,CAAC;IAEd,aAAa,IAAI,OAAO,CAAC;IAEzB,+BAA+B,IAAI,OAAO,CAAC;IAC3C,2BAA2B,IAAI,OAAO,CAAC;CACxC;AAED,eAAO,MAAM,uBAAuB,aACyB,CAAC"}

package/nitrogen/generated/android/c++/JHybridCallManagerSpec.cpp

@@ -142,5 +142,15 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
     auto __result = method(_javaPart);
     return static_cast<bool>(__result);
   }
+  bool JHybridCallManagerSpec::requestOverlayPermissionAndroid() {
+    static const auto method = javaClassStatic()->getMethod<jboolean()>("requestOverlayPermissionAndroid");
+    auto __result = method(_javaPart);
+    return static_cast<bool>(__result);
+  }
+  bool JHybridCallManagerSpec::hasOverlayPermissionAndroid() {
+    static const auto method = javaClassStatic()->getMethod<jboolean()>("hasOverlayPermissionAndroid");
+    auto __result = method(_javaPart);
+    return static_cast<bool>(__result);
+  }
 
 } // namespace margelo::nitro::qusaieilouti99_callmanager

package/nitrogen/generated/android/c++/JHybridCallManagerSpec.hpp

@@ -68,6 +68,8 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
     std::function<void()> addListener(const std::function<void(CallEventType /* event */, const std::string& /* payload */)>& listener) override;
     std::function<void()> registerVoIPTokenListener(const std::function<void(const std::string& /* payload */)>& listener) override;
     bool hasActiveCall() override;
+    bool requestOverlayPermissionAndroid() override;
+    bool hasOverlayPermissionAndroid() override;
 
   private:
     friend HybridBase;

package/nitrogen/generated/android/kotlin/com/margelo/nitro/qusaieilouti99/callmanager/HybridCallManagerSpec.kt

@@ -113,6 +113,14 @@ abstract class HybridCallManagerSpec: HybridObject() {
   @DoNotStrip
   @Keep
   abstract fun hasActiveCall(): Boolean
+  
+  @DoNotStrip
+  @Keep
+  abstract fun requestOverlayPermissionAndroid(): Boolean
+  
+  @DoNotStrip
+  @Keep
+  abstract fun hasOverlayPermissionAndroid(): Boolean
 
   private external fun initHybrid(): HybridData
 

package/nitrogen/generated/ios/c++/HybridCallManagerSpecSwift.hpp

@@ -172,6 +172,22 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
       auto __value = std::move(__result.value());
       return __value;
     }
+    inline bool requestOverlayPermissionAndroid() override {
+      auto __result = _swiftPart.requestOverlayPermissionAndroid();
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+      auto __value = std::move(__result.value());
+      return __value;
+    }
+    inline bool hasOverlayPermissionAndroid() override {
+      auto __result = _swiftPart.hasOverlayPermissionAndroid();
+      if (__result.hasError()) [[unlikely]] {
+        std::rethrow_exception(__result.error());
+      }
+      auto __value = std::move(__result.value());
+      return __value;
+    }
 
   private:
     CallManager::HybridCallManagerSpec_cxx _swiftPart;

package/nitrogen/generated/ios/swift/HybridCallManagerSpec.swift

@@ -30,6 +30,8 @@ public protocol HybridCallManagerSpec_protocol: HybridObject {
   func addListener(listener: @escaping (_ event: CallEventType, _ payload: String) -> Void) throws -> () -> Void
   func registerVoIPTokenListener(listener: @escaping (_ payload: String) -> Void) throws -> () -> Void
   func hasActiveCall() throws -> Bool
+  func requestOverlayPermissionAndroid() throws -> Bool
+  func hasOverlayPermissionAndroid() throws -> Bool
 }
 
 /// See ``HybridCallManagerSpec``

package/nitrogen/generated/ios/swift/HybridCallManagerSpec_cxx.swift

@@ -322,4 +322,28 @@ open class HybridCallManagerSpec_cxx {
       return bridge.create_Result_bool_(__exceptionPtr)
     }
   }
+  
+  @inline(__always)
+  public final func requestOverlayPermissionAndroid() -> bridge.Result_bool_ {
+    do {
+      let __result = try self.__implementation.requestOverlayPermissionAndroid()
+      let __resultCpp = __result
+      return bridge.create_Result_bool_(__resultCpp)
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_bool_(__exceptionPtr)
+    }
+  }
+  
+  @inline(__always)
+  public final func hasOverlayPermissionAndroid() -> bridge.Result_bool_ {
+    do {
+      let __result = try self.__implementation.hasOverlayPermissionAndroid()
+      let __resultCpp = __result
+      return bridge.create_Result_bool_(__resultCpp)
+    } catch (let __error) {
+      let __exceptionPtr = __error.toCpp()
+      return bridge.create_Result_bool_(__exceptionPtr)
+    }
+  }
 }

package/nitrogen/generated/shared/c++/HybridCallManagerSpec.cpp

@@ -30,6 +30,8 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
       prototype.registerHybridMethod("addListener", &HybridCallManagerSpec::addListener);
       prototype.registerHybridMethod("registerVoIPTokenListener", &HybridCallManagerSpec::registerVoIPTokenListener);
       prototype.registerHybridMethod("hasActiveCall", &HybridCallManagerSpec::hasActiveCall);
+      prototype.registerHybridMethod("requestOverlayPermissionAndroid", &HybridCallManagerSpec::requestOverlayPermissionAndroid);
+      prototype.registerHybridMethod("hasOverlayPermissionAndroid", &HybridCallManagerSpec::hasOverlayPermissionAndroid);
     });
   }
 

package/nitrogen/generated/shared/c++/HybridCallManagerSpec.hpp

@@ -71,6 +71,8 @@ namespace margelo::nitro::qusaieilouti99_callmanager {
       virtual std::function<void()> addListener(const std::function<void(CallEventType /* event */, const std::string& /* payload */)>& listener) = 0;
       virtual std::function<void()> registerVoIPTokenListener(const std::function<void(const std::string& /* payload */)>& listener) = 0;
       virtual bool hasActiveCall() = 0;
+      virtual bool requestOverlayPermissionAndroid() = 0;
+      virtual bool hasOverlayPermissionAndroid() = 0;
 
     protected:
       // Hybrid Setup

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qusaieilouti99/call-manager",
-  "version": "0.1.185",
+  "version": "0.1.187",
   "description": "Call manager",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/CallManager.nitro.ts

@@ -62,6 +62,9 @@ export interface CallManager
   ): () => void;
 
   hasActiveCall(): boolean; // if there is an active call, no matter ringing, incoming, outgoing, whatever
+
+  requestOverlayPermissionAndroid(): boolean; // only android
+  hasOverlayPermissionAndroid(): boolean; // only android
 }
 
 export const CallManagerHybridObject =