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 a0bb20e1d..1e9dd6d72 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
@@ -76,8 +76,9 @@ class CallsViewModel : ViewModel() {
removeCallFromPausedListIfPresent(call)
removeCallFromConferenceIfPresent(call)
}
- } else if (state == Call.State.Pausing) {
+ } else if (state == Call.State.Paused) {
addCallToPausedList(call)
+ removeCallFromConferenceIfPresent(call)
} else if (state == Call.State.Resuming) {
removeCallFromPausedListIfPresent(call)
} else if (call.state == Call.State.UpdatedByRemote) {
diff --git a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
index 2e5c5375f..389e8a97f 100644
--- a/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/call/viewmodels/ControlsViewModel.kt
@@ -355,7 +355,7 @@ class ControlsViewModel : ViewModel() {
params.enableVideo(currentCallVideoEnabled)
Log.i("[Call] Setting videoEnabled to [$currentCallVideoEnabled] in conference params")
- val conference = core.createConferenceWithParams(params)
+ val conference = core.conference ?: core.createConferenceWithParams(params)
for (call in core.calls) {
conference?.addParticipant(call)
}
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 79e5f9ef3..2cbea4bf1 100644
--- a/app/src/main/res/layout-land/call_controls_fragment.xml
+++ b/app/src/main/res/layout-land/call_controls_fragment.xml
@@ -54,6 +54,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+