Unverified Commit f704539c authored by Benoît Marty's avatar Benoît Marty Committed by GitHub
Browse files

Merge pull request #3284 from vector-im/feature/bca/spaces_stable_prefixes

stable prefix for msc1772
parents 096e95f9 3cbdf4ad
......@@ -52,11 +52,9 @@ object EventType {
const val STATE_ROOM_GUEST_ACCESS = "m.room.guest_access"
const val STATE_ROOM_POWER_LEVELS = "m.room.power_levels"
// const val STATE_SPACE_CHILD = "m.space.child"
const val STATE_SPACE_CHILD = "org.matrix.msc1772.space.child"
const val STATE_SPACE_CHILD = "m.space.child"
// const val STATE_SPACE_PARENT = "m.space.parent"
const val STATE_SPACE_PARENT = "org.matrix.msc1772.space.parent"
const val STATE_SPACE_PARENT = "m.space.parent"
/**
* Note that this Event has been deprecated, see
......
......@@ -18,6 +18,5 @@ package org.matrix.android.sdk.api.session.room.model
object RoomType {
const val SPACE = "org.matrix.msc1772.space" // "m.space"
// const val MESSAGING = "org.matrix.msc1840.messaging"
const val SPACE = "m.space"
}
......@@ -160,6 +160,6 @@ open class CreateRoomParams {
companion object {
private const val CREATION_CONTENT_KEY_M_FEDERATE = "m.federate"
private const val CREATION_CONTENT_KEY_ROOM_TYPE = "org.matrix.msc1772.type"
private const val CREATION_CONTENT_KEY_ROOM_TYPE = "type"
}
}
......@@ -28,5 +28,5 @@ data class RoomCreateContent(
@Json(name = "room_version") val roomVersion: String? = null,
@Json(name = "predecessor") val predecessor: Predecessor? = null,
// Defines the room type, see #RoomType (user extensible)
@Json(name = "org.matrix.msc1772.type") val type: String? = null
@Json(name = "type") val type: String? = null
)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment