From 3f7e48cf6fec2313faadcb49d43d486bbaf5fb02 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Fri, 1 Jan 2021 18:01:11 +0200
Subject: [PATCH] Improved incoming call notification

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../com/tutpro/baresip/BaresipService.kt      | 47 ++++++++++++++-----
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b3305793..be0ded5d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 
     <uses-feature
         android:name="android.hardware.telephony"
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 8037d168..d3f3af20 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -11,15 +11,21 @@ import android.media.*
 import android.net.*
 import android.net.wifi.WifiManager
 import android.os.*
-import androidx.annotation.Keep
-import androidx.core.app.NotificationCompat
-import android.view.View
-import android.widget.RemoteViews
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import androidx.core.content.ContextCompat
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import android.provider.Settings
 import android.telephony.TelephonyManager
-
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import android.view.View
+import android.widget.RemoteViews
+import androidx.annotation.ColorRes
+import androidx.annotation.Keep
+import androidx.annotation.StringRes
+import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import java.io.File
 import java.net.InetAddress
 import java.nio.charset.StandardCharsets
@@ -151,7 +157,7 @@ class BaresipService: Service() {
                     }
                     BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED -> {
                         val state = intent.getIntExtra(BluetoothHeadset.EXTRA_STATE,
-                            BluetoothHeadset.STATE_AUDIO_DISCONNECTED)
+                                BluetoothHeadset.STATE_AUDIO_DISCONNECTED)
                         when (state) {
                             BluetoothHeadset.STATE_AUDIO_CONNECTED -> {
                                 Log.d(LOG_TAG, "Bluetooth headset audio is connected")
@@ -255,8 +261,9 @@ class BaresipService: Service() {
                 val dnsServers = Utils.findDnsServers(BaresipService.dnsServers)
                 if ((ipV4Addr == "") && (ipV6Addr == ""))
                     Log.w(LOG_TAG, "Starting baresip without IP addresses")
-                Thread(Runnable { baresipStart(filesPath, ipV4Addr, ipV6Addr, "",
-                        dnsServers, Api.AF_UNSPEC, logLevel)
+                Thread(Runnable {
+                    baresipStart(filesPath, ipV4Addr, ipV6Addr, "",
+                            dnsServers, Api.AF_UNSPEC, logLevel)
                 }).start()
 
                 isServiceRunning = true
@@ -564,6 +571,8 @@ class BaresipService: Service() {
                                     .setOngoing(true)
                                     .setContentTitle(getString(R.string.incoming_call_from))
                                     .setContentText(caller)
+                                    .setShowWhen(true)
+                                    .setFullScreenIntent(pi, true)
                             if (Build.VERSION.SDK_INT < 26) {
                                 nb.setVibrate(LongArray(0))
                                         .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
@@ -579,8 +588,12 @@ class BaresipService: Service() {
                             rejectIntent.putExtra("callp", callp)
                             val rejectPendingIntent = PendingIntent.getService(this,
                                     REJECT_REQ_CODE, rejectIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-                            nb.addAction(R.drawable.ic_stat, getString(R.string.answer), answerPendingIntent)
-                            nb.addAction(R.drawable.ic_stat, getString(R.string.reject), rejectPendingIntent)
+                            nb.addAction(R.drawable.ic_stat,
+                                    getActionText(R.string.answer, R.color.colorGreen),
+                                    answerPendingIntent)
+                            nb.addAction(R.drawable.ic_stat,
+                                    getActionText(R.string.reject, R.color.colorRed),
+                                    rejectPendingIntent)
                             nm.notify(CALL_NOTIFICATION_ID, nb.build())
                             return
                         }
@@ -904,7 +917,15 @@ class BaresipService: Service() {
         nm.notify(STATUS_NOTIFICATION_ID, snb.build())
     }
 
-
+    private fun getActionText(@StringRes stringRes: Int, @ColorRes colorRes: Int): Spannable? {
+        val spannable: Spannable = SpannableString(applicationContext.getText(stringRes))
+        if (VERSION.SDK_INT >= VERSION_CODES.N_MR1) {
+            spannable.setSpan(
+                    ForegroundColorSpan(applicationContext.getColor(colorRes)),
+                    0, spannable.length, 0)
+        }
+        return spannable
+    }
 
     private fun requestAudioFocus(usage: Int) {
         if (audioFocusUsage != -1) {
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aaf8bfd0..6a44c9fa 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,4 +12,5 @@
     <color name="colorBaresip">#0ca1fd</color>
     <color name="colorWhite">#ffffff</color>
     <color name="colorGreen">#01df01</color>
+    <color name="colorRed">#df0101</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0f23a9f9..17336a91 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -186,7 +186,7 @@
     <!-- Baresip Service -->
     <string name="answer">Answer</string>
     <string name="reject">Reject</string>
-    <string name="incoming_call_from">Call from</string>
+    <string name="incoming_call_from">Incoming call from</string>
     <string name="missed_call_from">Missed call from</string>
     <string name="transfer_request_to">Call transfer request to</string>
     <string name="message_from">Message from</string>