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

Fixed navigation issues

Browse source
This commit is contained in:
Sylvain Berfini 2022-03-03 17:22:48 +01:00
parent 862c5e47c8
commit 7f035cccbc
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -979,7 +979,7 @@ internal fun CallActivity.navigateToOutgoingCall() {
findNavController(R.id.nav_host_fragment).navigate(
R.id.action_global_outgoingCallFragment,
null,
popupTo(R.id.singleCallFragment, false)
popupTo(R.id.singleCallFragment, true)
)
}
@ -989,7 +989,7 @@ internal fun CallActivity.navigateToIncomingCall(earlyMediaVideoEnabled: Boolean
findNavController(R.id.nav_host_fragment).navigate(
R.id.action_global_incomingCallFragment,
args,
popupTo(R.id.singleCallFragment, false)
popupTo(R.id.singleCallFragment, true)
)
}
@ -997,7 +997,7 @@ internal fun OutgoingCallFragment.navigateToActiveCall() {
findNavController().navigate(
R.id.action_global_singleCallFragment,
null,
popupTo(R.id.singleCallFragment, false)
popupTo(R.id.outgoingCallFragment, true)
)
}
@ -1005,7 +1005,7 @@ internal fun IncomingCallFragment.navigateToActiveCall() {
findNavController().navigate(
R.id.action_global_singleCallFragment,
null,
popupTo(R.id.singleCallFragment, false)
popupTo(R.id.incomingCallFragment, true)
)
}

1
app/src/main/java/org/linphone/activities/voip/fragments/ConferenceCallFragment.kt
View file

@ -20,7 +20,6 @@
package org.linphone.activities.voip.fragments
import android.annotation.SuppressLint
import android.app.Dialog
import android.content.Intent
import android.os.Bundle
import android.os.SystemClock

1
app/src/main/java/org/linphone/activities/voip/fragments/SingleCallFragment.kt
View file

@ -30,7 +30,6 @@ import androidx.databinding.DataBindingUtil
import androidx.databinding.ViewDataBinding
import androidx.navigation.navGraphViewModels
import androidx.window.layout.FoldingFeature
import com.google.android.material.snackbar.Snackbar
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R
import org.linphone.activities.*