From 384e15778ae8700e6b40e627eaa7f63cbe936f48 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sat, 8 Aug 2020 08:16:36 +0300
Subject: [PATCH] Dialpad button related fixes and improvements

---
 .../main/kotlin/com/tutpro/baresip/MainActivity.kt    | 11 +++++++++++
 fastlane/metadata/android/en-US/changelogs/20.0.2.txt |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/20.0.2.txt

diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 0668f6e7..e5c66b95 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -784,6 +784,10 @@ class MainActivity : AppCompatActivity() {
                     }
                     "call closed" -> {
                         if (aor == aorSpinner.tag) {
+                            callUri.inputType = InputType.TYPE_CLASS_TEXT +
+                                    InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+                            dialpadButton.setImageResource(R.drawable.dialpad_off)
+                            dialpadButton.tag = "off"
                             showCall(ua)
                             if (acc.missedCalls)
                                 callsButton.setImageResource(R.drawable.calls_missed)
@@ -1300,6 +1304,7 @@ class MainActivity : AppCompatActivity() {
             rejectButton.visibility = View.INVISIBLE
             holdButton.visibility = View.INVISIBLE
             dtmf.visibility = View.INVISIBLE
+            dialpadButton.isEnabled = true
             infoButton.visibility = View.INVISIBLE
         } else {
             val callsOut = Call.uaCalls(ua, "out")
@@ -1330,6 +1335,7 @@ class MainActivity : AppCompatActivity() {
                     rejectButton.visibility = View.INVISIBLE
                     holdButton.visibility = View.INVISIBLE
                     dtmf.visibility = View.INVISIBLE
+                    dialpadButton.isEnabled = false
                     infoButton.visibility = View.INVISIBLE
                 }
                 "incoming" -> {
@@ -1342,6 +1348,7 @@ class MainActivity : AppCompatActivity() {
                     rejectButton.isEnabled = true
                     holdButton.visibility = View.INVISIBLE
                     dtmf.visibility = View.INVISIBLE
+                    dialpadButton.isEnabled = false
                     infoButton.visibility = View.INVISIBLE
                 }
                 "connected" -> {
@@ -1369,6 +1376,10 @@ class MainActivity : AppCompatActivity() {
                     if (dtmfWatcher != null) dtmf.removeTextChangedListener(dtmfWatcher)
                     dtmfWatcher = call.dtmfWatcher
                     dtmf.addTextChangedListener(dtmfWatcher)
+                    callUri.inputType = InputType.TYPE_CLASS_PHONE
+                    dialpadButton.setImageResource(R.drawable.dialpad_on)
+                    dialpadButton.tag = "on"
+                    dialpadButton.isEnabled = false
                     infoButton.visibility = View.VISIBLE
                     infoButton.isEnabled = true
                 }
diff --git a/fastlane/metadata/android/en-US/changelogs/20.0.2.txt b/fastlane/metadata/android/en-US/changelogs/20.0.2.txt
new file mode 100644
index 00000000..fa8328c2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/20.0.2.txt
@@ -0,0 +1 @@
+- Dialpad button related fixes and improvements.