Merge branch 'fix_android_on_call_decline'

Author: cybex-dev

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Next Release
+
+* Fix: [Android] `call.isOnCall()` returns true when call is declined
+* Fix: [Android] handle reject vs error disconnect cause with message.
+* Logging: [Android] Added error code fallback
+
 ## 0.2.2
 
 * Fix: [Android] Fix cancelling call when app is in background throws [BackgroundServiceStartNotAllowedException](https://developer.android.com/reference/android/app/BackgroundServiceStartNotAllowedException). [Issue #204](https://github.com/cybex-dev/twilio_voice/issues/204)

android/src/main/kotlin/com/twilio/twilio_voice/TwilioVoicePlugin.kt

@@ -1827,7 +1827,11 @@ class TwilioVoicePlugin : FlutterPlugin, MethodCallHandler, EventChannel.StreamH
             }
 
             TVNativeCallEvents.EVENT_CONNECT_FAILURE -> {
-                val code = intent.getIntExtra(CallExceptionExtension.EXTRA_CODE, -1)
+                var code = intent.getIntExtra(CallExceptionExtension.EXTRA_CODE, -1)
+                if(code == -1) {
+                    // Fallback to the old code
+                    code = intent.getIntExtra("code", -1)
+                }
                 val message = intent.getStringExtra(CallExceptionExtension.EXTRA_MESSAGE) ?: run {
                     Log.e(TAG, "No 'EXTRA_MESSAGE' provided or invalid type")
                     return

android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnection.kt

@@ -146,7 +146,17 @@ open class TVCallConnection(
     override fun onConnectFailure(call: Call, callException: CallException) {
         Log.d(TAG, "onConnectFailure: onConnectFailure")
         twilioCall = null
-        [email protected](DisconnectCause(DisconnectCause.ERROR, callException.message))
+        val rejectedErrorCodeList = listOf(
+            31600, // Call invite rejected
+        )
+        val disconnectCauseCode = if (rejectedErrorCodeList.contains(callException.errorCode)) {
+            DisconnectCause.REJECTED
+        } else {
+            DisconnectCause.ERROR
+        }
+        val disconnectCause = DisconnectCause(disconnectCauseCode, callException.message);
+        [email protected](disconnectCause)
+        onDisconnected?.withValue(disconnectCause)
         onEvent?.onChange(TVNativeCallEvents.EVENT_CONNECT_FAILURE, callException.toBundle())
         onCallStateListener?.withValue(call.state)
     }

android/src/main/kotlin/com/twilio/twilio_voice/service/TVConnectionService.kt

@@ -630,6 +630,15 @@ class TVConnectionService : ConnectionService() {
             stopForegroundService()
             stopSelfSafe()
         }
+        val onCallState: CompletionHandler<Call.State> = CompletionHandler { state ->
+            if (state == Call.State.DISCONNECTED) {
+                if (activeConnections.containsKey(callSid)) {
+                    activeConnections.remove(callSid)
+                }
+                stopForegroundService()
+                stopSelfSafe()
+            }
+        }
 
         // Add to local connection cache
         activeConnections[callSid] = connection
@@ -638,6 +647,7 @@ class TVConnectionService : ConnectionService() {
         connection.setOnCallActionListener(onAction)
         connection.setOnCallEventListener(onEvent)
         connection.setOnCallDisconnected(onDisconnect)
+        connection.setOnCallStateListener(onCallState);
     }
 
     /**