From 11c33bb1b017c0bb7ab19a8fc22f77ad072e1c36 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 11 Dec 2023 16:53:12 +0100
Subject: [PATCH] Fixed proximity sensor not turning screen off during outgoing
 call

---
 .../chat/adapters/ChatMessagesListAdapter.kt  | 24 ++++++++++++++-----
 .../voip/viewmodels/ControlsViewModel.kt      | 20 ++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
index f8274f8f7..d922ccd93 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/adapters/ChatMessagesListAdapter.kt
@@ -217,13 +217,17 @@ class ChatMessagesListAdapter(
         previousList: MutableList<EventLogData>,
         currentList: MutableList<EventLogData>
     ) {
-        Log.i("[Chat Messages Adapter] List has changed, clearing previous first unread message position")
+        Log.i(
+            "[Chat Messages Adapter] List has changed, clearing previous first unread message position"
+        )
         // Need to wait for messages to be added before computing new first unread message position
         firstUnreadMessagePosition = -1
     }
 
     override fun displayHeaderForPosition(position: Int): Boolean {
-        Log.i("[Chat Messages Adapter] Unread message count is [$unreadMessagesCount], first unread message position is [$firstUnreadMessagePosition]")
+        Log.i(
+            "[Chat Messages Adapter] Unread message count is [$unreadMessagesCount], first unread message position is [$firstUnreadMessagePosition]"
+        )
         if (unreadMessagesCount > 0 && firstUnreadMessagePosition == -1) {
             computeFirstUnreadMessagePosition()
         }
@@ -255,16 +259,22 @@ class ChatMessagesListAdapter(
         // when new messages are added to the history whilst it is visible
         unreadMessagesCount = if (itemCount == 0 || forceUpdate) count else 0
         firstUnreadMessagePosition = -1
-        Log.i("[Chat Messages Adapter] Set [$unreadMessagesCount] unread message(s) for current chat room")
+        Log.i(
+            "[Chat Messages Adapter] Set [$unreadMessagesCount] unread message(s) for current chat room"
+        )
     }
 
     fun getFirstUnreadMessagePosition(): Int {
-        Log.i("[Chat Messages Adapter] First unread message position is [$firstUnreadMessagePosition]")
+        Log.i(
+            "[Chat Messages Adapter] First unread message position is [$firstUnreadMessagePosition]"
+        )
         return firstUnreadMessagePosition
     }
 
     private fun computeFirstUnreadMessagePosition() {
-        Log.i("[Chat Messages Adapter] [$unreadMessagesCount] unread message(s) for current chat room")
+        Log.i(
+            "[Chat Messages Adapter] [$unreadMessagesCount] unread message(s) for current chat room"
+        )
         if (unreadMessagesCount > 0) {
             Log.i("[Chat Messages Adapter] Computing first unread message position")
             var messageCount = 0
@@ -275,7 +285,9 @@ class ChatMessagesListAdapter(
                     messageCount += 1
                     if (messageCount == unreadMessagesCount) {
                         firstUnreadMessagePosition = position
-                        Log.i("[Chat Messages Adapter] First unread message position found [$firstUnreadMessagePosition]")
+                        Log.i(
+                            "[Chat Messages Adapter] First unread message position found [$firstUnreadMessagePosition]"
+                        )
                         break
                     }
                 }
diff --git a/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt b/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
index 9b275658f..ce8a1bf25 100644
--- a/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/voip/viewmodels/ControlsViewModel.kt
@@ -130,6 +130,7 @@ class ControlsViewModel : ViewModel() {
                     fullScreenMode.value = false
                 }
                 isVideoUpdateInProgress.value = false
+                proximitySensorEnabled.value = shouldProximitySensorBeEnabled()
             } else if (state == Call.State.PausedByRemote) {
                 fullScreenMode.value = false
             }
@@ -550,6 +551,25 @@ class ControlsViewModel : ViewModel() {
     }
 
     private fun shouldProximitySensorBeEnabled(): Boolean {
+        val currentCall = coreContext.core.currentCall ?: coreContext.core.calls.firstOrNull()
+        if (currentCall != null) {
+            when (val state = currentCall.state) {
+                Call.State.OutgoingEarlyMedia, Call.State.OutgoingProgress, Call.State.OutgoingRinging, Call.State.OutgoingInit -> {
+                    Log.i(
+                        "[Call Controls] Call is in outgoing state [$state], enabling proximity sensor"
+                    )
+                    return true
+                }
+                Call.State.IncomingEarlyMedia, Call.State.IncomingReceived -> {
+                    Log.i(
+                        "[Call Controls] Call is in incoming state [$state], enabling proximity sensor"
+                    )
+                    return true
+                }
+                else -> { }
+            }
+        }
+
         if (forceDisableProximitySensor.value == true) {
             Log.i(
                 "[Call Controls] Forcing proximity sensor to be disabled (usually in incoming/outgoing call fragments)"