rns-nativecall 0.1.3 → 0.1.5

package/android/src/main/java/com/rnsnativecall/CallModule.kt

@@ -1,4 +1,4 @@
-///Users/bush/Desktop/Apps/Raiidr/package/android/src/main/java/com/rnsnativecall/CallModule.kt
+/// Users/bush/Desktop/Apps/Raiidr/package/android/src/main/java/com/rnsnativecall/CallModule.kt
 package com.rnsnativecall
 
 import android.content.ComponentName
@@ -6,10 +6,10 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.telecom.DisconnectCause
 import android.telecom.PhoneAccount
 import android.telecom.PhoneAccountHandle
 import android.telecom.TelecomManager
-import android.telecom.DisconnectCause
 import com.facebook.react.bridge.*
 import com.facebook.react.modules.core.DeviceEventManagerModule
 
@@ -29,47 +29,56 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     }
 
     private fun registerPhoneAccount() {
-        val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
+        val telecomManager =
+                reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle()
 
         // Dynamically get the app's display name from the Android Manifest
-        val appName = reactApplicationContext.applicationInfo.loadLabel(reactApplicationContext.packageManager).toString()
+        val appName =
+                reactApplicationContext
+                        .applicationInfo
+                        .loadLabel(reactApplicationContext.packageManager)
+                        .toString()
 
         // Correct bitmasking: Combine all capabilities into a single integer
-        val capabilities = PhoneAccount.CAPABILITY_VIDEO_CALLING or
-                           PhoneAccount.CAPABILITY_SUPPORTS_VIDEO_CALLING
+        val capabilities =
+                PhoneAccount.CAPABILITY_VIDEO_CALLING or
+                        PhoneAccount.CAPABILITY_SUPPORTS_VIDEO_CALLING
 
-        val phoneAccount = PhoneAccount.builder(phoneAccountHandle, appName)
-             .setCapabilities(capabilities) 
-             .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED) 
-             .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER) 
-            .build()
+        val phoneAccount =
+                PhoneAccount.builder(phoneAccountHandle, appName)
+                        .setCapabilities(capabilities)
+                        .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)
+                        .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER)
+                        .build()
 
         telecomManager.registerPhoneAccount(phoneAccount)
     }
 
     @ReactMethod
     fun displayIncomingCall(
-        uuid: String,
-        number: String,
-        name: String,
-        hasVideo: Boolean,
-        playRing: Boolean,
-        promise: Promise
+            uuid: String,
+            number: String,
+            name: String,
+            hasVideo: Boolean,
+            playRing: Boolean,
+            promise: Promise
     ) {
-        val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
+        val telecomManager =
+                reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle()
 
-        val extras = Bundle().apply {
-            putParcelable(
-                TelecomManager.EXTRA_INCOMING_CALL_ADDRESS,
-                Uri.fromParts("sip", number, null)
-            )
-            putString(TelecomManager.EXTRA_CALL_SUBJECT, name)
-            putString("EXTRA_CALL_UUID", uuid)
-            putBoolean("EXTRA_PLAY_RING", playRing)
-            putBoolean(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, hasVideo)
-        }
+        val extras =
+                Bundle().apply {
+                    putParcelable(
+                            TelecomManager.EXTRA_INCOMING_CALL_ADDRESS,
+                            Uri.fromParts("sip", number, null)
+                    )
+                    putString(TelecomManager.EXTRA_CALL_SUBJECT, name)
+                    putString("EXTRA_CALL_UUID", uuid)
+                    putBoolean("EXTRA_PLAY_RING", playRing)
+                    putBoolean(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, hasVideo)
+                }
 
         try {
             telecomManager.addNewIncomingCall(phoneAccountHandle, extras)
@@ -91,7 +100,8 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
     @ReactMethod
     fun checkTelecomPermissions(promise: Promise) {
-        val telecomManager = reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
+        val telecomManager =
+                reactApplicationContext.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle()
 
         val account = telecomManager.getPhoneAccount(phoneAccountHandle)
@@ -113,12 +123,10 @@ class CallModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
         private var instance: CallModule? = null
 
         fun sendEventToJS(eventName: String, uuid: String?) {
-            val params = Arguments.createMap().apply {
-                putString("callUUID", uuid)
-            }
+            val params = Arguments.createMap().apply { putString("callUUID", uuid) }
             instance?.reactApplicationContext
-                ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                ?.emit(eventName, params)
+                    ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                    ?.emit(eventName, params)
         }
     }
-}
+}

package/android/src/main/java/com/rnsnativecall/CallPackage.kt

@@ -1,4 +1,4 @@
-/////Users/bush/Desktop/Apps/Raiidr/package/android/src/main/java/com/rnsnativecall/CallPackage.kt
+///// Users/bush/Desktop/Apps/Raiidr/package/android/src/main/java/com/rnsnativecall/CallPackage.kt
 package com.rnsnativecall
 
 import com.facebook.react.ReactPackage
@@ -11,7 +11,9 @@ class CallPackage : ReactPackage {
         return listOf(CallModule(reactContext))
     }
 
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    override fun createViewManagers(
+            reactContext: ReactApplicationContext
+    ): List<ViewManager<*, *>> {
         return emptyList()
     }
-}
+}

package/android/src/main/java/com/rnsnativecall/MyCallConnection.kt

@@ -1,4 +1,5 @@
-/////Users/bush/Desktop/Apps/Raiidr/package/android/src/main/java/com/rnsnativecall/MyCallConnection.kt
+/////
+// Users/bush/Desktop/Apps/Raiidr/package/android/src/main/java/com/rnsnativecall/MyCallConnection.kt
 package com.rnsnativecall
 
 import android.content.Context
@@ -10,11 +11,11 @@ import android.telecom.Connection
 import android.telecom.DisconnectCause
 
 class MyCallConnection(
-    private val context: Context,
-    private val callUUID: String?,
-    private val playRing: Boolean,
-    private val onAcceptCallback: (String?) -> Unit,
-    private val onRejectCallback: (String?) -> Unit
+        private val context: Context,
+        private val callUUID: String?,
+        private val playRing: Boolean,
+        private val onAcceptCallback: (String?) -> Unit,
+        private val onRejectCallback: (String?) -> Unit
 ) : Connection() {
 
     private var mediaPlayer: MediaPlayer? = null
@@ -31,18 +32,19 @@ class MyCallConnection(
     private fun startRingtone() {
         val uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)
 
-        mediaPlayer = MediaPlayer().apply {
-            setDataSource(context, uri)
-            setAudioAttributes(
-                AudioAttributes.Builder()
-                    .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-                    .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
-                    .build()
-            )
-            isLooping = true
-            prepare()
-            start()
-        }
+        mediaPlayer =
+                MediaPlayer().apply {
+                    setDataSource(context, uri)
+                    setAudioAttributes(
+                            AudioAttributes.Builder()
+                                    .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+                                    .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                                    .build()
+                    )
+                    isLooping = true
+                    prepare()
+                    start()
+                }
     }
 
     private fun stopRingtone() {

package/android/src/main/java/com/rnsnativecall/MyConnectionService.kt

@@ -1,6 +1,6 @@
-/////Users/bush/Desktop/Apps/Raiidr/package/android/src/main/java/com/rnsnativecall/MyConnectionService.kt
 package com.rnsnativecall
 
+import android.net.Uri // <--- ADD THIS IMPORT
 import android.telecom.Connection
 import android.telecom.ConnectionRequest
 import android.telecom.ConnectionService
@@ -23,46 +23,53 @@ class MyConnectionService : ConnectionService() {
     }
 
     override fun onCreateIncomingConnection(
-        connectionManagerPhoneAccount: PhoneAccountHandle?,
-        request: ConnectionRequest?
+            connectionManagerPhoneAccount: PhoneAccountHandle?,
+            request: ConnectionRequest?
     ): Connection {
 
-        // 1️⃣ Read extras FIRST
         val extras = request?.extras
         val callUUID = extras?.getString("EXTRA_CALL_UUID")
         val playRing = extras?.getBoolean("EXTRA_PLAY_RING", true) ?: true
-        val callerName = extras?.getString(TelecomManager.EXTRA_CALL_SUBJECT)
-
-        // 2️⃣ Create connection
-        val connection = MyCallConnection(
-            context = applicationContext,
-            callUUID = callUUID,
-            playRing = playRing,
-            onAcceptCallback = { uuid ->
-                CallModule.sendEventToJS("onCallAccepted", uuid)
-            },
-            onRejectCallback = { uuid ->
-                CallModule.sendEventToJS("onCallRejected", uuid)
-            }
-        )
-
-        // 3️⃣ Set caller display name (THIS FIXES MISALIGNMENT)
-        callerName?.let {
-            connection.setCallerDisplayName(
-                it,
-                TelecomManager.PRESENTATION_ALLOWED
-            )
-        }
 
-        // 4️⃣ Standard Telecom setup
+        // 1. "John Doe" (Top slot)
+        val actualPersonName = extras?.getString("EXTRA_CALLER_NAME") ?: "Someone"
+
+        // 2. "Raiidr Video Call" (Middle/Number slot)
+        val appLabel = extras?.getString(TelecomManager.EXTRA_CALL_SUBJECT) ?: "Incoming Call"
+
+        val connection =
+                MyCallConnection(
+                        context = applicationContext,
+                        callUUID = callUUID,
+                        playRing = playRing,
+                        onAcceptCallback = { uuid ->
+                            CallModule.sendEventToJS("onCallAccepted", uuid)
+                        },
+                        onRejectCallback = { uuid ->
+                            CallModule.sendEventToJS("onCallRejected", uuid)
+                        }
+                )
+
+        // 3. Set the LARGE text on top to the Person's Name
+        connection.setCallerDisplayName(actualPersonName, TelecomManager.PRESENTATION_ALLOWED)
+
+        // 4. Standard Telecom setup
         connection.connectionCapabilities =
-            Connection.CAPABILITY_MUTE or Connection.CAPABILITY_SUPPORT_HOLD
+                Connection.CAPABILITY_MUTE or Connection.CAPABILITY_SUPPORT_HOLD
+
+        // --- THE UI FIX ---
+        // We force the App Label (e.g. "Raiidr Video Call") into the Address slot
+        // This replaces the raw phone number/handle on the incoming call screen.
+        val labelUri = Uri.fromParts("tel", appLabel, null)
+        connection.setAddress(labelUri, TelecomManager.PRESENTATION_ALLOWED)
 
-        connection.setAddress(request?.address, TelecomManager.PRESENTATION_ALLOWED)
         connection.setInitializing()
         connection.setRinging()
 
-        // 5️⃣ Track connection
+        // Emit event to JS so the app can send the 'ringing' status
+        callUUID?.let { CallModule.sendEventToJS("onCallDisplayed", it) }
+
+        // Track connection
         callUUID?.let { addConnection(it, connection) }
 
         return connection

package/android/src/main/java/com/rnsnativecall/NativeCallManager.kt

@@ -6,17 +6,34 @@ import android.net.Uri
 import android.os.Bundle
 import android.telecom.PhoneAccountHandle
 import android.telecom.TelecomManager
-import android.telecom.VideoProfile // <-- ADD THIS IMPORT
+import android.telecom.VideoProfile
 
 object NativeCallManager {
 
     fun handleIncomingPush(context: Context, data: Map<String, String>) {
         val uuid = data["callId"] ?: return
         val handle = data["from"] ?: "Unknown"
+        val callType = data["callType"] ?: "audio"
         val name = data["name"] ?: handle
-        val hasVideo = data["hasVideo"]?.toBoolean() ?: false
         val playRing = data["playRing"]?.toBoolean() ?: true
 
+        // 1. Get Dynamic App Name
+        val appName =
+                try {
+                    val pm = context.packageManager
+                    val ai = pm.getApplicationInfo(context.packageName, 0)
+                    pm.getApplicationLabel(ai).toString()
+                } catch (e: Exception) {
+                    "App"
+                }
+
+        // 2. Format Sub-label (e.g., "Raiidr Video Call")
+        val capitalizedCallType =
+                callType.replaceFirstChar {
+                    if (it.isLowerCase()) it.titlecase() else it.toString()
+                }
+        val subLabel = "$appName $capitalizedCallType Call"
+
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle(context)
 
@@ -27,15 +44,23 @@ object NativeCallManager {
                             Uri.fromParts("sip", handle, null)
                     )
                     putString("EXTRA_CALL_UUID", uuid)
-                    putString(TelecomManager.EXTRA_CALL_SUBJECT, name)
+
+                    // This goes to the SECONDARY slot in MyConnectionService
+                    putString(TelecomManager.EXTRA_CALL_SUBJECT, subLabel)
+
+                    // This goes to the PRIMARY slot (The Name) in MyConnectionService
+                    putString("EXTRA_CALLER_NAME", name)
+
                     putBoolean("EXTRA_PLAY_RING", playRing)
 
-                    // Video state requires specific integer constants
+                    val isVideo = callType.equals("video", ignoreCase = true)
                     val videoState =
-                            if (hasVideo) VideoProfile.STATE_BIDIRECTIONAL
+                            if (isVideo) VideoProfile.STATE_BIDIRECTIONAL
                             else VideoProfile.STATE_AUDIO_ONLY
-
                     putInt(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, videoState)
+
+                    // Forward all other data
+                    data.forEach { (key, value) -> putString(key, value) }
                 }
 
         try {
@@ -45,6 +70,7 @@ object NativeCallManager {
         }
     }
 
+    // This function must be OUTSIDE handleIncomingPush but INSIDE the object
     private fun getPhoneAccountHandle(context: Context): PhoneAccountHandle {
         val componentName = ComponentName(context, MyConnectionService::class.java)
         return PhoneAccountHandle(componentName, "${context.packageName}.voip")

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rns-nativecall",
-    "version": "0.1.3",
+    "version": "0.1.5",
     "description": "RNS nativecall component with native Android/iOS for handling native call ui, when app is not open or open.",
     "main": "index.js",
     "types": "index.d.ts",