diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt index 77d64ed6c..444049314 100644 --- a/app/src/main/java/org/linphone/core/CoreContext.kt +++ b/app/src/main/java/org/linphone/core/CoreContext.kt @@ -213,8 +213,10 @@ class CoreContext( // Only start call recording when the call is in StreamsRunning for the first time if (corePreferences.automaticallyStartCallRecording && !call.params.isRecording) { - Log.i("[Context] We were asked to start the call recording automatically") - call.startRecording() + if (call.conference == null) { // TODO: FIXME: We disabled conference recording for now + Log.i("[Context] We were asked to start the call recording automatically") + call.startRecording() + } } } } else if (state == Call.State.End || state == Call.State.Error || state == Call.State.Released) { diff --git a/app/src/main/res/layout-land/voip_conference_active_speaker.xml b/app/src/main/res/layout-land/voip_conference_active_speaker.xml index b953fe345..be5e5001d 100644 --- a/app/src/main/res/layout-land/voip_conference_active_speaker.xml +++ b/app/src/main/res/layout-land/voip_conference_active_speaker.xml @@ -99,6 +99,7 @@ android:padding="7dp" android:selected="@{conferenceViewModel.isRecording}" android:src="@drawable/icon_call_record" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/active_conference_timer" app:layout_constraintEnd_toStartOf="@id/toggle_pause_conference" app:layout_constraintTop_toTopOf="@id/remote_name" /> @@ -118,7 +119,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}" - app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_conference_recording,toggle_pause_conference" /> + app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" /> + app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" /> diff --git a/app/src/main/res/layout/voip_conference_active_speaker.xml b/app/src/main/res/layout/voip_conference_active_speaker.xml index 5f0833e24..08178029d 100644 --- a/app/src/main/res/layout/voip_conference_active_speaker.xml +++ b/app/src/main/res/layout/voip_conference_active_speaker.xml @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}" - app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_conference_recording,toggle_pause_conference" /> + app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" /> diff --git a/app/src/main/res/layout/voip_conference_audio_only.xml b/app/src/main/res/layout/voip_conference_audio_only.xml index 91ca75f0c..c1aa3b580 100644 --- a/app/src/main/res/layout/voip_conference_audio_only.xml +++ b/app/src/main/res/layout/voip_conference_audio_only.xml @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}" - app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_conference_recording,toggle_pause_conference" /> + app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" /> diff --git a/app/src/main/res/layout/voip_conference_grid.xml b/app/src/main/res/layout/voip_conference_grid.xml index b54967a54..ecac814f9 100644 --- a/app/src/main/res/layout/voip_conference_grid.xml +++ b/app/src/main/res/layout/voip_conference_grid.xml @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="@{controlsViewModel.fullScreenMode || controlsViewModel.pipMode ? View.GONE : View.VISIBLE}" - app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_conference_recording,toggle_pause_conference" /> + app:constraint_referenced_ids="remote_name,active_conference_timer,toggle_pause_conference" />