filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[merge] Fix mismerge causing spaceless launch to not load any rooms

Browse Source 
Change-Id: Idde4f17babde5522e853c0f0bd7fdba2ed6f946d
This commit is contained in:
SpiritCroc 2022-09-11 16:43:34 +02:00
parent c43461e58f
commit 414881eb56
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
View File

@ -97,9 +97,10 @@ class SpaceStateHandlerImpl @Inject constructor(
from: SelectSpaceFrom, from: SelectSpaceFrom,
) { ) {
val activeSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return val activeSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
val spaceToLeave = selectedSpaceDataSourceSc.currentValue?.orNull()?.first val currentValue = selectedSpaceDataSourceSc.currentValue?.orNull()
val spaceToLeave = currentValue?.first
val spaceToSet = spaceId?.let { activeSession.getRoomSummary(spaceId) } val spaceToSet = spaceId?.let { activeSession.getRoomSummary(spaceId) }
val sameSpaceSelected = spaceId == spaceToLeave?.roomId val sameSpaceSelected = currentValue != null && spaceId == spaceToLeave?.roomId
if (sameSpaceSelected) { if (sameSpaceSelected) {
return return