Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed video & preview being visible while call is locally paused

Browse source
This commit is contained in:
Sylvain Berfini 2022-09-14 10:34:38 +02:00
parent 4fd7246a74
commit cb34e761c6
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/activities/voip/viewmodels/CallsViewModel.kt
View file

@ -254,8 +254,9 @@ class CallsViewModel : ViewModel() {
private fun updateCurrentCallData(currentCall: Call?) { private fun updateCurrentCallData(currentCall: Call?) {
var callToUse = currentCall var callToUse = currentCall
if (currentCall == null) { if (currentCall == null) {
Log.w("[Calls] Current call is now null") if (coreContext.core.callsNb == 1) return // There is only one call, most likely it is paused
Log.w("[Calls] Current call is now null")
val firstCall = coreContext.core.calls.find { call -> val firstCall = coreContext.core.calls.find { call ->
call.state != Call.State.Error && call.state != Call.State.End && call.state != Call.State.Released call.state != Call.State.Error && call.state != Call.State.End && call.state != Call.State.Released
} }

5
app/src/main/res/layout/voip_single_call_fragment.xml
View file

@ -26,6 +26,7 @@
type="org.linphone.activities.voip.viewmodels.StatisticsListViewModel" /> type="org.linphone.activities.voip.viewmodels.StatisticsListViewModel" />
</data> </data>
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator" android:id="@+id/coordinator"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -166,7 +167,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:onClick="@{() -> controlsViewModel.toggleFullScreen()}" android:onClick="@{() -> controlsViewModel.toggleFullScreen()}"
android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.isSendingVideo &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused ? View.VISIBLE : View.GONE, default=gone}" android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; controlsViewModel.isSendingVideo &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused &amp;&amp; !callsViewModel.currentCallData.isPaused ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintBottom_toBottomOf="@id/background" app:layout_constraintBottom_toBottomOf="@id/background"
app:layout_constraintEnd_toEndOf="@id/background" app:layout_constraintEnd_toEndOf="@id/background"
app:layout_constraintStart_toStartOf="@id/background" app:layout_constraintStart_toStartOf="@id/background"
@ -222,7 +223,7 @@
android:id="@+id/video_preview_group" android:id="@+id/video_preview_group"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused ? View.VISIBLE : View.GONE}" android:visibility="@{controlsViewModel.isVideoEnabled &amp;&amp; !callsViewModel.currentCallData.isRemotelyPaused &amp;&amp; !callsViewModel.currentCallData.isPaused ? View.VISIBLE : View.GONE}"
app:constraint_referenced_ids="local_preview_video_surface,switch_camera" /> app:constraint_referenced_ids="local_preview_video_surface,switch_camera" />
<org.linphone.activities.voip.views.RoundCornersTextureView <org.linphone.activities.voip.views.RoundCornersTextureView