From 18f24380f40739e371333ca14eddaf02ca3a4d6e Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 2 May 2023 14:35:16 +0300
Subject: [PATCH] Handle also DIAL action

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../kotlin/com/tutpro/baresip/MainActivity.kt | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2b379e95..176bd86c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,9 +61,9 @@
                 <action android:name="android.intent.action.CALL" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tel" />
                 <data android:scheme="sip" />
                 <data android:scheme="sips" />
-                <data android:scheme="tel" />
             </intent-filter>
         </activity>
         <activity
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 8a8acded..3658fdf9 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -8,6 +8,7 @@ import android.app.KeyguardManager
 import android.app.NotificationManager
 import android.content.*
 import android.content.Intent.ACTION_CALL
+import android.content.Intent.ACTION_DIAL
 import android.content.pm.PackageManager
 import android.content.res.Configuration.ORIENTATION_PORTRAIT
 import android.media.AudioManager
@@ -652,7 +653,7 @@ class MainActivity : AppCompatActivity() {
 
         atStartup = intent.hasExtra("onStartup")
 
-        if (intent?.action == ACTION_CALL) {
+        if (intent?.action == ACTION_CALL || intent?.action == ACTION_DIAL) {
             if (BaresipService.isServiceRunning)
                 callAction(intent)
             else
@@ -823,15 +824,18 @@ class MainActivity : AppCompatActivity() {
         resumeAction = ""
         resumeUri = ""
 
-        if (intent.action == ACTION_CALL) {
-            Log.d(TAG, "onNewIntent $ACTION_CALL ${intent.data}")
-            callAction(intent)
-        } else {
-            val action = intent.getStringExtra("action")
-            Log.d(TAG, "onNewIntent action `$action'")
-            if (action != null) {
-                intent.removeExtra("action")
-                handleIntent(intent, action)
+        Log.d(TAG, "onNewIntent with intent.action '${intent.action}'")
+
+        when (intent.action) {
+            ACTION_DIAL, ACTION_CALL -> {
+                callAction(intent)
+            }
+            else -> {
+                val action = intent.getStringExtra("action")
+                if (action != null) {
+                    intent.removeExtra("action")
+                    handleIntent(intent, action)
+                }
             }
         }
     }
@@ -840,6 +844,7 @@ class MainActivity : AppCompatActivity() {
         if (Call.inCall() || BaresipService.uas.size == 0)
             return
         val uri: Uri? = intent.data
+        Log.d(TAG, "callAction to $uri")
         if (uri != null) {
             when (uri.scheme) {
                 "sip" -> {