rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code review

Browse Source
This commit is contained in:
Valere 2021-04-29 11:56:57 +02:00
parent f89a7496aa
commit 30d7c73b2d
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
View File

@ -44,7 +44,7 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
import timber.log.Timber import timber.log.Timber
class CreateRoomViewModel @AssistedInject constructor(@Assisted val initialState: CreateRoomViewState, class CreateRoomViewModel @AssistedInject constructor(@Assisted private val initialState: CreateRoomViewState,
private val session: Session, private val session: Session,
private val rawService: RawService private val rawService: RawService
) : VectorViewModel<CreateRoomViewState, CreateRoomAction, CreateRoomViewEvents>(initialState) { ) : VectorViewModel<CreateRoomViewState, CreateRoomAction, CreateRoomViewEvents>(initialState) {
@ -236,7 +236,7 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted val initialState
if (initialState.parentSpaceId != null) { if (initialState.parentSpaceId != null) {
// add it as a child // add it as a child
try { try {
val via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList() val via = session.sessionParams.homeServerHost?.let { listOf(it) }.orEmpty()
session.spaceService() session.spaceService()
.getSpace(initialState.parentSpaceId) .getSpace(initialState.parentSpaceId)
?.addChildren(roomId, viaServers = via, order = null) ?.addChildren(roomId, viaServers = via, order = null)

4
vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
View File

@ -107,9 +107,7 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
setResult(RESULT_OK, Intent().apply { setResult(RESULT_OK, Intent().apply {
putExtra(RESULT_DATA_CREATED_SPACE_ID, it.spaceId) putExtra(RESULT_DATA_CREATED_SPACE_ID, it.spaceId)
putExtra(RESULT_DATA_DEFAULT_ROOM_ID, it.defaultRoomId) putExtra(RESULT_DATA_DEFAULT_ROOM_ID, it.defaultRoomId)
if (it.topology == SpaceTopology.JustMe) { putExtra(RESULT_DATA_CREATED_SPACE_IS_JUST_ME, it.topology == SpaceTopology.JustMe)
putExtra(RESULT_DATA_CREATED_SPACE_IS_JUST_ME, true)
}
}) })
finish() finish()
} }

1
vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
View File

@ -130,7 +130,6 @@ class CreateSpaceViewModel @AssistedInject constructor(
defaultRooms = emptyMap() defaultRooms = emptyMap()
) )
} }
// XXX finish and open the add rooms directly
handleNextFromDefaultRooms() handleNextFromDefaultRooms()
} }
SpaceTopology.MeAndTeammates -> { SpaceTopology.MeAndTeammates -> {