mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-16 20:10:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix some space back navigation crashes

Browse source 
Change-Id: I6d6058547688503a99fa7308a42e25652b00c01f
This commit is contained in:
SpiritCroc 2022-10-19 18:11:36 +02:00
parent f1ff7eb42c
commit af95abe15e
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
View file

@ -946,8 +946,12 @@ class HomeDetailFragment :
}
override fun onBackPressed(toolbarButton: Boolean) = if (vectorPreferences.spaceBackNavigation() && spaceStateHandler.getCurrentSpace() != null) {
navigateBack()
true
try {
navigateBack()
true
} catch (e: NoSuchElementException) {
false
}
} else {
false
}

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

@ -401,9 +401,13 @@ class NewHomeDetailFragment :
override fun onBackPressed(toolbarButton: Boolean) = if (spaceStateHandler.isRoot() || !vectorPreferences.spaceBackNavigation()) {
false
} else {
val lastSpace = spaceStateHandler.popSpaceBackstack()
spaceStateHandler.setCurrentSpace(lastSpace, isForwardNavigation = false)
true
try {
val lastSpace = spaceStateHandler.popSpaceBackstack()
spaceStateHandler.setCurrentSpace(lastSpace, isForwardNavigation = false)
true
} catch(e: NoSuchElementException) {
false
}
}
private fun SpaceStateHandler.isRoot() = getSpaceBackstack().isEmpty()