feat(voip): migrate Android accept/reject from DDP to REST (#7127)

Author: diegolmello

android/app/src/main/java/chat/rocket/reactnative/voip/DDPClient.kt

@@ -21,10 +21,13 @@ class DDPClient {
 
     companion object {
         private const val TAG = "RocketChat.DDPClient"
+        private val sharedClient = OkHttpClient.Builder()
+            .pingInterval(30, TimeUnit.SECONDS)
+            .build()
     }
 
     private var webSocket: WebSocket? = null
-    private var client: OkHttpClient? = null
+    private val client: OkHttpClient = sharedClient
     private var sendCounter = 0
     private var isConnected = false
     private val mainHandler = Handler(Looper.getMainLooper())
@@ -40,14 +43,9 @@ class DDPClient {
 
         Log.d(TAG, "Connecting to $wsUrl")
 
-        val httpClient = OkHttpClient.Builder()
-            .pingInterval(30, TimeUnit.SECONDS)
-            .build()
-        client = httpClient
-
         val request = Request.Builder().url(wsUrl).build()
 
-        webSocket = httpClient.newWebSocket(request, object : WebSocketListener() {
+        webSocket = client.newWebSocket(request, object : WebSocketListener() {
             override fun onOpen(webSocket: WebSocket, response: Response) {
                 Log.d(TAG, "WebSocket opened")
                 val connectMsg = JSONObject().apply {
@@ -142,8 +140,6 @@ class DDPClient {
         onCollectionMessage = null
         webSocket?.close(1000, null)
         webSocket = null
-        client?.dispatcher?.executorService?.shutdown()
-        client = null
     }
 
     private fun nextMessage(msg: String): JSONObject {

android/app/src/main/java/chat/rocket/reactnative/voip/MediaCallsAnswerRequest.kt

@@ -0,0 +1,134 @@
+package chat.rocket.reactnative.voip
+
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import chat.rocket.reactnative.notification.Ejson
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.IOException
+
+/**
+ * REST client for `POST /api/v1/media-calls.answer` used by accept/reject flows.
+ *
+ * Mirrors the iOS [MediaCallsAnswerRequest.swift][ios/Shared/RocketChat/API/MediaCallsAnswerRequest.swift]
+ * and replaces the DDP `sendAcceptSignal` / `sendRejectSignal` / `queueAcceptSignal` / `queueRejectSignal`
+ * methods in [VoipNotification].
+ *
+ * Auth headers (`x-user-id` / `x-auth-token`) are resolved from [Ejson] at call time,
+ * matching the pattern used by [chat.rocket.reactnative.notification.ReplyBroadcast].
+ *
+ * [fetch]'s `onResult` is always invoked on the main thread.
+ *
+ * @param callId       The call identifier from the VoIP payload.
+ * @param contractId   The device-unique contract identifier (`Settings.Secure.ANDROID_ID`).
+ * @param answer       Either `"accept"` or `"reject"`.
+ * @param supportedFeatures Optional list of supported features (e.g. `["audio"]`); sent only for accept.
+ */
+class MediaCallsAnswerRequest(
+    private val callId: String,
+    private val contractId: String,
+    private val answer: String,
+    private val supportedFeatures: List<String>? = null
+) {
+    companion object {
+        private const val TAG = "RocketChat.MediaCallsAnswerRequest"
+        private val JSON_MEDIA_TYPE = "application/json; charset=utf-8".toMediaType()
+        private val httpClient = OkHttpClient()
+        private val mainHandler = Handler(Looper.getMainLooper())
+
+        @JvmStatic
+        fun fetch(
+            context: android.content.Context,
+            host: String,
+            callId: String,
+            contractId: String,
+            answer: String,
+            supportedFeatures: List<String>? = null,
+            onResult: (Boolean) -> Unit
+        ) {
+            val request = MediaCallsAnswerRequest(callId, contractId, answer, supportedFeatures)
+            request.execute(context, host, onResult)
+        }
+    }
+
+    /**
+     * Builds the JSON body for the request:
+     * ```json
+     * {
+     *   "callId": "<callId>",
+     *   "contractId": "<contractId>",
+     *   "answer": "<accept|reject>",
+     *   "supportedFeatures": ["audio"]  // only when non-null for accept
+     * }
+     * ```
+     */
+    private fun buildBody(): JSONObject {
+        val json = JSONObject().apply {
+            put("callId", callId)
+            put("contractId", contractId)
+            put("answer", answer)
+        }
+        supportedFeatures?.let { features ->
+            val arr = JSONArray()
+            features.forEach { arr.put(it) }
+            json.put("supportedFeatures", arr)
+        }
+        return json
+    }
+
+    private fun execute(
+        context: android.content.Context,
+        host: String,
+        onResult: (Boolean) -> Unit
+    ) {
+        val ejson = Ejson().apply { this.host = host }
+        val userId = ejson.userId()
+        val token = ejson.token()
+
+        if (userId.isNullOrEmpty() || token.isNullOrEmpty()) {
+            Log.w(TAG, "Missing credentials for $host — cannot send media-call answer")
+            mainHandler.post { onResult(false) }
+            return
+        }
+
+        val serverUrl = host.removeSuffix("/")
+        val url = "$serverUrl/api/v1/media-calls.answer"
+
+        val body = buildBody().toString()
+        val requestBody = body.toRequestBody(JSON_MEDIA_TYPE)
+
+        val request = Request.Builder()
+            .header("x-user-id", userId)
+            .header("x-auth-token", token)
+            .url(url)
+            .post(requestBody)
+            .build()
+
+        httpClient.newCall(request).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                Log.e(TAG, "MediaCallsAnswerRequest failed for callId=$callId: ${e.message}")
+                mainHandler.post { onResult(false) }
+            }
+
+            override fun onResponse(call: Call, response: okhttp3.Response) {
+                response.use {
+                    val code = it.code
+                    val success = code in 200..299
+                    if (success) {
+                        Log.d(TAG, "MediaCallsAnswerRequest response for callId=$callId: code=$code success=true")
+                    } else {
+                        Log.w(TAG, "MediaCallsAnswerRequest failed callId=$callId code=$code answer=$answer")
+                    }
+                    mainHandler.post { onResult(success) }
+                }
+            }
+        })
+    }
+}