mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-23 01:45:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use unstable prefixes

Browse source
This commit is contained in:
Valere 2021-01-08 09:07:27 +01:00
parent df341d8ea3
commit ab4f2429c4
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
View file

@ -51,8 +51,8 @@ object EventType {
const val STATE_ROOM_JOIN_RULES = "m.room.join_rules"
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"
// const val STATE_SPACE_CHILD = "m.space.child"
const val STATE_SPACE_CHILD = "org.matrix.msc1772.space.child"
/**
* Note that this Event has been deprecated, see

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
View file

@ -18,6 +18,6 @@ package org.matrix.android.sdk.api.session.room.model
object RoomType {
const val SPACE = "m.space"
const val MESSAGING = "m.messaging"
const val SPACE = "org.matrix.msc1772.space" // "m.space"
// const val MESSAGING = "org.matrix.msc1840.messaging"
}

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
View file

@ -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 = "type") val type: String? = null
@Json(name = "org.matrix.msc1772.type") val type: String? = null
)

6
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
View file

@ -119,15 +119,15 @@ internal class DefaultPeekSpaceTask @Inject constructor(
peekChildren(childStateEvents, depth + 1, maxDepth)
)
)
} else if (type == RoomType.MESSAGING || type == null) {
} else
/** if (type == RoomType.MESSAGING || type == null)*/
{
Timber.v("## SPACE_PEEK: room child $entry")
spaceChildResults.add(
SpaceChildPeekResult(
childId, childPeek, entry.second?.default, entry.second?.order
)
)
} else {
// ignore for now?
}
// let's check child info