mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed crash when merging calls into conference

Browse source
This commit is contained in:
Sylvain Berfini 2024-04-18 10:25:11 +02:00
parent 81bb7156dc
commit b16ca7325e
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/linphone/ui/call/CallActivity.kt
View file

@ -51,6 +51,7 @@ import org.linphone.ui.call.conference.fragment.ActiveConferenceCallFragmentDire
import org.linphone.ui.call.conference.fragment.ConferenceLayoutMenuDialogFragment
import org.linphone.ui.call.fragment.ActiveCallFragmentDirections
import org.linphone.ui.call.fragment.AudioDevicesMenuDialogFragment
import org.linphone.ui.call.fragment.CallsListFragmentDirections
import org.linphone.ui.call.fragment.IncomingCallFragmentDirections
import org.linphone.ui.call.fragment.OutgoingCallFragmentDirections
import org.linphone.ui.call.model.AudioDeviceModel
@ -434,13 +435,22 @@ class CallActivity : GenericActivity() {
ActiveConferenceCallFragmentDirections.actionGlobalActiveConferenceCallFragment()
}
}
R.id.callsListFragment -> {
if (notInConference) {
Log.i("$TAG Going calls list fragment to conference fragment")
CallsListFragmentDirections.actionCallsListFragmentToActiveConferenceCallFragment()
} else {
Log.i("$TAG Going calls list fragment to active call fragment")
CallsListFragmentDirections.actionCallsListFragmentToActiveCallFragment()
}
}
else -> {
if (notInConference) {
Log.i("$TAG Going from call fragment to call fragment")
ActiveCallFragmentDirections.actionGlobalActiveCallFragment()
} else {
Log.i("$TAG Going from call fragment to conference call fragment")
ActiveCallFragmentDirections.actionActiveCallFragmentToActiveConferenceCallFragment()
ActiveCallFragmentDirections.actionGlobalActiveConferenceCallFragment()
}
}
}

9
app/src/main/res/navigation/call_nav_graph.xml
View file

@ -116,7 +116,14 @@
android:id="@+id/callsListFragment"
android:name="org.linphone.ui.call.fragment.CallsListFragment"
android:label="CallsListFragment"
tools:layout="@layout/calls_list_fragment" />
tools:layout="@layout/calls_list_fragment" >
<action
android:id="@+id/action_callsListFragment_to_activeConferenceCallFragment"
app:destination="@id/activeConferenceCallFragment" />
<action
android:id="@+id/action_callsListFragment_to_activeCallFragment"
app:destination="@id/activeCallFragment" />
</fragment>
<fragment
android:id="@+id/endedCallFragment"