mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-04-23 19:48:30 +00:00
Another fix for in-call navigation
This commit is contained in:
parent
e616582162
commit
4eb11a05bc
1 changed files with 13 additions and 4 deletions
|
|
@ -424,6 +424,15 @@ class CallActivity : GenericActivity() {
|
||||||
IncomingCallFragmentDirections.actionIncomingCallFragmentToActiveConferenceCallFragment()
|
IncomingCallFragmentDirections.actionIncomingCallFragmentToActiveConferenceCallFragment()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
R.id.activeCallFragment -> {
|
||||||
|
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()
|
||||||
|
}
|
||||||
|
}
|
||||||
R.id.activeConferenceCallFragment -> {
|
R.id.activeConferenceCallFragment -> {
|
||||||
if (notInConference) {
|
if (notInConference) {
|
||||||
Log.i("$TAG Going from conference call fragment to call fragment")
|
Log.i("$TAG Going from conference call fragment to call fragment")
|
||||||
|
|
@ -437,11 +446,11 @@ class CallActivity : GenericActivity() {
|
||||||
}
|
}
|
||||||
R.id.callsListFragment -> {
|
R.id.callsListFragment -> {
|
||||||
if (notInConference) {
|
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")
|
Log.i("$TAG Going calls list fragment to active call fragment")
|
||||||
CallsListFragmentDirections.actionCallsListFragmentToActiveCallFragment()
|
CallsListFragmentDirections.actionCallsListFragmentToActiveCallFragment()
|
||||||
|
} else {
|
||||||
|
Log.i("$TAG Going calls list fragment to conference fragment")
|
||||||
|
CallsListFragmentDirections.actionCallsListFragmentToActiveConferenceCallFragment()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
|
|
@ -450,7 +459,7 @@ class CallActivity : GenericActivity() {
|
||||||
ActiveCallFragmentDirections.actionGlobalActiveCallFragment()
|
ActiveCallFragmentDirections.actionGlobalActiveCallFragment()
|
||||||
} else {
|
} else {
|
||||||
Log.i("$TAG Going from call fragment to conference call fragment")
|
Log.i("$TAG Going from call fragment to conference call fragment")
|
||||||
ActiveCallFragmentDirections.actionGlobalActiveConferenceCallFragment()
|
ActiveConferenceCallFragmentDirections.actionGlobalActiveConferenceCallFragment()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue