From 7b86a0565b46d901e5dad0097a14568baa8d90b1 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 30 Jun 2026 15:41:03 +0300
Subject: [PATCH] Fixed mobile account status detection after resume

---
 .../kotlin/com/tutpro/baresip/BaresipService.kt   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 307c41a4..fdfba55b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -2265,10 +2265,13 @@ class BaresipService: Service() {
         val mobileAor = "sip:mobile@pstn"
 
         val isAirplaneModeOn = Utils.isAirplaneModeOn(this)
-        val status = if (mobileAccountHandle == null || isAirplaneModeOn || !isSimReady())
+        val isSimReady = isSimReady()
+        val status = if (mobileAccountHandle == null || !isSimReady)
             R.drawable.circle_white
         else if (existingMobileUa?.status == circleGreen.getValue(colorblind))
             circleGreen.getValue(colorblind)
+        else if (isAirplaneModeOn)
+            R.drawable.circle_white
         else
             circleRed.getValue(colorblind)
 
@@ -2312,9 +2315,13 @@ class BaresipService: Service() {
     private fun updateMobileStatus(newStatus: Int? = null) {
         uas.value.find { it.account.isMobile }?.let { ua ->
             val isAirplaneModeOn = Utils.isAirplaneModeOn(this)
-            val status = newStatus ?: if (isAirplaneModeOn || !isSimReady()) {
+            val isSimReady = isSimReady()
+            val status = newStatus ?: if (!isSimReady)
+                R.drawable.circle_white
+            else if (ua.status == circleGreen.getValue(colorblind))
+                ua.status
+            else if (isAirplaneModeOn)
                 R.drawable.circle_white
-            }
             else if (ua.status == R.drawable.circle_white)
                 // Show "Red" (not yet in service)
                 circleRed.getValue(colorblind)
@@ -2337,7 +2344,7 @@ class BaresipService: Service() {
         val isSimReady = isSimReady()
         val status = if (state == ServiceState.STATE_IN_SERVICE && isSimReady)
             circleGreen.getValue(colorblind)
-        else if (isAirplaneModeOn || !isSimReady())
+        else if (isAirplaneModeOn || !isSimReady)
             R.drawable.circle_white
         else
             circleRed.getValue(colorblind)