From 293c7ec0f09c8c4139b06f108c92a576fee7b11c Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Wed, 19 Feb 2020 23:59:17 +0200
Subject: [PATCH] - Use white colored status symbol if account's registration
 has not been activated. - Added info about accounts' status symbols to About
 page.

---
 app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt  | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt   | 7 +++++--
 app/src/main/res/values-fi/strings.xml                     | 3 +++
 app/src/main/res/values/strings.xml                        | 3 +++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index 00474d20..9ae9154b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -298,7 +298,7 @@ class AccountActivity : AppCompatActivity() {
                 } else {
                     if (acc.regint != 0) {
                         Api.ua_unregister(ua.uap)
-                        UserAgent.updateStatus(ua, R.drawable.dot_yellow)
+                        UserAgent.updateStatus(ua, R.drawable.dot_white)
                         newRegint = 0
                     }
                 }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
index 91edc7c7..bee2976b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
@@ -51,7 +51,7 @@ class AccountsActivity : AppCompatActivity() {
                     newAorView.setText("")
                     newAorView.hint = getString(R.string.user_domain)
                     newAorView.clearFocus()
-                    UserAgent.add(ua, R.drawable.dot_yellow)
+                    UserAgent.add(ua, R.drawable.dot_white)
                     generateAccounts()
                     alAdapter.notifyDataSetChanged()
                     saveAccounts()
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 83fe42c2..6891fa7e 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -464,7 +464,10 @@ class BaresipService: Service() {
             status.add(R.drawable.dot_green)
         } else {
             Log.d(LOG_TAG, "Ua ${ua.account.aor} is NOT registered")
-            status.add(R.drawable.dot_yellow)
+            if (ua.account.regint == 0)
+                status.add(R.drawable.dot_white)
+            else
+                status.add(R.drawable.dot_yellow)
         }
         val intent = Intent("service event")
         intent.putExtra("event", "ua added")
@@ -494,7 +497,7 @@ class BaresipService: Service() {
                     }
                     "registered" -> {
                         if (ua.account.regint == 0)
-                            status[account_index] = R.drawable.dot_yellow
+                            status[account_index] = R.drawable.dot_white
                         else
                             status[account_index] = R.drawable.dot_green
                         ua.registrationFailed = false
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 833f6a98..70ba7066 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -11,6 +11,9 @@
         <ul>
         <li>Tarkista, että Asetukset vastaavat tarpeitasi. Kunkin otsikon kosketus tarjoaa apua.</li>
         <li>Sen jälkeen luo yksi tai useampi tili. Jälleen kunkin otsikon kosketus tarjoaa apua.</li>
+        <li>Tilin rekisteröintitila kerrotaan värillisellä pisteellä: vihreä (rekisteröinti onnistui),
+            keltainen (rekisteröinti on meneillään), punainen (rekisteröinti epäonnistui), valkoinen
+            (rekisteröintiä ei ole aktivoitu).</li>
         <li>Voit lisätä puheluiden ja viestien kohteet kontakteihin pitkällä kosketuksella.</li>
         <li>Pitkillä kosketuksilla voi myös poistaa puheluita, viestiketjuja, viestejä ja kontakteja.</li>
         <li>Voit lisätä/poistaa kontaktin avatar-kuvan koskettamalla kontaktin ikonia lyhyesti/pitkästi.</li>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 949d262a..a1016e4b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,9 @@
         <ul>
             <li>Check that Settings default values meet your needs (touch item titles for help).</li>
             <li>Then create one or more accounts (again touch item titles for help).</li>
+            <li>Registration status of an account is shown with a colored dot:  green (registration
+            succeeded, yellow (registration is in progress), red (registration failed), white (registration
+            has not been activated).</li>
             <li>Peers of calls and messages can be added to contacts by long touches.</li>
             <li>Long touches can also be used to remove calls, chats, messages, and contacts.</li>
             <li>Touch/long touch of contact icon can be used to install/remove image avatar.</li>