mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-15 18:59:12 +03:00
Code Issues Projects Releases Packages Wiki Activity

Respect spaces back navigation preference in new app layout

Browse source 
Change-Id: I1c11b0621160317c868de125a9ffe9ef4e303c28
This commit is contained in:
SpiritCroc 2022-09-15 16:28:57 +02:00
parent 401a7f5f7d
commit 3c8eb0e0e5
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
View file

@ -391,7 +391,7 @@ class NewHomeDetailFragment :
}
}
override fun onBackPressed(toolbarButton: Boolean) = if (spaceStateHandler.isRoot()) {
override fun onBackPressed(toolbarButton: Boolean) = if (spaceStateHandler.isRoot() || !vectorPreferences.spaceBackNavigation()) {
false
} else {
val lastSpace = spaceStateHandler.popSpaceBackstack()

4
vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
View file

@ -1400,6 +1400,10 @@ class VectorPreferences @Inject constructor(
* Only the IDs of the spaces are stored.
*/
fun setSpaceBackstack(spaceBackstack: List<String?>) {
if (!spaceBackNavigation()) {
// Don't build a huge stack that'll never get cleared
return
}
val spaceIdsJoined = spaceBackstack.takeIf { it.isNotEmpty() }?.joinToString(",")
defaultPrefs.edit().putString(SETTINGS_PERSISTED_SPACE_BACKSTACK, spaceIdsJoined).apply()
}