From 61d2fdbe105950f812f63652bce4b29ced89fe8b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 15 Jun 2021 16:06:05 +0200
Subject: [PATCH] Fixed UI issue when pausing call

---
 .../linphone/activities/call/viewmodels/CallsViewModel.kt  | 4 ++++
 app/src/main/res/layout-land/call_controls_fragment.xml    | 7 +++----
 app/src/main/res/layout/call_controls_fragment.xml         | 7 +++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt
index 217829ef9..463559189 100644
--- a/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/call/viewmodels/CallsViewModel.kt
@@ -30,6 +30,8 @@ import org.linphone.utils.PermissionHelper
 class CallsViewModel : ViewModel() {
     val currentCallViewModel = MutableLiveData<CallViewModel>()
 
+    val noActiveCall = MutableLiveData<Boolean>()
+
     val callPausedByRemote = MutableLiveData<Boolean>()
 
     val pausedCalls = MutableLiveData<ArrayList<CallViewModel>>()
@@ -52,6 +54,7 @@ class CallsViewModel : ViewModel() {
             callPausedByRemote.value = (state == Call.State.PausedByRemote) and (call.conference == null)
 
             val currentCall = core.currentCall
+            noActiveCall.value = currentCall == null
             if (currentCall == null) {
                 currentCallViewModel.value?.destroy()
             } else if (currentCallViewModel.value?.call != currentCall) {
@@ -88,6 +91,7 @@ class CallsViewModel : ViewModel() {
         coreContext.core.addListener(listener)
 
         val currentCall = coreContext.core.currentCall
+        noActiveCall.value = currentCall == null
         if (currentCall != null) {
             currentCallViewModel.value?.destroy()
             currentCallViewModel.value = CallViewModel(currentCall)
diff --git a/app/src/main/res/layout-land/call_controls_fragment.xml b/app/src/main/res/layout-land/call_controls_fragment.xml
index 2a5a57756..2e955b8b8 100644
--- a/app/src/main/res/layout-land/call_controls_fragment.xml
+++ b/app/src/main/res/layout-land/call_controls_fragment.xml
@@ -29,7 +29,7 @@
 
         <LinearLayout
             android:id="@+id/active_call_header"
-            android:visibility="@{viewModel.currentCallViewModel == null || conferenceViewModel.isInConference() ? View.GONE : View.VISIBLE}"
+            android:visibility="@{viewModel.noActiveCall || conferenceViewModel.isInConference() ? View.GONE : View.VISIBLE}"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
@@ -66,7 +66,7 @@
             app:conferenceViewModel="@{conferenceViewModel}" />
 
         <org.linphone.contact.BigContactAvatarView
-            android:visibility="@{controlsViewModel.isVideoEnabled || conferenceViewModel.isInConference ? View.GONE : View.VISIBLE, default=gone}"
+            android:visibility="@{viewModel.noActiveCall || controlsViewModel.isVideoEnabled || conferenceViewModel.isInConference ? View.GONE : View.VISIBLE, default=gone}"
             android:id="@+id/avatar"
             android:layout_width="200dp"
             android:layout_height="200dp"
@@ -121,8 +121,7 @@
 
         <ImageView
             android:onClick="@{() -> viewModel.currentCallViewModel.pause()}"
-            android:visibility="@{viewModel.currentCallViewModel == null || conferenceViewModel.isInConference ? View.GONE : View.VISIBLE}"
-            android:selected="@{viewModel.currentCallViewModel.isPaused ?? false}"
+            android:visibility="@{viewModel.noActiveCall || conferenceViewModel.isInConference ? View.GONE : View.VISIBLE}"
             android:enabled="@{!viewModel.callPausedByRemote &amp;&amp; controlsViewModel.isPauseEnabled}"
             android:contentDescription="@string/content_description_pause_call"
             android:layout_width="50dp"
diff --git a/app/src/main/res/layout/call_controls_fragment.xml b/app/src/main/res/layout/call_controls_fragment.xml
index 792b13874..aee62bcad 100644
--- a/app/src/main/res/layout/call_controls_fragment.xml
+++ b/app/src/main/res/layout/call_controls_fragment.xml
@@ -28,7 +28,7 @@
 
         <LinearLayout
             android:id="@+id/active_call_header"
-            android:visibility="@{viewModel.currentCallViewModel == null || conferenceViewModel.isInConference() ? View.GONE : View.VISIBLE}"
+            android:visibility="@{viewModel.noActiveCall || conferenceViewModel.isInConference() ? View.GONE : View.VISIBLE}"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
@@ -65,7 +65,7 @@
             app:conferenceViewModel="@{conferenceViewModel}" />
 
         <org.linphone.contact.BigContactAvatarView
-            android:visibility="@{controlsViewModel.isVideoEnabled || conferenceViewModel.isInConference ? View.GONE : View.VISIBLE, default=gone}"
+            android:visibility="@{viewModel.noActiveCall || controlsViewModel.isVideoEnabled || conferenceViewModel.isInConference ? View.GONE : View.VISIBLE, default=gone}"
             android:id="@+id/avatar"
             android:layout_width="200dp"
             android:layout_height="200dp"
@@ -121,8 +121,7 @@
 
         <ImageView
             android:onClick="@{() -> viewModel.currentCallViewModel.pause()}"
-            android:visibility="@{viewModel.currentCallViewModel == null || conferenceViewModel.isInConference ? View.GONE : View.VISIBLE}"
-            android:selected="@{viewModel.currentCallViewModel.isPaused ?? false}"
+            android:visibility="@{viewModel.noActiveCall || conferenceViewModel.isInConference ? View.GONE : View.VISIBLE}"
             android:enabled="@{!viewModel.callPausedByRemote &amp;&amp; controlsViewModel.isPauseEnabled}"
             android:contentDescription="@string/content_description_pause_call"
             android:layout_width="50dp"