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 back stack with conversation shortcuts on launcher icon

Browse source
This commit is contained in:
Sylvain Berfini 2024-05-27 11:53:43 +02:00
parent a424f05ab9
commit 144fc5d728
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle.kts
View file

@ -160,6 +160,7 @@ android {
dependencies {
implementation(libs.androidx.annotations)
implementation(libs.androidx.activity)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.constraint.layout)
implementation(libs.androidx.core.ktx)

5
app/src/main/java/org/linphone/ui/main/MainActivity.kt
View file

@ -480,7 +480,10 @@ class MainActivity : GenericActivity() {
)
} else {
val navOptionsBuilder = NavOptions.Builder()
navOptionsBuilder.setPopUpTo(R.id.historyListFragment, true)
navOptionsBuilder.setPopUpTo(
findNavController().currentDestination?.id ?: R.id.historyListFragment,
true
)
navOptionsBuilder.setLaunchSingleTop(true)
val navOptions = navOptionsBuilder.build()
findNavController().navigate(

2
gradle/libs.versions.toml
View file

@ -7,6 +7,7 @@ firebaseBomVersion = "33.0.0"
ktlint = "11.3.1"
annotations = "1.8.0"
activity = "1.9.0"
appcompat = "1.7.0-rc01"
constraintLayout = "2.1.4"
coreKtx = "1.13.1"
@ -31,6 +32,7 @@ linphone = "5.4.+"
[libraries]
androidx-annotations = { group = "androidx.annotation", name = "annotation", version.ref = "annotations" }
androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
androidx-constraint-layout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintLayout" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }