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

Fixed navigating out of conference chat room

Browse source
This commit is contained in:
Sylvain Berfini 2022-05-20 15:55:24 +02:00
parent 3104ee6471
commit dd26a6059b
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/linphone/activities/Navigation.kt
View file

@ -225,14 +225,6 @@ internal fun ConferenceSchedulingSummaryFragment.navigateToDialer() {
) )
} }
internal fun ConferenceWaitingRoomFragment.navigateToDialer() {
findNavController().navigate(
R.id.action_global_dialerFragment,
null,
popupTo(R.id.dialerFragment, true)
)
}
internal fun DetailChatRoomFragment.navigateToConferenceWaitingRoom( internal fun DetailChatRoomFragment.navigateToConferenceWaitingRoom(
address: String, address: String,
subject: String? subject: String?
@ -638,7 +630,7 @@ internal fun MasterCallLogsFragment.navigateToConferenceWaitingRoom(
findMasterNavController().navigate( findMasterNavController().navigate(
R.id.action_global_conferenceWaitingRoomFragment, R.id.action_global_conferenceWaitingRoomFragment,
bundle, bundle,
popupTo(R.id.dialerFragment, false) popupTo(R.id.conferenceWaitingRoomFragment, true)
) )
} }

3
app/src/main/java/org/linphone/activities/main/conference/fragments/ConferenceWaitingRoomFragment.kt
View file

@ -29,7 +29,6 @@ import org.linphone.R
import org.linphone.activities.GenericFragment import org.linphone.activities.GenericFragment
import org.linphone.activities.main.MainActivity import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.conference.viewmodels.ConferenceWaitingRoomViewModel import org.linphone.activities.main.conference.viewmodels.ConferenceWaitingRoomViewModel
import org.linphone.activities.navigateToDialer
import org.linphone.compatibility.Compatibility import org.linphone.compatibility.Compatibility
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
import org.linphone.databinding.ConferenceWaitingRoomFragmentBinding import org.linphone.databinding.ConferenceWaitingRoomFragmentBinding
@ -70,7 +69,7 @@ class ConferenceWaitingRoomFragment : GenericFragment<ConferenceWaitingRoomFragm
Log.w("[Conference Waiting Room] Call to conference server with URI [$conferenceUri] wasn't found!") Log.w("[Conference Waiting Room] Call to conference server with URI [$conferenceUri] wasn't found!")
} }
} }
navigateToDialer() goBack()
} }
} }