From e73be20160f241307a56b0597b7c0517f54e0a3c Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Fri, 14 Jan 2022 09:57:57 +0200
Subject: [PATCH] Simplified screen lock handling

---
 .../com/tutpro/baresip/BaresipService.kt       | 18 +++++-------------
 .../kotlin/com/tutpro/baresip/MainActivity.kt  |  6 +-----
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 1a9add3b..eed0b898 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -213,19 +213,11 @@ class BaresipService: Service() {
 
         screenReceiver = object : BroadcastReceiver() {
             override fun onReceive(contxt: Context, intent: Intent) {
-                when (intent.action) {
-                    Intent.ACTION_SCREEN_ON ->
-                        if (kgm.isKeyguardLocked) {
-                            Log.d(TAG, "Screen on LOCKED")
-                            if (Utils.isVisible()) {
-                                val i = Intent("screen event")
-                                i.putExtra("event", Intent.ACTION_SCREEN_ON)
-                                LocalBroadcastManager.getInstance(this@BaresipService)
-                                        .sendBroadcast(i)
-                            }
-                        } else {
-                            Log.d(TAG, "Screen on UNLOCKED")
-                        }
+                if (kgm.isKeyguardLocked) {
+                    Log.d(TAG, "Screen on when locked")
+                    val i = Intent("screen event")
+                    i.putExtra("event", Intent.ACTION_SCREEN_ON)
+                    LocalBroadcastManager.getInstance(this@BaresipService).sendBroadcast(i)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index fa414c0f..b7eebc8a 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -170,11 +170,7 @@ class MainActivity : AppCompatActivity() {
 
         screenEventReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context, intent: Intent) {
-                val event = intent.getStringExtra("event")!!
-                if (event == Intent.ACTION_SCREEN_ON && Call.calls().size == 0) {
-                    Log.d(TAG, "setShowWhenLocked == false")
-                    Utils.setShowWhenLocked(this@MainActivity, false)
-                }
+                Utils.setShowWhenLocked(this@MainActivity, Call.calls().size > 0)
             }
         }