From 158a46a2bcf2affbfb453bef2a1f449cb8549c3c Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Fri, 25 Feb 2022 09:04:34 +0200
Subject: [PATCH] Use lowercase contact mode values

---
 app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt  | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt  | 8 ++++----
 app/src/main/kotlin/com/tutpro/baresip/Contact.kt         | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 47e2b99d..d74c9756 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -363,7 +363,7 @@ class BaresipService: Service() {
                     File(filesDir, "history").renameTo(File(filesDir, "calls"))
 
 
-                if (contactsMode != "Android")
+                if (contactsMode != "android")
                     Contact.restoreBaresipContacts()
                 if (contactsMode != "baresip") {
                     Contact.loadAndroidContacts(applicationContext)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
index f0cdec98..e61d9b2c 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
@@ -300,11 +300,11 @@ class ConfigActivity : AppCompatActivity() {
         darkTheme.isChecked = oldDisplayTheme == AppCompatDelegate.MODE_NIGHT_YES
 
         contactsSpinner = binding.contactsSpinner
-        contactsModeKeys = arrayListOf("baresip", "Android", "Both")
+        contactsModeKeys = arrayListOf("baresip", "android", "both")
         val contactsModeVals = arrayListOf(getString(R.string.baresip), getString(R.string.android),
                 getString(R.string.both))
         val ctCv = Config.variable("contacts_mode")
-        oldContactsMode = if (ctCv.size == 0) "baresip" else ctCv[0]
+        oldContactsMode = if (ctCv.size == 0) "baresip" else ctCv[0].lowercase()
         contactsMode = oldContactsMode
         val keyIndex = contactsModeKeys.indexOf(oldContactsMode)
         val keyValue = contactsModeVals.elementAt(keyIndex)
@@ -518,12 +518,12 @@ class ConfigActivity : AppCompatActivity() {
                             Contact.restoreBaresipContacts()
                             baresipService.action = "Stop Content Observer"
                         }
-                        "Android" -> {
+                        "android" -> {
                             BaresipService.baresipContacts.clear()
                             Contact.loadAndroidContacts(this)
                             baresipService.action = "Start Content Observer"
                         }
-                        "Both" -> {
+                        "both" -> {
                             Contact.restoreBaresipContacts()
                             Contact.loadAndroidContacts(this)
                             baresipService.action = "Start Content Observer"
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
index f7d17011..59e13dae 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Contact.kt
@@ -195,7 +195,7 @@ sealed class Contact {
 
         fun contactsUpdate() {
             BaresipService.contacts.clear()
-            if (BaresipService.contactsMode != "Android")
+            if (BaresipService.contactsMode != "android")
                 BaresipService.contacts.addAll(BaresipService.baresipContacts)
             if (BaresipService.contactsMode != "baresip")
                 addAndroidContacts()
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
index 255de66a..219009d4 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
@@ -80,7 +80,7 @@ class ContactActivity : AppCompatActivity() {
             else
                 uriView.setText(uri)
             uOrI = uri
-            if ((BaresipService.contactsMode == "Android")) {
+            if ((BaresipService.contactsMode == "android")) {
                 androidCheck.isChecked = true
                 androidCheck.isClickable = false
             } else {