Merge branch 'phone_app'

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools" >
 
     <uses-permission android:name="android.permission.BLUETOOTH"
         android:maxSdkVersion="30" />
@@ -15,8 +15,7 @@
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
-    <uses-permission
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28"
         tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -44,6 +43,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:remove="android:appComponentFactory" >
+
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -55,6 +55,11 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL" />
+                <action android:name="android.intent.action.CALL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.DIAL" />
@@ -63,26 +68,29 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="tel" />
                 <data android:scheme="sip" />
-                <data android:scheme="sips" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".AccountsActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/accounts"
             android:parentActivityName=".MainActivity" >
         </activity>
+
         <activity
             android:name=".AccountActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/account" >
         </activity>
+
         <activity
             android:name=".CodecsActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/codecs"
             android:parentActivityName=".AccountActivity" >
         </activity>
+
         <activity
             android:name=".ContactsActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -90,59 +98,69 @@
             android:parentActivityName=".MainActivity"
             android:windowSoftInputMode="adjustPan" >
         </activity>
+
         <activity
             android:name=".ContactActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/contact"
             android:parentActivityName=".ContactsActivity" >
         </activity>
+
         <activity
             android:name=".AndroidContactActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/contact"
             android:parentActivityName=".ContactsActivity" >
         </activity>
+
         <activity
             android:name=".ConfigActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/configuration"
             android:parentActivityName=".MainActivity" >
         </activity>
+
         <activity
             android:name=".AudioActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/audio_settings"
             android:parentActivityName=".ConfigActivity" >
         </activity>
+
         <activity
             android:name=".CallsActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/call_history"
             android:parentActivityName=".MainActivity" >
         </activity>
+
         <activity
             android:name=".CallDetailsActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/call_details"
             android:parentActivityName=".CallsActivity" >
         </activity>
+
         <activity
             android:name=".ChatsActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/chats"
             android:parentActivityName=".MainActivity" >
         </activity>
+
         <activity
             android:name=".ChatActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/chat" >
         </activity>
+
         <activity
             android:name=".AboutActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/about_title"
             android:parentActivityName=".MainActivity" >
         </activity>
+
         <service
             android:name=".BaresipService"
             android:enabled="true"
@@ -150,6 +168,23 @@
             android:permission="android.permission.FOREGROUND_SERVICE"
             android:stopWithTask="false" >
         </service>
+
+        <service
+            android:name=".InCallService"
+            android:enabled="true"
+            android:exported="true"
+            android:permission="android.permission.BIND_INCALL_SERVICE" >
+            <meta-data
+                android:name="android.telecom.IN_CALL_SERVICE_UI"
+                android:value="true" />
+            <meta-data
+                android:name="android.telecom.IN_CALL_SERVICE_CAR_MODE_UI"
+                android:value="false" />
+            <intent-filter>
+                <action android:name="android.telecom.InCallService" />
+            </intent-filter>
+        </service>
+
         <receiver
             android:name=".BootCompletedReceiver"
             android:enabled="true"
@@ -160,11 +195,12 @@
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
+
         <receiver
             android:name=".TaskReceiver"
             android:enabled="true"
             android:exported="true"
-            tools:ignore="ExportedReceiver">
+            tools:ignore="ExportedReceiver" >
             <intent-filter>
                 <action android:name="com.tutpro.baresip.REGISTER" />
                 <action android:name="com.tutpro.baresip.UNREGISTER" />
@@ -173,4 +209,4 @@
         </receiver>
     </application>
 
-</manifest>
+</manifest>

app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt

@@ -2,6 +2,7 @@ package com.tutpro.baresip
 
 import android.Manifest
 import android.app.Activity
+import android.app.role.RoleManager
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
@@ -21,6 +22,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.transition.Visibility
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.tutpro.baresip.Utils.copyInputStreamToFile
@@ -36,7 +38,6 @@ class ConfigActivity : AppCompatActivity() {
     private lateinit var layout: ScrollView
     private lateinit var baresipService: Intent
     private lateinit var autoStart: CheckBox
-    private lateinit var batteryOptimizations: CheckBox
     private lateinit var listenAddr: EditText
     private lateinit var netAfSpinner: Spinner
     private lateinit var netAf: String
@@ -49,6 +50,8 @@ class ConfigActivity : AppCompatActivity() {
     private lateinit var contactsSpinner: Spinner
     private lateinit var contactsMode: String
     private lateinit var contactsModeKeys: ArrayList<String>
+    private lateinit var batteryOptimizations: CheckBox
+    private lateinit var defaultDialer: CheckBox
     private lateinit var debug: CheckBox
     private lateinit var sipTrace: CheckBox
     private lateinit var reset: CheckBox
@@ -74,6 +77,7 @@ class ConfigActivity : AppCompatActivity() {
             goBack()
         }
     }
+
     override fun onCreate(savedInstanceState: Bundle?) {
 
         super.onCreate(savedInstanceState)
@@ -109,6 +113,37 @@ class ConfigActivity : AppCompatActivity() {
             }
         }
 
+        if (Build.VERSION.SDK_INT >= 29) {
+            val roleManager = getSystemService(ROLE_SERVICE) as RoleManager
+            defaultDialer = binding.DefaultPhoneApp
+            defaultDialer.isChecked = roleManager.isRoleHeld(RoleManager.ROLE_DIALER)
+            val dialerRoleRequest = registerForActivityResult(
+                    ActivityResultContracts.StartActivityForResult()
+            ) {
+                Log.d(TAG, "dialerRoleRequest succeeded: ${it.resultCode == Activity.RESULT_OK}")
+                defaultDialer.isChecked = roleManager.isRoleHeld(RoleManager.ROLE_DIALER)
+            }
+            defaultDialer.setOnCheckedChangeListener { _, isChecked ->
+                if (isChecked) {
+                    if (!roleManager.isRoleAvailable(RoleManager.ROLE_DIALER))
+                        Utils.alertView(this, getString(R.string.notice),
+                                getString(R.string.dialer_role_not_available))
+                    else
+                        if (!roleManager.isRoleHeld(RoleManager.ROLE_DIALER))
+                            dialerRoleRequest.launch(roleManager.createRequestRoleIntent(RoleManager.ROLE_DIALER))
+                } else {
+                    try {
+                        dialerRoleRequest.launch(Intent("android.settings.MANAGE_DEFAULT_APPS_SETTINGS"))
+                    } catch (e: ActivityNotFoundException) {
+                        Log.e(TAG, "ActivityNotFound exception: $e")
+
+                    }
+                }
+            }
+        } else {
+            binding.PhoneApp.visibility = View.GONE
+        }
+
         listenAddr = binding.ListenAddress
         val laCv = Config.variable("sip_listen")
         oldListenAddr = if (laCv.size == 0) "" else laCv[0]
@@ -642,10 +677,6 @@ class ConfigActivity : AppCompatActivity() {
             Utils.alertView(this, getString(R.string.start_automatically),
                     getString(R.string.start_automatically_help))
         }
-        binding.BatteryOptimizationsTitle.setOnClickListener {
-            Utils.alertView(this, getString(R.string.battery_optimizations),
-                getString(R.string.battery_optimizations_help))
-        }
         binding.ListenAddressTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.listen_address),
                     getString(R.string.listen_address_help))
@@ -681,6 +712,14 @@ class ConfigActivity : AppCompatActivity() {
             Utils.alertView(this, getString(R.string.contacts),
                     getString(R.string.contacts_help))
         }
+        binding.BatteryOptimizationsTitle.setOnClickListener {
+            Utils.alertView(this, getString(R.string.battery_optimizations),
+                    getString(R.string.battery_optimizations_help))
+        }
+        binding.DefaultPhoneAppTitle.setOnClickListener {
+            Utils.alertView(this, getString(R.string.default_phone_app),
+                    getString(R.string.default_phone_app_help))
+        }
         binding.DebugTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.debug), getString(R.string.debug_help))
         }

app/src/main/kotlin/com/tutpro/baresip/InCallService.kt

@@ -0,0 +1,14 @@
+package com.tutpro.baresip
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+
+// This is needed in order to allow choosing baresip as default Phone app
+
+class InCallService : Service() {
+
+    override fun onBind(intent: Intent): IBinder {
+        TODO("Return the communication channel to the service.")
+    }
+}

app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt

@@ -9,6 +9,7 @@ import android.app.NotificationManager
 import android.content.*
 import android.content.Intent.ACTION_CALL
 import android.content.Intent.ACTION_DIAL
+import android.content.Intent.ACTION_VIEW
 import android.content.pm.PackageManager
 import android.content.res.Configuration.ORIENTATION_PORTRAIT
 import android.media.AudioManager
@@ -37,7 +38,6 @@ import com.google.android.material.snackbar.Snackbar
 import com.tutpro.baresip.Utils.showSnackBar
 import com.tutpro.baresip.databinding.ActivityMainBinding
 import java.io.File
-import java.net.URLDecoder
 import kotlin.system.exitProcess
 
 class MainActivity : AppCompatActivity() {
@@ -653,11 +653,13 @@ class MainActivity : AppCompatActivity() {
 
         atStartup = intent.hasExtra("onStartup")
 
-        if (intent?.action == ACTION_CALL || intent?.action == ACTION_DIAL) {
+        when (intent?.action) {
-            if (BaresipService.isServiceRunning)
+            ACTION_DIAL, ACTION_CALL, ACTION_VIEW ->
-                callAction(intent)
+                if (BaresipService.isServiceRunning)
-            else
+                    callAction(intent.data, if (intent?.action == ACTION_CALL) "call" else "dial")
-                BaresipService.callActionUri = URLDecoder.decode(intent.data.toString(), "UTF-8")
+                else
+                    BaresipService.callActionUri = intent.data.toString()
+                            .replace("tel:%2B", "tel:+")
         }
 
         permissions = if (Build.VERSION.SDK_INT >= 33)
@@ -756,6 +758,9 @@ class MainActivity : AppCompatActivity() {
                 callUri.setText(BaresipService.uas[aorSpinner.selectedItemPosition].account.resumeUri)
                 callButton.performClick()
             }
+            "dial" -> {
+                callUri.setText(BaresipService.uas[aorSpinner.selectedItemPosition].account.resumeUri)
+            }
             "call transfer", "transfer show", "transfer accept" ->
                 handleServiceEvent("$resumeAction,$resumeUri",
                     arrayListOf(resumeCall!!.ua.uap, resumeCall!!.callp))
@@ -824,11 +829,11 @@ class MainActivity : AppCompatActivity() {
         resumeAction = ""
         resumeUri = ""
 
-        Log.d(TAG, "onNewIntent with intent.action '${intent.action}'")
+        Log.d(TAG, "onNewIntent with action/data '${intent.action}/${intent.data}'")
 
         when (intent.action) {
-            ACTION_DIAL, ACTION_CALL -> {
+            ACTION_DIAL, ACTION_CALL, ACTION_VIEW -> {
-                callAction(intent)
+                callAction(intent.data, if (intent.action == ACTION_CALL) "call" else "dial")
             }
             else -> {
                 val action = intent.getStringExtra("action")
@@ -840,15 +845,14 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun callAction(intent: Intent) {
+    private fun callAction(uri: Uri?, action: String) {
         if (Call.inCall() || BaresipService.uas.size == 0)
             return
-        val uri: Uri? = intent.data
+        Log.d(TAG, "Action $action to $uri")
-        Log.d(TAG, "callAction to $uri")
         if (uri != null) {
             when (uri.scheme) {
                 "sip" -> {
-                    val uriStr = URLDecoder.decode(uri.toString(), "UTF-8")
+                    val uriStr = uri.toString()
                     var ua = UserAgent.ofDomain(Utils.uriHostPart(uriStr))
                     if (ua == null && BaresipService.uas.size > 0)
                         ua = BaresipService.uas[0]
@@ -857,11 +861,11 @@ class MainActivity : AppCompatActivity() {
                         return
                     }
                     spinToAor(ua.account.aor)
-                    resumeAction = "call"
+                    resumeAction = action
                     ua.account.resumeUri = uriStr
                 }
                 "tel" -> {
-                    val uriStr = URLDecoder.decode(uri.toString(), "UTF-8")
+                    val uriStr = uri.toString().replace("%2B", "+")
                             .filterNot{setOf('-', ' ', '(', ')').contains(it)}
                     var account: Account? = null
                     for (a in Account.accounts())
@@ -874,7 +878,7 @@ class MainActivity : AppCompatActivity() {
                         return
                     }
                     spinToAor(account.aor)
-                    resumeAction = "call"
+                    resumeAction = action
                     account.resumeUri = uriStr
                 }
                 else -> {
@@ -897,7 +901,7 @@ class MainActivity : AppCompatActivity() {
                     getString(R.string.no_network))
                 return
             }
-            "call" -> {
+            "call", "dial" -> {
                 if (Call.inCall()) {
                     Toast.makeText(applicationContext, getString(R.string.call_already_active),
                             Toast.LENGTH_SHORT).show()
@@ -957,7 +961,7 @@ class MainActivity : AppCompatActivity() {
                 val uap = intent.getLongExtra("uap", 0L)
                 val ua = UserAgent.ofUap(uap)
                 if (ua == null) {
-                    Log.w(TAG, "onNewIntent did not find ua $uap")
+                    Log.w(TAG, "handleIntent did not find ua $uap")
                     return
                 }
                 if (ua.account.aor != aorSpinner.tag)
@@ -1005,27 +1009,16 @@ class MainActivity : AppCompatActivity() {
         }
 
         if (event == "started") {
-            val callActionUri = params[0] as String
+            val uriString = params[0] as String
-            Log.d(TAG, "Handling service event 'started' with '$callActionUri'")
+            Log.d(TAG, "Handling service event 'started' with URI '$uriString'")
             if (!this::uaAdapter.isInitialized) {
                 // Android has restarted baresip when permission has been denied in app settings
                 recreate()
                 return
             }
             uaAdapter.notifyDataSetChanged()
-            if (callActionUri != "") {
+            if (uriString != "") {
-                var ua = UserAgent.ofDomain(Utils.uriHostPart(callActionUri))
+                callAction(uriString.toUri(), "dial")
-                if (ua == null)
-                    if (BaresipService.uas.size > 0) {
-                        ua = BaresipService.uas[0]
-                    } else {
-                        handleNextEvent("No UAs to make the call to '$callActionUri'")
-                        return
-                    }
-                spinToAor(ua.account.aor)
-                ua.account.resumeUri = callActionUri
-                callUri.setText(callActionUri)
-                callButton.performClick()
             } else {
                 if ((aorSpinner.selectedItemPosition == -1) && (BaresipService.uas.size > 0)) {
                     aorSpinner.setSelection(0)

app/src/main/res/layout/activity_config.xml

@@ -41,33 +41,6 @@
             </CheckBox>
         </RelativeLayout>
 
-        <RelativeLayout
-            android:id="@+id/Battery"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
-            android:orientation="horizontal" >
-            <TextView
-                android:id="@+id/BatteryOptimizationsTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:layout_toStartOf="@id/BatteryOptimizations"
-                android:textSize="18sp"
-                android:text="@string/battery_optimizations" >
-            </TextView>
-            <CheckBox
-                android:id="@+id/BatteryOptimizations"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:layout_gravity="end"
-                android:checked="false" >
-            </CheckBox>
-        </RelativeLayout>
-
         <TextView
             android:id="@+id/ListenAddressTitle"
             android:layout_width="wrap_content"
@@ -254,6 +227,60 @@
             android:paddingTop="8dp" >
         </Spinner>
 
+        <RelativeLayout
+            android:id="@+id/Battery"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            android:orientation="horizontal" >
+            <TextView
+                android:id="@+id/BatteryOptimizationsTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_toStartOf="@id/BatteryOptimizations"
+                android:textSize="18sp"
+                android:text="@string/battery_optimizations" >
+            </TextView>
+            <CheckBox
+                android:id="@+id/BatteryOptimizations"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="end"
+                android:checked="false" >
+            </CheckBox>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/PhoneApp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="12dp"
+            android:orientation="horizontal" >
+            <TextView
+                android:id="@+id/DefaultPhoneAppTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_toStartOf="@id/DefaultPhoneApp"
+                android:textSize="18sp"
+                android:text="@string/default_phone_app" >
+            </TextView>
+            <CheckBox
+                android:id="@+id/DefaultPhoneApp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:layout_gravity="end"
+                android:checked="false" >
+            </CheckBox>
+        </RelativeLayout>
+
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

app/src/main/res/values-fi/strings.xml

@@ -310,6 +310,10 @@
     <string name="battery_optimizations_help">Ota akun käytön optimointi pois päältä (suositeltu),
         jos haluat vähentää todennäköisyyttä, että Android rajoittaa baresip-sovelluksen toimintaa
         ja pääsyä verkkoon.</string>
+    <string name="default_phone_app">Oletuspuhelinsovellus</string>
+    <string name="dialer_role_not_available">Puhelinrooli ei ole saatavana</string>
+    <string name="default_phone_app_help">Jos merkity, baresip on oletuspuhelinsovellus.  Älä
+        merkitse, jos laitteesi täytyy hallita myös muita kuin SIP-puheluita tai -viestejä.</string>
     <string name="listen_address">Kuunteluosoite</string>
     <string name="listen_address_help">IP-osoite ja portti muotoa
     \'osoite:portti\', missä baresip kuuntelee sisään tulevia

app/src/main/res/values/strings.xml

@@ -297,6 +297,10 @@
     <string name="battery_optimizations_help">Disable battery optimizations (recommended) if you want
         to reduce likelihood that Android restricts baresip\'s access to network or enters baresip
         to standby state.</string>
+    <string name="default_phone_app">Default Phone App</string>
+    <string name="dialer_role_not_available">Dialer role is not available</string>
+    <string name="default_phone_app_help">If checked, baresip is the default phone app.  Do not check
+        if your device may need to handle also other that SIP calls or messages.</string>
     <string name="listen_address">Listen Address</string>
     <string name="listen_address_help">IP address and port of form \'address:port\' at which baresip listens
         for incoming SIP requests.  If IP address is an IPv6 address, it must be written inside