mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 12:07:28 +00:00
Merge branch 'develop' into feature/fga/room_directory
This commit is contained in:
+1
@@ -55,6 +55,7 @@ interface MatrixRoom : Closeable {
|
||||
val topic: String?
|
||||
val avatarUrl: String?
|
||||
val isEncrypted: Boolean
|
||||
val isSpace: Boolean
|
||||
val isDirect: Boolean
|
||||
val isPublic: Boolean
|
||||
val activeMemberCount: Long
|
||||
|
||||
+3
-1
@@ -66,7 +66,9 @@ enum class RoomMembershipState {
|
||||
INVITE,
|
||||
JOIN,
|
||||
KNOCK,
|
||||
LEAVE
|
||||
LEAVE;
|
||||
|
||||
fun isActive(): Boolean = this == JOIN || this == INVITE
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+3
@@ -213,6 +213,9 @@ class RustMatrixRoom(
|
||||
override val isPublic: Boolean
|
||||
get() = innerRoom.isPublic()
|
||||
|
||||
override val isSpace: Boolean
|
||||
get() = innerRoom.isSpace()
|
||||
|
||||
override val isDirect: Boolean
|
||||
get() = innerRoom.isDirect()
|
||||
|
||||
|
||||
+1
@@ -77,6 +77,7 @@ class FakeMatrixRoom(
|
||||
override val alias: String? = null,
|
||||
override val alternativeAliases: List<String> = emptyList(),
|
||||
override val isPublic: Boolean = true,
|
||||
override val isSpace: Boolean = false,
|
||||
override val isDirect: Boolean = false,
|
||||
override val isOneToOne: Boolean = false,
|
||||
override val joinedMemberCount: Long = 123L,
|
||||
|
||||
Reference in New Issue
Block a user