rns-nativecall 0.1.4 → 0.1.5

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

@@ -1,7 +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
@@ -28,13 +27,16 @@ class MyConnectionService : ConnectionService() {
             request: ConnectionRequest?
     ): Connection {
 
-        // 1. Read extras
         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
+        // 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,
@@ -48,21 +50,26 @@ class MyConnectionService : ConnectionService() {
                         }
                 )
 
-        // 3. Set caller display name
-        callerName?.let { connection.setCallerDisplayName(it, TelecomManager.PRESENTATION_ALLOWED) }
+        // 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.setAddress(request?.address, TelecomManager.PRESENTATION_ALLOWED)
+        // --- 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.setInitializing()
         connection.setRinging()
 
-        // ✅ EMIT EVENT TO JS (Fixed variable name to callUUID)
+        // Emit event to JS so the app can send the 'ringing' status
         callUUID?.let { CallModule.sendEventToJS("onCallDisplayed", it) }
 
-        // 5. Track connection
+        // Track connection
         callUUID?.let { addConnection(it, connection) }
 
         return connection

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

@@ -10,33 +10,29 @@ import android.telecom.VideoProfile
 
 object NativeCallManager {
 
-    // Inside NativeCallManager.kt
-
     fun handleIncomingPush(context: Context, data: Map<String, String>) {
         val uuid = data["callId"] ?: return
         val handle = data["from"] ?: "Unknown"
-        val callType = data["callType"] ?: "audio" // video or audio
+        val callType = data["callType"] ?: "audio"
         val name = data["name"] ?: handle
         val playRing = data["playRing"]?.toBoolean() ?: true
 
-        // 1. Get the real App Name dynamically
+        // 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" // Fallback
+                    "App"
                 }
 
-        // 2. Capitalize callType (e.g., "video" -> "Video")
+        // 2. Format Sub-label (e.g., "Raiidr Video Call")
         val capitalizedCallType =
                 callType.replaceFirstChar {
                     if (it.isLowerCase()) it.titlecase() else it.toString()
                 }
-
-        // 3. Construct the robust label: "Incoming [AppName] [Video/Audio] Call"
-        val displayLabel = "Incoming $appName $capitalizedCallType Call"
+        val subLabel = "$appName $capitalizedCallType Call"
 
         val telecomManager = context.getSystemService(Context.TELECOM_SERVICE) as TelecomManager
         val phoneAccountHandle = getPhoneAccountHandle(context)
@@ -48,20 +44,22 @@ object NativeCallManager {
                             Uri.fromParts("sip", handle, null)
                     )
                     putString("EXTRA_CALL_UUID", uuid)
-                    putString(
-                            TelecomManager.EXTRA_CALL_SUBJECT,
-                            displayLabel
-                    ) // Set the dynamic label
+
+                    // 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)
 
-                    // Ensure hasVideo is properly mapped to Telecom constants
                     val isVideo = callType.equals("video", ignoreCase = true)
                     val videoState =
                             if (isVideo) VideoProfile.STATE_BIDIRECTIONAL
                             else VideoProfile.STATE_AUDIO_ONLY
                     putInt(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, videoState)
 
-                    // Pass all other data so ConnectionService can access it if needed
+                    // Forward all other data
                     data.forEach { (key, value) -> putString(key, value) }
                 }
 
@@ -72,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.4",
+    "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",