From 55e8f519dfb638081f19ac7c98a641b74c5d9cfa Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Fri, 2 Apr 2021 11:02:32 +0100
Subject: [PATCH 001/350] Convert RoomService to suspend functions

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../org/matrix/android/sdk/rx/RxSession.kt    |  8 +--
 .../android/sdk/common/CryptoTestHelper.kt    | 22 +++----
 .../crypto/gossiping/KeyShareTests.kt         | 14 ++---
 .../sdk/api/session/room/RoomService.kt       | 32 ++++------
 .../session/room/DefaultRoomService.kt        | 61 +++++--------------
 .../features/createdirect/DirectRoomHelper.kt |  5 +-
 .../VerificationBottomSheetViewModel.kt       | 52 ++++++++--------
 .../home/room/detail/RoomDetailViewModel.kt   | 29 +++++----
 .../home/room/list/RoomListViewModel.kt       | 10 ++-
 .../roomdirectory/RoomDirectoryViewModel.kt   | 12 ++--
 .../createroom/CreateRoomViewModel.kt         | 32 +++++-----
 .../roompreview/RoomPreviewViewModel.kt       | 17 ++----
 12 files changed, 129 insertions(+), 165 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 0d5b5ed821..cac0a32232 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -124,8 +124,8 @@ class RxSession(private val session: Session) {
                 .startWithCallable { session.getPendingThreePids() }
     }
 
-    fun createRoom(roomParams: CreateRoomParams): Single<String> = singleBuilder {
-        session.createRoom(roomParams, it)
+    fun createRoom(roomParams: CreateRoomParams): Single<String> = rxSingle {
+        session.createRoom(roomParams)
     }
 
     fun searchUsersDirectory(search: String,
@@ -136,8 +136,8 @@ class RxSession(private val session: Session) {
 
     fun joinRoom(roomIdOrAlias: String,
                  reason: String? = null,
-                 viaServers: List<String> = emptyList()): Single<Unit> = singleBuilder {
-        session.joinRoom(roomIdOrAlias, reason, viaServers, it)
+                 viaServers: List<String> = emptyList()): Single<Unit> = rxSingle {
+        session.joinRoom(roomIdOrAlias, reason, viaServers)
     }
 
     fun getRoomIdByAlias(roomAlias: String,
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index 5815b23c06..da176491c6 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -66,8 +66,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
     fun doE2ETestWithAliceInARoom(encryptedRoom: Boolean = true): CryptoTestData {
         val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
 
-        val roomId = mTestHelper.doSync<String> {
-            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" }, it)
+        val roomId = mTestHelper.runBlockingTest {
+            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" })
         }
 
         if (encryptedRoom) {
@@ -135,7 +135,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             bobRoomSummariesLive.observeForever(roomJoinedObserver)
         }
 
-        mTestHelper.doSync<Unit> { bobSession.joinRoom(aliceRoomId, callback = it) }
+        mTestHelper.runBlockingTest { bobSession.joinRoom(aliceRoomId) }
 
         mTestHelper.await(lock)
 
@@ -176,8 +176,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             room.invite(samSession.myUserId, null)
         }
 
-        mTestHelper.doSync<Unit> {
-            samSession.joinRoom(room.roomId, null, emptyList(), it)
+        mTestHelper.runBlockingTest {
+            samSession.joinRoom(room.roomId, null, emptyList())
         }
 
         return samSession
@@ -256,8 +256,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
     }
 
     fun createDM(alice: Session, bob: Session): String {
-        val roomId = mTestHelper.doSync<String> {
-            alice.createDirectRoom(bob.myUserId, it)
+        val roomId = mTestHelper.runBlockingTest {
+            alice.createDirectRoom(bob.myUserId)
         }
 
         mTestHelper.waitWithLatch { latch ->
@@ -300,7 +300,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
                 bobRoomSummariesLive.observeForever(newRoomObserver)
             }
 
-            mTestHelper.doSync<Unit> { bob.joinRoom(roomId, callback = it) }
+            mTestHelper.runBlockingTest { bob.joinRoom(roomId) }
         }
 
         return roomId
@@ -398,8 +398,8 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
         val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams)
         aliceSession.cryptoService().setWarnOnUnknownDevices(false)
 
-        val roomId = mTestHelper.doSync<String> {
-            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" }, it)
+        val roomId = mTestHelper.runBlockingTest {
+            aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" })
         }
         val room = aliceSession.getRoom(roomId)!!
 
@@ -412,7 +412,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
             val session = mTestHelper.createAccount("User_$index", defaultSessionParams)
             mTestHelper.runBlockingTest(timeout = 600_000) { room.invite(session.myUserId, null) }
             println("TEST -> " + session.myUserId + " invited")
-            mTestHelper.doSync<Unit> { session.joinRoom(room.roomId, null, emptyList(), it) }
+            mTestHelper.runBlockingTest { session.joinRoom(room.roomId, null, emptyList()) }
             println("TEST -> " + session.myUserId + " joined")
             sessions.add(session)
         }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index e6b364f3fb..40659cef11 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -71,13 +71,12 @@ class KeyShareTests : InstrumentedTest {
         val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
         // Create an encrypted room and add a message
-        val roomId = mTestHelper.doSync<String> {
+        val roomId = mTestHelper.runBlockingTest {
             aliceSession.createRoom(
                     CreateRoomParams().apply {
                         visibility = RoomDirectoryVisibility.PRIVATE
                         enableEncryption()
-                    },
-                    it
+                    }
             )
         }
         val room = aliceSession.getRoom(roomId)
@@ -332,13 +331,12 @@ class KeyShareTests : InstrumentedTest {
         }
 
         // Create an encrypted room and send a couple of messages
-        val roomId = mTestHelper.doSync<String> {
+        val roomId = mTestHelper.runBlockingTest {
             aliceSession.createRoom(
                     CreateRoomParams().apply {
                         visibility = RoomDirectoryVisibility.PRIVATE
                         enableEncryption()
-                    },
-                    it
+                    }
             )
         }
         val roomAlicePov = aliceSession.getRoom(roomId)
@@ -371,8 +369,8 @@ class KeyShareTests : InstrumentedTest {
             roomAlicePov.invite(bobSession.myUserId, null)
         }
 
-        mTestHelper.doSync<Unit> {
-            bobSession.joinRoom(roomAlicePov.roomId, null, emptyList(), it)
+        mTestHelper.runBlockingTest {
+            bobSession.joinRoom(roomAlicePov.roomId, null, emptyList())
         }
 
         // we want to discard alice outbound session
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 5f02b77a1e..bc5cb3c8f4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -17,14 +17,12 @@
 package org.matrix.android.sdk.api.session.room
 
 import androidx.lifecycle.LiveData
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 
@@ -36,22 +34,19 @@ interface RoomService {
     /**
      * Create a room asynchronously
      */
-    fun createRoom(createRoomParams: CreateRoomParams,
-                   callback: MatrixCallback<String>): Cancelable
+    suspend fun createRoom(createRoomParams: CreateRoomParams): String
 
     /**
      * Create a direct room asynchronously. This is a facility method to create a direct room with the necessary parameters
      */
-    fun createDirectRoom(otherUserId: String,
-                         callback: MatrixCallback<String>): Cancelable {
+    suspend fun createDirectRoom(otherUserId: String): String {
         return createRoom(
                 CreateRoomParams()
                         .apply {
                             invitedUserIds.add(otherUserId)
                             setDirectMessage()
                             enableEncryptionIfInvitedUsersSupportIt = true
-                        },
-                callback
+                        }
         )
     }
 
@@ -61,10 +56,9 @@ interface RoomService {
      * @param reason optional reason for joining the room
      * @param viaServers the servers to attempt to join the room through. One of the servers must be participating in the room.
      */
-    fun joinRoom(roomIdOrAlias: String,
-                 reason: String? = null,
-                 viaServers: List<String> = emptyList(),
-                 callback: MatrixCallback<Unit>): Cancelable
+    suspend fun joinRoom(roomIdOrAlias: String,
+                         reason: String? = null,
+                         viaServers: List<String> = emptyList())
 
     /**
      * Get a room from a roomId
@@ -110,20 +104,18 @@ interface RoomService {
      * Inform the Matrix SDK that a room is displayed.
      * The SDK will update the breadcrumbs in the user account data
      */
-    fun onRoomDisplayed(roomId: String): Cancelable
+    suspend fun onRoomDisplayed(roomId: String)
 
     /**
      * Mark all rooms as read
      */
-    fun markAllAsRead(roomIds: List<String>,
-                      callback: MatrixCallback<Unit>): Cancelable
+    suspend fun markAllAsRead(roomIds: List<String>)
 
     /**
      * Resolve a room alias to a room ID.
      */
-    fun getRoomIdByAlias(roomAlias: String,
-                         searchOnServer: Boolean,
-                         callback: MatrixCallback<Optional<RoomAliasDescription>>): Cancelable
+    suspend fun getRoomIdByAlias(roomAlias: String,
+                                 searchOnServer: Boolean): Optional<RoomAliasDescription>
 
     /**
      * Delete a room alias
@@ -170,12 +162,12 @@ interface RoomService {
     /**
      * Get some state events about a room
      */
-    fun getRoomState(roomId: String, callback: MatrixCallback<List<Event>>)
+    suspend fun getRoomState(roomId: String): List<Event>
 
     /**
      * Use this if you want to get information from a room that you are not yet in (or invited)
      * It might be possible to get some information on this room if it is public or if guest access is allowed
      * This call will try to gather some information on this room, but it could fail and get nothing more
      */
-    fun peekRoom(roomIdOrAlias: String, callback: MatrixCallback<PeekResult>)
+    suspend fun peekRoom(roomIdOrAlias: String): PeekResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 383dd876d3..f510b3c997 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.session.room
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.RoomService
@@ -29,7 +28,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.mapper.asDomain
@@ -47,8 +45,6 @@ import org.matrix.android.sdk.internal.session.room.peeking.ResolveRoomStateTask
 import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateBreadcrumbsTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.fetchCopied
 import javax.inject.Inject
 
@@ -64,16 +60,11 @@ internal class DefaultRoomService @Inject constructor(
         private val peekRoomTask: PeekRoomTask,
         private val roomGetter: RoomGetter,
         private val roomSummaryDataSource: RoomSummaryDataSource,
-        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
-        private val taskExecutor: TaskExecutor
+        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource
 ) : RoomService {
 
-    override fun createRoom(createRoomParams: CreateRoomParams, callback: MatrixCallback<String>): Cancelable {
-        return createRoomTask
-                .configureWith(createRoomParams) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun createRoom(createRoomParams: CreateRoomParams): String {
+        return createRoomTask.execute(createRoomParams)
     }
 
     override fun getRoom(roomId: String): Room? {
@@ -104,34 +95,20 @@ internal class DefaultRoomService @Inject constructor(
         return roomSummaryDataSource.getBreadcrumbsLive(queryParams)
     }
 
-    override fun onRoomDisplayed(roomId: String): Cancelable {
-        return updateBreadcrumbsTask
-                .configureWith(UpdateBreadcrumbsTask.Params(roomId))
-                .executeBy(taskExecutor)
+    override suspend fun onRoomDisplayed(roomId: String) {
+        updateBreadcrumbsTask.execute(UpdateBreadcrumbsTask.Params(roomId))
     }
 
-    override fun joinRoom(roomIdOrAlias: String, reason: String?, viaServers: List<String>, callback: MatrixCallback<Unit>): Cancelable {
-        return joinRoomTask
-                .configureWith(JoinRoomTask.Params(roomIdOrAlias, reason, viaServers)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun joinRoom(roomIdOrAlias: String, reason: String?, viaServers: List<String>) {
+        joinRoomTask.execute(JoinRoomTask.Params(roomIdOrAlias, reason, viaServers))
     }
 
-    override fun markAllAsRead(roomIds: List<String>, callback: MatrixCallback<Unit>): Cancelable {
-        return markAllRoomsReadTask
-                .configureWith(MarkAllRoomsReadTask.Params(roomIds)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun markAllAsRead(roomIds: List<String>) {
+        markAllRoomsReadTask.execute(MarkAllRoomsReadTask.Params(roomIds))
     }
 
-    override fun getRoomIdByAlias(roomAlias: String, searchOnServer: Boolean, callback: MatrixCallback<Optional<RoomAliasDescription>>): Cancelable {
-        return roomIdByAliasTask
-                .configureWith(GetRoomIdByAliasTask.Params(roomAlias, searchOnServer)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun getRoomIdByAlias(roomAlias: String, searchOnServer: Boolean): Optional<RoomAliasDescription> {
+        return roomIdByAliasTask.execute(GetRoomIdByAliasTask.Params(roomAlias, searchOnServer))
     }
 
     override suspend fun deleteRoomAlias(roomAlias: String) {
@@ -162,19 +139,11 @@ internal class DefaultRoomService @Inject constructor(
         }
     }
 
-    override fun getRoomState(roomId: String, callback: MatrixCallback<List<Event>>) {
-        resolveRoomStateTask
-                .configureWith(ResolveRoomStateTask.Params(roomId)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun getRoomState(roomId: String): List<Event> {
+        return resolveRoomStateTask.execute(ResolveRoomStateTask.Params(roomId))
     }
 
-    override fun peekRoom(roomIdOrAlias: String, callback: MatrixCallback<PeekResult>) {
-        peekRoomTask
-                .configureWith(PeekRoomTask.Params(roomIdOrAlias)) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+    override suspend fun peekRoom(roomIdOrAlias: String): PeekResult {
+        return peekRoomTask.execute(PeekRoomTask.Params(roomIdOrAlias))
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt b/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
index 171970ec1e..bfa56cfb9e 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/DirectRoomHelper.kt
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
-import org.matrix.android.sdk.internal.util.awaitCallback
 import javax.inject.Inject
 
 class DirectRoomHelper @Inject constructor(
@@ -45,9 +44,7 @@ class DirectRoomHelper @Inject constructor(
                 setDirectMessage()
                 enableEncryptionIfInvitedUsersSupportIt = adminE2EByDefault
             }
-            roomId = awaitCallback {
-                session.createRoom(roomParams, it)
-            }
+            roomId = session.createRoom(roomParams)
         }
         return roomId
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index 0e230c6727..a67cb96d37 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -249,32 +249,34 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                                 pendingRequest = Loading()
                         )
                     }
-                    session.createDirectRoom(otherUserId, object : MatrixCallback<String> {
-                        override fun onSuccess(data: String) {
-                            setState {
-                                copy(
-                                        roomId = data,
-                                        pendingRequest = Success(
-                                                session
-                                                        .cryptoService()
-                                                        .verificationService()
-                                                        .requestKeyVerificationInDMs(
-                                                                supportedVerificationMethodsProvider.provide(),
-                                                                otherUserId,
-                                                                data,
-                                                                pendingLocalId
-                                                        )
+                    viewModelScope.launch {
+                        val result = runCatching { session.createDirectRoom(otherUserId) }
+                        result.fold(
+                                { data ->
+                                    setState {
+                                        copy(
+                                                roomId = data,
+                                                pendingRequest = Success(
+                                                        session
+                                                                .cryptoService()
+                                                                .verificationService()
+                                                                .requestKeyVerificationInDMs(
+                                                                        supportedVerificationMethodsProvider.provide(),
+                                                                        otherUserId,
+                                                                        data,
+                                                                        pendingLocalId
+                                                                )
+                                                )
                                         )
-                                )
-                            }
-                        }
-
-                        override fun onFailure(failure: Throwable) {
-                            setState {
-                                copy(pendingRequest = Fail(failure))
-                            }
-                        }
-                    })
+                                    }
+                                },
+                                { failure ->
+                                    setState {
+                                        copy(pendingRequest = Fail(failure))
+                                    }
+                                }
+                        )
+                    }
                 } else {
                     setState {
                         copy(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 6152562850..ce53c72376 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -184,7 +184,12 @@ class RoomDetailViewModel @AssistedInject constructor(
             }
         }
         // Inform the SDK that the room is displayed
-        session.onRoomDisplayed(initialState.roomId)
+        viewModelScope.launch {
+            try {
+                session.onRoomDisplayed(initialState.roomId)
+            } catch (_: Exception) {
+            }
+        }
         callManager.addPstnSupportListener(this)
         callManager.checkForPSTNSupportIfNeeded()
         chatEffectManager.delegate = this
@@ -902,19 +907,19 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleJoinToAnotherRoomSlashCommand(command: ParsedCommand.JoinRoom) {
-        session.joinRoom(command.roomAlias, command.reason, emptyList(), object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
-                session.getRoomSummary(command.roomAlias)
-                        ?.roomId
-                        ?.let {
-                            _viewEvents.post(RoomDetailViewEvents.JoinRoomCommandSuccess(it))
-                        }
-            }
-
-            override fun onFailure(failure: Throwable) {
+        viewModelScope.launch {
+            try {
+                session.joinRoom(command.roomAlias, command.reason, emptyList())
+            } catch (failure: Throwable) {
                 _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
+                return@launch
             }
-        })
+            session.getRoomSummary(command.roomAlias)
+                    ?.roomId
+                    ?.let {
+                        _viewEvents.post(RoomDetailViewEvents.JoinRoomCommandSuccess(it))
+                    }
+        }
     }
 
     private fun legacyRiotQuoteText(quotedText: String?, myText: String): String {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 3a5e797f98..f4cfbe94d0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -26,7 +26,6 @@ import im.vector.app.core.utils.DataSource
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -169,7 +168,14 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                 ?.filter { it.membership == Membership.JOIN }
                 ?.map { it.roomId }
                 ?.toList()
-                ?.let { session.markAllAsRead(it, NoOpMatrixCallback()) }
+                ?.let {
+                    viewModelScope.launch {
+                        try {
+                            session.markAllAsRead(it)
+                        } catch (_: Exception) {
+                        }
+                    }
+                }
     }
 
     private fun handleChangeNotificationMode(action: RoomListAction.ChangeRoomNotificationState) {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 4ef38758c7..5012243e96 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -31,7 +31,6 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
@@ -232,17 +231,16 @@ class RoomDirectoryViewModel @AssistedInject constructor(
         val viaServers = state.roomDirectoryData.homeServer
                 ?.let { listOf(it) }
                 .orEmpty()
-        session.joinRoom(action.roomId, viaServers = viaServers, callback = object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
+        viewModelScope.launch {
+            try {
+                session.joinRoom(action.roomId, viaServers = viaServers)
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
                 // Instead, we wait for the room to be joined
-            }
-
-            override fun onFailure(failure: Throwable) {
+            } catch (failure: Throwable) {
                 // Notify the user
                 _viewEvents.post(RoomDirectoryViewEvents.Failure(failure))
             }
-        })
+        }
     }
 
     override fun onCleared() {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 3c027c4845..af63f23a8c 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -34,7 +34,6 @@ import im.vector.app.features.raw.wellknown.getElementWellknown
 import im.vector.app.features.raw.wellknown.isE2EByDefault
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
@@ -216,19 +215,22 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr
                     }
                 }
 
-        session.createRoom(createRoomParams, object : MatrixCallback<String> {
-            override fun onSuccess(data: String) {
-                setState {
-                    copy(asyncCreateRoomRequest = Success(data))
-                }
-            }
-
-            override fun onFailure(failure: Throwable) {
-                setState {
-                    copy(asyncCreateRoomRequest = Fail(failure))
-                }
-                _viewEvents.post(CreateRoomViewEvents.Failure(failure))
-            }
-        })
+        // TODO: Should this be non-cancellable?
+        viewModelScope.launch {
+            val result = runCatching { session.createRoom(createRoomParams) }
+            result.fold(
+                    { roomId ->
+                        setState {
+                            copy(asyncCreateRoomRequest = Success(roomId))
+                        }
+                    },
+                    { failure ->
+                        setState {
+                            copy(asyncCreateRoomRequest = Fail(failure))
+                        }
+                        _viewEvents.post(CreateRoomViewEvents.Failure(failure))
+                    }
+            )
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
index c99213d890..c4d479374b 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt
@@ -31,7 +31,6 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.roomdirectory.JoinState
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
@@ -39,7 +38,6 @@ import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
@@ -77,9 +75,7 @@ class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val ini
         }
         viewModelScope.launch(Dispatchers.IO) {
             val peekResult = tryOrNull {
-                awaitCallback<PeekResult> {
-                    session.peekRoom(initialState.roomAlias ?: initialState.roomId, it)
-                }
+                session.peekRoom(initialState.roomAlias ?: initialState.roomId)
             }
 
             when (peekResult) {
@@ -177,15 +173,14 @@ class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val ini
             Timber.w("Try to join an already joining room. Should not happen")
             return@withState
         }
-        session.joinRoom(state.roomId, viaServers = state.homeServers, callback = object : MatrixCallback<Unit> {
-            override fun onSuccess(data: Unit) {
+        viewModelScope.launch {
+            try {
+                session.joinRoom(state.roomId, viaServers = state.homeServers)
                 // We do not update the joiningRoomsIds here, because, the room is not joined yet regarding the sync data.
                 // Instead, we wait for the room to be joined
-            }
-
-            override fun onFailure(failure: Throwable) {
+            } catch (failure: Throwable) {
                 setState { copy(lastError = failure) }
             }
-        })
+        }
     }
 }

From 505b01ad97a141288738f17ca779037bcff0b4d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 07:19:20 +0000
Subject: [PATCH 002/350] Bump daggerVersion from 2.33 to 2.34

Bumps `daggerVersion` from 2.33 to 2.34.

Updates `dagger` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Updates `dagger-compiler` from 2.33 to 2.34
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.33...dagger-2.34)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 34460c6ab5..669444d563 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -112,7 +112,7 @@ dependencies {
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
-    def daggerVersion = '2.33'
+    def daggerVersion = '2.34'
     def work_version = '2.5.0'
     def retrofit_version = '2.9.0'
 
diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..38d3a4abbc 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -297,7 +297,7 @@ dependencies {
     def big_image_viewer_version = '1.7.1'
     def glide_version = '4.12.0'
     def moshi_version = '1.12.0'
-    def daggerVersion = '2.33'
+    def daggerVersion = '2.34'
     def autofill_version = "1.1.0"
     def work_version = '2.5.0'
     def arch_version = '2.1.0'

From 3ca00969c53cc84f0497d094968fd45bf6a10f70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 07:22:02 +0000
Subject: [PATCH 003/350] Bump media from 1.2.1 to 1.3.0

Bumps media from 1.2.1 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..511e2f7561 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -326,7 +326,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.sharetarget:sharetarget:1.1.0"
     implementation 'androidx.core:core-ktx:1.3.2'
-    implementation "androidx.media:media:1.2.1"
+    implementation "androidx.media:media:1.3.0"
 
     implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
     implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.9.0"

From 68efa63de4cde655b6fd0b82834129c567e655ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 07:22:33 +0000
Subject: [PATCH 004/350] Bump recyclerview from 1.2.0-rc01 to 1.2.0

Bumps recyclerview from 1.2.0-rc01 to 1.2.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 attachment-viewer/build.gradle | 2 +-
 vector/build.gradle            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 5a8cce92e8..8db57a59af 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.recyclerview:recyclerview:1.2.0-rc01"
+    implementation "androidx.recyclerview:recyclerview:1.2.0"
 
     implementation 'com.google.android.material:material:1.3.0'
 }
\ No newline at end of file
diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..2da7349a5e 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -320,7 +320,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
-    implementation "androidx.recyclerview:recyclerview:1.2.0-rc01"
+    implementation "androidx.recyclerview:recyclerview:1.2.0"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

From b5b651244b8af586eb7a57aa039781fdb2c0a857 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 07:25:53 +0000
Subject: [PATCH 005/350] Bump firebase-messaging from 21.0.1 to 21.1.0

Bumps firebase-messaging from 21.0.1 to 21.1.0.

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..393db17033 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -423,7 +423,7 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
 
     // gplay flavor only
-    gplayImplementation('com.google.firebase:firebase-messaging:21.0.1') {
+    gplayImplementation('com.google.firebase:firebase-messaging:21.1.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'

From bec6cfc46dd4f790391c66434ddd066815b10153 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 9 Apr 2021 12:42:59 +0200
Subject: [PATCH 006/350] Version++

---
 CHANGES.md          | 27 +++++++++++++++++++++++++++
 vector/build.gradle |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 40228f7db8..a73551cc33 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,30 @@
+Changes in Element 1.1.5 (2021-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ -
+
+Build 🧱:
+ -
+
+Test:
+ -
+
+Other changes:
+ -
+
 Changes in Element 1.1.4 (2021-04-09)
 ===================================================
 
diff --git a/vector/build.gradle b/vector/build.gradle
index d5a105d893..d561382e2d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 1
-ext.versionPatch = 4
+ext.versionPatch = 5
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From 37226a1641d9d437def9a1304f3d58e00d031a80 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 9 Apr 2021 16:58:41 +0200
Subject: [PATCH 007/350] Small cleanup

---
 matrix-sdk-android-rx/src/main/AndroidManifest.xml          | 3 +--
 .../android/sdk/internal/crypto/model/CryptoDeviceInfo.kt   | 4 ++--
 .../android/sdk/internal/crypto/model/MXDeviceInfo.kt       | 4 ++--
 .../java/im/vector/app/core/resources/AppNameProvider.kt    | 6 +++---
 .../im/vector/app/features/call/dialpad/DialPadFragment.kt  | 2 +-
 vector/src/main/res/layout/dialog_export_e2e_keys.xml       | 1 -
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/AndroidManifest.xml b/matrix-sdk-android-rx/src/main/AndroidManifest.xml
index f1bb42638f..5f399e9f84 100644
--- a/matrix-sdk-android-rx/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android-rx/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.matrix.android.sdk.rx" />
+<manifest package="org.matrix.android.sdk.rx" />
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
index 7eebbd9b2c..4004294d97 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
@@ -44,7 +44,7 @@ data class CryptoDeviceInfo(
      */
     fun fingerprint(): String? {
         return keys
-                ?.takeIf { !deviceId.isBlank() }
+                ?.takeIf { deviceId.isNotBlank() }
                 ?.get("ed25519:$deviceId")
     }
 
@@ -53,7 +53,7 @@ data class CryptoDeviceInfo(
      */
     fun identityKey(): String? {
         return keys
-                ?.takeIf { !deviceId.isBlank() }
+                ?.takeIf { deviceId.isNotBlank() }
                 ?.get("curve25519:$deviceId")
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
index 3c651c27a0..00b8bde5d9 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
@@ -103,7 +103,7 @@ data class MXDeviceInfo(
      */
     fun fingerprint(): String? {
         return keys
-                ?.takeIf { !deviceId.isBlank() }
+                ?.takeIf { deviceId.isNotBlank() }
                 ?.get("ed25519:$deviceId")
     }
 
@@ -112,7 +112,7 @@ data class MXDeviceInfo(
      */
     fun identityKey(): String? {
         return keys
-                ?.takeIf { !deviceId.isBlank() }
+                ?.takeIf { deviceId.isNotBlank() }
                 ?.get("curve25519:$deviceId")
     }
 
diff --git a/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
index 9874c1744f..90558e35b7 100644
--- a/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt
@@ -23,7 +23,7 @@ import javax.inject.Inject
 class AppNameProvider @Inject constructor(private val context: Context) {
 
     fun getAppName(): String {
-        try {
+        return try {
             val appPackageName = context.applicationContext.packageName
             val pm = context.packageManager
             val appInfo = pm.getApplicationInfo(appPackageName, 0)
@@ -33,10 +33,10 @@ class AppNameProvider @Inject constructor(private val context: Context) {
             if (!appName.matches("\\A\\p{ASCII}*\\z".toRegex())) {
                 appName = appPackageName
             }
-            return appName
+            appName
         } catch (e: Exception) {
             Timber.e(e, "## AppNameProvider() : failed")
-            return "ElementAndroid"
+            "ElementAndroid"
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
index b488a1af0e..11c3af9394 100644
--- a/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
@@ -146,7 +146,7 @@ class DialPadFragment : Fragment() {
     }
 
     private fun poll() {
-        if (!input.isEmpty()) {
+        if (input.isNotEmpty()) {
             input = input.substring(0, input.length - 1)
             formatter = PhoneNumberUtil.getInstance().getAsYouTypeFormatter(regionCode)
             if (formatAsYouType) {
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index 10c9dcd59b..eedaa81857 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

From 38b49916e20626e4ca708f93c07bb7f60e722c98 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 9 Apr 2021 17:05:09 +0200
Subject: [PATCH 008/350] Small cleanup

---
 vector/src/debug/res/layout/item_sas_emoji.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector/src/debug/res/layout/item_sas_emoji.xml
index 53fd448f90..fc56bc1948 100644
--- a/vector/src/debug/res/layout/item_sas_emoji.xml
+++ b/vector/src/debug/res/layout/item_sas_emoji.xml
@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:textSize="16sp"
-            tools:text="@string/verification_emoji_wrench" />
+            tools:text="@string/verification_emoji_spanner" />
 
         <TextView
             android:id="@+id/sas_emoji_text_id"
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:textSize="12sp"
-            tools:text="verification_emoji_wrench" />
+            tools:text="verification_emoji_spanner" />
 
     </LinearLayout>
 

From a1209c83bb832252101d68b3e5f260c9855c70e6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 9 Apr 2021 19:58:29 +0200
Subject: [PATCH 009/350] New store descriptions

---
 CHANGES.md                                    |  2 +-
 .../android/en-US/full_description.txt        | 45 +++++++++++--------
 .../android/en-US/short_description.txt       |  2 +-
 fastlane/metadata/android/en-US/title.txt     |  2 +-
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a73551cc33..d946f6ef8a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,7 +23,7 @@ Test:
  -
 
 Other changes:
- -
+ - New store descriptions
 
 Changes in Element 1.1.4 (2021-04-09)
 ===================================================
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index e939b75bb7..853885944c 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,30 +1,39 @@
-Element is a new type of messenger and collaboration app that:
+Element is both a secure messenger and a productivity team collaboration app that is ideal for group chats while remote working. This chat app uses end-to-end encryption to provide powerful video conferencing, file sharing and voice calls.
 
-1. Puts you in control to preserve your privacy
-2. Lets you communicate with anyone in the Matrix network, and even beyond by integrating with apps such as Slack
-3. Protects you from advertising, datamining and walled gardens
-4. Secures you through end-to-end encryption, with cross-signing to verify others
+<b>Element’s features include:</b>
+- Advanced online communication tools
+- Fully encrypted messages to allow safer corporate communication, even for remote workers
+- Decentralized chat based on the Matrix open source framework
+- File sharing securely with encrypted data while managing projects
+- Video chats with Voice over IP and screen sharing
+- Easy integration with your favourite online collaboration tools, project management tools, VoIP services and other team messaging apps
 
-Element is completely different from other messaging and collaboration apps because it is decentralised and open source.
+Element is completely different from other messaging and collaboration apps. It operates on Matrix, an open network for secure messaging and decentralized communication. It allows self-hosting to give users maximum ownership and control of their data and messages.
 
-Element lets you self-host - or choose a host - so that you have privacy, ownership and control of your data and conversations. It gives you access to an open network; so you’re not just stuck speaking to other Element users only. And it is very secure.
+<b>Privacy and encrypted messaging</b>
+Element protects you from unwanted ads, data mining and walled gardens. It also secures all your data, one-to-one video and voice communication through end-to-end encryption and cross-signed device verification.
 
-Element is able to do all this because it operates on Matrix - the standard for open, decentralised communication.
+Element gives you control over your privacy while allowing you to communicate securely with anyone on the Matrix network, or other business collaboration tools by integrating with apps such as Slack.
 
-Element puts you in control by letting you choose who hosts your conversations. From the Element app, you can choose to host in different ways:
+<b>Element can be self-hosted</b>
+To allow more control of your sensitive data and conversations, Element can be self-hosted or you can choose any Matrix-based host - the standard for open source, decentralized communication. Element gives you privacy, security compliance and integration flexibility.
 
+<b>Own your data</b>
+You decide where to keep your data and messages. Without the risk of data mining or access from third parties.
+
+Element puts you in control in different ways:
 1. Get a free account on the matrix.org public server hosted by the Matrix developers, or choose from thousands of public servers hosted by volunteers
-2. Self-host your account by running a server on your own hardware
+2. Self-host your account by running a server on your own IT infrastructure
 3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
 
-<b>Why choose Element?</b>
+<b>Open messaging and collaboration</b>
+You can chat with anyone on the Matrix network, whether they’re using Element, another Matrix app or even if they are using a different messaging app.
 
-<b>OWN YOUR DATA</b>: You decide where to keep your data and messages. You own it and control it, not some MEGACORP that mines your data or gives access to third parties.
+<b>Super secure</b>
+Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signed device verification.
 
-<b>OPEN MESSAGING AND COLLABORATION</b>: You can chat with anyone else in the Matrix network, whether they’re using Element or another Matrix app, and even if they are using a different messaging system of the likes of Slack, IRC or XMPP.
+<b>Complete communication and integration</b>
+Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
 
-<b>SUPER-SECURE</b>: Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signing to verify the devices of conversation participants.
-
-<b>COMPLETE COMMUNICATION</b>: Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
-
-<b>EVERYWHERE YOU ARE</b>: Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io.
+<b>Pick up where you left off</b>
+Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index 023b366c9a..5a98f6f772 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Secure decentralised chat & VoIP. Keep your data safe from third parties.
\ No newline at end of file
+Group messenger - encrypted messaging, group chat and video calls
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
index 039da1fc3b..12fa89b99b 100644
--- a/fastlane/metadata/android/en-US/title.txt
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -1 +1 @@
-Element (previously Riot.im)
\ No newline at end of file
+Element - Secure Messenger
\ No newline at end of file

From e404589544f73e2ad3cd6869dd67cc71ee74e565 Mon Sep 17 00:00:00 2001
From: gradle-update-robot <gradle-update-robot@regolo.cc>
Date: Sat, 10 Apr 2021 01:06:51 +0000
Subject: [PATCH 010/350] Update Gradle Wrapper from 6.8.3 to 7.0.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6e61ea7487..9d174797f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionSha256Sum=81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From a9ef58912f360309e90a6d51e520fdbf051865a5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sat, 10 Apr 2021 08:45:27 +0200
Subject: [PATCH 011/350] http -> https Fix the followinf error, since gradle
 7: `Using insecure protocols with repositories, without explicit opt-in, is
 unsupported. Switch Maven repository
 'maven2(http://dl.bintray.com/piasy/maven)' to redirect to a secure protocol
 (like HTTPS) or allow insecure protocols. See
 https://docs.gradle.org/7.0/dsl/org.gradle.api.artifacts.repositories.UrlArtifactRepository.html#org.gradle.api.artifacts.repositories.UrlArtifactRepository:allowInsecureProtocol
 for more details.`

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b8da6c3864..d645382015 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,7 @@ allprojects {
             }
         }
         maven {
-            url "http://dl.bintray.com/piasy/maven"
+            url "https://dl.bintray.com/piasy/maven"
             content {
                 includeGroupByRegex "com\\.github\\.piasy"
             }

From 91e85f56d88ac1919d0c86d4ad9e2a84590b5bad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 7 Apr 2021 17:38:02 +0000
Subject: [PATCH 012/350] Translated using Weblate (Estonian)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
---
 vector/src/main/res/values-et/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 2b4a0e0590..b2165af837 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2672,4 +2672,5 @@
     <string name="event_status_a11y_sent">Saadetud</string>
     <string name="event_status_a11y_sending">Saadan</string>
     <string name="settings_category_room_directory">Jututubade kataloog</string>
+    <string name="event_status_sent_message">Sõnum on saadetud</string>
 </resources>
\ No newline at end of file

From 166817411cfe3d3d3a7c17fcedbaa8b0b8e9e332 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 8 Apr 2021 13:17:37 +0000
Subject: [PATCH 013/350] Translated using Weblate (Italian)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
---
 fastlane/metadata/android/it/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/it/changelogs/40101030.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/it/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/40101030.txt

diff --git a/fastlane/metadata/android/it/changelogs/40101020.txt b/fastlane/metadata/android/it/changelogs/40101020.txt
new file mode 100644
index 0000000000..21057629e3
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: prestazioni migliorate e correzione di errori!
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/it/changelogs/40101030.txt b/fastlane/metadata/android/it/changelogs/40101030.txt
new file mode 100644
index 0000000000..a62c4a0736
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: prestazioni migliorate e correzioni di errori!
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.3

From e0a79af93a0f53e5601f2bdd7a9efb33ed07fbdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 7 Apr 2021 17:39:24 +0000
Subject: [PATCH 014/350] Translated using Weblate (Estonian)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
---
 fastlane/metadata/android/et/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/et/changelogs/40101030.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/40101030.txt

diff --git a/fastlane/metadata/android/et/changelogs/40101020.txt b/fastlane/metadata/android/et/changelogs/40101020.txt
new file mode 100644
index 0000000000..5f34bb579f
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jõudluse parandused ja pisikohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/et/changelogs/40101030.txt b/fastlane/metadata/android/et/changelogs/40101030.txt
new file mode 100644
index 0000000000..5a558d911a
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jõudluse parandused ja pisikohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.3

From f4959ba553d043697671675b5bec18a3acded29b Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Wed, 7 Apr 2021 18:54:55 +0000
Subject: [PATCH 015/350] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
---
 fastlane/metadata/android/uk/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/uk/changelogs/40101030.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/uk/changelogs/40101030.txt

diff --git a/fastlane/metadata/android/uk/changelogs/40101020.txt b/fastlane/metadata/android/uk/changelogs/40101020.txt
new file mode 100644
index 0000000000..469de21a6f
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: поліпшення продуктивності та виправлення помилок!
+Повний журнал змін: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/uk/changelogs/40101030.txt b/fastlane/metadata/android/uk/changelogs/40101030.txt
new file mode 100644
index 0000000000..da2bb0ddd6
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: поліпшення продуктивності та виправлення помилок!
+Повний журнал змін: https://github.com/vector-im/element-android/releases/tag/v1.1.3

From 931bd1042b41a526a97df03c4cc69e647ea24237 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Fri, 9 Apr 2021 23:23:44 +0000
Subject: [PATCH 016/350] Translated using Weblate (Catalan)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ca/
---
 fastlane/metadata/android/ca/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/ca/changelogs/40101030.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/ca/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/ca/changelogs/40101030.txt

diff --git a/fastlane/metadata/android/ca/changelogs/40101020.txt b/fastlane/metadata/android/ca/changelogs/40101020.txt
new file mode 100644
index 0000000000..43c140214f
--- /dev/null
+++ b/fastlane/metadata/android/ca/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Canvis principals d'aquesta versió: millora de rendiment i correcció d'errors!
+Registre de canvis complet: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/ca/changelogs/40101030.txt b/fastlane/metadata/android/ca/changelogs/40101030.txt
new file mode 100644
index 0000000000..9b2627e7f2
--- /dev/null
+++ b/fastlane/metadata/android/ca/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Canvis principals d'aquesta versió: millora de rendiment i correcció d'errors!
+Registre de canvis complet: https://github.com/vector-im/element-android/releases/tag/v1.1.3

From e4c664edafa2fdd593727ae80c04aeb7713dd591 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Thu, 8 Apr 2021 06:27:15 +0000
Subject: [PATCH 017/350] Translated using Weblate (French)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 31eb24371c..92fe2986a4 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2679,4 +2679,5 @@
     <string name="settings_room_directory_show_all_rooms_summary">Afficher tous les salons dans le répertoire, y compris ceux au contenu choquant.</string>
     <string name="settings_room_directory_show_all_rooms">Afficher les salons au contenu choquant</string>
     <string name="settings_category_room_directory">Répertoire des salons</string>
+    <string name="event_status_sent_message">Message envoyé</string>
 </resources>
\ No newline at end of file

From 55d4304620a0eac9deb3373d1a18c73b1ca8a24e Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 8 Apr 2021 13:16:18 +0000
Subject: [PATCH 018/350] Translated using Weblate (Italian)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
---
 vector/src/main/res/values-it/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index a60946c593..fcb805ef30 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2734,4 +2734,5 @@
 \nScaricamento dati…</string>
     <string name="initial_sync_start_server_computing">Sinc. iniziale:
 \nIn attesa di risposta dal server…</string>
+    <string name="event_status_sent_message">Messaggio inviato</string>
 </resources>
\ No newline at end of file

From 4561dc8c64f12815098cec4dabad83792d3aba99 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Thu, 8 Apr 2021 17:15:41 +0000
Subject: [PATCH 019/350] Translated using Weblate (Czech)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
---
 vector/src/main/res/values-cs/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 6d6574a87e..0b76b6c019 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2723,4 +2723,5 @@
     <string name="settings_room_directory_show_all_rooms_summary">Zobrazit všechny místnosti v adresáři místností, včetně místností s explicitním obsahem.</string>
     <string name="settings_room_directory_show_all_rooms">Zobrazit místnosti s explicitním obsahem</string>
     <string name="settings_category_room_directory">Adresář místností</string>
+    <string name="event_status_sent_message">Zpráva odeslána</string>
 </resources>
\ No newline at end of file

From bdb4e2dab839616b188478241fe2360805360b52 Mon Sep 17 00:00:00 2001
From: Jeanne Lavoie <j.lavoie@net-c.ca>
Date: Fri, 9 Apr 2021 22:12:02 +0000
Subject: [PATCH 020/350] Translated using Weblate (German)

Currently translated at 99.9% (2362 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 52e67eb460..baeb910d84 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2734,4 +2734,5 @@
     <string name="event_status_a11y_delete_all">Alle fehgeschlagene Nachrichten löschen</string>
     <string name="event_status_failed_messages_warning">Senden der Nachricht gescheitert</string>
     <string name="event_status_a11y_sending">Wird gesendet</string>
+    <string name="event_status_sent_message">Nachricht gesendet</string>
 </resources>
\ No newline at end of file

From ceca81f0ab2f234ba20bba56b09b076422c410f6 Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Fri, 9 Apr 2021 05:27:34 +0000
Subject: [PATCH 021/350] Translated using Weblate (Russian)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
---
 fastlane/metadata/android/ru/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/ru/changelogs/40101030.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/ru/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/ru/changelogs/40101030.txt

diff --git a/fastlane/metadata/android/ru/changelogs/40101020.txt b/fastlane/metadata/android/ru/changelogs/40101020.txt
new file mode 100644
index 0000000000..70e164f39d
--- /dev/null
+++ b/fastlane/metadata/android/ru/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: улучшение производительности и исправления ошибок!
+Полный список изменений: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/ru/changelogs/40101030.txt b/fastlane/metadata/android/ru/changelogs/40101030.txt
new file mode 100644
index 0000000000..381c2761d0
--- /dev/null
+++ b/fastlane/metadata/android/ru/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: улучшение производительности и исправления ошибок!
+Полный список изменений: https://github.com/vector-im/element-android/releases/tag/v1.1.3

From 007134da12a18cd94adcc18f481315df59161328 Mon Sep 17 00:00:00 2001
From: Vivek K J <VIVEKKJ2004@gmail.com>
Date: Fri, 9 Apr 2021 13:41:23 +0000
Subject: [PATCH 022/350] Translated using Weblate (Malayalam)

Currently translated at 26.6% (629 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 55 ++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index e11aaa7639..2cef400e8e 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -359,7 +359,7 @@
     <string name="start_video_call_prompt_msg">നിങ്ങൾക്ക് ഒരു വിഡിയോ കോൾ ആരംഭിക്കണമെന്ന് ഉറപ്പാണോ\?</string>
     <string name="identity_url">തിരിച്ചറിയൽ സെർവറിന്റെ URL</string>
     <string name="send_bug_report_description_in_english">കഴിയുമെങ്കിൽ, വിവരണം ഇംഗ്ലീഷിൽ എഴുതുക.</string>
-    <string name="home_filter_placeholder_people">ആളുകളെ ഫിൽറ്റർ</string>
+    <string name="home_filter_placeholder_people">ആളുകളെ അരിക്കുക</string>
     <string name="keys_backup_activate">കീ ബാക്കപ്പ് ഉപയൊഗിക്കുക</string>
     <string name="keys_backup_is_not_finished_please_wait">കീ ബാക്കപ്പ് പൂർത്തിയായിട്ടില്ല, കാത്തിരിക്കൂ…</string>
     <string name="settings_phone_numbers">ഫോൺ നമ്പറുകൾ</string>
@@ -640,4 +640,57 @@
     <string name="notice_room_third_party_invite">%1$s മുറിയിൽ ചേരാൻ %2$s ന് ക്ഷണം അയച്ചു</string>
     <string name="notice_profile_change_redacted_by_you">നിങ്ങളുടെ പ്രൊഫൈൽ %1$s നവീകരിച്ചു</string>
     <string name="notice_profile_change_redacted">%1$s അവരുടെ പ്രൊഫൈൽ %2$s നവീകരിച്ചു</string>
+    <string name="room_participants_idle">നിഷ്‌ക്രിയം</string>
+    <plurals name="format_time_d">
+        <item quantity="one">%dദി</item>
+        <item quantity="other">%dദി</item>
+    </plurals>
+    <plurals name="format_time_h">
+        <item quantity="one">%dമ</item>
+        <item quantity="other">%dമ</item>
+    </plurals>
+    <plurals name="format_time_m">
+        <item quantity="one">%dമി</item>
+        <item quantity="other">%dമി</item>
+    </plurals>
+    <plurals name="format_time_s">
+        <item quantity="one">%dസെ</item>
+        <item quantity="other">%dസെ</item>
+    </plurals>
+    <string name="preview">പ്രിവ്യൂ</string>
+    <string name="call_hold_action">ഹോൾഡ്</string>
+    <string name="call_resume_action">പുനരാരംഭിക്കുക</string>
+    <string name="compression_opt_list_small">ചെറുത്</string>
+    <string name="compression_opt_list_medium">ഇടത്തരം</string>
+    <string name="compression_opt_list_large">വലുത്</string>
+    <string name="compression_opt_list_original">യഥാർത്ഥം</string>
+    <string name="call_camera_front">മുന്നിലുള്ള</string>
+    <string name="call_camera_back">പിന്നിലുള്ള</string>
+    <string name="sound_device_headset">ഹെഡ്‌സെറ്റ്</string>
+    <string name="read_receipt">വായിക്കുക</string>
+    <string name="groups_header">കമ്മ്യൂണിറ്റികൾ</string>
+    <string name="bottom_action_groups">കമ്മ്യൂണിറ്റികൾ</string>
+    <string name="dialog_title_error">പിശക്</string>
+    <string name="disable">അപ്രാപ്തമാക്കുക</string>
+    <string name="review">അവലോകനം</string>
+    <string name="abort">ഉപേക്ഷിക്കുക</string>
+    <string name="pause_video">താൽക്കാലികമായി നിർത്തുക</string>
+    <string name="disconnect">വിച്ഛേദിക്കുക</string>
+    <string name="revoke">അസാധുവാക്കുക</string>
+    <string name="forward">ഫോർവേഡ്</string>
+    <string name="quote">ഉദ്ധരണി</string>
+    <string name="stay">തുടരുക</string>
+    <string name="leave">വിടുക</string>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">ഈ മുറിക്കായി %1$s എന്ന ഇതര വിലാസം നിങ്ങൾ ചേർത്തു.</item>
+        <item quantity="other">ഈ മുറിക്കായി %1$s എന്ന ഇതര വിലാസങ്ങൾ നിങ്ങൾ ചേർത്തു.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s ഈ മുറിക്കായി %2$s എന്ന ഇതര വിലാസം ചേർത്തു.</item>
+        <item quantity="other">%1$s ഈ മുറിക്കായി %2$s എന്നീ ഇതര വിലാസങ്ങൾ ചേർത്തു.</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset_by_you">ഈ മുറിയുടെ പ്രധാന വിലാസം നിങ്ങൾ നീക്കംചെയ്തു.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s ഈ മുറിയുടെ പ്രധാന വിലാസം നീക്കംചെയ്‌തു.</string>
+    <string name="notice_room_canonical_alias_set_by_you">ഈ മുറിയുടെ പ്രധാന വിലാസം %1$s ആയി നിങ്ങൾ സജ്ജമാക്കി.</string>
+    <string name="event_status_sent_message">സന്ദേശം അയച്ചു</string>
 </resources>
\ No newline at end of file

From f68eae58918d4b64252d1c58f6c28aef920a6d0c Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Fri, 9 Apr 2021 05:28:14 +0000
Subject: [PATCH 023/350] Translated using Weblate (Russian)

Currently translated at 99.4% (2351 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
---
 vector/src/main/res/values-ru/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 1ed1b17734..dc8387733c 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2820,4 +2820,5 @@
 \nЗагрузка данных…</string>
     <string name="initial_sync_start_server_computing">Начальная синхронизация:
 \nОжидание ответа сервера…</string>
+    <string name="event_status_sent_message">Сообщение отправлено</string>
 </resources>
\ No newline at end of file

From a7be6a61efc99389df7c75df719bff59a2f18e40 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 8 Apr 2021 03:28:30 +0000
Subject: [PATCH 024/350] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
---
 fastlane/metadata/android/zh-Hant/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/zh-Hant/changelogs/40101030.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-Hant/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/zh-Hant/changelogs/40101030.txt

diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101020.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101020.txt
new file mode 100644
index 0000000000..90e76b074e
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hant/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+此版本中的主要變更：效能改進與錯誤修復！
+完整變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101030.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101030.txt
new file mode 100644
index 0000000000..c13d6ecfd4
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hant/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+此版本中的主要變更：效能改進與錯誤修復！
+完整變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.3

From fad3a60bc4311b0f001c26189ff16aea06c96358 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Thu, 8 Apr 2021 06:28:05 +0000
Subject: [PATCH 025/350] Translated using Weblate (French)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
---
 fastlane/metadata/android/fr/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/fr/changelogs/40101030.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/fr/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/40101030.txt

diff --git a/fastlane/metadata/android/fr/changelogs/40101020.txt b/fastlane/metadata/android/fr/changelogs/40101020.txt
new file mode 100644
index 0000000000..7bce8ac19a
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : amélioration des performances et corrections de bugs !
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/fr/changelogs/40101030.txt b/fastlane/metadata/android/fr/changelogs/40101030.txt
new file mode 100644
index 0000000000..93f0b9e7fb
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : amélioration des performances et corrections de bugs !
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.3

From 6443dd6c4dd6c74236b3a9eb5928f72d2709ce9a Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Fri, 9 Apr 2021 23:22:39 +0000
Subject: [PATCH 026/350] Translated using Weblate (Catalan)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
---
 vector/src/main/res/values-ca/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index d5a9ed5b3e..812cb4b531 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -2740,4 +2740,5 @@
     <string name="event_status_a11y_failed">Ha fallat</string>
     <string name="event_status_a11y_sent">Enviat</string>
     <string name="event_status_a11y_sending">Enviant</string>
+    <string name="event_status_sent_message">Missatge enviat</string>
 </resources>
\ No newline at end of file

From 67cbe6ebb07d37f3d0c58fb6cd012b8236a9cadd Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 9 Apr 2021 16:13:37 +0000
Subject: [PATCH 027/350] Translated using Weblate (Albanian)

Currently translated at 99.4% (2351 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
---
 vector/src/main/res/values-sq/strings.xml | 69 ++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 90b0e45a9b..ef68551dc8 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1623,7 +1623,7 @@
 \nJu lutemi, lejoni, te flluska pasuese, hyrje për të qenë e mundur të eksportohen kyçet tuaj dorazi.</string>
     <string name="no_network_indicator">Tani për tani s’la lidhje rrjeti</string>
     <string name="settings_add_3pid_confirm_password_title">Ripohoni fjalëkalimin tuaj</string>
-    <string name="template_settings_add_3pid_flow_not_supported">Këtë s’e bëni dot që nga ${app_name}-i për celular</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Këtë s’e bëni dot që nga ${app_name} për celular</string>
     <string name="settings_add_3pid_authentication_needed">Lypset mirëfilltësim</string>
     <string name="settings_integrations">Integrime</string>
     <string name="settings_integrations_summary">Përdorni një Përgjegjës Integrimesh që të administroni robotë, ura, widget-e dhe paketa ngjitësish.
@@ -2595,4 +2595,71 @@
     <string name="call_resume_action">Rimerre</string>
     <string name="error_unauthorized">E paautorizuar, i mungojnë kredenciale të vlefshme mirëfilltësimi</string>
     <string name="system_theme">Parazgjedhje Sistemi</string>
+    <string name="event_status_delete_all_failed_dialog_message">Jeni i sigurt se doni të fshihen krejt mesazhet e padërguar në këtë dhomë\?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Fshi mesazhet e padërguar</string>
+    <string name="event_status_failed_messages_warning">Dështoi dërgimi i mesazheve</string>
+    <string name="event_status_cancel_sending_dialog_message">Doni të anulohet dërgimi i mesazhit\?</string>
+    <string name="event_status_a11y_delete_all">Fshiji krejt mesazhet e dështuara</string>
+    <string name="event_status_a11y_failed">I dështuar</string>
+    <string name="event_status_a11y_sent">I dërguar</string>
+    <string name="event_status_a11y_sending">Po dërgohet</string>
+    <string name="dev_tools_event_content_hint">Lëndë akti</string>
+    <string name="dev_tools_success_state_event">Akti i gjendjes u dërgua!</string>
+    <string name="dev_tools_success_event">Akti u dërgua!</string>
+    <string name="dev_tools_error_malformed_event">Akt i keqformuar</string>
+    <string name="dev_tools_error_no_message_type">Lloj mesazhi që mungon</string>
+    <string name="dev_tools_error_no_content">S’ka lëndë</string>
+    <string name="dev_tools_form_hint_event_content">Lëndë Akti</string>
+    <string name="dev_tools_form_hint_state_key">Kyç Gjendjesh</string>
+    <string name="dev_tools_form_hint_type">Lloj</string>
+    <string name="dev_tools_send_custom_state_event">Dërgoni Akt Vetjak Gjendjeje</string>
+    <string name="dev_tools_edit_content">Përpunoni Lëndën</string>
+    <string name="dev_tools_state_event">Akte Gjendjeje</string>
+    <string name="dev_tools_send_state_event">Dërgoni Akt Gjendjeje</string>
+    <string name="dev_tools_send_custom_event">Dërgoni Akt Vetjak</string>
+    <string name="dev_tools_explore_room_state">Eksploroni Gjendje Dhome</string>
+    <string name="dev_tools_menu_name">Mjete Zhvilluesi</string>
+    <string name="a11y_view_read_receipts">Shihni dëftesa leximi</string>
+    <string name="a11y_rule_notify_off">Mos njofto</string>
+    <string name="a11y_rule_notify_silent">Njofto pa tingull</string>
+    <string name="a11y_rule_notify_noisy">Njofto me tingull</string>
+    <string name="a11y_error_message_not_sent">Mesazhi s’u dërgua, për shkak të një gabimi</string>
+    <string name="a11y_close_emoji_picker">Mbyllni Zgjedhës emoji-sh</string>
+    <string name="a11y_open_emoji_picker">Hap Zgjedhës emoji-sh</string>
+    <string name="a11y_trust_level_trusted">Shkallë besimi I besuar</string>
+    <string name="a11y_trust_level_warning">Shkallë besimi Kujdes</string>
+    <string name="a11y_trust_level_default">Shkallë besimi parazgjedhje</string>
+    <string name="a11y_selected">Të përzgjedhura</string>
+    <string name="a11y_video">Video</string>
+    <string name="a11y_unsent_draft">Kjo dhomë ka skicë të padërguar</string>
+    <string name="a11y_error_some_message_not_sent">Disa nga mesazhet s’janë dërguar</string>
+    <string name="a11y_delete_avatar">Fshije avatarin</string>
+    <string name="a11y_change_avatar">Ndërroni avatarin</string>
+    <string name="a11y_image">Figurë</string>
+    <string name="a11y_import_key_from_file">Importo kyç prej kartele</string>
+    <string name="a11y_open_widget">Hap widget-e</string>
+    <string name="a11y_screenshot">Foto ekrani</string>
+    <plurals name="entries">
+        <item quantity="one">%d zë</item>
+        <item quantity="other">%d zëra</item>
+    </plurals>
+    <string name="settings_server_upload_size_unknown">Kufiri është i panjohur.</string>
+    <string name="settings_server_upload_size_content">Shërbyesi juaj Home pranon bashkëngjitje (kartela, media, etj.) me një madhësi deri në %s.</string>
+    <string name="settings_server_upload_size_title">Kufi shërbyesi për ngarkim kartelash</string>
+    <string name="settings_server_version">Version shërbyesi</string>
+    <string name="settings_server_name">Emër shërbyesi</string>
+    <string name="room_list_quick_actions_room_settings">Rregullime dhome</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Të braktiset konferenca e tanishme dhe të kalohet te një tjetër\?</string>
+    <string name="room_settings_room_version_title">Version dhome</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Shfaq krejt dhomat te drejtoria e dhomave, përfshi dhomat me lëndë troç.</string>
+    <string name="settings_room_directory_show_all_rooms">Shfaq dhoma me lëndë eksplicite</string>
+    <string name="settings_category_room_directory">Drejtori dhomash</string>
+    <string name="dialog_edit_hint">Vlerë e re</string>
+    <string name="action_return">Kthehuni</string>
+    <string name="action_switch">Ndërroje</string>
+    <string name="event_status_sent_message">Mesazh i dërguar</string>
+    <string name="initial_sync_start_downloading">Njëkohësimi Fillestar:
+\nPo shkarkohen të dhëna…</string>
+    <string name="initial_sync_start_server_computing">Njëkohësimi Fillestar:
+\nPo pritet për përgjigje nga shërbyesi…</string>
 </resources>
\ No newline at end of file

From f0e75d06346e782b3eab738a7f706d196ef55abd Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 8 Apr 2021 03:25:38 +0000
Subject: [PATCH 028/350] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
---
 vector/src/main/res/values-zh-rTW/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index f9345b146f..bd628d9bdb 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2621,4 +2621,5 @@
     <string name="settings_room_directory_show_all_rooms_summary">顯示聊天室目錄中的所有聊天室，包含有明確內容的聊天室。</string>
     <string name="settings_room_directory_show_all_rooms">顯示帶有明確內容的聊天室</string>
     <string name="settings_category_room_directory">聊天室目錄</string>
+    <string name="event_status_sent_message">訊息已傳送</string>
 </resources>
\ No newline at end of file

From 66db67e8571a3f3edfa7de2438e5b4a99f8d3704 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sat, 10 Apr 2021 16:43:16 +0100
Subject: [PATCH 029/350] Missed a spot

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../src/main/java/org/matrix/android/sdk/rx/RxSession.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index cac0a32232..0fe2b01576 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -141,8 +141,8 @@ class RxSession(private val session: Session) {
     }
 
     fun getRoomIdByAlias(roomAlias: String,
-                         searchOnServer: Boolean): Single<Optional<RoomAliasDescription>> = singleBuilder {
-        session.getRoomIdByAlias(roomAlias, searchOnServer, it)
+                         searchOnServer: Boolean): Single<Optional<RoomAliasDescription>> = rxSingle {
+        session.getRoomIdByAlias(roomAlias, searchOnServer)
     }
 
     fun getProfileInfo(userId: String): Single<JsonDict> = rxSingle {

From 9ce12a1b283686644d3201999b066dfb8e2ebc84 Mon Sep 17 00:00:00 2001
From: Ariko <ariko@vivaldi.net>
Date: Sat, 10 Apr 2021 16:15:51 +0000
Subject: [PATCH 030/350] Translated using Weblate (French)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 92fe2986a4..1bb02454ec 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2629,13 +2629,13 @@
     <string name="call_held_by_user">%s a mis l’appel en attente</string>
     <string name="call_hold_action">Mettre en attente</string>
     <string name="call_resume_action">Reprendre</string>
-    <string name="error_unauthorized">Non autorisé, informations d’authentification manquantes</string>
+    <string name="error_unauthorized">Non autorisé, identifiants d\'authentification valides manquants</string>
     <string name="dialog_edit_hint">Nouvelle valeur</string>
     <string name="action_return">Revenir</string>
     <string name="action_unpublish">Dé-publier</string>
     <string name="action_switch">Changer</string>
     <string name="action_add">Ajouter</string>
-    <string name="system_theme">Comme le système</string>
+    <string name="system_theme">Par défaut du système</string>
     <string name="notice_room_canonical_alias_no_change_by_you">Vous avez modifié les adresses de ce salon.</string>
     <string name="notice_room_canonical_alias_no_change">%1$s a modifié les adresses de ce salon.</string>
     <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Vous avez modifié les adresses principale et alternative de ce salon.</string>

From 759528f19a543b6899caf8de65415e1e42f5cad1 Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 11 Apr 2021 10:54:17 +0100
Subject: [PATCH 031/350] Missed another spot

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
---
 .../java/im/vector/app/features/home/HomeDetailViewModel.kt   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index c87b19f0e6..908270cb79 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -109,9 +109,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
             )
                     .map { it.roomId }
             try {
-                awaitCallback<Unit> {
-                    session.markAllAsRead(roomIds, it)
-                }
+                session.markAllAsRead(roomIds)
             } catch (failure: Throwable) {
                 Timber.d(failure, "Failed to mark all as read")
             }

From 35667db29c3c2a82cee53edcea9940d3ebec543b Mon Sep 17 00:00:00 2001
From: Dominic Fischer <dominicfischer7@gmail.com>
Date: Sun, 11 Apr 2021 11:35:28 +0100
Subject: [PATCH 032/350] Lint

---
 .../main/java/im/vector/app/features/home/HomeDetailViewModel.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 908270cb79..d6a8b075f4 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -35,7 +35,6 @@ import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber

From 4fcbf718caacddcca563cce0051998674c6c1041 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Sun, 11 Apr 2021 12:05:42 +0000
Subject: [PATCH 033/350] Translated using Weblate (French)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
---
 .../metadata/android/fr/full_description.txt  | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/fastlane/metadata/android/fr/full_description.txt b/fastlane/metadata/android/fr/full_description.txt
index 2b17d8f846..7604384dd1 100644
--- a/fastlane/metadata/android/fr/full_description.txt
+++ b/fastlane/metadata/android/fr/full_description.txt
@@ -1,30 +1,28 @@
-Element est une nouvelle application de messagerie et de collaboration qui :
+Element est une nouvelle application de messagerie et de collaboration qui :
 
-1) Vous place aux commandes de votre vie privée
-2) Vous permet de communiquer avec n'importe qui du réseau Matrix, et plus encore par des intégrations d'autres applications comme Slack ou Discord
-3) Vous protège de la publicité et de la collecte de données
-4) Vous sécurise grâce à du chiffrement bout-à-bout, avec de la signature croisée pour authentifier les autres utilisateurs
+1. Vous permet de préserver votre vie privée
+2. Vous permet de communiquer avec n’importe qui sur réseau Matrix, et plus encore grâce aux intégrations d’autres applications telles que Slack ou Discord
+3. Vous protège de la publicité et de la collecte de données
+4. Vous protège grâce au chiffrement de bout-à-bout et à la signature croisée pour authentifier les autres utilisateurs
 
-Element est complètement différent des autres applications de messagerie et de collaboration puisque l'application est décentralisée et open-source.
+Element est complètement différente des autres applications de messagerie et de collaboration puisque l’application est décentralisée et open-source.
 
-Element vous permet d'héberger vous-même -ou de choisir un hôte- vous permettant d'assurer votre vie privée, la propriété et le contrôle de vos données et de vos conversations. Cela vous offre l'accès à un réseau ouvert, vous n'êtes donc pas condamné à parler à d'autres utilisateurs d'Element seulement. Et c'est très sécurisé.
+Element vous permet d’héberger vous-même ou de choisir un hôte vous permettant d’assurer votre vie privée, la propriété et le contrôle de vos données et de vos conversations. Cela vous donne accès à un réseau ouvert. Vous n’êtes donc pas condamné à parler à d’autres utilisateurs d’Element seulement. Et c'est très sécurisé.
 
-Element peut faire tout ça car il est basé sur Matrix, le protocole standard pour la communication ouverte et décentralisée.
+Element peut faire tout ça car elle est basée sur Matrix, le protocole standard pour la communication ouverte et décentralisée.
 
-Element vous donne le contrôle en vous laissant choisir qui héberge vos conversations. Depuis l'application Element, vous pouvez choisir votre hôte de différentes manières :
+Element vous donne le contrôle en vous laissant choisir qui héberge vos conversations. Depuis l'application Element, vous pouvez choisir votre hôte de différentes manières :
 
-1) Créer un compte gratuit sur le serveur public matrix.org hébergé par les développeurs de Matrix, ou choisir parler les milliers de serveurs public hébergés par des bénévoles
-2) Héberger vous-même votre compte en installant un serveur sur votre propre machine
-3) Créer un compte sur un serveur personnalisé en souscrivant sur la plateforme d'hébergement « Element Matrix Services » (EMS)
+1. Créer un compte gratuit sur le serveur public matrix.org hébergé par les développeurs de Matrix, ou choisir parmi les milliers de serveurs public hébergés par des bénévoles
+2. Héberger vous-même votre compte en installant un serveur sur votre propre machine
+3. Créer un compte sur un serveur personnalisé en souscrivant sur la plateforme d'hébergement « Element Matrix Services » (EMS)
 
-<b>Pourquoi choisir Element ?</b>
+<b>VOS DONNÉES VOUS APPARTIENNENT</b> : vous décidez où stocker vos données et messages. Ils vous appartiennent et vous les maîtrisez. Aucune multinationale ne viendra extraire vos données pour les envoyer au plus offrant.
 
-<b>POSSÉDEZ VOS DONNÉES</b> : Vous décidez où conserver vos données et vos messages. Vous les possédez et vous les contrôlez, et non une MEGACORP qui mine vos données ou les donnent à des tiers
+<b>MESSAGERIE ET COLLABORATION OUVERTES</b> : vous pouvez discuter avec tout le réseau Matrix, qu’ils utilisent Element ou une autre application Matrix, même s’ils utilisent une autre plateforme de messagerie telle que Slack, IRC ou XMPP.
 
-<b>UNE MESSAGERIE OUVERTE ET COLLABORATIVE</b> : Vous pouvez discuter avec n'importe qui sur le réseau Matrix, qu'ils utilisent Element ou une autre application basée sur Matrix, et même s'ils utilisent un système de messagerie différent comment Slack, Discord, IRC ou XMPP.
+<b>ULTRA SÉCURISÉ</b> : chiffrement de bout en bout (seuls les membres d’une conversation peuvent déchiffrer les messages), et signature croisée pour vérifier les appareils de vos interlocuteurs.
 
-<b>SUPER SÉCURISÉ</b> : Un réel chiffrement bout-à-bout (seulement ceux deux la conversation peuvent déchiffrer les messages), et une signature croisée pour vérifier les appareils des participants de la conversation.
+<b>TOUTES VOS COMMUNICATIONS</b> : messagerie, appels audio et vidéo, partage de fichier, partage d’écran et un grand nombre d’intégrations, robots et widgets. Participez à des salons, des communautés, restez en contact et faites avancer vos projets.
 
-<b>COMMUNICATION COMPLÈTE</b> : Messagerie, appels vocaux et vidéo, transfert de fichiers, partage d'écran et un tas d'intégrations, robots et widgets. Construisez des salons, des communautés, restez en contact et accomplissez de grandes choses.
-
-<b>PARTOUT OÙ VOUS ÊTES</b> : Restez connectés peu import où vous êtes avec la synchronisation complète de l'historique des messages sur tous vos appareils et sur le web sur https://app.element.io.
+<b>PARTOUT AVEC VOUS</b> : votre historique reste synchronisé entre tous vos appareils et sur le web sur https://element.io/app.

From fbb77b7332856c637248a550e5c60eefb49b3e32 Mon Sep 17 00:00:00 2001
From: Jeanne Lavoie <j.lavoie@net-c.ca>
Date: Sat, 10 Apr 2021 17:06:17 +0000
Subject: [PATCH 034/350] Translated using Weblate (German)

Currently translated at 99.9% (2362 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index baeb910d84..c60e226b7b 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -599,8 +599,8 @@
     <string name="room_event_action_report_prompt_ignore_user">Möchtest du alle Nachrichten dieses Nutzers verbergen\?
 \n
 \nBeachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string>
-    <string name="room_event_action_cancel_upload">Upload abbrechen</string>
-    <string name="room_event_action_cancel_download">Download abbrechen</string>
+    <string name="room_event_action_cancel_upload">Hochladen abbrechen</string>
+    <string name="room_event_action_cancel_download">Herunterladen abbrechen</string>
     <!-- Search -->
     <string name="search_hint">Suchen</string>
     <string name="search_members_hint">Raum-Mitglieder filtern</string>
@@ -1945,7 +1945,7 @@
         <item quantity="one">Eine Person</item>
         <item quantity="other">%1$d Personen</item>
     </plurals>
-    <string name="room_profile_section_more_uploads">Uploads</string>
+    <string name="room_profile_section_more_uploads">Hochgeladene Dateien</string>
     <string name="room_profile_section_more_leave">Raum verlassen</string>
     <string name="room_profile_leaving_room">Verlasse den Raum…</string>
     <string name="room_member_power_level_admins">Administratoren</string>
@@ -2615,7 +2615,7 @@
     <string name="room_settings_permissions_title">Raum-Berechtigungen</string>
     <string name="room_permissions_notice_read_only">Du hast nicht die Berechtigung zum Aktualisieren der Rollen, die zum Ändern verschiedener Teile des Raums erforderlich sind</string>
     <string name="room_participants_leave_private_warning">Dieser Raum ist nicht öffentlich. Du wirst ihn ohne Einladung nicht wieder betreten können.</string>
-    <string name="system_theme">Standard Design</string>
+    <string name="system_theme">Standard-Design</string>
     <string name="login_social_continue">Oder</string>
     <string name="default_message_emote_snow">Sendet Schnee ❄️</string>
     <string name="default_message_emote_confetti">Sendet Konfetti 🎉</string>

From c7a241fbf54e7bad60824a2371930e64b1db8748 Mon Sep 17 00:00:00 2001
From: Jeanne Lavoie <j.lavoie@net-c.ca>
Date: Sat, 10 Apr 2021 17:17:25 +0000
Subject: [PATCH 035/350] Translated using Weblate (French (Canada))

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr_CA/
---
 vector/src/main/res/values-fr-rCA/strings.xml | 2674 ++++++++++++++++-
 1 file changed, 2673 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-fr-rCA/strings.xml b/vector/src/main/res/values-fr-rCA/strings.xml
index 0d2c4cc409..cf3e08d791 100644
--- a/vector/src/main/res/values-fr-rCA/strings.xml
+++ b/vector/src/main/res/values-fr-rCA/strings.xml
@@ -1,4 +1,2676 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <string name="notice_widget_modified_by_you">Vous avez modifié le gadget logiciel %1$s</string>
+    <string name="notice_widget_modified">%1$s a modifié le gadget logiciel %2$s</string>
+    <string name="notice_widget_removed_by_you">Vous avez supprimé le gadget logiciel %1$s</string>
+    <string name="notice_widget_removed">%1$s a supprimé le gadget logiciel %2$s</string>
+    <string name="notice_widget_added_by_you">Vous avez ajouté le gadget logiciel %1$s</string>
+    <string name="notice_widget_added">%1$s a ajouté le gadget logiciel %2$s</string>
+    <string name="room_no_active_widgets">Aucun gadget logiciel n’est activé</string>
+    <string name="failed_to_remove_widget">Échec de la suppression du gadget logiciel</string>
+    <string name="failed_to_add_widget">Échec de l’ajout du gadget logiciel</string>
+    <string name="widget_integration_unable_to_create">Impossible de créer le gadget logiciel.</string>
+    <string name="room_widget_resource_permission_title">Ce gadget logiciel veut utiliser les ressources suivantes :</string>
+    <string name="room_widget_permission_widget_id">L’identifiant du gadget logiciel</string>
+    <string name="room_widget_reload">Recharger le gadget logiciel</string>
+    <string name="room_widget_failed_to_load">Échec de chargement du gadget logiciel.
+\n%s</string>
+    <string name="room_widget_permission_added_by">Ce gadget logiciel a été ajouté par :</string>
+    <string name="room_widget_permission_title">Charger un gadget logiciel</string>
+    <string name="widget_delete_message_confirmation">Voulez-vous vraiment supprimer le gadget logiciel de ce salon \?</string>
+    <string name="widget_creation_failure">La création du gadget logiciel a échoué</string>
+    <string name="a11y_open_widget">Ouvrir les gadgets logiciels</string>
+    <string name="room_permissions_modify_widgets">Modifier les gadgets logiciels</string>
+    <string name="terms_description_for_integration_manager">Utiliser des robots, passerelles, gadgets logiciels et jeux d’autocollants</string>
+    <string name="verification_cancelled">Vérification annulée</string>
+    <string name="verify_cancelled_notice">Vérifiez vos appareils depuis les paramètres.</string>
+    <string name="verify_not_me_self_verification">Un des éléments suivants est peut-être compromis :
+\n
+\n- Votre mot de passe
+\n- Votre serveur d’accueil
+\n- Cet appareil ou l’autre appareil
+\n- La connexion internet utilisée par un des deux appareils
+\n
+\nNous vous recommandons de modifier immédiatement votre mot de passe et votre clé de récupération dans les paramètres.</string>
+    <string name="verify_cancel_other">Vous ne vérifierez pas %1$s (%2$s) si vous annulez maintenant. Recommencez sur son profil utilisateur.</string>
+    <string name="verify_cancel_self_verification_from_trusted">Si vous annulez, vous ne pourrez pas lire les messages chiffrés sur votre nouvel appareil, et les autres utilisateurs ne lui feront pas confiance</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Si vous annulez, vous ne pourrez pas lire les messages chiffrés sur cet appareil, et les autres utilisateurs ne lui feront pas confiance</string>
+    <string name="verify_new_session_compromized">Votre compte est peut-être compromis</string>
+    <string name="verify_new_session_was_not_me">Ce n’était pas moi</string>
+    <string name="verify_new_session_notice">Utilisez cette session pour vérifiez la nouvelle, ce qui lui permettra d’avoir accès aux messages chiffrés.</string>
+    <string name="new_session_review">Appuyer pour examiner et vérifier</string>
+    <string name="new_session">Nouvelle connexion. Était-ce vous \?</string>
+    <string name="refresh">Actualiser</string>
+    <string name="e2e_use_keybackup">Déverrouiller l’historique des messages chiffrés</string>
+    <string name="settings_export_trail">Exporter le rapport d’audit</string>
+    <string name="settings_key_requests">Demandes de clé</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
+    <string name="keys_backup_restore_success_title_already_up_to_date">Les clés sont déjà à jour !</string>
+    <string name="event_redacted_by_admin_reason_with_reason">Évènement modéré par l’administrateur du salon, motif : %1$s</string>
+    <string name="event_redacted_by_user_reason_with_reason">Évènement supprimé par l’utilisateur, motif : %1$s</string>
+    <string name="delete_event_dialog_reason_hint">Motif de la suppression</string>
+    <string name="delete_event_dialog_reason_checkbox">Fournir un motif</string>
+    <string name="delete_event_dialog_content">Voulez-vous vraiment supprimer cet évènement \? Notez que si vous supprimez un changement de nom ou de sujet du salon, cela pourrait annuler le changement.</string>
+    <string name="delete_event_dialog_title">Confirmer la suppression</string>
+    <string name="share_confirm_room">Voulez-vous envoyer cette pièce jointe à %1$s \?</string>
+    <string name="message_action_item_redact">Supprimer…</string>
+    <string name="enter_secret_storage_passphrase_warning_text">Vous devriez accéder à votre coffre secret uniquement depuis un appareil de confiance</string>
+    <string name="enter_secret_storage_passphrase_warning">Attention :</string>
+    <string name="enter_secret_storage_passphrase">Saisir la phrase secrète du coffre secret</string>
+    <string name="enter_secret_storage_invalid">Impossible de trouver les secrets dans le stockage</string>
+    <string name="new_signin">Nouvelle connexion</string>
+    <string name="verification_use_passphrase">Si vous n’avez pas accès à une session existante</string>
+    <string name="verification_cannot_access_other_session">Utiliser une phrase secrète ou une clé de récupération</string>
+    <string name="command_description_poll">Crée un sondage simple</string>
+    <string name="poll_item_selected_aria">Option sélectionnée</string>
+    <string name="delete_account_data_warning">Supprimer les données du compte de type %1$s \?
+\n
+\nÀ utiliser avec précaution, ceci peut entraîner des comportements inattendus.</string>
+    <string name="settings_account_data">Données du compte</string>
+    <string name="settings_dev_tools">Outils de développement</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">Le mode avion est activé</string>
+    <string name="no_connectivity_to_the_server_indicator">La connexion avec le serveur a été perdue</string>
+    <string name="qr_code_scanned_by_other_no">Non</string>
+    <string name="qr_code_scanned_by_other_yes">Oui</string>
+    <string name="qr_code_scanned_by_other_notice">On y est presque ! Est-ce que %s affiche le même bouclier \?</string>
+    <string name="a11y_qr_code_for_verification">Code QR</string>
+    <string name="reset_cross_signing">Réinitialiser les clés</string>
+    <string name="initialize_cross_signing">Initialiser la signature croisée</string>
+    <string name="verification_profile_device_untrust_info">Tant que cet utilisateur ne fera pas confiance à cette session, les messages qu’elle envoie et qui lui sont envoyés seront affichés avec des avertissements. Sinon, vous pouvez la vérifier manuellement.</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) s’est connecté en utilisant une nouvelle session :</string>
+    <string name="verification_profile_device_verified_because">Cette session est fiable pour la messagerie sécurisée car %1$s (%2$s) l’a vérifiée :</string>
+    <string name="not_trusted">Non fiable</string>
+    <string name="trusted">Fiable</string>
+    <string name="room_member_profile_sessions_section_title">Sessions</string>
+    <string name="room_member_profile_failed_to_get_devices">Échec lors de la récupération des sessions</string>
+    <string name="verification_profile_warning">Attention</string>
+    <string name="verification_profile_verified">Vérifié</string>
+    <string name="verification_profile_verify">Vérifier</string>
+    <string name="verification_open_other_to_verify">Utilisez une session existante pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.</string>
+    <string name="complete_security">Améliorer la sécurité</string>
+    <string name="crosssigning_other_user_not_trust">Les autres utilisateurs ne lui font peut-être pas confiance</string>
+    <string name="crosssigning_verify_this_session">Vérifier cette session</string>
+    <string name="settings_active_sessions_unverified_device_desc">Vérifiez cette session pour la marquer comme fiable et lui permettre d’accéder aux messages chiffrés. Si vous ne vous êtes pas connecté à cette session, votre compte est peut-être compromis :</string>
+    <string name="settings_active_sessions_verified_device_desc">Cette session est fiable pour la messagerie sécurisée car vous l’avez vérifiée :</string>
+    <string name="settings_failed_to_get_crypto_device_info">Aucune information cryptographique n’est disponible</string>
+    <string name="settings_server_upload_size_unknown">La limite n’est pas connue.</string>
+    <string name="settings_server_upload_size_content">Votre serveur d’accueil accepte les pièces jointes (fichiers, médias, etc.) jusqu’à %s.</string>
+    <string name="settings_server_version">Version du serveur</string>
+    <string name="settings_server_name">Nom du serveur</string>
+    <string name="settings_active_sessions_signout_device">Se déconnecter de cette session</string>
+    <string name="settings_active_sessions_manage">Gérer les sessions</string>
+    <string name="settings_active_sessions_show_all">Afficher toutes les sessions</string>
+    <string name="settings_active_sessions_list">Sessions actives</string>
+    <string name="settings_hs_admin_e2e_disabled">L\'administrateur de votre serveur a désactivé le chiffrement de bout en bout par défaut dans les salons et conversations privés.</string>
+    <string name="encryption_information_dg_xsigning_disabled">La signature croisée n’est pas activée</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">La signature croisée est activée.
+\nLes clés ne sont pas fiables</string>
+    <string name="encryption_information_dg_xsigning_trusted">La signature croisée est activée
+\nLes clés sont fiables.
+\nLes clés privées ne sont pas connues</string>
+    <string name="encryption_information_dg_xsigning_complete">La signature croisée est activée
+\nLes clés privées sont sur l’appareil.</string>
+    <string name="encryption_information_cross_signing_state">Signature croisée</string>
+    <string name="verification_conclusion_ok_self_notice">À présent, votre nouvelle session est vérifiée. Elle a accès à vos messages chiffrés et les autre utilisateurs la verront comme fiable.</string>
+    <string name="verification_conclusion_ok_notice">Les messages avec cet utilisateur sont chiffrés de bout en bout et ne peuvent pas être lus par des tiers.</string>
+    <string name="verification_code_notice">Comparez le code avec celui qui s’affiche sur l’écran de l’autre utilisateur.</string>
+    <string name="verification_emoji_notice">Comparez les émojis uniques, en vous assurant qu’ils apparaissent dans le même ordre.</string>
+    <string name="verification_request_start_notice">Pour plus de sécurité, faites cela en personne ou utilisez un autre moyen de communication.</string>
+    <string name="verification_request_notice">Pour plus de sécurité, vérifiez %s en comparant un code à usage unique.</string>
+    <string name="room_settings_enable_encryption_dialog_submit">Activer le chiffrement</string>
+    <string name="room_settings_enable_encryption_dialog_content">Une fois qu’il est activé, le chiffrement ne peut pas être désactivé. Les messages envoyés dans les salons chiffrés ne peuvent pas être vus par le serveur, uniquement par les participants du salon. Activer le chiffrement empêchera peut-être les robots et les passerelles de fonctionner correctement.</string>
+    <string name="room_settings_enable_encryption_dialog_title">Activer le chiffrement \?</string>
+    <string name="room_settings_enable_encryption_warning">Une fois qu’il est activé, le chiffrement ne peut pas être désactivé.</string>
+    <string name="room_settings_enable_encryption_no_permission">Vous n\'avez pas le droit d’activer le chiffrement dans ce salon.</string>
+    <string name="room_settings_enable_encryption">Active le chiffrement de bout en bout…</string>
+    <string name="settings_category_composer">Éditeur de messages</string>
+    <string name="settings_category_timeline">Fil de discussion</string>
+    <string name="command_description_rainbow_emote">Envoie la réaction fournie colorée comme un arc-en-ciel</string>
+    <string name="command_description_rainbow">Envoie le message fourni coloré comme un arc-en-ciel</string>
+    <string name="room_list_sharing_header_other_rooms">Autres salons</string>
+    <string name="room_list_sharing_header_recent_rooms">Salons récents</string>
+    <string name="verify_cannot_cross_sign">Cette session est incapable de partager cette vérification avec vos autres sessions.
+\nLa vérification sera sauvegardée localement et partagée dans une version future de l’application.</string>
+    <string name="unignore">Ne plus ignorer</string>
+    <string name="template_rendering_event_error_exception">${app_name} a rencontré un problème lors de l’affichage du contenu de l’évènement ayant pour identifiant « %1$s »</string>
+    <string name="template_rendering_event_error_type_of_message_not_handled">${app_name} ne gère pas les messages de type « %1$s »</string>
+    <string name="template_rendering_event_error_type_of_event_not_handled">${app_name} ne gère pas les évènements de type « %1$s »</string>
+    <string name="room_member_jump_to_read_receipt">Aller à l’accusé de lecture</string>
+    <string name="room_member_open_or_create_dm">Conversation privée</string>
+    <string name="room_member_power_level_custom_in">Personnalisé (%1$d) dans %2$s</string>
+    <string name="room_member_power_level_default_in">Par défaut dans %1$s</string>
+    <string name="room_member_power_level_moderator_in">Modérateur dans %1$s</string>
+    <string name="room_member_power_level_admin_in">Administrateur dans %1$s</string>
+    <string name="room_member_power_level_users">Utilisateurs</string>
+    <string name="room_member_power_level_invites">Invitations</string>
+    <string name="room_member_power_level_custom">Personnalisé</string>
+    <string name="room_member_power_level_moderators">Modérateurs</string>
+    <string name="room_member_power_level_admins">Administrateurs</string>
+    <string name="room_profile_leaving_room">En train de quitter le salon…</string>
+    <string name="direct_room_profile_section_more_leave">Quitter</string>
+    <string name="room_profile_section_more_leave">Quitter le salon</string>
+    <string name="room_profile_section_more_notifications">Notifications</string>
+    <string name="direct_room_profile_section_more_settings">Paramètres</string>
+    <string name="room_profile_section_more_settings">Paramètres du salon</string>
+    <string name="room_profile_section_admin">Actions d’administrateur</string>
+    <string name="room_profile_section_more">Plus</string>
+    <string name="room_profile_section_security_learn_more">En savoir plus</string>
+    <string name="room_profile_section_security">Sécurité</string>
+    <string name="direct_room_profile_encrypted_subtitle">Les messages ici sont chiffrés de bout en bout.
+\n
+\nVos messages sont sécurisés avec des verrous et seuls vous et le destinataire en possédez la clé unique pour les déverrouiller.</string>
+    <string name="room_profile_encrypted_subtitle">Les messages dans ce salon sont chiffrés de bout en bout.
+\n
+\nVos messages sont sécurisés avec des verrous et seuls vous et le destinataire avez les clés uniques pour les déverrouiller.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Les messages ici ne sont pas chiffrés de bout en bout.</string>
+    <string name="room_profile_not_encrypted_subtitle">Les messages dans ce salon ne sont pas chiffrés de bout en bout.</string>
+    <string name="verification_request_alert_description">Pour une sécurité supplémentaire, vérifiez %s en comparant un code à usage unique sur vos deux appareils.
+\n
+\nPour une sécurité optimale, faites-le en personne.</string>
+    <string name="verification_request_waiting_for">Nous attendons %s…</string>
+    <string name="verification_verified_user">%s a été vérifié</string>
+    <string name="verification_verify_user">Vérifier %s</string>
+    <string name="a13n_qr_code_description">Image de code QR</string>
+    <string name="verify_by_emoji_description">Si vous ne pouvez pas scanner le code ci-dessus, procédez à la vérification en comparant une sélection courte et unique d’émojis.</string>
+    <string name="verify_by_emoji_title">Vérifier avec des émojis</string>
+    <string name="verification_no_scan_emoji_title">Vérifier en comparant des émojis</string>
+    <string name="verification_scan_emoji_subtitle">Si vous ne pouvez pas vous voir en personne, comparez des émojis à la place</string>
+    <string name="verification_scan_emoji_title">Impossible de scanner</string>
+    <string name="verification_scan_their_code">Scanner leur code</string>
+    <string name="verification_scan_notice">Scanner le code avec l’appareil de l’autre utilisateurs pour vous vérifier réciproquement de façon sécurisée</string>
+    <string name="you">Vous</string>
+    <string name="verification_verify_device_manually">Vérifier manuellement</string>
+    <string name="verification_verify_device">Vérifier cette session</string>
+    <string name="verification_request">Demande de vérification</string>
+    <string name="verification_sent">Vérification envoyée</string>
+    <string name="verification_request_you_accepted">Vous avez accepté</string>
+    <string name="verification_request_other_accepted">%s a accepté</string>
+    <string name="verification_request_you_cancelled">Vous avez annulé</string>
+    <string name="verification_request_other_cancelled">%s a annulé</string>
+    <string name="verification_request_waiting">En attente…</string>
+    <string name="sent_verification_conclusion">Conclusion de la vérification</string>
+    <string name="sent_a_reaction">A réagi avec : %s</string>
+    <string name="sent_a_bot_buttons">Boutons de robot</string>
+    <string name="sent_a_poll">Sondage</string>
+    <string name="send_a_sticker">Autocollants</string>
+    <string name="sent_a_file">Fichier</string>
+    <string name="sent_an_audio_file">Audio</string>
+    <string name="sent_an_image">Image.</string>
+    <string name="sent_a_video">Vidéo.</string>
+    <string name="verification_conclusion_compromised">Un des éléments suivants est peut-être compromis :
+\n
+\n - Votre serveur d’accueil
+\n - Le serveur d’accueil auquel est connecté l’utilisateur que vous essayez de vérifier
+\n - Votre connexion internet ou celle de l’autre utilisateur
+\n - Votre appareil ou celui de l’autre utilisateur</string>
+    <string name="verification_conclusion_not_secure">Non sécurisé</string>
+    <string name="verification_green_shield">Cherchez le bouclier vert pour vous assurer qu’un utilisateur est fiable. Faites confiance à tous les utilisateurs d’un salon pour vous assurer que le salon est fiable.</string>
+    <string name="verify_user_sas_emoji_security_tip">Pour une sécurité optimale, utilisez un autre moyen de communication ou faites cela en personne.</string>
+    <string name="verify_user_sas_emoji_help_text">Vérifiez cet utilisateur en confirmant que les émojis uniques suivants apparaissent sur son écran, dans le même ordre.</string>
+    <string name="verification_sas_do_not_match">Ils ne correspondent pas</string>
+    <string name="verification_sas_match">Ils correspondent</string>
+    <string name="verification_conclusion_warning">Connexion non fiable</string>
+    <string name="create_room_in_progress">Création du salon…</string>
+    <string name="create_room_alias_invalid">Certains caractères sont interdits</string>
+    <string name="create_room_alias_empty">Veuillez fournir une adresse de salon</string>
+    <string name="create_room_alias_already_in_use">Cette adresse est déjà utilisée</string>
+    <string name="create_room_alias_hint">Adresse du salon</string>
+    <string name="create_room_disable_federation_description">Vous devriez l’activer si le salon n’est utilisé que pour collaborer avec des équipes internes sur votre serveur d’accueil. Ceci ne peut pas être changé plus tard.</string>
+    <string name="create_room_disable_federation_title">Empêcher les personnes qui ne sont pas membres de %s de rejoindre ce salon</string>
+    <string name="hide_advanced">Masquer les paramètres avancés</string>
+    <string name="show_advanced">Afficher les paramètres avancés</string>
+    <string name="create_room_encryption_description">Une fois qu’il est activé, le chiffrement ne peut pas être désactivé.</string>
+    <string name="create_room_encryption_title">Activer le chiffrement</string>
+    <string name="command_description_shrug">Préfixe ¯\\_(ツ)_/¯ à un message en texte brut</string>
+    <string name="template_settings_developer_mode_fail_fast_summary">${app_name} peut planter plus souvent quand une erreur inattendue survient</string>
+    <string name="settings_developer_mode_fail_fast_title">Défaillance rapide</string>
+    <string name="autocomplete_limited_results">Seuls les premiers résultats sont affichés, saisissez plus de lettres…</string>
+    <string name="devices_other_devices">Autres sessions</string>
+    <string name="devices_current_device">Cette session</string>
+    <string name="settings">Paramètres</string>
+    <string name="rageshake_detected">Secousse détectée !</string>
+    <string name="settings_rageshake_detection_threshold_summary">Secouez votre téléphone pour tester le seuil de détection</string>
+    <string name="settings_rageshake_detection_threshold">Seuil de détection</string>
+    <string name="settings_rageshake">Secouer de frustration</string>
+    <string name="settings_developer_mode_summary">Le mode développeur active des fonctionnalités cachées et peut rendre l’application moins stable. Réservé aux développeurs !</string>
+    <string name="settings_developer_mode">Mode développeur</string>
+    <string name="settings_advanced_settings">Paramètres avancés</string>
+    <string name="settings_show_devices_list">Voir toutes mes sessions</string>
+    <string name="notification_initial_sync">Synchronisation initiale…</string>
+    <string name="bug_report_error_too_short">La description est trop courte</string>
+    <string name="permalink_malformed">Votre lien matrix.to était malformé</string>
+    <string name="template_soft_logout_sso_not_same_user_error">La session en cours est celle de l’utilisateur %1$s et vous fournissez des identifiants pour l’utilisateur %2$s. Ce n’est pas pris en charge par ${app_name}.
+\nEffacez d’abord les données, puis reconnectez-vous avec un autre compte.</string>
+    <string name="soft_logout_clear_data_dialog_submit">Effacer les données</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Vous perdrez l’accès à vos messages sécurisés sauf si vous vous connectez pour récupérer vos clés de chiffrement.</string>
+    <string name="soft_logout_clear_data_dialog_content">Effacer toutes les données stockées sur cet appareil \?
+\nReconnectez-vous pour accéder aux données et aux messages de votre compte.</string>
+    <string name="soft_logout_clear_data_dialog_title">Effacer les données</string>
+    <string name="soft_logout_clear_data_submit">Effacer toutes les données</string>
+    <string name="soft_logout_clear_data_notice">Attention : Vos données personnelles (y compris les clés de chiffrement) sont toujours stockées sur cet appareil.
+\n
+\nEffacez-les si vous n’utilisez plus cet appareil ou si vous voulez vous connecter à un autre compte.</string>
+    <string name="soft_logout_clear_data_title">Effacer les données personnelles</string>
+    <string name="soft_logout_signin_password_hint">Mot de passe</string>
+    <string name="soft_logout_signin_submit">Se connecter</string>
+    <string name="soft_logout_signin_e2e_warning_notice">Connectez-vous pour récupérer les clés de chiffrement stockées uniquement sur cet appareil. Vous en avez besoin pour lire tous vos messages sécurisés sur n’importe quel appareil.</string>
+    <string name="soft_logout_signin_notice">L’administrateur de votre serveur d’accueil (%1$s) vous a déconnecté de votre compte %2$s (%3$s).</string>
+    <string name="soft_logout_signin_title">Se connecter</string>
+    <string name="soft_logout_title">Vous êtes déconnecté</string>
+    <string name="signed_out_submit">Se reconnecter</string>
+    <string name="signed_out_notice">Cela peut être dû à plusieurs raisons :
+\n
+\n• Vous avez changé votre mot de passe sur une autre session.
+\n
+\n• Vous avez supprimé cette session depuis une autre session.
+\n
+\n• L’administrateur de votre serveur a invalidé votre accès pour des raisons de sécurité.</string>
+    <string name="signed_out_title">Vous êtes déconnecté</string>
+    <string name="seen_by">Vu par</string>
+    <string name="autodiscover_well_known_error">Impossible de trouver un serveur d’accueil valide. Veuillez vérifier votre identifiant</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Ce n’est pas un identifiant d’utilisateur valide. Format attendu : « @utilisateur:serveuraccueil.org »</string>
+    <string name="login_signin_matrix_id_password_notice">Si vous ne connaissez pas votre mot de passe, faites précédent et réinitialisez-le.</string>
+    <string name="uploads_files_subtitle">%1$s à %2$s</string>
+    <string name="uploads_files_title">FICHIERS</string>
+    <string name="uploads_media_no_result">Il n’y a aucun média dans ce salon</string>
+    <string name="uploads_media_title">MÉDIA</string>
+    <string name="attachment_viewer_item_x_of_y">%1$d de %2$d</string>
+    <string name="error_handling_incoming_share">Impossible de traiter les données de partage</string>
+    <string name="rotate_and_crop_screen_title">Pivoter et rogner</string>
+    <string name="attachment_type_sticker">Autocollants</string>
+    <string name="attachment_type_gallery">Galerie</string>
+    <string name="attachment_type_audio">Audio</string>
+    <string name="attachment_type_camera">Appareil photo</string>
+    <string name="attachment_type_contact">Contact</string>
+    <string name="attachment_type_file">Fichier</string>
+    <string name="attachment_type_dialog_title">Ajouter une image à partir de</string>
+    <string name="error_attachment">Une erreur est survenue pendant la récupération de la pièce jointe.</string>
+    <string name="one_user_read">%s a lu</string>
+    <string name="two_users_read">%1$s et %2$s ont lu</string>
+    <string name="three_users_read">%1$s, %2$s et %3$s ont lu</string>
+    <string name="a11y_jump_to_bottom">Sauter en bas de page</string>
+    <string name="a11y_hide_password">Masquer le mot de passe</string>
+    <string name="a11y_show_password">Afficher le mot de passe</string>
+    <string name="a11y_close_keys_backup_banner">Fermer la bannière de sauvegarde des clés</string>
+    <string name="a11y_create_room">Créer un nouveau salon</string>
+    <string name="a11y_create_direct_message_by_qr_code">Créer une nouvelle conversation privée en scannant un code QR</string>
+    <string name="a11y_create_direct_message_by_mxid">Créer une nouvelle conversation privée avec un identifiant Matrix</string>
+    <string name="a11y_create_direct_message">Créer une nouvelle conversation privée</string>
+    <string name="a11y_create_menu_close">Fermer le menu de création de salon…</string>
+    <string name="a11y_create_menu_open">Ouvrir le menu de création de salon</string>
+    <string name="a11y_open_drawer">Ouvrir le menu de navigation</string>
+    <string name="send_attachment">Envoyer une pièce jointe</string>
+    <string name="error_network_timeout">On dirait que le serveur met trop de temps à répondre. Ça peut être dû à une mauvaise connexion ou à une erreur avec le serveur. Réessayez plus tard.</string>
+    <string name="error_terms_not_accepted">Réessayez quand vous aurez accepté les termes et conditions de votre serveur d’accueil.</string>
+    <string name="labs_allow_extended_logging_summary">Les journaux verbeux aideront les développeurs en fournissant plus de journaux quand vous envoyez un rapport d’anomalie. Même si cette option est activée, l’application n’envoie pas le contenu des messages ou toute autre donnée personnelle.</string>
+    <string name="labs_allow_extended_logging">Activer les journaux verbeux.</string>
+    <string name="settings_text_message_sent_wrong_code">Le code de vérification n’est pas correct.</string>
+    <string name="settings_text_message_sent_hint">Code</string>
+    <string name="settings_text_message_sent">Un SMS a été envoyé à %s. Saisissez le code de vérification qu’il contient.</string>
+    <string name="settings_discovery_no_terms">Le serveur d’identité qui vous avez choisi n’a pas de conditions de service. Continuez uniquement si vous faites confiance au propriétaire de ce service</string>
+    <string name="settings_discovery_no_terms_title">Le serveur d’identité n’a pas de conditions de service</string>
+    <string name="settings_discovery_please_enter_server">Veuillez renseigner l’URL du serveur d’identité</string>
+    <string name="settings_discovery_bad_identity_server">Impossible de se connecter au serveur d’identité</string>
+    <string name="settings_discovery_enter_identity_server">Renseignez l’URL d’un serveur d’identité</string>
+    <string name="settings_discovery_consent_action_give_consent">Autoriser</string>
+    <string name="settings_discovery_consent_action_revoke">Révoquer mon autorisation</string>
+    <string name="settings_discovery_mail_pending">En attente</string>
+    <string name="settings_discovery_msisdn_title">Numéros de téléphone découvrables</string>
+    <string name="settings_discovery_no_msisdn">Les options de découverte apparaîtront quand vous aurez ajouté un numéro de téléphone.</string>
+    <string name="settings_discovery_identity_server_info_none">Vous n’utilisez actuellement aucun serveur d’identité. Pour découvrir et être découvrable par les contacts existants que vous connaissez, configurez-en un ci-dessous.</string>
+    <string name="settings_discovery_identity_server_info">Vous utilisez actuellement %1$s pour découvrir et être découvrable par les contacts existants que vous connaissez.</string>
+    <string name="change_identity_server">Modifier le serveur d’identité</string>
+    <string name="add_identity_server">Configurer le serveur d’identité</string>
+    <string name="disconnect_identity_server">Se déconnecter du serveur d’identité</string>
+    <string name="identity_server">Serveur d’identité</string>
+    <string name="read_at">Lu à</string>
+    <string name="terms_description_for_identity_server">Être découvrable par les autres</string>
+    <string name="review_terms">Examiner les conditions</string>
+    <string name="terms_of_service">Conditions de service</string>
+    <string name="message_view_edit_history">Voir l’historique des éditions</string>
+    <string name="joining_room">En train de rejoindre le salon…</string>
+    <string name="direct_room_user_list_suggestions_title">Suggestions</string>
+    <string name="direct_room_user_list_contacts_title">Contacts</string>
+    <string name="direct_room_user_list_known_title">Utilisateurs connus</string>
+    <string name="direct_room_user_list_recent_title">Récent</string>
+    <string name="direct_room_filter_hint">Filtrer par nom d’utilisateur ou identifiant…</string>
+    <string name="direct_room_start_search">Entrez du texte pour avoir des résultats</string>
+    <string name="direct_room_no_known_users">Aucun résultat trouvé, utilisez Ajouter par identifiant matrix pour chercher sur le serveur.</string>
+    <string name="creating_direct_room">Création du salon…</string>
+    <string name="qr_code">code QR</string>
+    <string name="add_by_qr_code">Ajouter avec un code QR</string>
+    <string name="add_by_matrix_id">Ajouter par identifiant matrix</string>
+    <string name="link_copied_to_clipboard">Lien copié dans le presse-papiers</string>
+    <string name="labs_show_unread_notifications_as_tab">Ajouter un onglet dédié aux notifications non-lues sur l’écran principal.</string>
+    <string name="labs_swipe_to_reply_in_timeline">Activer le balayage pour répondre dans l’historique</string>
+    <string name="user_directory_search_hint">Chercher par nom ou identifiant</string>
+    <string name="room_directory_search_hint">Nom ou identifiant (#exemple:matrix.org)</string>
+    <string name="room_filtering_footer_open_room_directory">Voir le répertoire des salons</string>
+    <string name="room_filtering_footer_create_new_direct_message">Envoyer un nouveau message privé</string>
+    <string name="room_filtering_footer_create_new_room">Créer un nouveau salon</string>
+    <string name="room_filtering_footer_title">Vous ne trouvez pas ce que vous cherchez \?</string>
+    <string name="room_filtering_filter_hint">Filtrer les conversations…</string>
+    <string name="no_message_edits_found">Aucune modification trouvée</string>
+    <string name="message_edits">Modifications de message</string>
+    <string name="edited_suffix">(modifié)</string>
+    <string name="downloaded_file">Le fichier %1$s a été téléchargé !</string>
+    <string name="downloading_file">Téléchargement du fichier %1$s…</string>
+    <string name="send_file_step_sending_file">Envoi du fichier (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_file">Chiffrement du fichier…</string>
+    <string name="send_file_step_sending_thumbnail">Envoi de la miniature (%1$s / %2$s)</string>
+    <string name="send_file_step_encrypting_thumbnail">Chiffrement de la miniature…</string>
+    <string name="send_file_step_idle">Attente…</string>
+    <string name="bottom_action_people_x">Conversations privées</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Afficher l’historique dans les salons chiffrés</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">Afficher les évènements cachés dans les discussions</string>
+    <string name="send_suggestion_failed">Échec d’envoi de la suggestion (%s)</string>
+    <string name="send_suggestion_sent">Merci, la suggestion a bien été envoyée</string>
+    <string name="send_suggestion_report_placeholder">Décrivez votre suggestion ici</string>
+    <string name="send_suggestion_content">Saisissez votre suggestion ci-dessous.</string>
+    <string name="send_suggestion">Faire une suggestion</string>
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Inscrire le jeton</string>
+    <string name="preference_root_help_about">Aide &amp; à propos</string>
+    <string name="preference_voice_and_video">Voix &amp; vidéo</string>
+    <string name="push_gateway_item_format">Format :</string>
+    <string name="push_gateway_item_url">URL :</string>
+    <string name="push_gateway_item_device_name">session_name :</string>
+    <string name="push_gateway_item_app_display_name">app_display_name :</string>
+    <string name="push_gateway_item_push_key">push_key :</string>
+    <string name="push_gateway_item_app_id">app_id :</string>
+    <string name="settings_push_gateway_no_pushers">Aucune passerelle de notification enregistrée</string>
+    <string name="settings_push_rules_no_rules">Aucune règle de notification définie</string>
+    <string name="settings_push_rules">Règles de notification</string>
+    <string name="settings_expert">Expert</string>
+    <string name="settings_security_and_privacy">Sécurité &amp; vie privée</string>
+    <string name="settings_preferences">Préférences</string>
+    <string name="settings_general_title">Général</string>
+    <string name="quick_reactions">Réactions rapides</string>
+    <string name="navigate_to_room_when_already_in_the_room">Vous êtes déjà en train de visualiser ce salon !</string>
+    <string name="settings_other_third_party_notices">Licences tierces</string>
+    <string name="settings_sdk_version">Version du SDK de Matrix</string>
+    <string name="import_e2e_keys_from_file">Importer les clés de chiffrement depuis le fichier « %1$s ».</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">Une erreur est survenue lors de la récupération des données de sauvegarde de clés</string>
+    <string name="keys_backup_unable_to_get_trust_info">Une erreur est survenue lors de la récupération des informations de confiance</string>
+    <string name="create_room_federation_error">Le salon a été créé, mais certaines invitations n’ont pas été envoyées pour la raison suivante :
+\n
+\n%s</string>
+    <string name="create_room_directory_description">Publier ce salon dans l’annuaire des salons</string>
+    <string name="create_room_directory_title">Annuaire des salons</string>
+    <string name="create_room_public_description">Tout le monde pourra rejoindre ce salon</string>
+    <string name="create_room_public_title">Public</string>
+    <string name="create_room_settings_section">Paramètres du salon</string>
+    <string name="create_room_topic_hint">Sujet</string>
+    <string name="create_room_topic_section">Sujet du salon (facultatif)</string>
+    <string name="create_room_name_hint">Nom</string>
+    <string name="create_room_name_section">Nom du salon</string>
+    <string name="create_room_action_create">CRÉER</string>
+    <string name="create_room_title">Nouveau salon</string>
+    <string name="fab_menu_create_chat">Conversations privées</string>
+    <string name="fab_menu_create_room">Salons</string>
+    <string name="room_preview_no_preview_join">Impossible d’afficher un aperçu du salon. Voulez-vous le rejoindre \?</string>
+    <string name="room_preview_not_found">Ce salon n’est pas accessible en ce moment.
+\nRéessayez plus tard, ou demandez à un administrateur de ce salon de vérifier que vous pouvez y accéder.</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">L’aperçu des salons visibles par tout le monde n’est pas encore pris en charge par ${app_name}</string>
+    <string name="room_preview_no_preview">Impossible d’avoir un aperçu de ce salon</string>
+    <string name="group_all_communities">Toutes les communautés</string>
+    <string name="please_wait">Veuillez patienter…</string>
+    <string name="change_room_directory_network">Changer de réseau</string>
+    <string name="action_change">Changer</string>
+    <string name="error_no_network">Aucun réseau. Vérifiez votre connexion Internet.</string>
+    <string name="create_new_room">Créer un nouveau salon</string>
+    <string name="malformed_message">Évènement malformé, affichage impossible</string>
+    <string name="last_edited_info_message">Dernière édition par %1$s le %2$s</string>
+    <string name="event_redacted_by_admin_reason">Évènement modéré par l’administrateur du salon</string>
+    <string name="event_redacted_by_user_reason">Évènement supprimé par l’utilisateur</string>
+    <string name="settings_show_redacted_summary">Afficher un remplaçant pour les messages supprimés</string>
+    <string name="settings_show_redacted">Afficher les messages supprimés</string>
+    <string name="event_redacted">Message supprimé</string>
+    <string name="reactions">Réactions</string>
+    <string name="message_view_reaction">Voir les réactions</string>
+    <string name="message_add_reaction">Ajouter une réaction</string>
+    <string name="reactions_like">J’aime</string>
+    <string name="reactions_agree">D’accord</string>
+    <string name="title_activity_emoji_reaction_picker">Réactions</string>
+    <string name="room_list_rooms_empty_body">Vos salons seront affichés ici. Appuyez sur le « + » en bas à droite pour trouver ceux existant ou en créer de nouveaux.</string>
+    <string name="room_list_rooms_empty_title">Salons</string>
+    <string name="room_list_people_empty_body">Vos conversations privées seront affichées ici. Appuyez sur « + » en bas à droite pour en démarrer une.</string>
+    <string name="room_list_people_empty_title">Discussions</string>
+    <string name="room_list_catchup_welcome_body">Rattrapez votre retard sur vos messages non lus ici</string>
+    <string name="room_list_catchup_welcome_title">Bienvenue chez vous !</string>
+    <string name="room_list_catchup_empty_body">Vous n’avez plus de messages non lus</string>
+    <string name="room_list_catchup_empty_title">Vous êtes à jour !</string>
+    <string name="invited_by">Invité par %s</string>
+    <string name="send_you_invite">Vous a envoyé une invitation</string>
+    <string name="room_list_empty">Rejoignez un salon pour commencer à utiliser l’application.</string>
+    <string name="global_retry">Réessayer</string>
+    <string name="reply">Répondre</string>
+    <string name="edit">Modifier</string>
+    <string name="error_user_already_logged_in">Il semblerait que vous essayez de vous connecter à un autre serveur d’accueil. Voulez-vous vous déconnecter \?</string>
+    <string name="identity_server_not_defined_for_password_reset">Aucun serveur d’identité n’est configuré, il est nécessaire pour réinitialiser votre mot de passe.</string>
+    <string name="identity_server_not_defined">Vous n’utilisez aucun serveur d’identité</string>
+    <string name="sas_error_unknown">Erreur inconnue</string>
+    <string name="widget_no_power_to_manage">Vous avez besoin de la permission pour gérer les gadgets logiciels de ce salon</string>
+    <string name="settings_integrations_summary">Utilisez un gestionnaire d’intégrations pour gérer les robots, les passerelles, les gadgets logiciels et les jeux d’autocollants.
+\nLes gestionnaires d’intégrations reçoivent des données de configuration et peuvent modifier des gadgets logiciels, envoyer des invitations de salon et définir des rangs à votre place.</string>
+    <string name="settings_server_upload_size_title">Taille maximum pour des téléversements sur ce serveur</string>
+    <string name="room_profile_section_more_uploads">Téléversements</string>
+    <string name="error_file_too_big">Le fichier « %1$s » (%2$s) est trop gros pour être téléversé. La limite est %3$s.</string>
+    <string name="room_event_action_cancel_upload">Annuler le téléversement</string>
+    <string name="attachment_cancel_upload">Annuler le téléversement\?</string>
+    <string name="message_failed_to_upload">Le téléversement de l’image a échoué</string>
+    <string name="media_slider_saved_message">Enregistrer dans les téléchargements\?</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur adresse courriel et leur numéro de téléphone.
+\n
+\nAutorisez-vous l’accès à vos contacts à cette fin\?</string>
+    <string name="attachment_cancel_download">Annuler le téléchargement\?</string>
+    <string name="auth_forgot_password">Mot de passe oublié\?</string>
+    <string name="no_sticker_application_dialog_content">Vous n’avez aucun jeu d\'autocollants activé pour le moment.
+\n
+\nVoulez-vous en ajouter\?</string>
+    <string name="start_video_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel vidéo\?</string>
+    <string name="start_voice_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel audio\?</string>
+    <string name="start_new_chat_prompt_msg">Voulez-vous vraiment engager une nouvelle discussion avec %s\?</string>
+    <string name="send_bug_report_app_crashed">L’application s’est arrêtée anormalement la dernière fois. Souhaitez-vous ouvrir l’écran de rapport d’anomalie\?</string>
+    <string name="send_bug_report_alert_message">Vous semblez secouer le téléphone avec agacement. Souhaitez-vous ouvrir soumettre un rapport d’anomalie\?</string>
+    <string name="send_bug_report_description">Veuillez décrire l’erreur. Qu’avez-vous fait\? Quel était le comportement attendu\? Que s’est-il réellement passé\?</string>
+    <string name="action_sign_out_confirmation_simple">Voulez-vous vraiment vous déconnecter\?</string>
+    <string name="are_you_sure">Êtes-vous sûr·e\?</string>
+    <string name="conference_call_in_progress">Une téléconférence est déjà en cours!</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Tous les serveurs sont interdits de participation! Ce salon ne peut plus être utilisé.</string>
+    <string name="room_alias_delete_confirmation">Supprimer l’adresse « %1$s »\?</string>
+    <string name="room_alias_unpublish_confirmation">Dépublier l’adresse « %1$s »\?</string>
+    <string name="auth_pin_confirm_to_disable_title">Confirmer le NIP pour le désactiver</string>
+    <string name="settings_security_pin_code_change_pin_summary">Changer votre NIP actuel</string>
+    <string name="settings_security_pin_code_change_pin_title">Changer le NIP</string>
+    <string name="settings_security_pin_code_summary">Si vous voulez réinitialiser votre code, appuyez sur NIP oublié pour vous déconnecter et le réinitialiser.</string>
+    <string name="settings_security_application_protection_summary">Protéger l’accès en utilisant un NIP et des données biométriques.</string>
+    <string name="auth_pin_new_pin_action">Nouveau NIP</string>
+    <string name="auth_pin_reset_title">Réinitialiser le NIP</string>
+    <string name="auth_pin_forgot">NIP oublié\?</string>
+    <string name="auth_pin_title">Entrez votre NIP</string>
+    <string name="create_pin_confirm_failure">Impossible de valider le NIP, veillez en composer un nouveau.</string>
+    <string name="create_pin_confirm_title">Confirmez le NIP</string>
+    <string name="create_pin_title">Choisissez un NIP par sécurité</string>
+    <plurals name="call_one_active_and_other_paused">
+        <item quantity="one">1 appel en cours (%1$s) ⋅ 1 appel en attente</item>
+        <item quantity="other">1 appel en cours (%1$s) ⋅ %2$d appels en attente</item>
+    </plurals>
+    <plurals name="call_only_paused">
+        <item quantity="one">Appel en attente</item>
+        <item quantity="other">%1$d appels en attente</item>
+    </plurals>
+    <plurals name="entries">
+        <item quantity="one">%d entrée</item>
+        <item quantity="other">%d entrées</item>
+    </plurals>
+    <plurals name="wrong_pin_message_remaining_attempts">
+        <item quantity="one">Mauvais code, %d tentative restante</item>
+        <item quantity="other">Mauvais code, %d tentatives restantes</item>
+    </plurals>
+    <plurals name="invitations_sent_to_one_and_more_users">
+        <item quantity="one">Invitations envoyées à %1$s et un autre</item>
+        <item quantity="other">Invitations envoyées à %1$s et %2$d autres</item>
+    </plurals>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="one">Afficher le périphérique avec lequel vous pouvez vérifier</item>
+        <item quantity="other">Afficher les %d périphériques avec lesquels vous pouvez vérifier</item>
+    </plurals>
+    <plurals name="send_images_with_original_size">
+        <item quantity="one">Envoyer l’image en taille originale</item>
+        <item quantity="other">Envoyer les images en taille originale</item>
+    </plurals>
+    <plurals name="poll_info_final">
+        <item quantity="one">%d vote − Résultats finaux</item>
+        <item quantity="other">%d votes − Résultats finaux</item>
+    </plurals>
+    <plurals name="poll_info">
+        <item quantity="one">%d vote</item>
+        <item quantity="other">%d votes</item>
+    </plurals>
+    <plurals name="settings_active_sessions_count">
+        <item quantity="one">%d session active</item>
+        <item quantity="other">%d sessions actives</item>
+    </plurals>
+    <plurals name="room_profile_section_more_member_list">
+        <item quantity="one">Une personne</item>
+        <item quantity="other">%1$d personnes</item>
+    </plurals>
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="one">Trop de requêtes ont été envoyées. Vous pouvez réessayer dans %1$d seconde…</item>
+        <item quantity="other">Trop de requêtes ont été envoyées. Vous pouvez réessayer dans %1$d secondes…</item>
+    </plurals>
+    <plurals name="fallback_users_read">
+        <item quantity="one">%d utilisateur a lu</item>
+        <item quantity="other">%d utilisateurs ont lu</item>
+    </plurals>
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s et %3$d autre ont lu</item>
+        <item quantity="other">%1$s, %2$s et %3$d autres ont lu</item>
+    </plurals>
+    <plurals name="keys_backup_info_keys_backing_up">
+        <item quantity="one">Sauvegarde d’%d clé…</item>
+        <item quantity="other">Sauvegarde de %d clés…</item>
+    </plurals>
+    <plurals name="keys_backup_restore_success_description_part2">
+        <item quantity="one">%d nouvelle clé a été ajoutée à cette session.</item>
+        <item quantity="other">%d nouvelles clés ont été ajoutées à cette session.</item>
+    </plurals>
+    <plurals name="keys_backup_restore_success_description_part1">
+        <item quantity="one">Sauvegarde restaurée avec %d clé.</item>
+        <item quantity="other">Sauvegarde restaurée avec %d clés.</item>
+    </plurals>
+    <plurals name="group_rooms">
+        <item quantity="one">%d salon</item>
+        <item quantity="other">%d salons</item>
+    </plurals>
+    <plurals name="group_members">
+        <item quantity="one">%d participant</item>
+        <item quantity="other">%d participants</item>
+    </plurals>
+    <plurals name="active_widgets">
+        <item quantity="one">%d gadget logiciel actif</item>
+        <item quantity="other">%d gadgets logiciels actifs</item>
+    </plurals>
+    <plurals name="notification_compat_summary_title">
+        <item quantity="one">%d notification</item>
+        <item quantity="other">%d notifications</item>
+    </plurals>
+    <plurals name="notification_compat_summary_line_for_room">
+        <item quantity="one">%1$s : %2$d message</item>
+        <item quantity="other">%1$s : %2$d messages</item>
+    </plurals>
+    <plurals name="notification_invitations">
+        <item quantity="one">%d invitation</item>
+        <item quantity="other">%d invitations</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages_in_room_rooms">
+        <item quantity="one">%d salon</item>
+        <item quantity="other">%d salons</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages_in_room_msgs">
+        <item quantity="one">%d message notifié non lu</item>
+        <item quantity="other">%d messages notifiés non lu</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages">
+        <item quantity="one">%d message notifié non lu</item>
+        <item quantity="other">%d messages notifiés non lu</item>
+    </plurals>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="one">%1$d/%2$d clé importée avec succès.</item>
+        <item quantity="other">%1$d/%2$d clés importées avec succès.</item>
+    </plurals>
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d utilisateur banni</item>
+        <item quantity="other">%d utilisateurs bannis</item>
+    </plurals>
+    <plurals name="seconds">
+        <item quantity="one">%d seconde</item>
+        <item quantity="other">%d secondes</item>
+    </plurals>
+    <plurals name="directory_search_rooms_for">
+        <item quantity="one">%1$s salon trouvé pour %2$s</item>
+        <item quantity="other">%1$s salons trouvés pour %2$s</item>
+    </plurals>
+    <plurals name="directory_search_rooms">
+        <item quantity="one">%d salon</item>
+        <item quantity="other">%d salons</item>
+    </plurals>
+    <string name="dev_tools_event_content_hint">Contenu de l’évènement</string>
+    <string name="dev_tools_form_hint_event_content">Contenu d’évènement</string>
+    <string name="dev_tools_send_custom_state_event">Envoyer des évènements d’état personnalisés</string>
+    <string name="dev_tools_send_state_event">Envoyer un évènement d’état</string>
+    <string name="dev_tools_send_custom_event">Envoyer un évènement personnalisé</string>
+    <string name="room_permissions_send_m_room_server_acl_events">Envoyer des évènements m.room.server_acl</string>
+    <string name="settings_show_room_member_state_events_summary">Inclure les évènement d’invitation/ajout/départ/expulsion/exclusion ainsi que les changements d’avatar et de nom d’affichage.</string>
+    <string name="settings_show_room_member_state_events">Afficher les évènement des membres du salon</string>
+    <string name="encryption_information_device_info">Informations sur l’évènement</string>
+    <string name="settings_show_avatar_display_name_changes_messages">Afficher les évènements liés au compte</string>
+    <string name="room_details_title">Informations sur le salon</string>
+    <plurals name="room_details_selected">
+        <item quantity="one">%d sélectionné</item>
+        <item quantity="other">%d sélectionnés</item>
+    </plurals>
+    <plurals name="room_new_messages_notification">
+        <item quantity="one">%d nouveau message</item>
+        <item quantity="other">%d nouveaux messages</item>
+    </plurals>
+    <plurals name="format_time_d">
+        <item quantity="one">%d j.</item>
+        <item quantity="other">%d j.</item>
+    </plurals>
+    <plurals name="format_time_h">
+        <item quantity="one">%d h</item>
+        <item quantity="other">%d h</item>
+    </plurals>
+    <plurals name="format_time_m">
+        <item quantity="one">%d min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="format_time_s">
+        <item quantity="one">%d s</item>
+        <item quantity="other">%d s</item>
+    </plurals>
+    <plurals name="room_title_members">
+        <item quantity="one">%d membre</item>
+        <item quantity="other">%d membres</item>
+    </plurals>
+    <string name="room_participants_leave_prompt_msg">Voulez-vous vraiment quitter le salon\?</string>
+    <plurals name="room_header_active_members_count">
+        <item quantity="one">%d membre actif</item>
+        <item quantity="other">%d membres actifs</item>
+    </plurals>
+    <plurals name="membership_changes">
+        <item quantity="one">%d changement de statut</item>
+        <item quantity="other">%d changements de statut</item>
+    </plurals>
+    <plurals name="public_room_nb_users">
+        <item quantity="one">%d utilisateur</item>
+        <item quantity="other">%d utilisateurs</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="one">Vous avez supprimé l’adresse alternative %1$s de ce salon.</item>
+        <item quantity="other">Vous avez supprimé les adresses alternatives %1$s de ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="one">%1$s a supprimé l’adresse alternative %2$s de ce salon.</item>
+        <item quantity="other">%1$s a supprimé les adresses alternatives %2$s de ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="one">Vous avez ajouté %1$s comme adresse alternative pour ce salon.</item>
+        <item quantity="other">Vous avez ajouté %1$s comme adresses alternatives pour ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="one">%1$s a ajouté %2$s comme adresse alternative pour ce salon.</item>
+        <item quantity="other">%1$s a ajouté %2$s comme adresses alternatives pour ce salon.</item>
+    </plurals>
+    <string name="room_permissions_title">Autorisations</string>
+    <string name="login_registration_not_supported">L’application ne peut pas créer de compte sur ce serveur d’accueil.
+\n
+\nVoulez-vous vous inscrire en utilisant un client web\?</string>
+    <string name="login_mode_not_supported">L’application ne peut pas s’authentifier sur ce serveur d’accueil. Le serveur d’accueil prend en charge le(s) type(s) d’authentification suivant(s) : %1$s.
+\n
+\nVoulez-vous vous connecter en utilisant un client web\?</string>
+    <string name="room_widget_permission_webview_shared_info_title">Son utilisation peut entraîner l’utilisation de fichiers témoins et le partage de données avec %s :</string>
+    <string name="settings_emails_and_phone_numbers_title">Courriels et numéros de téléphone</string>
+    <string name="login_set_email_optional_hint">Courriel (facultatif)</string>
+    <string name="login_set_email_mandatory_hint">Courriel</string>
+    <string name="login_reset_password_email_hint">Courriel</string>
+    <string name="settings_email_address">Courriel</string>
+    <string name="people_search_invite_by_id_dialog_hint">Courriel ou identifiant Matrix</string>
+    <string name="login_error_threepid_denied">Le domaine de votre adresse courriel n’est pas autorisé à s’inscrire sur ce serveur</string>
+    <string name="settings_discovery_no_mails">Les options de découverte apparaîtront quand vous aurez ajouté un courriel.</string>
+    <string name="deactivate_account_content">Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous connecter et personne ne pourra se réenregistrer avec le même identifiant d’utilisateur. Le compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d’identité. <b>Cette action est irréversible.</b>
+\n
+\nDésactiver votre compte <b>ne nous fait pas oublier les messages que vous avez envoyés par défaut</b>. Si vous souhaitez que nous oubliions vos messages, cochez la case ci-dessous.
+\n
+\nLa visibilité des messages dans Matrix est identique à celle des courriels. Si nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront plus partagés avec les nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà accès à ces messages en conserveront leur copie.</string>
+    <string name="room_preview_unlinked_email_warning">Cette invitation a été envoyée à %s, qui n’est pas associé à ce compte.
+\nVous pouvez vous identifier avec un compte différent ou ajouter cette adresse courriel à votre compte.</string>
+    <string name="auth_reset_password_error_unauthorized">Impossible de vérifier l’adresse courriel : assurez-vous d’avoir cliqué sur le lien dans l’courriel</string>
+    <string name="auth_reset_password_message">Pour réinitialiser votre mot de passe, saisissez l’adresse courriel associée à votre compte :</string>
+    <string name="auth_reset_password_next_step_button">J’ai vérifié mon adresse courriel</string>
+    <string name="settings_emails_empty">Aucune adresse courriel n’a été ajoutée à votre compte</string>
+    <string name="auth_opt_email_placeholder">Adresse courriel (facultatif)</string>
+    <string name="auth_email_placeholder">Adresse courriel</string>
+    <string name="auth_email_already_defined">Cette adresse courriel est déjà utilisée.</string>
+    <string name="auth_missing_email">Adresse courriel manquante</string>
+    <string name="auth_missing_email_or_phone">Adresse courriel ou numéro de téléphone manquant</string>
+    <string name="auth_email_validation_message">Veuillez vérifier votre courriel pour continuer votre inscription</string>
+    <string name="auth_threepid_warning_message">L’inscription avec courriel et numéro de téléphone à la fois n’est pas prise en charge tant que l’API n’existe pas. Seul le numéro de téléphone sera pris en compte.
+\n
+\nVous pouvez ajouter votre adresse courriel à votre profil dans les paramètres.</string>
+    <string name="auth_reset_password_missing_email">L’adresse courriel liée à votre compte doit être saisie.</string>
+    <string name="auth_reset_password_email_validation_message">Un courriel a été envoyé à %s. Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="login_error_unable_register_mail_ownership">Impossible de s’inscrire : erreur d’appartenance de l’adresse courriel</string>
+    <string name="notice_crypto_unable_to_decrypt_final">Vous n’avez pas accès à ce message</string>
+    <string name="room_settings_set_avatar">Définir l’avatar</string>
+    <string name="room_settings_save_success">Vous avez bien changé les paramètres du salon</string>
+    <string name="room_settings_topic_hint">Sujet</string>
+    <string name="room_settings_name_hint">Nom du salon</string>
+    <string name="save_your_security_key_notice">Stockez votre clé de sécurité en lieu sûr comme un gestionnaire de mots de passe ou un coffre-fort.</string>
+    <string name="save_your_security_key_title">Enregistrer votre clé de sécurité</string>
+    <string name="set_a_security_phrase_again_notice">Entrez de nouveau votre phrase de sécurité pour la confirmer.</string>
+    <string name="set_a_security_phrase_hint">Phrase de sécurité</string>
+    <string name="set_a_security_phrase_notice">Entrez une phrase de sécurité que seul vous connaissez, celle-ci est utilisée pour sécuriser les mots de passe sur le serveur.</string>
+    <string name="set_a_security_phrase_title">Définir une phrase de sécurité</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Stockez votre clé de sécurité en lieu sûr comme un gestionnaire de mots de passe ou un coffre-fort.</string>
+    <string name="bottom_sheet_save_your_recovery_key_title">Enregistrer votre clé de sécurité</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Entrez une phrase secrète que seul vous connaissez, et générez une clé de sauvegarde.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Utiliser une phrase de sécurité</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Générez une clé de sécurité à stocker en lieu sûr comme un gestionnaire de mots de passe ou un coffre-fort.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Utiliser une clé de sécurité</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Configuration</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Protection contre la perte d’accès aux messages et données chiffrées en sauvegardant les clés de chiffrement sur votre serveur.</string>
+    <string name="bottom_sheet_setup_secure_backup_title">Sauvegarde sécurisée</string>
+    <string name="settings_setup_secure_backup">Activer la sauvegarde sécurisée</string>
+    <string name="a11y_start_camera">Démarrer la caméra</string>
+    <string name="a11y_stop_camera">Arrêter la caméra</string>
+    <string name="a11y_unmute_microphone">Activer le microphone</string>
+    <string name="a11y_mute_microphone">Désactiver le microphone</string>
+    <string name="a11y_open_chat">Ouvrir la discussion</string>
+    <string name="power_level_title">Rôle</string>
+    <string name="power_level_edit_title">Définir le rôle</string>
+    <string name="identity_server_set_alternative_submit">Valider</string>
+    <string name="identity_server_set_alternative_notice_no_default">Renseignez l’URL d’un serveur d’identité</string>
+    <string name="identity_server_set_alternative_notice">Sinon, vous pouvez renseigner n’importe quelle autre URL de serveur d’identité</string>
+    <string name="identity_server_set_default_submit">Utiliser %1$s</string>
+    <string name="identity_server_set_default_notice">Votre serveur d’accueil (%1$s) propose d’utiliser %2$s comme serveur d’identité</string>
+    <string name="identity_server_user_consent_not_provided">Le consentement de l\'utilisateur n’a pas été fourni.</string>
+    <string name="identity_server_error_no_current_binding_error">Il n’y a actuellement aucune association avec cet identifiant.</string>
+    <string name="identity_server_error_binding_error">L’association a échoué.</string>
+    <string name="identity_server_error_terms_not_signed">Veuillez d’abord accepter les termes du serveur d’identité dans les paramètres.</string>
+    <string name="identity_server_error_no_identity_server_configured">Veuillez d’abord configurer un serveur d’identité.</string>
+    <string name="identity_server_error_outdated_home_server">Cette opération n’est pas possible. Le serveur d’accueil est obsolète.</string>
+    <string name="template_identity_server_error_outdated_identity_server">Ce serveur d’identité est obsolète. ${app_name} ne prend en charge que l’API V2.</string>
+    <string name="disconnect_identity_server_dialog_content">Se déconnecter du serveur d’identité %s \?</string>
+    <string name="open_terms_of">Ouvrir les termes de %s</string>
+    <string name="choose_locale_loading_locales">Chargement des langues disponibles…</string>
+    <string name="choose_locale_other_locales_title">Autres langues disponibles</string>
+    <string name="choose_locale_current_locale_title">Langue actuelle</string>
+    <string name="user_code_info_text">Partagez ce code avec des gens pour qu’ils puissent le scanner pour vous ajouter et commencer à discuter.</string>
+    <string name="user_code_my_code">Mon code</string>
+    <string name="user_code_share">Partager mon code</string>
+    <string name="user_code_scan">Scanner un code QR</string>
+    <string name="invite_users_to_room_failure">Nous n’avons pas pu inviter les utilisateurs. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.</string>
+    <string name="not_a_valid_qr_code">Ce n’est pas un code QR matrix valide</string>
+    <string name="invitations_sent_to_two_users">Invitations envoyées à %1$s et %2$s</string>
+    <string name="invitation_sent_to_one_user">Invitation envoyée à %1$s</string>
+    <string name="template_invite_friends_rich_title">🔐️ Rejoins-moi sur ${app_name}</string>
+    <string name="template_invite_friends_text">Salut, parle-moi sur ${app_name} : %s</string>
+    <string name="invite_friends">Ajouter des amis</string>
+    <string name="invite_users_to_room_title">Inviter des utilisateurs</string>
+    <string name="inviting_users_to_room">Invitation des utilisateurs…</string>
+    <string name="invite_users_to_room_action_invite">INVITER</string>
+    <string name="add_people">Ajouter des personnes</string>
+    <string name="add_members_to_room">Ajouter des membres</string>
+    <string name="create_room_dm_failure">Nous n’avons pas pu créer votre conversation privée. Vérifiez les utilisateurs que vous souhaitez inviter et réessayez.</string>
+    <string name="external_link_confirmation_message">Le lien %1$s vous emmène sur un autre site : %2$s.
+\n
+\nVoulez-vous vraiment poursuivre \?</string>
+    <string name="external_link_confirmation_title">Vérifiez ce lien</string>
+    <string name="error_empty_field_choose_password">Veuillez choisir un mot de passe.</string>
+    <string name="error_empty_field_choose_user_name">Veuillez choisir un nom d’utilisateur.</string>
+    <string name="failed_to_initialize_cross_signing">Échec de la mise en place de la signature croisée</string>
+    <string name="mark_as_verified">Marquer comme fiable</string>
+    <string name="confirm_your_identity_quad_s">Confirmez votre identité en vérifiant cet identifiant, lui donnant ainsi accès aux messages chiffrés.</string>
+    <string name="confirm_your_identity">Confirmez votre identité en vérifiant cette connexion depuis une de vos autres sessions, ce qui lui permettra d’avoir accès à vos messages chiffrés.</string>
+    <string name="cross_signing_verify_by_emoji">Vérifier de façon interactive avec des émojis</string>
+    <string name="crosssigning_verify_session">Vérifier la connexion</string>
+    <string name="cross_signing_verify_by_text">Vérifier manuellement avec un texte</string>
+    <string name="verify_this_session">Vérifiez la nouvelle connexion accédant à votre compte : %1$s</string>
+    <string name="verify_other_sessions">Vérifiez toutes les sessions pour vous assurer que votre compte et vos messages sont en sécurité</string>
+    <string name="review_logins">Vérifiez où vous vous êtes connecté</string>
+    <string name="encrypted_unverified">Chiffré par un appareil non vérifié</string>
+    <string name="unencrypted">Non chiffré</string>
+    <string name="default_message_emote_snow">envoie de la neige ❄️</string>
+    <string name="default_message_emote_confetti">envoie des confettis 🎉</string>
+    <string name="command_snow">Envoie le message avec de la neige</string>
+    <string name="command_confetti">Envoie le message avec des confettis</string>
+    <string name="secure_backup_reset_no_history">Vous redémarrerez sans aucun historique, message, appareil ou utilisateurs connus</string>
+    <string name="secure_backup_reset_if_you_reset_all">Si vous réinitialisez tout</string>
+    <string name="secure_backup_reset_all_no_other_devices">Faites uniquement ceci si vous n\'avez aucun autre appareil pouvant vérifier celui-ci.</string>
+    <string name="secure_backup_reset_all">Réinitialiser tout</string>
+    <string name="bad_passphrase_key_reset_all_action">Perdu ou oublié toutes les options de récupération \? Réinitialisez tout</string>
+    <string name="failed_to_access_secure_storage">Échec d’accès au coffre secret</string>
+    <string name="keys_backup_recovery_key_error_decrypt">La sauvegarde n’a pas pu être déchiffrée avec cette clé de récupération : veuillez vérifier que vous avez saisi la bonne clé de récupération.</string>
+    <string name="enter_secret_storage_input_key">Sélectionnez votre clé de récupération ou saisissez-la manuellement avec le clavier ou en la copiant depuis le presse-papiers</string>
+    <string name="use_recovery_key">Utiliser la clé de récupération</string>
+    <string name="enter_secret_storage_passphrase_or_key">Utilisez votre %1$s ou votre %2$s pour continuer.</string>
+    <string name="command_description_discard_session_not_handled">Seulement pris en charge dans les salons chiffrés</string>
+    <string name="command_description_discard_session">Force la session de groupe sortante actuelle dans un salon chiffré à être abandonnée</string>
+    <string name="template_use_latest_app">Utilisez la dernière version de ${app_name} sur vos autres appareils :</string>
+    <string name="or_other_mx_capabale_client">ou un autre client Matrix qui prend en charge la signature croisée</string>
+    <string name="template_app_ios_android">${app_name} iOS
+\n${app_name} Android</string>
+    <string name="template_app_desktop_web">${app_name} Web
+\n${app_name} pour Bureau</string>
+    <string name="template_use_other_session_content_description">Utilisez la dernière version de ${app_name} sur vos autres appareils : ${app_name} Web, ${app_name} pour Bureau, ${app_name} iOS, ${app_name} pour Android, ou un autre client Matrix qui prend en charge la signature croisée</string>
+    <string name="change_password_summary">Définir un nouveau mot de passe de compte…</string>
+    <string name="error_saving_media_file">Impossible d’enregistrer le fichier multimédia</string>
+    <string name="error_adding_media_file_to_gallery">Impossible d’ajouter le fichier multimédia à la galerie</string>
+    <string name="media_file_added_to_gallery">Fichier multimédia ajouté à la galerie</string>
+    <string name="settings_security_prevent_screenshots_summary">L’activation de ce paramètre ajoute FLAG_SECURE à toutes les activités. Redémarrez l’application pour que la modification soit prise en compte.</string>
+    <string name="settings_security_prevent_screenshots_title">Empêcher les captures d’écran de l’application</string>
+    <string name="bootstrap_migration_backup_recovery_key">Clé de récupération de sauvegarde de clés</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Vous ne connaissez pas votre phrase secrète de sauvegarde de clés, vous pouvez %s.</string>
+    <string name="bootstrap_migration_use_recovery_key">utiliser votre clé de récupération de sauvegarde de clés</string>
+    <string name="bootstrap_migration_enter_backup_password">Saisissez votre phrase secrète de sauvegarde de clés pour continuer.</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+    <string name="bootstrap_progress_storing_in_sss">Stockage du secret de sauvegarde dans le SSSS</string>
+    <string name="bootstrap_progress_generating_ssss_recovery">Génération de la clé SSSS à partir de la clé de récupération</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Génération de la clé SSSS à partir de la phrase secrète (%s)</string>
+    <string name="bootstrap_progress_generating_ssss">Génération de la clé SSSS à partir de la phrase secrète</string>
+    <string name="bootstrap_progress_compute_curve_key">Récupération de la clé de courbe</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Vérification de la clé de sauvegarde (%s)</string>
+    <string name="bootstrap_progress_checking_backup">Vérification de la clé de sauvegarde</string>
+    <string name="recovery_key_empty_error_message">Veuillez entrer une clé de récupération</string>
+    <string name="bootstrap_invalid_recovery_key">Ce n’est pas une clé de récupération valide</string>
+    <string name="backup_recovery_passphrase">Phrase de récupération</string>
+    <string name="enter_backup_passphrase">Entrez %s</string>
+    <string name="use_file">Utiliser un fichier</string>
+    <string name="bootstrap_enter_recovery">Entrez votre %s pour continuer</string>
+    <string name="security_prompt_text">Vérifiez vos sessions et les autres pour garantir la sûreté de vos discussions</string>
+    <string name="setup_cross_signing">Activer la signature croisée</string>
+    <string name="upgrade_security">Mise à niveau du chiffrement disponible</string>
+    <string name="room_message_placeholder">Message…</string>
+    <string name="auth_invalid_login_deactivated_account">Ce compte a été désactivé.</string>
+    <string name="auth_invalid_login_param_space_in_password">Nom et/ou mot de passe incorrect(s). Le mot de passe saisi commence ou se termine par des espaces, veuillez le vérifier.</string>
+    <string name="command_description_plain">Envoie un message en texte simple, sans l’interpréter comme du Markdown</string>
+    <string name="settings_notification_advanced_summary">Définir l’importance des notifications par évènement</string>
+    <string name="settings_troubleshoot_title">Résolution de problèmes</string>
+    <string name="settings_when_rooms_are_upgraded">Quand les salons sont mis à niveau</string>
+    <string name="settings_messages_in_e2e_group_chat">Messages chiffrés dans les conversations de groupe</string>
+    <string name="settings_messages_in_e2e_one_to_one">Messages chiffrés dans les conversations individuelles</string>
+    <string name="settings_messages_at_room">Messages contenant @room</string>
+    <string name="settings_notification_configuration">Configuration des notifications</string>
+    <string name="error_failed_to_import_keys">Échec de l’importation des clés</string>
+    <string name="qr_code_scanned_verif_waiting">En attente de %s…</string>
+    <string name="qr_code_scanned_verif_waiting_notice">On y est presque ! En attente de la confirmation…</string>
+    <string name="qr_code_scanned_self_verif_notice">On y est presque ! L’autre appareil affiche-t-il le même bouclier \?</string>
+    <string name="topic_prefix">"Sujet : "</string>
+    <string name="add_a_topic_link_text">Ajouter un sujet</string>
+    <string name="room_created_summary_no_topic_creation_text">%s pour permettre aux gens de connaître le sujet de ce salon.</string>
+    <string name="this_is_the_beginning_of_dm">Ceci est le début de l’historique de votre conversation privée avec %s.</string>
+    <string name="this_is_the_beginning_of_room_no_name">Ceci est le début de cette conversation.</string>
+    <string name="this_is_the_beginning_of_room">Ceci est le début de %s.</string>
+    <string name="direct_room_created_summary_item_by_you">Vous avez rejoint la conversation.</string>
+    <string name="direct_room_created_summary_item">%s a rejoint la conversation.</string>
+    <string name="room_created_summary_item_by_you">Vous avez créé et configuré ce salon.</string>
+    <string name="room_created_summary_item">%s a créé et configuré ce salon.</string>
+    <string name="encryption_unknown_algorithm_tile_description">Le chiffrement utilisé par ce salon n’est pas pris en charge</string>
+    <string name="encryption_not_enabled">Chiffrement désactivé</string>
+    <string name="direct_room_encryption_enabled_tile_description">Les messages de ce salon sont chiffrés de bout en bout.</string>
+    <string name="encryption_enabled_tile_description">Les messages de ce salon sont chiffrés de bout en bout. Apprenez-en plus et vérifiez les utilisateurs sur leur profil.</string>
+    <string name="encryption_enabled">Chiffrement activé</string>
+    <string name="bootstrap_cancel_text">Si vous annulez maintenant, vous pourrez perdre les messages et données chiffrés si vous perdez accès à vos identifiants.
+\n
+\nVous pouvez aussi activer la sauvegarde sécurisée et gérer vos clés dans les paramètres.</string>
+    <string name="bootstrap_skip_text_no_gen_key">La configuration d’une phrase de récupération vous permet des sécuriser et déverrouiller les messages chiffrés et les vérifications.</string>
+    <string name="bootstrap_skip_text">La configuration d’un mot de passe de messages vous permet des sécuriser et déverrouiller les messages chiffrés et les vérifications.
+\n
+\nSi vous ne voulez pas définir un mot de passe de messages, générez plutôt une clé de messages.</string>
+    <string name="auth_flow_not_supported">Vous ne pouvez pas faire ça depuis votre portable</string>
+    <string name="bootstrap_crosssigning_save_cloud">Copiez-le sur votre stockage dans le cloud personnel</string>
+    <string name="bootstrap_crosssigning_save_usb">Sauvegardez-le sur une clé USB ou un disque de sauvegarde</string>
+    <string name="bootstrap_crosssigning_print_it">Imprimez-le et conservez-le en lieu sûr</string>
+    <string name="bootstrap_cross_signing_success">Votre %2$s et votre %1$s sont bien réglés.
+\n
+\nConservez-les en lieu sûr ! Vous en aurez besoin pour accéder aux messages chiffrés et à vos informations sécurisées si vous perdez toutes vos sessions actives.</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Configuration de la sauvegarde de clés</string>
+    <string name="bootstrap_crosssigning_progress_save_ssk">Synchronisation de la clé d’auto-signature</string>
+    <string name="bootstrap_crosssigning_progress_save_usk">Synchronisation de la clé de l’utilisateur</string>
+    <string name="bootstrap_crosssigning_progress_save_msk">Synchronisation de la clé maîtresse</string>
+    <string name="bootstrap_crosssigning_progress_default_key">Définition de la clé par défaut du SSSS</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Génération d’une clé sécurisée depuis la phrase secrète</string>
+    <string name="bootstrap_crosssigning_progress_initializing">Publication des clés d’identité créées</string>
+    <string name="bootstrap_save_key_description">Utilisez cette %1$s comme filet de sécurité au cas où vous oublieriez votre %2$s.</string>
+    <string name="finish">Terminer</string>
+    <string name="keep_it_safe">Conservez-le en lieu sûr</string>
+    <string name="bootstrap_finish_title">Vous avez terminé !</string>
+    <string name="your_recovery_key">Votre clé de récupération</string>
+    <string name="bootstrap_loading_title">Configuration de la récupération.</string>
+    <string name="bootstrap_loading_text">Cela peut prendre plusieurs secondes, veuillez patienter.</string>
+    <string name="bootstrap_info_text_2">Entrez une phrase de sécurité que seul vous connaissez, celle-ci est utilisée pour sécuriser les mots de passe sur le serveur.</string>
+    <string name="bootstrap_dont_reuse_pwd">Ne réutilisez pas votre mot de passe de compte.</string>
+    <string name="bootstrap_info_confirm_text">Saisissez à nouveau votre %s pour le confirmer.</string>
+    <string name="bootstrap_info_text">Sécurisez et débloquez vos messages chiffrés et vos vérifications avec un %s.</string>
+    <string name="enter_account_password">Saisissez votre %s pour continuer.</string>
+    <string name="confirm_recovery_passphrase">Confirmez le %s</string>
+    <string name="generate_message_key">Générez une clé de messages</string>
+    <string name="set_recovery_passphrase">Définissez un %s</string>
+    <string name="account_password">Mot de passe du compte</string>
+    <string name="message_key">clé des messages</string>
+    <string name="recovery_passphrase">Phrase de récupération</string>
+    <string name="sas_error_m_user_error">Non-concordance d’utilisateur</string>
+    <string name="sas_error_m_key_mismatch">Non-concordance de clé</string>
+    <string name="sas_error_m_invalid_message">Un message non valide a été reçu</string>
+    <string name="sas_error_m_unexpected_message">La session a reçu un message inattendu</string>
+    <string name="sas_error_m_mismatched_sas">Le SAS ne correspond pas</string>
+    <string name="sas_error_m_mismatched_commitment">L’engagement de hachage ne correspond pas</string>
+    <string name="sas_error_m_unknown_method">La session ne peut pas s’accorder sur une méthode de concordance, de hachage, de MAC ou de SAS de clé</string>
+    <string name="sas_error_m_unknown_transaction">La session n’est pas au courant de cette transaction</string>
+    <string name="sas_error_m_timeout">Le processus de vérification a expiré</string>
+    <string name="sas_error_m_user">L’utilisateur a annulé la vérification</string>
+    <string name="sas_incoming_request_notif_content">%s veut vérifier votre session</string>
+    <string name="sas_incoming_request_notif_title">Demande de vérification</string>
+    <string name="sas_verification_request_notification_channel">Vérification de session interactive</string>
+    <string name="sas_cancelled_by_me">La vérification est annulée.
+\nMotif : %s</string>
+    <string name="sas_cancelled_by_other">Votre interlocuteur a annulé la vérification.
+\n%s</string>
+    <string name="sas_cancelled_dialog_title">Demande annulée</string>
+    <string name="sas_verification_request_notification_channel_title">Vérification de clé</string>
+    <string name="sas_legacy_verification_button_title">Utiliser la vérification traditionnelle.</string>
+    <string name="sas_verifying_keys">Rien n’apparaît \? Tous les clients ne prennent pas encore en charge la vérification interactive. Utilisez la vérification traditionnelle.</string>
+    <string name="sas_got_it">Compris</string>
+    <string name="sas_verified_successful_description">Les messages sécurisés avec cet utilisateur sont chiffrés de bout en bout et ne peuvent être lus par des tiers.</string>
+    <string name="sas_verified_successful">Vous avez bien vérifié cette session.</string>
+    <string name="sas_verified">Vérifié !</string>
+    <string name="sas_waiting_for_partner">Attente de la confirmation du partenaire…</string>
+    <string name="sas_view_request_action">Voir la demande</string>
+    <string name="sas_incoming_verification_request_dialog">Vous avez reçu une demande de vérification entrante.</string>
+    <string name="notification_new_invitation">Nouvelle invitation</string>
+    <string name="notification_new_messages">Nouveaux messages</string>
+    <string name="notification_unknown_room_name">Salon</string>
+    <string name="notification_unknown_new_event">Nouvel évènement</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s et %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s dans %2$s et %3$s</string>
+    <string name="notification_unread_notified_messages_in_room">%1$s dans %2$s</string>
+    <string name="lock_screen_hint">Saisir du texte ici…</string>
+    <string name="directory_server_native_rooms">Tous les salons natifs sur %s</string>
+    <string name="directory_server_all_rooms_on_server">Tous les salons sur le serveur %s</string>
+    <string name="directory_server_placeholder">URL du serveur d’accueil</string>
+    <string name="directory_server_type_homeserver">Saisir un serveur d’accueil pour lister ses salons publics</string>
+    <string name="directory_server_fail_to_retrieve_server">Le serveur est peut-être indisponible ou surchargé</string>
+    <string name="select_room_directory">Sélectionner un répertoire de salons</string>
+    <string name="unknown_devices_alert_message">Ce salon contient des sessions inconnues, qui n’ont pas été vérifiées.
+\nCela signifie qu’il n’y a aucune garantie que les sessions appartiennent aux utilisateurs qu’elles prétendent.
+\nNous vous recommandons d’effectuer le processus de vérification pour chaque session avant de continuer, mais vous pouvez renvoyer le message sans vérifier si vous préférez.
+\n
+\nSessions inconnues :</string>
+    <string name="unknown_devices_alert_title">Le salon contient des sessions inconnues</string>
+    <string name="encryption_information_verify_key_match">Je confirme que les clés correspondent</string>
+    <string name="encryption_information_verify_device_warning2">Si elles ne correspondent pas, la sécurité de votre communication est peut-être compromise.</string>
+    <string name="encryption_information_verify_device_warning">Confirmez en comparant les informations suivantes avec les paramètres utilisateur dans votre autre session :</string>
+    <string name="encryption_information_verify_device">Vérifier la session</string>
+    <string name="encryption_information_unblock">Supprimer de la liste noire</string>
+    <string name="encryption_information_block">Ajouter à la liste noire</string>
+    <string name="encryption_information_unverify">Annuler la vérification</string>
+    <string name="encryption_information_verify">Vérifier</string>
+    <string name="encryption_information_none">aucun</string>
+    <string name="encryption_information_unknown_ip">adresse IP inconnue</string>
+    <string name="encryption_information_unknown_device">session inconnue</string>
+    <string name="encryption_information_blocked">Sur liste noire</string>
+    <string name="encryption_information_verified">Vérifié</string>
+    <string name="encryption_information_not_verified">Non vérifié</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Ne jamais envoyer de messages chiffrés aux sessions non vérifiées depuis cette session.</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Chiffrer uniquement vers les sessions vérifiées</string>
+    <string name="encryption_import_import">Importer</string>
+    <string name="encryption_import_room_keys_summary">Importer les clés à partir d’un fichier local</string>
+    <string name="encryption_import_room_keys">Importer les clés des salons</string>
+    <string name="encryption_import_e2e_room_keys">Importer les clés de chiffrement des salons</string>
+    <string name="encryption_settings_manage_message_recovery_summary">Gérer la sauvegarde de clés</string>
+    <string name="encryption_message_recovery">Récupération des messages chiffrés</string>
+    <string name="encryption_exported_successfully">Les clés ont bien été exportées</string>
+    <string name="encryption_export_saved_as">Les clés de chiffrement du salon ont été sauvegardées dans « %s ».
+\n
+\nAttention : ce fichier peut être supprimé si l’application est désinstallée.</string>
+    <string name="encryption_export_notice">Veuillez créer une phrase secrète pour chiffrer les clés exportées. Vous devrez saisir cette même phrase secrète afin de pouvoir importer les clés.</string>
+    <string name="encryption_export_export">Exporter</string>
+    <string name="encryption_export_room_keys_summary">Exporter les clés vers un fichier local</string>
+    <string name="encryption_export_room_keys">Exporter les clés des salons</string>
+    <string name="encryption_export_e2e_room_keys">Exporter les clés E2E des salons</string>
+    <string name="encryption_information_ed25519_fingerprint">Empreinte Ed25519</string>
+    <string name="encryption_information_verification">Vérification</string>
+    <string name="encryption_information_device_key">Clé de la session</string>
+    <string name="encryption_information_device_id">Identifiant de session</string>
+    <string name="encryption_information_name">Nom public</string>
+    <string name="device_name_warning">Le nom public d’une session est visible par les personnes avec qui vous communiquez</string>
+    <string name="encryption_information_device_name_with_warning">Nom public (visible par les personnes avec qui vous communiquez)</string>
+    <string name="encryption_information_device_name">Nom public</string>
+    <string name="encryption_information_sender_device_information">Informations sur la session de l’expéditeur</string>
+    <string name="encryption_information_decryption_error">Erreur de déchiffrement</string>
+    <string name="encryption_information_session_id">Identifiant de session</string>
+    <string name="encryption_information_algorithm">Algorithme</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">Clé d’empreinte Ed25519 déclarée</string>
+    <string name="encryption_information_curve25519_identity_key">Clé d’identité Curve25519</string>
+    <string name="encryption_information_user_id">Identifiant utilisateur</string>
+    <string name="encryption_information_title">Informations sur le chiffrement de bout en bout</string>
+    <string name="failed_to_load_timeline_position">%s a essayé de charger un point précis dans l’historique du salon mais ne l’a pas trouvé.</string>
+    <string name="settings_theme">Thème</string>
+    <string name="directory_title">Répertoire</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">Activer le chiffrement
+\n(attention : ne peut plus être désactivé par la suite !)</string>
+    <string name="room_settings_addresses_e2e_disabled">Le chiffrement est désactivé sur ce salon.</string>
+    <string name="room_settings_addresses_e2e_enabled">Le chiffrement est activé sur ce salon.</string>
+    <string name="room_settings_copy_room_address">Copier l’adresse du salon</string>
+    <string name="room_settings_copy_room_id">Copier l’identifiant du salon</string>
+    <string name="room_settings_unset_main_address">Désactiver comme adresse principale</string>
+    <string name="room_settings_set_main_address">Définir comme adresse principale</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_title">Avertissements concernant l’adresse principale</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">Vous n’aurez aucune adresse principale spécifiée pour ce salon.</string>
+    <string name="room_settings_addresses_invalid_format_dialog_body">« %s » n’est pas un format valide pour un alias</string>
+    <string name="room_settings_addresses_invalid_format_dialog_title">Format d’alias invalide</string>
+    <string name="room_settings_invalid_group_format_dialog_body">« %s » n’est pas un identifiant de communauté valide</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Identifiant de communauté invalide</string>
+    <string name="room_settings_add_new_group">Nouvel identifiant de communauté (ex. +foo:matrix.org)</string>
+    <string name="room_settings_no_flair">Ce salon n’a de badge pour aucune communauté</string>
+    <string name="room_settings_addresses_add_new_address">Nouvelle adresse (par exemple #foo:matrix.org)</string>
+    <string name="room_settings_addresses_no_local_addresses">Ce salon n’a pas d’adresse locale</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">Ne jamais envoyer de message chiffré aux sessions non vérifiées sur ce salon, depuis cette session.</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Chiffrer uniquement pour les sessions vérifiées</string>
+    <string name="room_settings_labs_end_to_end_warnings">Vous devez vous déconnecter pour pouvoir activer le chiffrement.</string>
+    <string name="room_settings_labs_end_to_end_is_active">Le chiffrement de bout en bout est actif</string>
+    <string name="room_settings_labs_end_to_end">Chiffrement de bout en bout</string>
+    <string name="room_settings_labs_warning_message">Ce sont des fonctionnalités expérimentales qui peuvent se comporter de façon inattendue. À utiliser avec précaution.</string>
+    <string name="room_settings_labs_pref_title">Expérimental</string>
+    <string name="room_settings_addresses_pref_title">Adresses</string>
+    <string name="room_settings_room_version_title">Version du salon</string>
+    <string name="room_settings_room_internal_id">L’identifiant interne de ce salon</string>
+    <string name="room_settings_category_advanced_title">Avancé</string>
+    <string name="room_settings_banned_users_title">Utilisateurs bannis</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Tous ceux qui connaissent le lien du salon, y compris les visiteurs</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Tous ceux qui connaissent le lien du salon, à part les visiteurs</string>
+    <string name="room_settings_room_access_entry_only_invited">Seules les personnes qui ont été invitées</string>
+    <string name="room_settings_room_access_warning">Pour faire référence à un salon, il doit avoir une adresse.</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Uniquement les membres (depuis qu’ils sont arrivés)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Uniquement les membres (depuis leur invitation)</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Uniquement les membres (à partir de l’activation de cette option)</string>
+    <string name="room_settings_read_history_entry_anyone">N’importe qui</string>
+    <string name="room_alias_publish_to_directory_error">Impossible de récupérer la visibilité du répertoire de salons actuel (%1$s).</string>
+    <string name="room_alias_publish_to_directory">Publier ce salon dans le répertoire public de %1$s \?</string>
+    <string name="room_alias_action_unpublish">Dé-publier cette adresse</string>
+    <string name="room_alias_action_publish">Publier cette adresse</string>
+    <string name="room_alias_local_address_add">Ajouter une adresse locale</string>
+    <string name="room_alias_local_address_empty">Ce salon n’a pas d’adresse locale</string>
+    <string name="room_alias_local_address_subtitle">Définissez des adresses pour ce salon afin que les utilisateurs puissent le trouver via votre serveur d’accueil(%1$s)</string>
+    <string name="room_alias_local_address_title">Adresse locale</string>
+    <string name="room_alias_address_hint">Nouvelle adresse publiée (par ex. #alias:serveur)</string>
+    <string name="room_alias_address_empty">Aucune adresse publiée pour le moment.</string>
+    <string name="room_alias_address_empty_can_add">Aucune adresse publiée pour le moment, ajoutez en une ci-dessous.</string>
+    <string name="room_alias_publish">Publier ce salon dans le répertoire public de %1$s \?</string>
+    <string name="room_alias_published_alias_add_manually_submit">Publier</string>
+    <string name="room_alias_published_alias_add_manually">Publier une nouvelle adresse manuellement</string>
+    <string name="room_alias_published_other">Autres adresses publiées :</string>
+    <string name="room_alias_main_address_hint">Adresse principale</string>
+    <string name="room_alias_published_alias_main">Ceci est l’adresse principale</string>
+    <string name="room_alias_published_alias_subtitle">Les adresses publiées peuvent être utilisées par n’importe qui pour rejoindre votre salon. Pour pouvoir publier une adresse, elle doit d’abord être définie comme adresse locale.</string>
+    <string name="room_alias_published_alias_title">Adresses publiées</string>
+    <string name="room_alias_title">Adresses du salon</string>
+    <string name="room_settings_alias_subtitle">Voir et gérer les adresses de ce salon, et sa visibilité dans le répertoire des salons.</string>
+    <string name="room_settings_alias_title">Adresses du salon</string>
+    <string name="room_settings_room_access_title">Accès au salon</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Qui peut accéder à ce salon \?</string>
+    <string name="room_settings_room_read_history_dialog_subtitle">Les modifications de visibilité de l’historique ne s’appliqueront qu’aux messages ultérieurs dans ce salon. La visibilité de l’historique actuel demeurera inchangée.</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Qui peut lire l’historique \?</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Accès à l’historique du salon</string>
+    <string name="room_settings_room_access_rules_pref_title">Accès au salon</string>
+    <string name="room_settings_room_notifications_title">Notifications</string>
+    <string name="room_settings_directory_visibility">Lister ce salon dans le répertoire des salons</string>
+    <string name="room_settings_category_access_visibility_title">Accès et visibilité</string>
+    <string name="room_settings_tag_pref_entry_none">Aucune</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Priorité basse</string>
+    <string name="room_settings_tag_pref_entry_favourite">Favori</string>
+    <string name="room_settings_tag_pref_dialog_title">Étiqueté comme :</string>
+    <string name="room_settings_room_tag">Étiquette du salon</string>
+    <string name="room_settings_topic">Sujet</string>
+    <string name="room_settings_room_name">Nom du salon</string>
+    <string name="room_settings_room_photo">Photo du salon</string>
+    <string name="media_saving_period_forever">Pas de limite</string>
+    <string name="media_saving_period_1_month">1 mois</string>
+    <string name="media_saving_period_1_week">1 semaine</string>
+    <string name="media_saving_period_3_days">3 jours</string>
+    <string name="settings_without_flair">Vous n’êtes pour le moment membre d’aucune communauté.</string>
+    <string name="settings_flair">Badge</string>
+    <string name="settings_play_shutter_sound">Jouer le son de l’obturateur</string>
+    <string name="media_source_choose">Choisir</string>
+    <string name="settings_default_media_source">Source de médias par défaut</string>
+    <string name="compression_opt_list_choose">Choisir</string>
+    <string name="settings_default_compression">Compression par défaut</string>
+    <string name="settings_media">Média</string>
+    <string name="account_additional_info">Informations additionnelles : %s</string>
+    <string name="account_phone_number_error">Une erreur est survenue lors de la vérification de votre numéro de téléphone.</string>
+    <string name="settings_phone_number_code">Code</string>
+    <string name="settings_phone_number_verification_error">Erreur lors de la validation de votre numéro de téléphone</string>
+    <string name="settings_phone_number_verification_error_empty_code">Saisir un code d’activation</string>
+    <string name="settings_phone_number_verification_instruction">Nous avons envoyé un SMS avec un code d’activation. Veuillez saisir ce code ci-dessous.</string>
+    <string name="settings_phone_number_verification">Vérification du téléphone</string>
+    <string name="settings_phone_number_error">Numéro de téléphone non valide pour le pays sélectionné</string>
+    <string name="settings_phone_number_label">Numéro de téléphone</string>
+    <string name="settings_phone_number_country_error">Choisissez un pays</string>
+    <string name="settings_phone_number_country_label">Pays</string>
+    <string name="settings_select_country">Choisissez un pays</string>
+    <string name="settings_delete_threepid_confirmation">Voulez-vous vraiment supprimer le %1$s %2$s \?</string>
+    <string name="settings_delete_notification_targets_confirmation">Voulez-vous vraiment supprimer cette cible de notification \?</string>
+    <string name="passwords_do_not_match">Les mots de passe ne correspondent pas</string>
+    <string name="settings_unignore_user">Afficher tous les messages de %s \?
+\n
+\nVeuillez noter que cette action redémarrera l’application et pourra prendre un certain temps.</string>
+    <string name="settings_password_updated">Votre mot de passe a été mis à jour</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">Le mot de passe n’est pas valide</string>
+    <string name="settings_fail_to_update_password">Échec de mise à jour du mot de passe</string>
+    <string name="settings_change_password_submit">Mettre à jour le mot de passe</string>
+    <string name="settings_confirm_password">Confirmer le nouveau mot de passe</string>
+    <string name="settings_new_password">Nouveau mot de passe</string>
+    <string name="settings_old_password">Mot de passe actuel</string>
+    <string name="settings_change_password">Changer le mot de passe</string>
+    <string name="settings_password">Mot de passe</string>
+    <string name="account_phone_number_already_used_error">Ce numéro de téléphone est déjà utilisé.</string>
+    <string name="account_email_validation_title">Vérification en attente</string>
+    <string name="settings_select_language">Choisissez une langue</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_off">Le code est requis à l’ouverture d’${app_name}.</string>
+    <string name="template_settings_security_pin_code_grace_period_summary_on">Le code est demandé après 2 minutes d\'inutilisation d’${app_name}.</string>
+    <string name="settings_security_pin_code_grace_period_title">Demander le code après 2 minutes</string>
+    <string name="settings_security_pin_code_notifications_summary_off">Afficher uniquement le numéro de messages non-lus dans une simple notification.</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Afficher les détails comme les noms des salons et le contenu du message.</string>
+    <string name="settings_security_pin_code_notifications_title">Afficher le contenu dans les notifications</string>
+    <string name="template_settings_security_pin_code_use_biometrics_summary_off">Le code est la seule façon de déverrouiller ${app_name}.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Activer les données biométriques comme les empreintes digitales ou la reconnaissance faciale.</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Activer les données biométriques</string>
+    <string name="settings_security_pin_code_title">Activer le code</string>
+    <string name="settings_security_application_protection_screen_title">Configurer la protection</string>
+    <string name="settings_security_application_protection_title">Protéger l’accès</string>
+    <string name="auth_pin_reset_content">Pour réinitialiser votre code, vous devez vous reconnecter et en créer un nouveau.</string>
+    <string name="too_many_pin_failures">Trop d’erreurs, vous avez été déconnecté</string>
+    <string name="wrong_pin_message_last_remaining_attempt">Attention ! Dernière tentative avant déconnexion !</string>
+    <string name="alert_push_are_disabled_description">Vérifiez vos paramètres pour activer les notifications push</string>
+    <string name="alert_push_are_disabled_title">Les notifications push sont désactivées</string>
+    <string name="failed_to_unban">Échec de la révocation du bannissement de l’utilisateur</string>
+    <string name="member_banned_by">Banni par %1$s</string>
+    <string name="three_pid_revoke_invite_dialog_content">Révoquer l’invitation à %1$s \?</string>
+    <string name="three_pid_revoke_invite_dialog_title">Révoquer l’invitation</string>
+    <string name="phone_book_perform_lookup">Rechercher des contacts sur Matrix</string>
+    <string name="contacts_book_title">Carnet d’adresses</string>
+    <string name="empty_contact_book">Votre carnet d’adresses est vide</string>
+    <string name="loading_contact_book">Récupération de vos contacts…</string>
+    <string name="search_in_my_contacts">Rechercher dans mes contacts</string>
+    <string name="phone_book_title">Carnet d’adresse</string>
+    <string name="empty_phone_book">Votre carnet d’adresses est vide</string>
+    <string name="add_from_phone_book">Ajouter depuis mon carnet d’adresses</string>
+    <string name="save_recovery_key_chooser_hint">Enregistrer la clé de récupération</string>
+    <string name="disclaimer_positive_button">EN SAVOIR PLUS</string>
+    <string name="disclaimer_negative_button">COMPRIS</string>
+    <string name="disclaimer_content">Nous sommes heureux de vous annoncer que nous avons un nouveau nom ! Votre application est à jour et vous êtes connectés à votre compte.</string>
+    <string name="disclaimer_title">Riot est désormais Element !</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Attente de l’historique du chiffrement</string>
+    <string name="crypto_error_withheld_generic">Impossible d’accéder à ce message car l’envoyeur n’a intentionnellement pas envoyé les clés</string>
+    <string name="crypto_error_withheld_unverified">Vous ne pouvez pas accéder à ce message car l’envoyeur n’a pas confiance en votre session</string>
+    <string name="crypto_error_withheld_blacklisted">Impossible d’accéder à ce message car vous avez été bloqué par l’envoyeur</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">À cause du chiffrement de bout en bout, vous pouvez avoir besoin d’attendre l’arrivée du message de quelqu’un car les clés de chiffrement ne vous ont pas été correctement envoyées.</string>
+    <string name="crypto_utd">Impossible de déchiffrer</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Attente du message, cela peut prendre du temps</string>
+    <string name="login_signin_matrix_id_hint">Identifiant de l’utilisateur</string>
+    <string name="login_signin_matrix_id_notice">Si vous avez créé un compte sur un serveur d\'accueil, utilisez ci-dessous votre identifiant Matrix (par ex. : @utilisateur:domaine.com) et mot de passe.</string>
+    <string name="login_signin_matrix_id_title">Se connecter</string>
+    <string name="login_connect_using_matrix_id_submit">Me connecter avec mon identifiant Matrix</string>
+    <string name="login_connect_using_matrix_id_notice">Sinon, si vous avez déjà un compte et que vous connaissez votre identifiant Matrix et votre mot de passe, vous pouvez utiliser cette méthode :</string>
+    <string name="login_error_outdated_homeserver_warning_content">Ce serveur d\'accueil utilise une version obsolète. Demandez à l’administrateur de votre serveur d\'accueil de le mettre à jour. Vous pouvez continuer, mais certaines fonctionnalités peuvent ne pas fonctionner correctement.</string>
+    <string name="login_error_outdated_homeserver_content">Ce serveur d’accueil utilise une version trop ancienne pour s’y connecter. Demandez à l’administrateur de votre serveur d’accueil de le mettre à jour.</string>
+    <string name="login_error_outdated_homeserver_title">Serveur d’accueil obsolète</string>
+    <string name="login_validation_code_is_not_correct">Le code saisi n’est pas correct. Veuillez vérifier.</string>
+    <string name="login_terms_title">Acceptez les termes pour continuer</string>
+    <string name="login_a11y_captcha_container">Veuillez compléter le captcha</string>
+    <string name="login_a11y_choose_other">Sélectionner un serveur d’accueil personnalisé</string>
+    <string name="login_a11y_choose_modular">Sélectionner Element Matrix Services</string>
+    <string name="login_a11y_choose_matrix_org">Sélectionner matrix.org</string>
+    <string name="login_signup_cancel_confirmation_content">Votre compte n’est pas encore crée.
+\n
+\nArrêter le processus de création \?</string>
+    <string name="login_signup_cancel_confirmation_title">Attention</string>
+    <string name="login_signup_error_user_in_use">Ce nom d’utilisateur est déjà pris</string>
+    <string name="login_signup_submit">Suivant</string>
+    <string name="login_signup_password_hint">Mot de passe</string>
+    <string name="login_signup_username_hint">Nom d’utilisateur</string>
+    <string name="login_signup_to">S’inscrire sur %1$s</string>
+    <string name="login_msisdn_error_other">Le numéro de téléphone n’a pas l’air d’être valide. Veuillez le vérifier</string>
+    <string name="login_msisdn_error_not_international">Les numéros de téléphone internationaux doivent commencer par « + »</string>
+    <string name="login_msisdn_notice">Veuillez utiliser le format international (le numéro de téléphone doit commencer par « + »)</string>
+    <string name="login_msisdn_confirm_submit">Suivant</string>
+    <string name="login_msisdn_confirm_send_again">Renvoyer</string>
+    <string name="login_msisdn_confirm_hint">Saisir le code</string>
+    <string name="login_msisdn_confirm_notice">Nous avons envoyé un code à %1$s. Saisissez-le ci-dessous pour vérifier que c’est bien vous.</string>
+    <string name="login_msisdn_confirm_title">Confirmer le numéro de téléphone</string>
+    <string name="login_set_msisdn_submit">Suivant</string>
+    <string name="login_set_msisdn_optional_hint">Numéro de téléphone (facultatif)</string>
+    <string name="login_set_msisdn_mandatory_hint">Numéro de téléphone</string>
+    <string name="login_set_msisdn_notice2">Veuillez utiliser le format international.</string>
+    <string name="login_set_msisdn_notice">Définir un numéro de téléphone pour autoriser éventuellement des personnes à vous découvrir.</string>
+    <string name="login_set_msisdn_title">Définir le numéro de téléphone</string>
+    <string name="login_set_email_submit">Suivant</string>
+    <string name="login_reset_password_cancel_confirmation_content">Votre mot de passe n’a pas encore été changé.
+\n
+\nArrêter le processus de changement \?</string>
+    <string name="login_reset_password_cancel_confirmation_title">Attention</string>
+    <string name="login_reset_password_success_submit">Retourner à l’authentification</string>
+    <string name="login_reset_password_success_notice_2">Vous avez été déconnecté de toutes les sessions et ne recevrez plus de notification. Pour réactiver les notifications, reconnectez-vous sur chaque appareil.</string>
+    <string name="login_reset_password_success_notice">Votre mot de passe a été réinitialisé.</string>
+    <string name="login_reset_password_success_title">Succès !</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Touchez le lien pour confirmer votre nouveau mot de passe. Après avoir suivi le lien qu’il contient, cliquez ci-dessous.</string>
+    <string name="login_reset_password_mail_confirmation_title">Vérifiez votre boîte de réception</string>
+    <string name="login_reset_password_warning_submit">Poursuivre</string>
+    <string name="login_reset_password_warning_content">Le changement de mot de passe réinitialisera toutes les clés de chiffrement sur toutes vos sessions, rendant l’historique des discussions chiffrées illisible. Configurez la sauvegarde de clés ou exportez vos clés de salon depuis une autre session avant de réinitialiser votre mot de passe.</string>
+    <string name="login_reset_password_warning_title">Attention !</string>
+    <string name="login_reset_password_password_hint">Nouveau mot de passe</string>
+    <string name="login_reset_password_submit">Suivant</string>
+    <string name="login_reset_password_on">Réinitialiser le mot de passe sur %1$s</string>
+    <string name="login_registration_disabled">Désolé, ce serveur n’accepte pas de nouveau compte.</string>
+    <string name="login_sso_error_message">Une erreur est survenue pendant le chargement de la page : %1$s (%2$d)</string>
+    <string name="login_server_url_form_common_notice">Entrez l’adresse du serveur que vous voulez utiliser</string>
+    <string name="login_server_url_form_modular_notice">Saisir l’adresse de Element ou du serveur de Modular que vous voulez utiliser</string>
+    <string name="login_server_url_form_modular_text">Hébergement privé pour les organisations</string>
+    <string name="login_server_url_form_other_hint">Adresse</string>
+    <string name="login_server_url_form_modular_hint">Adresse Element Matrix Services</string>
+    <string name="login_clear_homeserver_history">Effacer l’historique</string>
+    <string name="login_signin_sso">Continuer avec l’authentification unique</string>
+    <string name="login_signin">S’authentifier</string>
+    <string name="login_signup">S’inscrire</string>
+    <string name="login_signin_to">S’authentifier sur %1$s</string>
+    <string name="login_connect_to_a_custom_server">Se connecter à un serveur personnalisé</string>
+    <string name="login_connect_to_modular">Se connecter à Element Matrix Services</string>
+    <string name="login_connect_to">Se connecter à %1$s</string>
+    <string name="login_continue">Poursuivre</string>
+    <string name="login_social_sso">authentification unique</string>
+    <string name="login_social_signin_with">Se connecter avec %s</string>
+    <string name="login_social_signup_with">S’inscrire avec %s</string>
+    <string name="login_social_continue_with">Poursuivre avec %s</string>
+    <string name="login_social_continue">Ou</string>
+    <string name="login_server_other_text">Paramètres personnalisés et avancés</string>
+    <string name="login_server_other_title">Autre</string>
+    <string name="login_server_modular_learn_more">En savoir plus</string>
+    <string name="login_server_modular_text">Hébergement premium pour les organisations</string>
+    <string name="login_server_matrix_org_text">Rejoignez des millions de personnes gratuitement sur le plus grand serveur public</string>
+    <string name="login_server_title">Sélectionner un serveur</string>
+    <string name="login_splash_submit">Démarrer</string>
+    <string name="login_splash_text3">Étendez et personnalisez votre expérience</string>
+    <string name="login_splash_text2">Gardez vos conversations privées avec le chiffrement</string>
+    <string name="login_splash_text1">Discutez directement avec des personnes ou avec des groupes</string>
+    <string name="login_splash_title">Libérez votre communication.</string>
+    <string name="timeline_unread_messages">Messages non lus</string>
+    <string name="direct_room_join_rules_invite_by_you">Vous avez rendu ceci uniquement accessible par invitation.</string>
+    <string name="direct_room_join_rules_invite">%1$s a rendu ceci uniquement accessible par invitation.</string>
+    <string name="room_join_rules_invite_by_you">Vous avez rendu le salon uniquement accessible par invitation.</string>
+    <string name="room_join_rules_invite">%1$s a rendu le salon accessible uniquement par invitation.</string>
+    <string name="room_join_rules_public_by_you">Vous avez rendu ce salon public à tous ceux qui en connaissent le lien.</string>
+    <string name="room_join_rules_public">%1$s a rendu le salon public à tous ceux qui en connaissent le lien.</string>
+    <string name="help_long_click_on_room_for_more_options">Clic long sur un salon pour voir plus d’options</string>
+    <string name="no_ignored_users">Vous n’ignorez aucun utilisateur</string>
+    <string name="reaction_search_type_hint">Saisir des mots-clés pour trouver une réaction.</string>
+    <string name="spoiler">Spoiler</string>
+    <string name="command_description_spoiler">Envoie le message fourni comme un spoiler</string>
+    <string name="notice_member_no_changes_by_you">Vous n’avez rien changé</string>
+    <string name="notice_member_no_changes">%1$s n’a effectué aucun changement</string>
+    <string name="room_list_quick_actions_room_settings">Paramètres du salon</string>
+    <string name="room_list_quick_actions_leave">Quitter le salon</string>
+    <string name="room_list_quick_actions_low_priority_remove">Retirer de la priorité faible</string>
+    <string name="room_list_quick_actions_low_priority_add">Ajouter à la priorité faible</string>
+    <string name="room_list_quick_actions_favorite_remove">Supprimer des favoris</string>
+    <string name="room_list_quick_actions_favorite_add">Ajouter aux favoris</string>
+    <string name="room_list_quick_actions_settings">Paramètres</string>
+    <string name="room_list_quick_actions_notifications_mute">Sourdine</string>
+    <string name="room_list_quick_actions_notifications_mentions">Seulement les mentions</string>
+    <string name="room_list_quick_actions_notifications_all">Tous les messages</string>
+    <string name="room_list_quick_actions_notifications_all_noisy">Tous les messages (sonore)</string>
+    <string name="message_ignore_user">Bloquer l’utilisateur</string>
+    <string name="no_network_indicator">Il n’y a aucune connexion au réseau pour le moment</string>
+    <string name="template_permissions_rationale_msg_keys_backup_export">${app_name} a besoin de votre permission pour sauvegarder vos clés de chiffrement sur le disque.
+\n
+\nAutorisez l’accès dans le prochaine fenêtre pour pouvoir exporter vos clés manuellement.</string>
+    <string name="content_reported_as_inappropriate_content">Ce contenu a été signalé comme inapproprié.
+\n
+\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l’ignorer pour masquer ses messages.</string>
+    <string name="content_reported_as_inappropriate_title">Signalé comme inapproprié</string>
+    <string name="content_reported_as_spam_content">Ce contenu a été signalé comme spam.
+\n
+\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l’ignorer pour masquer ses messages.</string>
+    <string name="content_reported_as_spam_title">Signalé comme spam</string>
+    <string name="content_reported_content">Ce contenu a été signalé.
+\n
+\nSi vous ne voulez plus voir de contenu de cet utilisateur, vous pouvez l’ignorer pour masquer ses messages.</string>
+    <string name="content_reported_title">Contenu signalé</string>
+    <string name="block_user">BLOQUER L’UTILISATEUR</string>
+    <string name="report_content_custom_submit">SIGNALER</string>
+    <string name="report_content_custom_hint">Motif de signalement de ce contenu</string>
+    <string name="report_content_custom_title">Signaler ce contenu</string>
+    <string name="report_content_custom">Signalement personnalisé…</string>
+    <string name="report_content_inappropriate">C’est inapproprié</string>
+    <string name="report_content_spam">C’est du spam</string>
+    <string name="uploads_files_no_result">Il n’y a aucun fichier dans ce salon</string>
+    <string name="settings_interface_language">Langue</string>
+    <string name="settings_user_interface">Interface utilisateur</string>
+    <string name="disabled_integration_dialog_content">Activer « Autoriser les intégrations » dans les paramètres pour faire ceci.</string>
+    <string name="disabled_integration_dialog_title">Les intégrations sont désactivées</string>
+    <string name="settings_integration_manager">Gestionnaire d’intégrations</string>
+    <string name="settings_integration_allow">Autoriser les intégrations</string>
+    <string name="settings_identity_server">Serveur d’identité</string>
+    <string name="settings_home_server">Serveur d’accueil</string>
+    <string name="settings_logged_in">Connecté en tant que</string>
+    <string name="devices_delete_submit_button_label">Valider</string>
+    <string name="devices_delete_pswd">Mot de passe :</string>
+    <string name="devices_delete_dialog_title">Authentification</string>
+    <string name="devices_delete_dialog_text">Cette opération nécessite de s’authentifier à nouveau.
+\nPour continuer, veuillez saisir votre mot de passe.</string>
+    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+    <string name="devices_details_last_seen_title">Vu la dernière fois</string>
+    <string name="devices_details_device_name">Mettre à jour le nom public</string>
+    <string name="devices_details_name_title">Nom public</string>
+    <string name="devices_details_id_title">Identifiant</string>
+    <string name="devices_details_dialog_title">Informations de la session</string>
+    <string name="settings_data_save_mode_summary">Le mode d’économie de données utilise un filtre spécifique qui ignore les notifications de présence et de saisie.</string>
+    <string name="settings_data_save_mode">Mode économie de données</string>
+    <string name="settings_opt_in_of_analytics_ok">Oui, je veux aider !</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Veuillez autoriser la collecte des données pour nous aider à améliorer ${app_name}.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} collecte des données statistiques anonymes pour nous permettre d’améliorer l’application.</string>
+    <string name="settings_opt_in_of_analytics">Envoyer des statistiques d’utilisation</string>
+    <string name="settings_analytics">Statistiques d’utilisation</string>
+    <string name="settings_notification_privacy_need_permission">L’application a besoin de la permission de fonctionner en arrière-plan</string>
+    <string name="settings_notification_privacy_reduced">Confidentialité réduite</string>
+    <string name="settings_notification_privacy_normal">Normal</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Ignorer l’optimisation</string>
+    <string name="settings_troubleshoot_test_battery_failed">Si un utilisateur laisse un appareil débranché et immobile pour une longue durée, avec l’écran éteint, l’appareil entre en mode veille.. Cela empêche les applications d’accéder au réseau et reporte leurs tâches, synchronisations et alarmes standard.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} n’est pas affecté par l’optimisation de la batterie.</string>
+    <string name="settings_troubleshoot_test_battery_title">Optimisation de la batterie</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Désactiver les restrictions</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">Les restrictions en arrière-plan sont activées pour ${app_name}.
+\nLes tâches que l’application essaiera d’effectuer seront fortement restreintes tant qu’elle sera en arrière-plan et cela pourra affecter les notifications.
+\n%1$s</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">Les restrictions en arrière-plan sont désactivées pour ${app_name}. Ce test devrait être lancé en utilisant les données mobiles (pas le Wi-Fi).
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_title">Vérifier les restrictions en arrière-plan</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">Activer le démarrage au démarrage de l’appareil</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Le service ne démarrera pas quand l’appareil sera redémarré, vous ne recevrez pas de notifications tant que ${app_name} n’aura pas été lancé au moins une fois.</string>
+    <string name="settings_troubleshoot_test_service_boot_success">Le service démarrera quand l’appareil sera redémarré.</string>
+    <string name="settings_troubleshoot_test_service_boot_title">Lancer au démarrage</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">Le redémarrage du service a échoué</string>
+    <string name="settings_troubleshoot_test_service_restart_success">Le service a été tué et redémarré automatiquement.</string>
+    <string name="settings_troubleshoot_test_service_restart_title">Redémarrage automatique du service de notifications</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Démarrer le service</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">Le service de notifications n’est pas lancé.
+\nEssayez de redémarrer l’application.</string>
+    <string name="settings_troubleshoot_test_foreground_service_startedt_success">Le service de notifications est lancé.</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_title">Service de notifications</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">La notification a été cliquée !</string>
+    <string name="settings_troubleshoot_test_notification_notice">Veuillez cliquer sur la notification. Si vous ne voyez pas la notification, veuillez vérifier les paramètres système.</string>
+    <string name="settings_troubleshoot_test_notification_title">Affichage de la notification</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Vous voyez la notification ! Cliquez-moi dessus !</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">Erreur de réception du push. La solution pourrait être de réinstaller l’application.</string>
+    <string name="settings_troubleshoot_test_push_loop_success">L’application reçoit le PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">L’application attend le PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_title">Tester le Push</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">Le jeton FCM n’a pas pu être enregistré sur le serveur d’accueil :
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_success">Le jeton FCM a été correctement enregistré sur le serveur d’accueil.</string>
+    <string name="settings_troubleshoot_test_token_registration_title">Enregistrement du jeton</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Ajouter un compte</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nCette erreur est indépendante de ${app_name}. Il n’y pas de compte Google sur l’appareil. Veuillez ouvrir le gestionnaire de comptes et ajouter un compte Google.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nCette erreur est indépendante de ${app_name}. Elle peut survenir pour plusieurs raisons. Cela peut fonctionner si vous réessayez plus tard. Vous pouvez aussi vérifier que le Service Google Play n’a pas un usage limité de données dans les paramètres système. Cela peut aussi arriver sur une ROM personnalisée.</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nCette erreur est indépendante de ${app_name} et, selon Google, cette erreur indique que l’appareil a enregistré trop d’applications avec FCM. Cette erreur ne survient que s’il y a un nombre d’applications anormalement élevé, et ne devrait donc pas affecter un utilisateur normal.</string>
+    <string name="settings_troubleshoot_test_fcm_failed">Le jeton FCM n’a pas pu être récupéré :
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_success">Le jeton FCM a été récupéré avec succès :
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_title">Jeton Firebase</string>
+    <string name="settings_troubleshoot_test_play_services_quickfix">Réparer les services Google Play</string>
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} utilise les services Google Play pour envoyer les notifications mais ils n’ont pas l’air d’être configurés correctement :
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_play_services_success">L’APK des services Google Play est disponible et à jour.</string>
+    <string name="settings_troubleshoot_test_play_services_title">Vérification des services Google Play</string>
+    <string name="settings_troubleshoot_test_bing_settings_quickfix">Vérifier les paramètres</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Échec du chargement de vos règles personnalisées, veuillez réessayer.</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">Certaines notifications sont désactivées dans vos paramètres personnalisés.</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Remarquez que certains messages sont réglés pour être silencieux (ils produiront une notification sans son).</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">Paramètres personnalisés.</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">Activer</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Les notifications ne sont pas activées pour cette session.
+\nVeuillez vérifier les paramètres de ${app_name}.</string>
+    <string name="settings_troubleshoot_test_device_settings_success">Les notifications sont activées pour cette session.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">Paramètres de la session.</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">Activer</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Les notifications sont désactivées pour votre compte.
+\nVeuillez vérifier les paramètres du compte.</string>
+    <string name="settings_troubleshoot_test_account_settings_success">Les notifications sont activées pour votre compte.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">Paramètres du compte.</string>
+    <string name="open_settings">Ouvrir les paramètres</string>
+    <string name="settings_troubleshoot_test_system_settings_failed">Les notifications sont désactivées dans les paramètres systèmes.
+\nVeuillez vérifier les paramètres système.</string>
+    <string name="settings_troubleshoot_test_system_settings_success">Les notifications sont activées dans les paramètres système.</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Paramètres système.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Au moins un test a échoué, veuillez envoyer un rapport d’anomalie pour nous aider à résoudre le problème.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Au moins un test a échoué, essayez les solutions suggérées.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">Le diagnostic de base est passé. Si vous ne recevez toujours pas de notifications, envoyez un rapport d’anomalie pour nous aider à résoudre le problème.</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">Exécution… (%1$d sur %2$d)</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">Lancer les tests</string>
+    <string name="settings_troubleshoot_diagnostic">Diagnostics de résolution de problème</string>
+    <string name="settings_notification_troubleshoot">Résoudre les problèmes de notification</string>
+    <string name="settings_notification_privacy">Confidentialité des notifications</string>
+    <string name="settings_notification_by_event">Importance des notifications par évènement</string>
+    <string name="settings_notification_advanced">Paramètres de notification avancés</string>
+    <string name="settings_remove_three_pid_confirmation_content">Supprimer %s \?</string>
+    <string name="settings_phone_numbers">Numéros de téléphone</string>
+    <string name="settings_add_3pid_authentication_needed">Une authentification est nécessaire</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Vous ne pouvez pas faire ceci depuis ${app_name} mobile</string>
+    <string name="settings_add_3pid_confirm_password_title">Confirmez votre mot de passe</string>
+    <string name="settings_app_info_link_summary">Affiche les informations de l’application dans les paramètres système.</string>
+    <string name="settings_app_info_link_title">Informations sur l’application</string>
+    <string name="settings_add_phone_number">Ajouter un numéro de téléphone</string>
+    <string name="settings_phone_number_empty">Aucun numéro de téléphone n’a été ajouté à votre compte</string>
+    <string name="settings_phone_number">Téléphone</string>
+    <string name="settings_display_name">Nom affiché</string>
+    <string name="settings_profile_picture">Image de profil</string>
+    <string name="room_sliding_menu_privacy_policy">Politique de confidentialité</string>
+    <string name="room_sliding_menu_copyright">Droits d’auteur</string>
+    <string name="room_sliding_menu_third_party_notices">Licences tierces</string>
+    <string name="room_sliding_menu_term_and_conditions">Termes et conditions</string>
+    <string name="room_sliding_menu_version_x">Version %s</string>
+    <string name="room_sliding_menu_version">Version</string>
+    <string name="room_sliding_menu_settings">Paramètres</string>
+    <string name="room_sliding_menu_messages">Messages</string>
+    <string name="room_settings_add_homescreen_shortcut">Ajouter à l’écran d’accueil</string>
+    <string name="room_settings_forget">Abandonner</string>
+    <string name="room_settings_leave_conversation">Quitter la discussion</string>
+    <string name="room_settings_direct_chat">Conversation privée</string>
+    <string name="room_settings_de_prioritize">Passer en faible priorité</string>
+    <string name="room_settings_favourite">Favori</string>
+    <string name="room_settings_mute">Pas de notification</string>
+    <string name="room_settings_mention_only">Notifier uniquement lorsque mon nom est mentionné</string>
+    <string name="room_settings_all_messages">Notification pour chaque message</string>
+    <string name="room_settings_all_messages_noisy">Notification sonore pour chaque message</string>
+    <string name="directory_searching_title">Recherche dans le répertoire…</string>
+    <string name="directory_search_results_title">Parcourir le répertoire</string>
+    <string name="room_recents_join_room_prompt">Saisissez un identifiant ou un alias de salon</string>
+    <string name="room_recents_join_room_title">Rejoindre un salon</string>
+    <string name="room_recents_join_room">Rejoindre le salon</string>
+    <string name="room_recents_create_room">Créer un salon</string>
+    <string name="room_recents_start_chat">Nouvelle discussion</string>
+    <string name="room_recents_invites">INVITATIONS</string>
+    <string name="room_recents_low_priority">PRIORITÉ BASSE</string>
+    <string name="room_recents_conversations">SALONS</string>
+    <string name="room_recents_favourites">FAVORIS</string>
+    <string name="room_recents_directory">RÉPERTOIRE</string>
+    <string name="room_recents_join">REJOINDRE</string>
+    <string name="search_is_not_supported_in_e2e_room">La recherche dans les salons chiffrés n\'est pas encore prise en charge.</string>
+    <string name="tab_title_search_files">FICHIERS</string>
+    <string name="tab_title_search_people">PARTICIPANTS</string>
+    <string name="tab_title_search_messages">MESSAGES</string>
+    <string name="tab_title_search_rooms">SALONS</string>
+    <string name="search_no_results">Aucun résultat</string>
+    <string name="search_banned_user_hint">Filtrer les utilisateurs exclus</string>
+    <string name="search_members_hint">Filtrer les membres du salon</string>
+    <string name="search_hint">Rechercher</string>
+    <string name="room_event_action_cancel_download">Annuler le téléchargement</string>
+    <string name="room_event_action_report_prompt_ignore_user">Voulez-vous cacher tous les messages de cet utilisateur \?
+\n
+\nVeuillez noter que cette action redémarrera l’application et pourra prendre un certain temps.</string>
+    <string name="room_event_action_report_prompt_reason">Motif du signalement de ce contenu</string>
+    <string name="room_details_people_present_group_name">MEMBRES</string>
+    <string name="room_details_people_invited_group_name">INVITÉS</string>
+    <string name="room_details_settings">Paramètres</string>
+    <string name="room_details_files">Fichiers</string>
+    <string name="room_details_people">Participants</string>
+    <string name="room_permissions_change_topic">Changer le sujet</string>
+    <string name="room_permissions_upgrade_the_room">Mettre à niveau le salon</string>
+    <string name="room_permissions_change_permissions">Changer les permissions</string>
+    <string name="room_permissions_change_room_name">Changer le nom du salon</string>
+    <string name="room_permissions_change_history_visibility">Changer la visibilité de l’historique</string>
+    <string name="room_permissions_enable_room_encryption">Activer le chiffrement du salon</string>
+    <string name="room_permissions_change_main_address_for_the_room">Changer l’adresse principale du salon</string>
+    <string name="room_permissions_change_room_avatar">Changer l’avatar du salon</string>
+    <string name="room_permissions_notify_everyone">Notifier tout le monde</string>
+    <string name="room_permissions_remove_messages_sent_by_others">Supprimer les messages des autres</string>
+    <string name="room_permissions_ban_users">Bannir des utilisateurs</string>
+    <string name="room_permissions_kick_users">Expulser des utilisateurs</string>
+    <string name="room_permissions_change_settings">Mettre à jour les paramètres</string>
+    <string name="room_permissions_invite_users">Inviter des utilisateurs</string>
+    <string name="room_permissions_send_messages">Envoyer des messages</string>
+    <string name="room_permissions_default_role">Rôle par défaut</string>
+    <string name="room_permissions_notice_read_only">Vous n’avez pas la permission de changer les rôles requis pour changer différentes parties du salon</string>
+    <string name="room_permissions_notice">Indiquer les rôles requis pour changer les différentes parties du salon</string>
+    <string name="room_settings_permissions_subtitle">Voir et changer les rôles requis pour changer les différentes parties du salon.</string>
+    <string name="room_settings_permissions_title">Permissions du salon</string>
+    <string name="ssl_only_accept">Acceptez le certificat uniquement si l’administrateur du serveur a publié une empreinte correspondant à celle ci-dessus.</string>
+    <string name="ssl_expected_existing_expl">Le certificat n’est plus celui qui a été approuvé par votre téléphone. Le serveur a peut-être renouvelé son certificat. Contactez l’administrateur du serveur pour lui demander l’empreinte de son certificat.</string>
+    <string name="ssl_unexpected_existing_expl">Le certificat n’est plus celui qui a été approuvé par votre téléphone. Ce comportement est INATTENDU. Il est recommandé de ne PAS ACCEPTER ce nouveau certificat.</string>
+    <string name="ssl_cert_new_account_expl">Si l’administrateur du serveur a confirmé que cela était normal, assurez-vous que l’empreinte ci-dessous correspond à l’empreinte fournie par l’administrateur.</string>
+    <string name="ssl_cert_not_trust">Cela pourrait signifier que quelqu’un intercepte malicieusement votre trafic ou que votre téléphone ne fait pas confiance au certificat fourni par le serveur distant.</string>
+    <string name="ssl_could_not_verify">Impossible de vérifier l’identité du serveur distant.</string>
+    <string name="ssl_fingerprint_hash">Empreinte (%s) :</string>
+    <string name="ssl_remain_offline">Ignorer</string>
+    <string name="ssl_logout_account">Se déconnecter</string>
+    <string name="ssl_do_not_trust">Ne pas faire confiance</string>
+    <string name="ssl_trust">Faire confiance</string>
+    <string name="room_do_not_have_permission_to_post">Vous n’avez pas la permission de poster dans ce salon</string>
+    <string name="room_message_file_not_found">Fichier non trouvé</string>
+    <string name="room_delete_unsent_messages">Supprimer les messages non envoyés</string>
+    <string name="room_resend_unsent_messages">Renvoyer les messages non envoyés</string>
+    <string name="room_prompt_cancel">Tout annuler</string>
+    <string name="room_prompt_resend">Tout renvoyer</string>
+    <string name="room_unknown_devices_messages_notification">Messages non envoyés car des sessions inconnues sont présentes. %1$s ou %2$s maintenant \?</string>
+    <string name="room_unsent_messages_notification">Messages non envoyés. %1$s ou %2$s maintenant \?</string>
+    <string name="room_offline_notification">La connexion au serveur a été perdue.</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">Envoyer une réponse (non chiffrée)…</string>
+    <string name="room_message_placeholder_reply_to_encrypted">Envoyer une réponse chiffrée…</string>
+    <string name="room_message_placeholder_not_encrypted">Envoyer un message (non chiffré)…</string>
+    <string name="room_message_placeholder_encrypted">Envoyer un message chiffré…</string>
+    <string name="room_many_users_are_typing">%1$s, %2$s et d’autres écrivent…</string>
+    <string name="room_two_users_are_typing">%1$s et %2$s écrivent…</string>
+    <string name="room_one_user_is_typing">%s écrit…</string>
+    <string name="room_menu_search">Rechercher</string>
+    <string name="login_error_login_email_not_yet">Vous n’avez pas encore cliqué sur le lien dans l’courriel</string>
+    <string name="room_participants_invite_search_another_user">Identifiant, nom ou adresse courriel</string>
+    <string name="people_search_invite_by_id_dialog_description">Entrez une ou plusieurs adresses courriel ou identifiants Matrix</string>
+    <string name="malformed_id">Identifiant au mauvais format. Une adresse courriel ou un identifiant Matrix au format « @utilisateur:domaine » est attendu</string>
+    <string name="settings_add_email_address">Ajouter une adresse courriel</string>
+    <string name="settings_emails">Adresses courriel</string>
+    <string name="error_threepid_auth_failed">Assurez-vous d\'avoir cliqué sur le lien envoyé par courriel.</string>
+    <string name="account_email_validation_message">Vérifiez votre courriel et cliquez sur le lien qu’il contient. Une fois cela fait, cliquez sur continuer.</string>
+    <string name="account_email_validation_error">Impossible de vérifier l’adresse courriel. Vérifiez vos courriels et cliquez sur le lien qui a été envoyé. Ensuite, cliquez sur continuer.</string>
+    <string name="account_email_already_used_error">Cette adresse courriel est déjà utilisée.</string>
+    <string name="account_email_not_found_error">Cette adresse courriel n’a pas été trouvée.</string>
+    <string name="account_email_error">Une erreur est survenue lors de la vérification de votre adresse courriel.</string>
+    <string name="settings_emails_and_phone_numbers_summary">Gérer les courriels et numéros de téléphone liés à votre compte Matrix</string>
+    <string name="login_server_text">Tout comme les courriels, les comptes ont un serveur d’accueil, même si vous pouvez parler à tout le monde</string>
+    <string name="settings_discovery_emails_title">Adresses courriel découvrables</string>
+    <string name="settings_discovery_disconnect_identity_server_info">La déconnexion du serveur d’identité signifie que vous ne pourrez plus être découvrable par les autres utilisateurs et que vous ne pourrez plus inviter d’autres personnes par courriel ou par téléphone.</string>
+    <string name="settings_discovery_confirm_mail">Nous vous avons envoyé un courriel de confirmation à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Nous vous avons envoyé un courriel de confirmation à %s, consultez vos courriels et cliquez sur le lien de confirmation</string>
+    <string name="settings_discovery_consent_title">Envoyer des courriels et des numéros de téléphone</string>
+    <string name="settings_discovery_consent_notice_on">Vous avez donné votre autorisation pour envoyer des courriels et des numéros de téléphone à ce serveur d’identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
+    <string name="settings_discovery_consent_notice_off">Vous n’avez pas donné votre autorisation pour envoyer des courriels et des numéros de téléphone à ce serveur d’identité pour découvrir d\'autres utilisateurs à partir de vos contacts.</string>
+    <string name="identity_server_consent_dialog_title">Envoyer des courriels et des numéros de téléphone</string>
+    <string name="identity_server_consent_dialog_content">Dans le but de découvrir des contacts que vous connaîtriez, acceptez-vous d\'envoyer vos données de contact (numéros de téléphone et/ou courriels) au serveur d’identité configuré (%1$s) \?
+\n
+\nPour une meilleure protection de la vie privée, les données seront condensées (hash) avant l’envoi.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Vous partagez actuellement des adresse courriels et des numéros de téléphone sur le serveur d’identité %1$s. Vous devrez vous reconnecter à %2$s pour arrêter de les partager.</string>
+    <string name="settings_agree_to_terms">Acceptez les conditions de service du serveur d’identité (%s) pour vous permettre d’être découvrable avec une adresse courriel ou un numéro de téléphone.</string>
+    <string name="login_reset_password_notice">Un courriel de vérification sera envoyé à votre adresse pour confirmer la configuration de votre nouveau mot de passe.</string>
+    <string name="login_reset_password_error_not_found">Cet courriel n’est lié à aucun compte</string>
+    <string name="login_reset_password_mail_confirmation_notice">Un courriel de vérification a été envoyé à %1$s.</string>
+    <string name="login_reset_password_mail_confirmation_submit">J’ai vérifié mon adresse courriel</string>
+    <string name="login_set_email_title">Définir l’adresse courriel</string>
+    <string name="login_set_email_notice">Définir une adresse courriel pour récupérer votre compte. Plus tard, vous pourrez éventuellement autoriser des personnes à vous retrouver avec votre adresse courriel.</string>
+    <string name="login_signin_username_hint">Nom d’utilisateur ou courriel</string>
+    <string name="login_wait_for_email_title">Vérifiez vos courriels</string>
+    <string name="login_wait_for_email_notice">Nous avons envoyé un courriel à %1$s.
+\nCliquez sur le lien qu’il contient pour continuer la création du compte.</string>
+    <string name="template_identity_server_error_bulk_sha256_not_supported">Pour votre vie privée, ${app_name} prend uniquement en charge l’envoi des adresses courriel et des numéros de téléphone hachés.</string>
+    <string name="login_login_with_email_error">Cet courriel n’est associé à aucun compte.</string>
+    <string name="template_permissions_rationale_msg_contacts">${app_name} peut accéder à votre carnet d’adresses pour trouver d’autres utilisateurs de Matrix avec leur numéro de téléphone et leur adresse courriel. Veuillez autoriser l’accès dans la prochaine fenêtre pour découvrir les utilisateurs du carnet d’adresses joignables via ${app_name}.</string>
+    <string name="auth_add_email_and_phone_message_2">Renseignez une adresse courriel pour la récupération de compte. Utilisez ensuite un courriel ou un téléphone pour être éventuellement découvrable par les personnes qui vous connaissent.</string>
+    <string name="auth_invalid_phone">Ceci ne ressemble pas à un numéro de téléphone valide</string>
+    <string name="auth_invalid_email">Ceci ne ressemble pas à une adresse courriel valide</string>
+    <string name="auth_add_email_phone_message_2">Renseignez une adresse courriel pour la récupération de compte. Utilisez ensuite un courriel ou un téléphone pour être éventuellement découvrable par les personnes qui vous connaissent.</string>
+    <string name="auth_add_email_message_2">Renseignez une adresse courriel pour la récupération de compte et pour être éventuellement découvrable par les personnes qui vous connaissent.</string>
+    <string name="auth_user_id_placeholder">Courriel ou nom d’utilisateur</string>
+    <string name="auth_send_reset_email">Envoyer le courriel de réinitialisation</string>
+    <string name="medium_email">Adresse courriel</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">Vous avez retiré %1$s comme adresse pour ce salon.</item>
+        <item quantity="other">Vous avez retiré %1$s comme adresses pour ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s a retiré %2$s comme adresse pour ce salon.</item>
+        <item quantity="other">%1$s a retiré %2$s comme adresses pour ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">Vous avez ajouté %1$s comme adresse pour ce salon.</item>
+        <item quantity="other">Vous avez ajouté %1$s comme adresses pour ce salon.</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s a ajouté %2$s comme adresse pour ce salon.</item>
+        <item quantity="other">%1$s a ajouté %2$s comme adresses pour ce salon.</item>
+    </plurals>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s et 1 autre</item>
+        <item quantity="other">%1$s et %2$d autres</item>
+    </plurals>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s et %4$d autre</item>
+        <item quantity="other">%1$s, %2$s, %3$s et %4$d autres</item>
+    </plurals>
+    <string name="event_status_delete_all_failed_dialog_message">Êtes-vous sûr de vouloir supprimer tous les messages non envoyés dans ce salon \?</string>
+    <string name="event_status_delete_all_failed_dialog_title">Supprimer les messages non envoyés</string>
+    <string name="event_status_failed_messages_warning">Messages non envoyés</string>
+    <string name="event_status_cancel_sending_dialog_message">Voulez-vous annuler l’envoi du message \?</string>
+    <string name="event_status_a11y_delete_all">Supprimer tous les messages en échec</string>
+    <string name="event_status_a11y_failed">Échec</string>
+    <string name="event_status_a11y_sent">Envoyé</string>
+    <string name="event_status_a11y_sending">Envoi</string>
+    <string name="dev_tools_success_state_event">Événement d’état envoyé !</string>
+    <string name="dev_tools_success_event">Événement envoyé !</string>
+    <string name="dev_tools_error_malformed_event">Événement malformé</string>
+    <string name="dev_tools_error_no_message_type">Type de message manquant</string>
+    <string name="dev_tools_error_no_content">Pas de contenu</string>
+    <string name="dev_tools_form_hint_state_key">Clé d’état</string>
+    <string name="dev_tools_form_hint_type">Type</string>
+    <string name="dev_tools_edit_content">Modifier le contenu</string>
+    <string name="dev_tools_state_event">Événements d’état</string>
+    <string name="dev_tools_explore_room_state">Explorer l’état du salon</string>
+    <string name="dev_tools_menu_name">Outils de développement</string>
+    <string name="a11y_view_read_receipts">Voir les accusés de réception</string>
+    <string name="a11y_rule_notify_off">Ne pas notifier</string>
+    <string name="a11y_rule_notify_silent">Notifier sans son</string>
+    <string name="a11y_rule_notify_noisy">Notifier avec son</string>
+    <string name="a11y_error_message_not_sent">Message non envoyé suite à une erreur</string>
+    <string name="a11y_checked">Vérifié</string>
+    <string name="a11y_close_emoji_picker">Fermer le sélecteur d’émojis</string>
+    <string name="a11y_open_emoji_picker">Ouvrir le sélecteur d’émojis</string>
+    <string name="a11y_trust_level_trusted">Reconnu</string>
+    <string name="a11y_trust_level_warning">Douteux</string>
+    <string name="a11y_trust_level_default">Niveau de confiance par défaut</string>
+    <string name="a11y_selected">Sélectionné</string>
+    <string name="a11y_video">Vidéo</string>
+    <string name="a11y_unsent_draft">Ce salon a des brouillons non envoyés</string>
+    <string name="a11y_error_some_message_not_sent">Certains messages n’ont pas été envoyés</string>
+    <string name="a11y_delete_avatar">Supprimer l’avatar</string>
+    <string name="a11y_change_avatar">Changer l’avatar</string>
+    <string name="a11y_image">Image</string>
+    <string name="a11y_import_key_from_file">Importer la clé depuis le fichier</string>
+    <string name="a11y_screenshot">Capture d’écran</string>
+    <string name="authentication_error">Échec d’authentification</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} requiert que vous saisissiez vos identifiants à nouveau pour effectuer cette action.</string>
+    <string name="re_authentication_activity_title">Une nouvelle authentification est requise</string>
+    <string name="call_transfer_users_tab_title">Utilisateurs</string>
+    <string name="call_transfer_failure">Une erreur s’est produite lors du transfert de l’appel</string>
+    <string name="call_transfer_title">Transférer</string>
+    <string name="call_transfer_connect_action">Rejoindre</string>
+    <string name="call_transfer_consult_first">Consulter d’abord</string>
+    <string name="call_only_active">Appel en cours (%1$s)</string>
+    <string name="call_dial_pad_lookup_error">Il y a eu une erreur lors de la recherche du numéro de téléphone</string>
+    <string name="call_dial_pad_title">Pavé de numérotation</string>
+    <string name="call_tile_call_back">Rappeler</string>
+    <string name="call_tile_ended">Cet appel est terminé</string>
+    <string name="call_tile_other_declined">%1$s a refusé cet appel</string>
+    <string name="call_tile_you_declined">Vous avez refusé cet appel %1$s</string>
+    <string name="call_tile_in_call">Vous êtes actuellement dans cet appel</string>
+    <string name="call_tile_other_started_call">%1$s a lancé un appel</string>
+    <string name="call_tile_you_started_call">Vous avez lancé un appel</string>
+    <string name="matrix_to_card_title">Lien Matrix</string>
+    <string name="warning_unsaved_change_discard">Annuler les changements</string>
+    <string name="warning_unsaved_change">Il y a des modifications non-enregistrées. Annuler les changements \?</string>
+    <string name="warning_room_not_created_yet">Le salon n\'est pas encore créé. Annuler la création du salon \?</string>
+    <string name="universal_link_malformed">Le lien est malformé</string>
+    <string name="qr_code_not_scanned">Code QR non scanné !</string>
+    <string name="invalid_qr_code_uri">Code QR invalide (URI invalide) !</string>
+    <string name="cannot_dm_self">Impossible avec vous-même !</string>
+    <string name="share_by_text">Partager par SMS</string>
+    <string name="room_error_not_found">Impossible de trouver ce salon. Assurez-vous qu’il existe.</string>
+    <string name="error_opening_banned_room">Impossible d’ouvrir un salon dont vous êtes banni.</string>
+    <string name="sas_decimal_description">Vérifiez cette session en confirmant que les chiffres suivants apparaissent sur l’écran de votre partenaire</string>
+    <string name="sas_emoji_description">Vérifiez cette session en confirmant que les émojis suivants apparaissent sur l’écran de votre partenaire</string>
+    <string name="sas_incoming_request_description_2">La vérification de cette session la marquera comme fiable, et marquera aussi votre session comme fiable pour votre partenaire.</string>
+    <string name="sas_incoming_request_description">Vérifiez cette session pour la marquer comme fiable. Faire confiance aux sessions de vos partenaires vous permet d’être plus serein en utilisant les messages chiffrés de bout en bout.</string>
+    <string name="sas_incoming_request_title">Demande de vérification entrante</string>
+    <string name="sas_verify_start_button_title">Commencer la vérification</string>
+    <string name="sas_security_advise">Pour une sécurité maximale, nous vous recommandons de faire cela en personne ou d’utiliser d’autres moyens de communication sécurisés.</string>
+    <string name="sas_verify_title">Vérifier en comparant une courte chaîne de caractères.</string>
+    <string name="invalid_or_expired_credentials">Vous avez été déconnecté car vos identifiants sont incorrects ou ont expiré.</string>
+    <string name="autodiscover_well_known_autofill_confirm">Utiliser la configuration</string>
+    <string name="template_autodiscover_well_known_autofill_dialog_message">${app_name} a détecté une configuration de serveur personnalisée pour le domaine de votre identifiant « %1$s » :
+\n%2$s</string>
+    <string name="autodiscover_well_known_autofill_dialog_title">Auto-compléter les options du serveur</string>
+    <string name="autodiscover_invalid_response">Réponse de découverte du serveur d’accueil non valide</string>
+    <string name="keys_backup_info_title_signature">Signature</string>
+    <string name="keys_backup_info_title_algorithm">Algorithme</string>
+    <string name="keys_backup_info_title_version">Version</string>
+    <string name="keys_backup_info_keys_all_backup_up">Toutes les clés sont sauvegardées</string>
+    <string name="secure_backup_setup">Activer la sauvegarde sécurisée</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">On dirait que vous avez déjà configuré une sauvegarde de clé depuis une autre session. Voulez-vous la remplacer par celle que vous êtes en train de créer \?</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">Une sauvegarde est déjà disponible sur votre serveur d’accueil</string>
+    <string name="recovery_key_export_saved">La clé de récupération a été enregistrée.</string>
+    <string name="recovery_key_export_saved_as_warning">La clé de récupération a bien été enregistrée vers « %s ».
+\n
+\nAttention : ce fichier pourrait être supprimé si l’application est désinstallée.</string>
+    <string name="keys_backup_setup_step3_save_button_title">Enregistrer dans un fichier</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">Partager</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Sauvegarder la clé de récupération</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">J’ai fait une copie</string>
+    <string name="keys_backup_setup_step3_button_title">Terminé</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Conservez votre clé de récupération dans un endroit sûr, comme un gestionnaire de mots de passe (ou un coffre-fort)</string>
+    <string name="keys_backup_setup_step3_text_line2">Votre clé de récupération est une mesure de précaution. Vous pouvez l’utiliser pour restaurer l’accès à vos messages chiffrés si vous oubliez votre phrase secrète.
+\nConservez votre clé de récupération en lieu sûr, comme un gestionnaire de mots de passe (ou un coffre-fort)</string>
+    <string name="keys_backup_setup_step3_text_line1">Vos clés sont en cours de sauvegarde.</string>
+    <string name="keys_backup_setup_step3_success_title">Bien joué !</string>
+    <string name="keys_backup_setup_step2_skip_button_title">(Avancé) Configurer une clé de récupération</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Ou protégez votre sauvegarde avec une clé de récupération, en la conservant en lieu sûr.</string>
+    <string name="keys_backup_setup_creating_backup">Création de la sauvegarde</string>
+    <string name="keys_backup_setup_step2_button_title">Définir la phrase secrète</string>
+    <string name="keys_backup_setup_step2_text_description">Nous conserverons une copie chiffrée de vos clés sur votre serveur d’accueil. Protégez votre sauvegarde avec une phrase secrète pour la sécuriser.
+\n
+\nPour une sécurité maximale, elle devrait être différente du mot de passe de votre compte.</string>
+    <string name="keys_backup_setup_step2_text_title">Protégez votre sauvegarde avec une phrase secrète.</string>
+    <string name="keys_backup_setup_step1_manual_export">Exporter les clés manuellement</string>
+    <string name="keys_backup_setup_step1_advanced">(Avancé)</string>
+    <string name="keys_backup_setup">Commencer à utiliser la sauvegarde de clés</string>
+    <string name="keys_backup_setup_step1_description">Les messages dans les salons chiffrés sont sécurisés avec un chiffrement de bout en bout. Seuls vous et le(s) destinataire(s) avez les clés pour lire ces messages.
+\n
+\nSauvegardez vos clés de façon sécurisée pour éviter de les perdre.</string>
+    <string name="keys_backup_setup_step1_title">Ne perdez jamais vos messages chiffrés</string>
+    <string name="keys_backup_no_session_error">Aucune session Matrix n’est disponible</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Veuillez supprimer la phrase secrète si vous voulez que ${app_name} génère une clé de récupération.</string>
+    <string name="passphrase_passphrase_too_weak">La phrase secrète est trop faible</string>
+    <string name="passphrase_empty_error_message">Veuillez saisir une phrase secrète</string>
+    <string name="passphrase_passphrase_does_not_match">Les phrases secrètes doivent concorder</string>
+    <string name="passphrase_enter_passphrase">Saisir la phrase secrète</string>
+    <string name="passphrase_confirm_passphrase">Confirmer la phrase secrète</string>
+    <string name="passphrase_create_passphrase">Créer la phrase secrète</string>
+    <string name="no_valid_google_play_services_apk">Aucun APK des services Google Play valide n’a été trouvé. Les notifications peuvent ne pas fonctionner correctement.</string>
+    <string name="x_plus">%d+</string>
+    <string name="plus_x">+%d</string>
+    <string name="generic_label_and_value">%1$s : %2$s</string>
+    <string name="generic_label">%1$s :</string>
+    <string name="show_info_area_only_errors">Seulement pour les erreurs</string>
+    <string name="show_info_area_messages_and_errors">Pour les messages et les erreurs</string>
+    <string name="show_info_area_always">Toujours</string>
+    <string name="settings_info_area_show">Afficher la zone d’information</string>
+    <string name="merged_events_collapse">réduire</string>
+    <string name="merged_events_expand">développer</string>
+    <string name="unknown_error">Désolé, une erreur est survenue</string>
+    <string name="error_lazy_loading_not_supported_by_home_server">Votre serveur d’accueil ne prend pas encore en charge le chargement en différé des membres des salons. Réessayez ultérieurement.</string>
+    <string name="settings_lazy_loading_description">Améliore les performances en ne chargeant les membres des salons qu’au premier affichage.</string>
+    <string name="settings_lazy_loading_title">Charger les membres des salons en différé</string>
+    <string name="resource_limit_hard_contact">Veuillez %s pour continuer à utiliser ce service.</string>
+    <string name="resource_limit_soft_contact">Veuillez %s pour augmenter cette limite.</string>
+    <string name="resource_limit_hard_mau">Ce serveur d’accueil a atteint sa limite mensuelle d’utilisateurs actifs.</string>
+    <string name="resource_limit_soft_mau"> Ce serveur d’accueil a atteint sa limite mensuelle d’utilisateurs actifs donc <b>certains utilisateurs ne pourront pas se connecter</b>.</string>
+    <string name="resource_limit_hard_default">Ce serveur d’accueil a dépassé une de ses limites de ressources.</string>
+    <string name="resource_limit_soft_default">Ce serveur d’accueil a dépassé une de ses limites de ressources donc <b>certains utilisateurs ne pourront pas se connecter</b>.</string>
+    <string name="resource_limit_contact_admin">contacter l’administrateur de votre service</string>
+    <string name="resource_limit_contact_action">Contacter l’administrateur</string>
+    <string name="resource_limit_exceeded_title">Limite de ressources dépassée</string>
+    <string name="room_tombstone_predecessor_link">Cliquer ici pour voir les anciens messages</string>
+    <string name="room_tombstone_continuation_description">Ce salon est la suite d’une autre conversation</string>
+    <string name="room_tombstone_continuation_link">La conversation continue ici</string>
+    <string name="room_tombstone_versioned_description">Ce salon a été remplacé et n’est plus actif</string>
+    <string name="error_empty_field_your_password">Veuillez renseigner votre mot de passe.</string>
+    <string name="error_empty_field_enter_user_name">Veuillez renseigner un nom d’utilisateur.</string>
+    <string name="deactivate_account_submit">Désactiver le compte</string>
+    <string name="deactivate_account_prompt_password">Pour poursuivre, veuillez renseigner votre mot de passe :</string>
+    <string name="deactivate_account_delete_checkbox">Veuillez oublier tous les messages que j’ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront une version incomplète des conversations)</string>
+    <string name="deactivate_account_title">Désactiver le compte</string>
+    <string name="dialog_user_consent_submit">Voir maintenant</string>
+    <string name="dialog_user_consent_content">Pour continuer à utiliser le serveur d’accueil %1$s, vous devez lire et accepter les conditions générales.</string>
+    <string name="avatar">Avatar</string>
+    <string name="notice_avatar">Avatar d’avertissement</string>
+    <string name="receipt_avatar">Avatar de réception</string>
+    <string name="forget_room">Oublier le salon</string>
+    <string name="rejoin">Rejoindre</string>
+    <string name="reason_colon">Motif : %1$s</string>
+    <string name="has_been_banned">%2$s vous a banni de %1$s</string>
+    <string name="has_been_kicked">%2$s vous a expulsé de %1$s</string>
+    <string name="group_no_long_description">L’administrateur de cette communauté n’a pas encore fourni de description.</string>
+    <string name="filter_group_rooms">Filtrer les salons du groupe</string>
+    <string name="filter_group_members">Filtrer les membres du groupe</string>
+    <string name="invited">Invité</string>
+    <string name="joined">Rejoint</string>
+    <string name="rooms">Salons</string>
+    <string name="no_users_placeholder">Pas d’utilisateur</string>
+    <string name="group_details_rooms">Salons</string>
+    <string name="group_details_people">Personnes</string>
+    <string name="group_details_home">Accueil</string>
+    <string name="community_id_hint">Exemple</string>
+    <string name="community_id">Identifiant de communauté</string>
+    <string name="community_name_hint">Exemple</string>
+    <string name="community_name">Nom de la communauté</string>
+    <string name="create_community">Créer une communauté</string>
+    <string name="create">Créer</string>
+    <string name="encrypted_message">Message chiffré</string>
+    <string name="notification_noisy">Notification sonore</string>
+    <string name="notification_silent">Silencieuse</string>
+    <string name="notification_off">Désactivé</string>
+    <string name="markdown_has_been_disabled">Le Markdown a été désactivé.</string>
+    <string name="markdown_has_been_enabled">Le Markdown a été activé.</string>
+    <string name="command_description_clear_scalar_token">Pour réparer la gestion des applications Matrix</string>
+    <string name="command_description_markdown">Markdown activé/désactivé</string>
+    <string name="command_description_nick">Change le nom d’affichage</string>
+    <string name="command_description_kick_user">Expulse l’utilisateur avec l’identifiant fourni</string>
+    <string name="command_description_topic">Définit le sujet du salon</string>
+    <string name="command_description_part_room">Quitte le salon</string>
+    <string name="command_description_join_room">Rejoint le salon avec l’alias fourni</string>
+    <string name="command_description_invite_user">Invite l’utilisateur avec l’identifiant fourni dans le salon actuel</string>
+    <string name="command_description_deop_user">Rétrograde l’utilisateur avec l’identifiant fourni</string>
+    <string name="command_description_op_user">Définit le rang d’un utilisateur</string>
+    <string name="command_description_unban_user">Révoque le bannissement de l’utilisateur avec l’identifiant fourni</string>
+    <string name="command_description_ban_user">Exclus l’utilisateur avec l’identifiant fourni</string>
+    <string name="command_description_emote">Affiche une action</string>
+    <string name="command_problem_with_parameters">La commande « %s » nécessite plus de paramètres, ou certains paramètres ne sont pas corrects.</string>
+    <string name="unrecognized_command">Commande non reconnue : %s</string>
+    <string name="command_error">Erreur de commande</string>
+    <string name="conference_call_warning_message">L’appel en téléconférence est en cours de développement et peut ne pas être fiable.</string>
+    <string name="conference_call_warning_title">Attention !</string>
+    <string name="ignore_request_short_label">Ignorer</string>
+    <string name="ignore_request">Ignorer la demande</string>
+    <string name="key_share_request">Demande de partage de clé</string>
+    <string name="share_without_verifying_short_label">Partager</string>
+    <string name="share_without_verifying">Partager sans vérifier</string>
+    <string name="start_verification_short_label">Vérifier</string>
+    <string name="start_verification">Commencer la vérification</string>
+    <string name="your_unverified_device_requesting_with_info">Une session non vérifiée demande les clés de chiffrement.
+\nNom de la session : %1$s
+\nVu : %2$s
+\nSi vous ne vous êtes pas connecté à une autre session, ignorez cette demande.</string>
+    <string name="your_unverified_device_requesting">Votre session non vérifiée « %s » demande les clés de chiffrement.</string>
+    <string name="you_added_a_new_device_with_info">Une nouvelle session demande les clés de chiffrement.
+\nNom de la session : %1$s
+\nVu : %2$s
+\nSi vous ne vous êtes pas connecté à une autre session, ignorez cette demande.</string>
+    <string name="you_added_a_new_device">Vous avez ajouté une nouvelle session « %s », qui demande les clés de chiffrement.</string>
+    <string name="widget_integration_review_terms">Pour continuer, vous devez accepter les conditions de ce service.</string>
+    <string name="settings_labs_enable_send_voice_summary">Cette option nécessite une autre application pour enregistrer les messages.</string>
+    <string name="settings_labs_enable_send_voice">Envoyer des messages vocaux</string>
+    <string name="settings_labs_keyboard_options_to_send_message">Utiliser la touche Entrée du clavier pour envoyer un message</string>
+    <string name="settings_labs_native_camera_summary">Lancer l’appareil photo du système plutôt que l’écran d’appareil photo personnalisé.</string>
+    <string name="settings_labs_native_camera">Utiliser la caméra de l’appareil</string>
+    <string name="room_manage_integrations">Gérer les intégrations</string>
+    <string name="room_add_matrix_apps">Ajouter des applications Matrix</string>
+    <string name="integration_manager_not_configured">Aucun gestionnaire d’intégrations n’est configuré.</string>
+    <string name="widget_integration_invalid_parameter">Un paramètre n’est pas valide.</string>
+    <string name="widget_integration_missing_parameter">Un paramètre requis est manquant.</string>
+    <string name="widget_integration_room_not_visible">Le salon %s n’est pas visible.</string>
+    <string name="widget_integration_missing_user_id">user_id manquant dans la requête.</string>
+    <string name="widget_integration_missing_room_id">room_id manquant dans la requête.</string>
+    <string name="widget_integration_no_permission_in_room">Vous n’avez pas la permission de faire cela dans ce salon.</string>
+    <string name="widget_integration_must_be_in_room">Vous n’êtes pas dans ce salon.</string>
+    <string name="widget_integration_positive_power_level">Le rang doit être un entier positif.</string>
+    <string name="widget_integration_failed_to_send_request">Échec de l’envoi de la requête.</string>
+    <string name="room_widget_webview_read_protected_media">Lire des médias protégés par des DRM</string>
+    <string name="room_widget_webview_access_microphone">Utiliser le micro</string>
+    <string name="room_widget_webview_access_camera">Utiliser la caméra</string>
+    <string name="room_widget_resource_decline_permission">Tout bloquer</string>
+    <string name="room_widget_resource_grant_permission">Autoriser</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Partir de la téléconférence actuelle et basculer sur une autre \?</string>
+    <string name="error_jitsi_not_supported_on_old_device">Désolé, les appels en visioconférence avec Jitsi ne sont pas pris en charge sur les anciens appareils (avec une version d\'Android antérieure à 6.0)</string>
+    <string name="room_widget_permission_room_id">L’identifiant du salon</string>
+    <string name="room_widget_permission_theme">Votre thème</string>
+    <string name="room_widget_permission_user_id">Votre identifiant utilisateur</string>
+    <string name="room_widget_permission_avatar_url">L’URL de votre avatar</string>
+    <string name="room_widget_permission_display_name">Votre nom d’affichage</string>
+    <string name="room_widget_revoke_access">Révoquer l’accès pour moi</string>
+    <string name="room_widget_open_in_browser">Ouvrir dans le navigateur</string>
+    <string name="room_widget_permission_shared_info_title">Son utilisation peut entraîner le partage de données avec %s :</string>
+    <string name="room_widget_activity_title">Widget</string>
+    <string name="active_widgets_title">Widgets actifs</string>
+    <string name="active_widget_view_action">VUE</string>
+    <string name="settings_labs_create_conference_with_jitsi">Créer des appels en téléconférence avec jitsi</string>
+    <string name="huge">Énorme</string>
+    <string name="largest">La plus grande</string>
+    <string name="larger">Très grande</string>
+    <string name="large">Grande</string>
+    <string name="normal">Normale</string>
+    <string name="small">Petite</string>
+    <string name="tiny">Minuscule</string>
+    <string name="font_size">Taille de la police</string>
+    <string name="historical_placeholder">Rechercher dans l’historique</string>
+    <string name="notification_ticker_text_group">%1$s : %2$s %3$s</string>
+    <string name="notification_ticker_text_dm">%1$s : %2$s</string>
+    <string name="notification_inline_reply_failed">** Échec de l’envoi − veuillez ouvrir le salon</string>
+    <string name="notification_sender_me">Moi</string>
+    <string name="people_search_invite_by_id_dialog_title">Inviter un utilisateur par son identifiant Matrix</string>
+    <string name="people_search_filter_text">Utilisateurs Matrix uniquement</string>
+    <string name="people_search_user_directory">RÉPERTOIRE UTILISATEUR (%s)</string>
+    <string name="people_search_local_contacts">CONTACTS LOCAUX (%d)</string>
+    <string name="people_search_invite_by_id"><u>Inviter par identifiant</u></string>
+    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
+    <string name="room_participants_invite_join_names_and">%1$s et %2$s</string>
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="room_participants_invite_prompt_msg">Voulez-vous vraiment inviter %s à cette discussion \?</string>
+    <string name="reason_hint">Motif</string>
+    <string name="room_participants_unban_prompt_msg">Révoquer le bannissement de l’utilisateur lui permettra de rejoindre le salon.</string>
+    <string name="room_participants_ban_prompt_msg">Bannir un utilisateur va l’expulser du salon et l’empêcher de le rejoindre à nouveau.</string>
+    <string name="room_participants_unban_title">Révoquer le bannissement de l’utilisateur</string>
+    <string name="room_participants_ban_reason">Motif du bannissement</string>
+    <string name="room_participants_ban_title">Bannir l’utilisateur</string>
+    <string name="room_participants_kick_prompt_msg">expulser un utilisateur le supprimera de ce salon.
+\n
+\nPour l’empêcher de revenir, vous devez plutôt le bannir.</string>
+    <string name="room_participants_kick_reason">Motif d’expulsion</string>
+    <string name="room_participants_kick_title">Expulser l’utilisateur</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Êtes-vous sûr de vouloir annuler l’invitation pour cet utilisateur \?</string>
+    <string name="room_participants_action_cancel_invite_title">Annuler l’invitation</string>
+    <string name="room_participants_action_unignore">Afficher tous les messages de cet utilisateur</string>
+    <string name="room_participants_action_unignore_prompt_msg">Ne plus ignorer cet utilisateur aura pour effet de ré-afficher ses messages.</string>
+    <string name="room_participants_action_unignore_title">Ne plus ignorer l’utilisateur</string>
+    <string name="room_participants_action_ignore">Ignorer</string>
+    <string name="auth_login_sso">Se connecter avec l’authentification unique</string>
+    <string name="auth_login">Se connecter</string>
+    <string name="error_no_external_application_found">Désolé, aucune application externe n’a été trouvée pour effectuer cette action.</string>
+    <string name="go_on_with">continuer avec…</string>
+    <string name="option_take_video">Prendre une vidéo</string>
+    <string name="option_take_photo">Prendre une photo</string>
+    <string name="option_take_photo_video">Prendre une photo ou une vidéo</string>
+    <string name="option_send_sticker">Envoyer un autocollant</string>
+    <string name="option_send_files">Envoyer des fichiers</string>
+    <string name="call_format_turn_hd_on">Activer la HD</string>
+    <string name="call_format_turn_hd_off">Désactiver la HD</string>
+    <string name="call_camera_back">Arrière</string>
+    <string name="call_camera_front">Frontale</string>
+    <string name="call_switch_camera">Changer de caméra</string>
+    <string name="sound_device_wireless_headset">Écouteurs sans fil</string>
+    <string name="sound_device_headset">Écouteurs</string>
+    <string name="sound_device_speaker">Hauts-parleurs</string>
+    <string name="sound_device_phone">Téléphone</string>
+    <string name="call_select_sound_device">Sélectionner un périphérique audio</string>
+    <string name="call_failed_no_connection_description">Impossible d\'établir une connexion en temps réel.
+\nVeuillez demander à l’administrateur de votre serveur d’accueil de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.</string>
+    <string name="template_call_failed_no_connection">Appel échoué</string>
+    <string name="call_failed_dont_ask_again">Ne plus me demander</string>
+    <string name="call_failed_no_ice_use_alt">Essayez d’utiliser %s</string>
+    <string name="call_failed_no_ice_description">Demandez à l’administrateur de votre serveur d’accueil (%1$s) de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.
+\n
+\nSinon, vous pouvez essayer d’utiliser le serveur public à %2$s, mais ça ne sera pas fiable et ça partagera votre adresse IP avec ce serveur. Vous pouvez aussi régler cela dans les paramètres.</string>
+    <string name="call_failed_no_ice_title">L’appel a échoué en raison d’un serveur mal configuré</string>
+    <string name="option_send_voice">Envoyer un message vocal</string>
+    <string name="start_video_call">Nouvel appel vidéo</string>
+    <string name="start_voice_call">Nouvel appel audio</string>
+    <string name="start_new_chat">Nouvelle discussion</string>
+    <string name="search">Rechercher</string>
+    <string name="identity_url">URL du serveur d’identité</string>
+    <string name="hs_url">URL du serveur d’accueil</string>
+    <string name="logout">Se déconnecter</string>
+    <string name="login">Se connecter</string>
+    <string name="create_account">Créer un compte</string>
+    <string name="username">Nom d’utilisateur</string>
+    <string name="join_room">Rejoindre le salon</string>
+    <string name="read_receipt">Lu</string>
+    <string name="send_files_in">Envoyer dans</string>
+    <string name="send_bug_report_progress">Avancement (%s %%)</string>
+    <string name="send_bug_report_failed">L’envoi du rapport d’anomalie a échoué (%s)</string>
+    <string name="send_bug_report_sent">Le rapport d’anomalie a bien été envoyé</string>
+    <string name="send_bug_report_rage_shake">Secouer avec agacement pour signaler une anomalie</string>
+    <string name="send_bug_report_logs_description">Afin de diagnostiquer les problèmes, les journaux de ce client seront envoyés avec ce rapport d’erreur. Ce rapport d’erreur, y compris les journaux et la capture d’écran, ne seront pas visibles publiquement. Si vous préférez envoyer le texte ci-dessus uniquement, veuillez décocher :</string>
+    <string name="send_bug_report_placeholder">Décrivez votre problème ici</string>
+    <string name="send_bug_report_description_in_english">Si possible, veuillez écrire la description en anglais.</string>
+    <string name="send_bug_report">Rapporter une erreur</string>
+    <string name="send_bug_report_include_screenshot">Envoyer une capture d’écran</string>
+    <string name="send_bug_report_include_key_share_history">Inclure l’historique d’échange de clés</string>
+    <string name="send_bug_report_include_crash_logs">Envoyer les journaux d’erreur</string>
+    <string name="send_bug_report_include_logs">Envoyer les journaux</string>
+    <string name="no_group_placeholder">Aucun groupe</string>
+    <string name="groups_header">Communautés</string>
+    <string name="groups_invite_header">Inviter</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Afficher tous les salons dans le répertoire, y compris ceux au contenu choquant.</string>
+    <string name="settings_room_directory_show_all_rooms">Afficher les salons au contenu choquant</string>
+    <string name="settings_category_room_directory">Répertoire des salons</string>
+    <string name="no_public_room_placeholder">Aucun salon public disponible</string>
+    <string name="no_room_placeholder">Aucun salon</string>
+    <string name="rooms_directory_header">Répertoire de salons</string>
+    <string name="rooms_header">Salons</string>
+    <string name="people_no_identity_server">Aucun serveur d’identité configuré.</string>
+    <string name="no_more_results">Plus aucun résultat</string>
+    <string name="no_result_placeholder">Aucun résultat</string>
+    <string name="template_no_contact_access_placeholder">Vous n’avez pas autorisé ${app_name} à accéder à votre carnet d’adresses</string>
+    <string name="no_conversation_placeholder">Aucune discussion</string>
+    <string name="matrix_only_filter">Contacts Matrix uniquement</string>
+    <string name="user_directory_header">Répertoire utilisateur</string>
+    <string name="local_address_book_header">Carnet d’adresses local</string>
+    <string name="direct_chats_header">Discussions</string>
+    <string name="system_alerts_header">Alertes système</string>
+    <string name="low_priority_header">Priorité basse</string>
+    <string name="invitations_header">Invitations</string>
+    <string name="home_filter_placeholder_groups">Filtrer les noms des communautés</string>
+    <string name="home_filter_placeholder_rooms">Filtrer les noms des salons</string>
+    <string name="home_filter_placeholder_people">Filtrer les participants</string>
+    <string name="home_filter_placeholder_favorites">Filtrer les favoris</string>
+    <string name="home_filter_placeholder_home">Filtrer les noms des salons</string>
+    <string name="bottom_action_groups">Communautés</string>
+    <string name="bottom_action_rooms">Salons</string>
+    <string name="bottom_action_people">Participants</string>
+    <string name="bottom_action_favourites">Favoris</string>
+    <string name="bottom_action_notification">Notifications</string>
+    <string name="bottom_action_home">Accueil</string>
+    <string name="dialog_edit_hint">Nouvelle valeur</string>
+    <string name="dialog_title_success">Succès</string>
+    <string name="dialog_title_error">Erreur</string>
+    <string name="dialog_title_warning">Attention</string>
+    <string name="dialog_title_confirmation">Confirmation</string>
+    <string name="action_return">Revenir</string>
+    <string name="disable">Désactiver</string>
+    <string name="copied_to_clipboard">Copié dans le presse-papiers</string>
+    <string name="action_unpublish">Dé-publier</string>
+    <string name="action_switch">Changer</string>
+    <string name="action_add">Ajouter</string>
+    <string name="action_copy">Copier</string>
+    <string name="action_close">Fermer</string>
+    <string name="action_open">Ouvrir</string>
+    <string name="action_mark_room_read">Marquer comme lu</string>
+    <string name="action_quick_reply">Réponse rapide</string>
+    <string name="action_historical">Historique</string>
+    <string name="action_mark_all_as_read">Tout marquer comme lu</string>
+    <string name="action_global_search">Recherche globale</string>
+    <string name="action_video_call">Appel vidéo</string>
+    <string name="action_voice_call">Appel audio</string>
+    <string name="action_sign_out">Se déconnecter</string>
+    <string name="actions">Actions</string>
+    <string name="action_exit">Quitter</string>
+    <string name="call_notification_hangup">Raccrocher</string>
+    <string name="call_notification_reject">Refuser</string>
+    <string name="call_notification_answer">Accepter</string>
+    <string name="decline">Refuser</string>
+    <string name="review">Examiner</string>
+    <string name="ignore">Ignorer</string>
+    <string name="abort">Annuler</string>
+    <string name="done">Terminé</string>
+    <string name="skip">Passer</string>
+    <string name="accept">Accepter</string>
+    <string name="offline">Hors ligne</string>
+    <string name="invite">Inviter</string>
+    <string name="or">ou</string>
+    <string name="send_anyway">Envoyer quand même</string>
+    <string name="call_anyway">Appeler quand même</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">Les téléconférences ne sont pas prises en charge dans les salons chiffrés</string>
+    <string name="device_information">Informations sur la session</string>
+    <string name="cannot_call_yourself_with_invite">Vous ne pouvez pas passer un appel avec vous-même, attendez que les participants acceptent l’invitation</string>
+    <string name="cannot_call_yourself">Vous ne pouvez pas passer un appel avec vous-même</string>
+    <string name="missing_permissions_title_to_start_conf_call">Impossible de lancer l’appel</string>
+    <string name="audio_video_meeting_description">Les réunions utilisent les règles de sécurité et les permissions de Jitsi. Toutes les personnes actuellement dans ce salon recevront une invitation à participer à la réunion.</string>
+    <string name="audio_meeting">Commencer une téléconférence audio</string>
+    <string name="video_meeting">Commencer une téléconférence vidéo</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Vous n’avez pas la permission de lancer un appel</string>
+    <string name="no_permissions_to_start_webrtc_call">Vous n\'avez pas la permission de lancer un appel dans ce salon</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Vous n’avez pas la permission de lancer une téléconférence</string>
+    <string name="no_permissions_to_start_conf_call">Vous n’avez pas la permission de lancer une téléconférence dans ce salon</string>
+    <string name="missing_permissions_to_start_conf_call">Vous avez besoin de la permission d’invitation pour lancer une téléconférence dans ce salon</string>
+    <string name="missing_permissions_error">En raison de permissions manquantes, cette action n’est pas possible.</string>
+    <string name="missing_permissions_warning">En raison de permissions manquantes, certaines fonctionnalités peuvent être absentes…</string>
+    <string name="cannot_start_call">Impossible d’initier l’appel, réessayez plus tard</string>
+    <string name="ongoing_conference_call_video">vidéo</string>
+    <string name="ongoing_conference_call_voice">audio</string>
+    <string name="ongoing_conference_call">Téléconférence en cours.
+\nLa rejoindre en %1$s ou en %2$s</string>
+    <string name="start_chatting">Commencer une conversation</string>
+    <string name="reset">Réinitialiser</string>
+    <string name="dismiss">Ignorer</string>
+    <string name="pause_video">Pause</string>
+    <string name="play_video">Lancer</string>
+    <string name="active_call">Appel en cours</string>
+    <string name="report_content">Signaler le contenu</string>
+    <string name="disconnect">Déconnecter</string>
+    <string name="revoke">Révoquer</string>
+    <string name="none">Aucun</string>
+    <string name="rename">Renommer</string>
+    <string name="delete">Supprimer</string>
+    <string name="view_decrypted_source">Afficher la source déchiffrée</string>
+    <string name="view_source">Afficher la source</string>
+    <string name="permalink">Permalien</string>
+    <string name="forward">Transférer</string>
+    <string name="later">Plus tard</string>
+    <string name="clear">Effacer</string>
+    <string name="speak">Parler</string>
+    <string name="share">Partager</string>
+    <string name="download">Télécharger</string>
+    <string name="quote">Citer</string>
+    <string name="redact">Effacer</string>
+    <string name="resend">Renvoyer</string>
+    <string name="send">Envoyer</string>
+    <string name="stay">Rester</string>
+    <string name="leave">Quitter</string>
+    <string name="save">Enregistrer</string>
+    <string name="cancel">Annuler</string>
+    <string name="ok">OK</string>
+    <string name="loading">Chargement…</string>
+    <string name="dialog_title_third_party_licences">Licences tierces</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Vous n’aurez plus accès à vos messages chiffrés, sauf si vous sauvegardez vos clés avant de vous déconnecter.</string>
+    <string name="backup">Sauvegarder</string>
+    <string name="keys_backup_activate">Utiliser la sauvegarde de clés</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Sauvegarde de clés…</string>
+    <string name="keys_backup_banner_in_progress">Sauvegarde de clés…</string>
+    <string name="keys_backup_banner_update_line2">Gérer la sauvegarde de clés</string>
+    <string name="keys_backup_banner_update_line1">Nouvelles clés de message sécurisé</string>
+    <string name="keys_backup_banner_recover_line2">Utiliser la sauvegarde de clés</string>
+    <string name="keys_backup_banner_recover_line1">Ne perdez jamais vos messages chiffrés</string>
+    <string name="secure_backup_banner_setup_line2">Sécurité contre la perte d’accès aux messages et données chiffrées</string>
+    <string name="secure_backup_banner_setup_line1">Sauvegarde sécurisée</string>
+    <string name="keys_backup_banner_setup_line2">Commencer à utiliser la sauvegarde de clés</string>
+    <string name="keys_backup_banner_setup_line1">Ne perdez jamais vos messages chiffrés</string>
+    <string name="new_recovery_method_popup_was_me">C’est bien moi</string>
+    <string name="new_recovery_method_popup_description">Une nouvelle sauvegarde de clés de messages sécurisés a été détectée.
+\n
+\nSi vous n’avez pas configuré de nouvelle méthode de récupération, un attaquant essaye peut-être d’accéder à votre compte. Modifiez le mot de passe de votre compte et configurez une nouvelle méthode de récupération immédiatement dans les paramètres.</string>
+    <string name="new_recovery_method_popup_title">Nouvelle sauvegarde de clés</string>
+    <string name="keys_backup_settings_delete_confirm_message">Supprimer les clés de chiffrement sauvegardées sur le serveur \? Vous ne pourrez plus utiliser votre clé de récupération pour lire l’historique des messages chiffrés.</string>
+    <string name="keys_backup_settings_delete_confirm_title">Supprimer la sauvegarde</string>
+    <string name="keys_backup_settings_checking_backup_state">Vérification de l’état de la sauvegarde</string>
+    <string name="keys_backup_settings_delete_backup_error">Échec lors de la suppression de la sauvegarde (%s)</string>
+    <string name="keys_backup_settings_deleting_backup">Suppression de la sauvegarde…</string>
+    <string name="keys_backup_settings_untrusted_backup">Pour utiliser la sauvegarde de clés sur cette session, faites une restauration avec votre phrase secrète ou votre clé de récupération.</string>
+    <string name="keys_backup_get_trust_error">Échec de la récupération des informations de confiance de la sauvegarde (%s).</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">La sauvegarde a une signature non valide de la session non vérifiée %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">La sauvegarde a une signature non valide de la session vérifiée %s</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">La sauvegarde a une signature valide de la session non vérifiée %s</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">La sauvegarde a une signature valide de la session vérifiée %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">La sauvegarde a une signature valide de cette session.</string>
+    <string name="keys_backup_settings_signature_from_unknown_device">La sauvegarde a une signature d’une session inconnue ayant pour identifiant %s.</string>
+    <string name="keys_backup_settings_status_not_setup">Vos clés ne sont pas sauvegardées depuis cette session.</string>
+    <string name="keys_backup_settings_status_ko">La sauvegarde de clés n’est pas activée sur cette session.</string>
+    <string name="keys_backup_settings_status_ok">La sauvegarde de clés a été correctement configurée pour cette session.</string>
+    <string name="keys_backup_settings_delete_backup_button">Supprimer la sauvegarde</string>
+    <string name="keys_backup_settings_restore_backup_button">Restaurer depuis la sauvegarde</string>
+    <string name="keys_backup_no_keysbackup_sdk_error">La cryptographie de la session n’est pas activée</string>
+    <string name="keys_backup_get_version_error">Échec de récupération de la dernière version des clés de récupération (%s).</string>
+    <string name="keys_backup_restore_success_title">Sauvegarde restaurée %s !</string>
+    <string name="keys_backup_recovery_code_error_decrypt">La sauvegarde n’a pas pu être déchiffrée avec cette clé de récupération : veuillez vérifier que vous avez saisi la bonne clé de récupération.</string>
+    <string name="keys_backup_recovery_code_empty_error_message">Veuillez saisir une clé de récupération</string>
+    <string name="keys_backup_unlock_button">Déverrouiller l’historique</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">Importation des clés…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">Téléchargement des clés…</string>
+    <string name="keys_backup_restoring_computing_key_waiting_message">Traitement de la clé de récupération…</string>
+    <string name="keys_backup_restoring_waiting_message">Restauration de la sauvegarde :</string>
+    <string name="network_error_please_check_and_retry">Erreur de réseau : veuillez vérifier votre connexion et réessayer.</string>
+    <string name="keys_backup_passphrase_error_decrypt">La sauvegarde n’a pas pu être déchiffrée avec cette phrase secrète. Veuillez vérifier que vous avez saisi la bonne phrase secrète de récupération.</string>
+    <string name="keys_backup_restore_with_key_helper">Vous avez perdu votre clé de récupération \? Vous pouvez en configurer une autre dans les paramètres.</string>
+    <string name="keys_backup_restore_setup_recovery_key">Récupération des messages</string>
+    <string name="keys_backup_restore_key_enter_hint">Saisir la clé de récupération</string>
+    <string name="keys_backup_restore_with_recovery_key">Utilisez votre clé de récupération pour déverrouiller l’historique de vos messages chiffrés</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Si vous ne connaissez pas votre phrase secrète de récupération, vous pouvez %s.</string>
+    <string name="keys_backup_restore_use_recovery_key">utiliser votre clé de récupération</string>
+    <string name="keys_backup_restore_with_passphrase">Utilisez votre phrase secrète de récupération pour déverrouiller l’historique de vos messages chiffrés</string>
+    <string name="keys_backup_restore_is_getting_backup_version">Récupération de la version de la sauvegarde…</string>
+    <string name="keys_backup_setup_skip_msg">Vous pourriez perdre l’accès vos messages si vous vous déconnectez ou si vous perdez votre appareil.</string>
+    <string name="keys_backup_setup_skip_title">En êtes-vous sûr \?</string>
+    <string name="keys_backup_setup_backup_started_message">Vos clés de chiffrement sont sauvegardées en arrière-plan sur votre serveur d’accueil. La sauvegarde initiale peut prendre plusieurs minutes.</string>
+    <string name="keys_backup_setup_backup_started_title">La sauvegarde a commencé</string>
+    <string name="unexpected_error">Erreur inattendue</string>
+    <string name="recovery_key">Clé de récupération</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Génération de la clé de récupération utilisant la phrase secrète. Cette opération peut prendre plusieurs secondes.</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Partager la clé de récupération avec…</string>
+    <string name="keys_backup_setup_step3_please_make_copy">Veuillez en faire une copie</string>
+    <string name="keys_backup_setup_override_stop">Arrêter</string>
+    <string name="keys_backup_setup_override_replace">Remplacer</string>
+    <string name="startup_notification_fdroid_battery_optim_button_grant">Donner la permission</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} doit garder une connexion à faible empreinte en arrière-plan afin d’avoir des notifications fiables.
+\nSur l’écran suivant on vous demandera d’autoriser ${app_name} à toujours fonctionner en arrière-plan, veuillez accepter.</string>
+    <string name="startup_notification_fdroid_battery_optim_title">Connexion en arrière-plan</string>
+    <string name="startup_notification_privacy_button_other">Choisir une autre option</string>
+    <string name="startup_notification_privacy_button_grant">Donner la permission</string>
+    <string name="template_startup_notification_privacy_message">${app_name} peut fonctionner en arrière-plan pour gérer vos notifications de façon sécurisée et confidentielle. Cela peut affecter l’utilisation de la batterie.</string>
+    <string name="startup_notification_privacy_title">Confidentialité des notifications</string>
+    <string name="settings_discovery_manage">Gérer vos paramètres de découverte.</string>
+    <string name="settings_discovery_category">Découverte</string>
+    <string name="settings_deactivate_my_account">Désactiver mon compte</string>
+    <string name="settings_deactivate_account_section">Désactiver le compte</string>
+    <string name="reset_secure_backup_warning">Ceci remplacera votre clé ou phrase actuelle.</string>
+    <string name="reset_secure_backup_title">Générer une nouvelle clé de sécurité ou définir une nouvelle phrase de sécurité pour votre sauvegarde existante.</string>
+    <string name="settings_secure_backup_section_info">Protection contre la perte d\'accès aux messages et données chiffrées en sauvegardant les clés de chiffrage sur votre serveur.</string>
+    <string name="settings_secure_backup_enter_to_setup">Activer sur cet appareil</string>
+    <string name="settings_secure_backup_reset">Réinitialiser la sauvegarde sécurisée</string>
+    <string name="settings_secure_backup_setup">Activer la sauvegarde sécurisée</string>
+    <string name="settings_secure_backup_manage">Gérer</string>
+    <string name="settings_secure_backup_section_title">Sauvegarde sécurisée</string>
+    <string name="settings_show_emoji_keyboard_summary">Ajoute un bouton sur le compositeur pour ouvrir le clavier des emojis</string>
+    <string name="settings_show_emoji_keyboard">Afficher le clavier des emojis</string>
+    <string name="settings_send_message_with_enter_summary">Le bouton Entrée sur le clavier logiciel enverra le message au lieu d’aller à la ligne</string>
+    <string name="settings_send_message_with_enter">Envoyer le message avec Entrée</string>
+    <string name="settings_preview_media_before_sending">Afficher un aperçu du média avant de l’envoyer</string>
+    <string name="settings_vibrate_on_mention">Vibrer lorsque l’on mentionne un utilisateur</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Cela inclut les changements d’avatar et de nom d’affichage.</string>
+    <string name="settings_show_join_leave_messages_summary">Les invitations, expulsions et exclusions ne sont pas concernés.</string>
+    <string name="settings_show_join_leave_messages">Afficher les notifications d’arrivée et de départ</string>
+    <string name="settings_chat_effects_description">Utilisez la commande /confetti ou envoyez un message contenant ❄️ ou 🎉</string>
+    <string name="settings_chat_effects_title">Afficher les animations de conversation</string>
+    <string name="settings_show_read_receipts_summary">Cliquer sur les accusés de réception pour une liste détaillée.</string>
+    <string name="settings_show_read_receipts">Afficher les accusés de réception</string>
+    <string name="settings_12_24_timestamps">Afficher l’horodatage au format 12 heures</string>
+    <string name="settings_always_show_timestamps">Afficher l’horodatage pour tous les messages</string>
+    <string name="settings_send_markdown_summary">Rédiger les messages en utilisant la syntaxe Markdown. Cela permet d’utiliser des styles avancés comme les astérisques pour afficher du texte en italique.</string>
+    <string name="settings_send_markdown">Format Markdown</string>
+    <string name="settings_send_typing_notifs_summary">Les autres utilisateurs pourront voir que vous êtes en train d’écrire.</string>
+    <string name="settings_send_typing_notifs">Envoyer des notifications de saisie</string>
+    <string name="settings_inline_url_preview_summary">Afficher un aperçu des liens dans la discussion quand votre serveur d’accueil le permet.</string>
+    <string name="settings_inline_url_preview">Aperçu des liens</string>
+    <string name="settings_devices_list">Sessions</string>
+    <string name="settings_pin_unread_messages">Épingler les salons avec des messages non lus</string>
+    <string name="settings_pin_missed_notifications">Épingler les salons avec des notifications manquées</string>
+    <string name="settings_home_display">Page d’accueil</string>
+    <string name="settings_contacts_phonebook_country">Pays pour le répertoire téléphonique</string>
+    <string name="settings_contacts_app_permission">Autoriser l’accès aux contacts locaux</string>
+    <string name="settings_contact">Contacts locaux</string>
+    <string name="settings_notifications_targets">Cibles de notification</string>
+    <string name="settings_cryptography_manage_keys">Gestion des clés cryptographiques</string>
+    <string name="settings_cryptography">Chiffrement</string>
+    <string name="settings_integrations">Intégrations</string>
+    <string name="settings_advanced">Avancé</string>
+    <string name="settings_other">Autres</string>
+    <string name="settings_ignored_users">Utilisateurs ignorés</string>
+    <string name="settings_notifications">Notifications</string>
+    <string name="settings_user_settings">Paramètres utilisateur</string>
+    <string name="settings_clear_media_cache">Vider le cache des médias</string>
+    <string name="settings_clear_cache">Vider le cache</string>
+    <string name="settings_keep_media">Conserver les médias</string>
+    <string name="settings_privacy_policy">Politique de confidentialité</string>
+    <string name="settings_copyright">Droits d’auteur</string>
+    <string name="settings_third_party_notices">Licences tierces</string>
+    <string name="settings_app_term_conditions">Termes et conditions</string>
+    <string name="settings_olm_version">Version de olm</string>
+    <string name="settings_version">Version</string>
+    <string name="settings_set_sync_delay">Délai entre chaque synchronisation</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nLa synchronisation peut être retardée selon les ressources (batterie) ou l’état (veille) de l’appareil.</string>
+    <string name="settings_set_workmanager_delay">Intervalle de synchronisation préféré</string>
+    <string name="settings_set_sync_timeout">Délai d’attente de la requête de synchronisation</string>
+    <string name="settings_enable_background_sync">Activer la synchronisation en arrière-plan</string>
+    <string name="settings_start_on_boot">Lancer au démarrage</string>
+    <string name="settings_background_sync_update_error">Échec de la mise à jour des paramètres.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Vous ne serez pas notifié des messages entrants quand l’application est en arrière-plan.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Aucune synchronisation en arrière-plan</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} se synchronisera en arrière-plan de façon périodique à un moment précis (configurable).
+\nCela aura un impact sur l’utilisation des données mobiles et de la batterie, une notification permanente sera affichée indiquant que ${app_name} est à l’écoute des évènements.</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimisé pour le temps réel</string>
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} se synchronisera en arrière-plan de façon à préserver les ressources limitées de l’appareil (batterie).
+\nSelon l’état des ressources de votre appareil, la synchronisation peut être retardée par le système d’exploitation.</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimisé pour préserver la batterie</string>
+    <string name="settings_background_fdroid_sync_mode">Mode de synchronisation en arrière-plan</string>
+    <string name="settings_background_sync">Synchronisation en arrière-plan</string>
+    <string name="settings_messages_sent_by_bot">Messages envoyés par un robot</string>
+    <string name="settings_call_invitations">Appels entrants</string>
+    <string name="settings_invited_to_room">Quand je suis invité sur un salon</string>
+    <string name="settings_messages_in_group_chat">Messages dans les discussions de groupe</string>
+    <string name="settings_messages_in_one_to_one">Messages dans les conversations privées</string>
+    <string name="settings_containing_my_user_name">Messages contenant mon nom d’utilisateur</string>
+    <string name="settings_containing_my_display_name">Messages contenant mon nom affiché</string>
+    <string name="settings_system_preferences_summary">Choisir la couleur de la LED, les vibrations, le son…</string>
+    <string name="settings_silent_notifications_preferences">Configurer les notifications silencieuses</string>
+    <string name="settings_call_notifications_preferences">Configurer les notifications d’appel</string>
+    <string name="settings_noisy_notifications_preferences">Configurer les notifications sonores</string>
+    <string name="settings_turn_screen_on">Allumer l’écran pendant 3 secondes</string>
+    <string name="settings_enable_this_device">Activer les notifications pour cette session</string>
+    <string name="settings_enable_all_notif">Activer les notifications pour ce compte</string>
+    <string name="settings_notification_ringtone">Son de notification</string>
+    <string name="settings_notification_privacy_message_content_not_shown">• Les notifications <b>n’afficheront pas le contenu des messages</b></string>
+    <string name="settings_notification_privacy_nosecure_message_content">• Les notifications contiennent <b>des métadonnées et des messages</b></string>
+    <string name="settings_notification_privacy_secure_message_content">• Le contenu du message de notification est <b>issu directement du serveur d’accueil Matrix</b></string>
+    <string name="settings_notification_privacy_metadata">• Les notifications ne contiennent que des métadonnées</string>
+    <string name="settings_notification_privacy_fcm">• Les notifications sont envoyées via Firebase Cloud Messaging</string>
+    <string name="settings_notification_privacy_no_background_sync">Les applications <b>n’ont pas</b> besoin d’être connectées au serveur d’accueil en arrière-plan, cela devrait diminuer l’utilisation de la batterie</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Je ne veux pas de mes messages chiffrés</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">La sauvegarde de clés sécurisées devrait être activée pour toutes vos sessions afin d’éviter de perdre l’accès à vos messages chiffrés.</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Sauvegarde de clés en cours. Si vous vous déconnectez maintenant, vous perdrez accès à vos messages chiffrés.</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Vous perdrez vos messages chiffrés si vous vous déconnectez maintenant</string>
+    <string name="keys_backup_is_not_finished_please_wait">La sauvegarde des clés n’est pas terminée, veuillez patienter…</string>
+    <string name="title_activity_verify_device">Vérifier la session</string>
+    <string name="title_activity_keys_backup_restore">Utiliser la sauvegarde de clé</string>
+    <string name="title_activity_keys_backup_setup">Sauvegarde de clé</string>
+    <string name="title_activity_choose_sticker">Envoyer un autocollant</string>
+    <string name="title_activity_group_details">Informations sur la communauté</string>
+    <string name="title_activity_bug_report">Rapport d’anomalie</string>
+    <string name="title_activity_historical">Historique</string>
+    <string name="title_activity_member_details">Informations sur ce participant</string>
+    <string name="title_activity_settings">Paramètres</string>
+    <string name="title_activity_room">Salon</string>
+    <string name="title_activity_home">Messages</string>
+    <string name="notification_silent_notifications">Notifications muettes</string>
+    <string name="notification_noisy_notifications">Notifications sonores</string>
+    <string name="notification_listening_for_events">Écoute d’évènements</string>
+    <string name="notification_sync_in_progress">Synchronisation…</string>
+    <string name="notification_sync_init">Initialisation du service</string>
+    <string name="black_theme">Thème noir</string>
+    <string name="dark_theme">Thème sombre</string>
+    <string name="light_theme">Thème clair</string>
+    <string name="system_theme">Par défaut du système</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Vous avez activé le chiffrement de bout en bout (algorithme %1$s inconnu).</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s a activé le chiffrement de bout en bout (algorithme %2$s inconnu).</string>
+    <string name="notice_end_to_end_ok_by_you">Vous avez activé le chiffrement de bout en bout.</string>
+    <string name="notice_end_to_end_ok">%1$s a activé le chiffrement de bout en bout.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Vous avez empêché les visiteurs de rejoindre le salon.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s a empêché les visiteurs de rejoindre le salon.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Vous avez empêché les visiteurs de rejoindre le salon.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s a empêché les visiteurs de rejoindre le salon.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Vous avez autorisé les visiteurs à venir ici.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s a autorisé les visiteurs à venir ici.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Vous avez autorisé les visiteurs à rejoindre le salon.</string>
+    <string name="notice_room_guest_access_can_join">%1$s a autorisé les visiteurs à rejoindre le salon.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Vous avez modifié les adresses de ce salon.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s a modifié les adresses de ce salon.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Vous avez modifié les adresses principale et alternative de ce salon.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s a modifié les adresses principale et alternative de ce salon.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Vous avez modifié les adresses alternatives de ce salon.</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$s a modifié les adresses alternatives de ce salon.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Vous avez supprimé l’adresse principale de ce salon.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s a supprimé l’adresse principale de ce salon.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Vous avez défini %1$s comme adresse principale pour ce salon.</string>
+    <string name="notice_room_canonical_alias_set">%1$s a défini %2$s comme adresse principale pour ce salon.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Vous avez ajouté %1$s et supprimé %2$s comme adresses pour ce salon.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s a ajouté %2$s et supprimé %3$s comme adresses pour ce salon.</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Vous avez annulé l’invitation de %1$s. Raison : %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s a annulé l’invitation de %2$s. Raison : %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Vous avez accepté l’invitation de %1$s. Raison : %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s a accepté l’invitation de %2$s. Raison : %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Vous avez révoqué l’invitation de %1$s à rejoindre le salon. Raison : %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s a révoqué l’invitation de %2$s à rejoindre le salon. Raison : %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Vous avez envoyé une invitation à %1$s à rejoindre le salon. Raison : %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s a envoyé une invitation à %2$s à rejoindre le salon. Raison : %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Vous avez banni %1$s. Raison : %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s a banni %2$s. Raison : %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Vous avez révoqué le bannissement de %1$s. Raison : %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s a révoqué le bannissement de %2$s. Raison : %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Vous avez expulsé %1$s. Raison : %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s a expulsé %2$s. Raison : %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Vous avez refusé l’invitation. Raison : %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s a refusé l’invitation. Raison : %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Vous êtes parti. Raison : %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s est parti. Raison : %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Vous êtes parti du salon. Raison : %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s est parti du salon. Raison : %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Vous avez rejoint. Raison : %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s rejoint. Raison : %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Vous avez rejoint le salon. Raison : %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s a rejoint le salon. Raison : %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s vous a invité. Raison : %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Vous avez invité %1$s. Raison : %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s a invité %2$s. Raison : %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Votre invitation. Raison : %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Invitation de %1$s. Raison : %2$s</string>
+    <string name="clear_timeline_send_queue">Vider la file d’envoi</string>
+    <string name="event_status_sending_message">Envoi du message…</string>
+    <string name="event_status_sent_message">Message envoyé</string>
+    <string name="initial_sync_start_importing_account_data">Synchronisation initiale :
+\nImportation des données du compte</string>
+    <string name="initial_sync_start_importing_account_groups">Synchronisation initiale :
+\nImportation des communautés</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Synchronisation initiale :
+\nImportation des salons que vous avez quittés</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Synchronisation initiale :
+\nImportation des salons où vous avez été invité</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Synchronisation initiale :
+\nImportation des salons que vous avez rejoints</string>
+    <string name="initial_sync_start_importing_account_rooms">Synchronisation initiale :
+\nImportation des salons</string>
+    <string name="initial_sync_start_importing_account_crypto">Synchronisation initiale :
+\nImportation de la cryptographie</string>
+    <string name="initial_sync_start_importing_account">Synchronisation initiale :
+\nImportation du compte…</string>
+    <string name="initial_sync_start_downloading">Synchronisation initiale :
+\nTéléchargement des données…</string>
+    <string name="initial_sync_start_server_computing">Synchronisation initiale :
+\nEn attente de la réponse du serveur…</string>
+    <string name="room_displayname_empty_room_was">Salon vide (était %s)</string>
+    <string name="room_displayname_empty_room">Salon vide</string>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s et %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s et %3$s</string>
+    <string name="room_displayname_two_members">%1$s et %2$s</string>
+    <string name="room_displayname_room_invite">Invitation au salon</string>
+    <string name="room_displayname_invite_from">Invitation de %s</string>
+    <string name="medium_phone_number">Numéro de téléphone</string>
+    <string name="room_error_join_failed_empty_room">Il est impossible pour le moment de revenir dans un salon vide.</string>
+    <string name="matrix_error">Erreur de Matrix</string>
+    <string name="network_error">Erreur de réseau</string>
+    <string name="unable_to_send_message">Envoi du message impossible</string>
+    <string name="could_not_redact">Effacement impossible</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">L’appareil de l’expéditeur ne nous a pas envoyé les clés pour ce message.</string>
+    <string name="notice_crypto_unable_to_decrypt">** Déchiffrement impossible : %s **</string>
+    <string name="notice_power_level_diff">%1$s de %2$s à %3$s</string>
+    <string name="notice_power_level_changed">%1$s a modifié le rang de %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Vous avez modifié le rang de %1$s.</string>
+    <string name="power_level_custom_no_value">Personnalisé</string>
+    <string name="power_level_custom">Personnalisé (%1$d)</string>
+    <string name="power_level_default">Défaut</string>
+    <string name="power_level_moderator">Modérateur</string>
+    <string name="power_level_admin">Admin</string>
+    <string name="notice_widget_jitsi_modified_by_you">Vous avez modifié la téléconférence</string>
+    <string name="notice_widget_jitsi_modified">%1$s a modifié la téléconférence</string>
+    <string name="notice_widget_jitsi_removed_by_you">Vous avez mis fin à la téléconférence</string>
+    <string name="notice_widget_jitsi_removed">%1$s a mis fin à la téléconférence</string>
+    <string name="notice_widget_jitsi_added_by_you">Vous avez démarré la téléconférence</string>
+    <string name="notice_widget_jitsi_added">Téléconférence démarrée par %1$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Vous avez accepté l’invitation de %1$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s a accepté l’invitation de %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Vous avez révoqué l’invitation de %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s a révoqué l’invitation de %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Vous avez révoqué l’invitation de %1$s à rejoindre le salon</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s a révoqué l’invitation de %2$s à rejoindre le salon</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Vous avez invité %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s a invité %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Vous avez envoyé une invitation à %1$s pour rejoindre le salon</string>
+    <string name="notice_room_third_party_invite">%1$s a envoyé une invitation à %2$s pour rejoindre le salon</string>
+    <string name="notice_profile_change_redacted_by_you">Vous avez mis à jour votre profil %1$s</string>
+    <string name="notice_profile_change_redacted">%1$s a mis à jour son profil %2$s</string>
+    <string name="notice_event_redacted_by_with_reason">Message supprimé par %1$s [motif : %2$s]</string>
+    <string name="notice_event_redacted_with_reason">Message supprimé [motif : %1$s]</string>
+    <string name="notice_event_redacted_by">Message supprimé par %1$s</string>
+    <string name="notice_event_redacted">Message supprimé</string>
+    <string name="notice_room_avatar_removed_by_you">Vous avez supprimé l’avatar du salon</string>
+    <string name="notice_room_avatar_removed">%1$s a supprimé l’avatar du salon</string>
+    <string name="notice_room_topic_removed_by_you">Vous avez supprimé le sujet du salon</string>
+    <string name="notice_room_topic_removed">%1$s a supprimé le sujet du salon</string>
+    <string name="notice_room_name_removed_by_you">Vous avez supprimé le nom du salon</string>
+    <string name="notice_room_name_removed">%1$s a supprimé le nom du salon</string>
+    <string name="notice_avatar_changed_too">(l’avatar a aussi changé)</string>
+    <string name="notice_voip_finished">Téléconférence VoIP terminée</string>
+    <string name="notice_voip_started">Téléconférence VoIP démarrée</string>
+    <string name="notice_requested_voip_conference_by_you">Vous avez demandé une téléconférence VoIP</string>
+    <string name="notice_requested_voip_conference">%1$s a demandé une téléconférence VoIP</string>
+    <string name="notice_room_server_acl_updated_no_change">Aucun changement.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Les serveurs correspondant à des IP littérales sont maintenant interdits.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Les serveurs correspondants à des IP littérales sont maintenant autorisés.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Les serveurs correspondant à %s sont supprimés de la liste autorisée.</string>
+    <string name="notice_room_server_acl_updated_allowed">• les serveur correspondant à %s sont maintenant autorisés.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Les serveurs correspondant à %s étaient supprimés de la liste des interdits.</string>
+    <string name="notice_room_server_acl_updated_banned">• Les serveurs correspondant à %s sont maintenant interdits.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Vous avez changé les droits ACL du serveur pour ce salon.</string>
+    <string name="notice_room_server_acl_updated_title">%s a changé les droits ACL du serveur pour ce salon.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Les serveurs correspondants à des IP littérales sont interdites.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Les serveurs correspondants à des IP littérales sont autorisés.</string>
+    <string name="notice_room_server_acl_set_allowed">• Les serveurs correspondant à %s sont autorisés.</string>
+    <string name="notice_room_server_acl_set_banned">• Les serveurs correspondant à %s sont interdits.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Vous avez paramétré les ACL pour ce salon.</string>
+    <string name="notice_room_server_acl_set_title">%s paramètre les autorisations étendues (ACL) du serveur pour ce salon.</string>
+    <string name="notice_direct_room_update_by_you">Vous avez mis cet endroit à niveau.</string>
+    <string name="notice_direct_room_update">%s a mis cet endroit à niveau.</string>
+    <string name="notice_room_update_by_you">Vous avez mis à niveau ce salon.</string>
+    <string name="notice_room_update">%s a mis à niveau ce salon.</string>
+    <string name="notice_end_to_end_by_you">Vous avez activé le chiffrement de bout en bout (%1$s)</string>
+    <string name="notice_end_to_end">%1$s a activé le chiffrement de bout en bout (%2$s)</string>
+    <string name="notice_room_visibility_unknown">inconnu (%s).</string>
+    <string name="notice_room_visibility_world_readable">n’importe qui.</string>
+    <string name="notice_room_visibility_shared">tous les membres du salon.</string>
+    <string name="notice_room_visibility_joined">tous les membres du salon, depuis qu’ils l’ont rejoint.</string>
+    <string name="notice_room_visibility_invited">tous les membres du salon, depuis qu’ils ont été invités.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Vous avez rendu les futurs messages visible pour %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s a rendu les futurs messages visible pour %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Vous avez rendu l’historique futur du salon visible pour %1$s</string>
+    <string name="notice_made_future_room_visibility">%1$s a rendu l’historique futur du salon visible pour %2$s</string>
+    <string name="notice_ended_call_by_you">Vous avez raccroché.</string>
+    <string name="notice_ended_call">%s a raccroché.</string>
+    <string name="notice_answered_call_by_you">Vous avez répondu à l’appel.</string>
+    <string name="notice_answered_call">%s a répondu à l’appel.</string>
+    <string name="notice_call_candidates_by_you">Vous avez envoyé les données pour configurer l’appel.</string>
+    <string name="notice_call_candidates">%s a envoyé les données pour configurer l’appel.</string>
+    <string name="notice_placed_voice_call_by_you">Vous avez passé un appel audio.</string>
+    <string name="notice_placed_voice_call">%s a passé un appel audio.</string>
+    <string name="notice_placed_video_call_by_you">Vous avez passé un appel vidéo.</string>
+    <string name="notice_placed_video_call">%s a passé un appel vidéo.</string>
+    <string name="notice_room_name_changed_by_you">Vous avez changé le nom du salon en : %1$s</string>
+    <string name="notice_room_name_changed">%1$s a changé le nom du salon en : %2$s</string>
+    <string name="notice_room_avatar_changed_by_you">Vous avez modifié l’avatar du salon</string>
+    <string name="notice_room_avatar_changed">%1$s a modifié l’avatar du salon</string>
+    <string name="notice_room_topic_changed_by_you">Vous avez changé le sujet en : %1$s</string>
+    <string name="notice_room_topic_changed">%1$s a changé le sujet en : %2$s</string>
+    <string name="notice_display_name_removed_by_you">Vous avez supprimé votre nom d’affichage (précédemment %1$s)</string>
+    <string name="notice_display_name_removed">%1$s a supprimé son nom d’affichage (précédemment %2$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Vous avez modifié votre nom d’affichage de %1$s en %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s a modifié son nom d’affichage de %2$s en %3$s</string>
+    <string name="notice_display_name_set_by_you">Vous avez modifié votre nom d’affichage en %1$s</string>
+    <string name="notice_display_name_set">%1$s a modifié son nom d’affichage en %2$s</string>
+    <string name="notice_avatar_url_changed_by_you">Vous avez changé votre avatar</string>
+    <string name="notice_avatar_url_changed">%1$s a changé d’avatar</string>
+    <string name="notice_room_withdraw_by_you">Vous avez annulé l’invitation de %1$s</string>
+    <string name="notice_room_withdraw">%1$s a annulé l’invitation de %2$s</string>
+    <string name="notice_room_ban_by_you">Vous avez banni %1$s</string>
+    <string name="notice_room_ban">%1$s a banni %2$s</string>
+    <string name="notice_room_unban_by_you">Vous avez révoqué le bannissement de %1$s</string>
+    <string name="notice_room_unban">%1$s a révoqué le bannissement de %2$s</string>
+    <string name="room_participants_action_ignore_prompt_msg">Ignorer cet utilisateur aura pour effet de supprimer ses messages des salons que vous partagez.
+\n
+\nVous pouvez annuler cette action à tout moment dans les paramètres généraux.</string>
+    <string name="room_participants_action_ignore_title">Ignorer l’utilisateur</string>
+    <string name="room_participants_power_level_demote">Rétrograder</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Vous ne pourrez pas annuler cette modification car vous vous rétrogradez vous-même, il ne vous sera pas possible de regagner ces privilèges si vous êtes le dernier utilisateur privilégié de ce salon.</string>
+    <string name="room_participants_power_level_demote_warning_title">Vous rétrograder vous-même \?</string>
+    <string name="room_participants_power_level_prompt">Vous ne pourrez pas annuler cette modification car vous promouvez l’utilisateur au même rang que le vôtre.
+\nLe voulez-vous vraiment \?</string>
+    <string name="room_participants_action_devices_list">Afficher la liste des sessions</string>
+    <string name="room_participants_action_mention">Mentionner</string>
+    <string name="room_participants_action_set_admin">Nommer administrateur</string>
+    <string name="room_participants_action_set_moderator">Nommer modérateur</string>
+    <string name="room_participants_action_set_default_power_level">Réinitialiser en tant qu’utilisateur standard</string>
+    <string name="room_participants_action_kick">Expulser</string>
+    <string name="room_participants_action_unban">Révoquer le bannissement</string>
+    <string name="room_participants_action_ban">Bannir</string>
+    <string name="room_participants_action_remove">Exclure de ce salon</string>
+    <string name="room_participants_action_leave">Quitter ce salon</string>
+    <string name="room_participants_action_cancel_invite">Annuler l’invitation</string>
+    <string name="room_participants_action_invite">Inviter</string>
+    <string name="room_participants_header_devices">SESSIONS</string>
+    <string name="room_participants_header_direct_chats">Conversations privées</string>
+    <string name="room_participants_header_call">APPEL</string>
+    <string name="room_participants_header_admin_tools">OUTILS DE L’ADMINISTRATEUR</string>
+    <string name="room_participants_ago">%1$s il y a %2$s</string>
+    <string name="room_participants_now">%1$s maintenant</string>
+    <string name="room_participants_idle">Inactif</string>
+    <string name="room_participants_offline">Hors ligne</string>
+    <string name="room_participants_online">En ligne</string>
+    <string name="room_participants_create">Créer</string>
+    <string name="room_participants_remove_prompt_msg">Voulez-vous vraiment bannir %s de cette discussion \?</string>
+    <string name="room_participants_leave_private_warning">Ce salon n’est pas public. Vous ne pourrez pas le rejoindre sans invitation.</string>
+    <string name="room_participants_leave_prompt_title">Quitter le salon</string>
+    <string name="room_title_one_member">1 membre</string>
+    <string name="room_creation_add_member">Ajouter un membre</string>
+    <string name="room_creation_title">Nouvelle discussion</string>
+    <string name="invite_no_identity_server_error">Ajoutez un serveur d’identité dans vos paramètres pour réaliser cette action.</string>
+    <string name="room_preview_room_interactions_disabled">Ceci est un aperçu du salon. Vous ne pouvez pas interagir.</string>
+    <string name="room_preview_try_join_an_unknown_room_default">un salon</string>
+    <string name="room_preview_try_join_an_unknown_room">Vous essayez d’accéder à %s. Souhaitez-vous rejoindre le salon pour participer à la discussion \?</string>
+    <string name="room_preview_invitation_format">%s vous a invité à rejoindre ce salon</string>
+    <string name="room_jump_to_first_unread">Aller au premier message non lu.</string>
+    <string name="room_sync_in_progress">Synchronisation…</string>
+    <string name="open_chat_header">Développer l’entête</string>
+    <string name="list_members">Liste les membres</string>
+    <string name="reject">Rejeter</string>
+    <string name="preview">Aperçu</string>
+    <string name="join">Rejoindre</string>
+    <string name="remove">Supprimer</string>
+    <string name="_continue">Continuer</string>
+    <string name="no">NON</string>
+    <string name="yes">OUI</string>
+    <string name="media_slider_saved">Enregistré</string>
+    <string name="permissions_denied_add_contact">Autoriser l’accès à vos contacts.</string>
+    <string name="permissions_denied_qr_code">Pour scanner un code QR, vous devez autoriser l’accès à votre appareil photo.</string>
+    <string name="permissions_action_not_performed_missing_permissions">Désolé. L’action n’a pas été réalisée faute d’autorisations</string>
+    <string name="template_permissions_rationale_msg_camera_and_audio">${app_name} a besoin d’accéder à votre appareil photo et à votre microphone pour passer des appels vidéo.
+\n
+\nVeuillez autoriser l’accès dans les prochaines fenêtres pour pouvoir effectuer l’appel.</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">"
+\n
+\nVeuillez autoriser l’accès dans la prochaine fenêtre contextuelle pour pouvoir effectuer l’appel."</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} a besoin d’accéder à votre microphone pour passer des appels audio.</string>
+    <string name="permissions_rationale_msg_camera_explanation">"
+\n
+\nVeuillez autoriser l’accès dans la prochaine fenêtre pour pouvoir effectuer l’appel."</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} a besoin d’accéder à votre appareil photo pour prendre des photos et passer des appels vidéo.</string>
+    <string name="template_permissions_rationale_msg_storage">${app_name} a besoin d’accéder à vos photos et vidéos pour envoyer et enregistrer des pièces jointes
+\n
+\nVeuillez autoriser l’accès dans la prochaine fenêtre pour pouvoir envoyer des fichiers depuis votre téléphone.</string>
+    <string name="permissions_rationale_popup_title">Information</string>
+    <string name="media_picker_cannot_record_video">Impossible d’enregistrer une vidéo</string>
+    <string name="media_picker_both_capture_title">Prendre une photo ou une vidéo</string>
+    <string name="call_error_answered_elsewhere">Appel décroché ailleurs</string>
+    <string name="call_error_camera_init_failed">Impossible d’initialiser l’appareil photo</string>
+    <string name="call_error_ice_failed">Échec de la connexion</string>
+    <string name="call_error_user_not_responding">Le correspondant n’a pas décroché.</string>
+    <string name="call_held_by_you">Vous avez mis l’appel en attente</string>
+    <string name="call_held_by_user">%s a mis l’appel en attente</string>
+    <string name="call_hold_action">Mettre en attente</string>
+    <string name="call_resume_action">Reprendre</string>
+    <string name="return_to_call">Retour à l’appel</string>
+    <string name="active_call_with_duration">Appel actif (%s)</string>
+    <string name="video_call_in_progress">Appel vidéo en cours…</string>
+    <string name="call_in_progress">Appel en cours…</string>
+    <string name="incoming_voice_call">Appel audio entrant</string>
+    <string name="incoming_video_call">Appel vidéo entrant</string>
+    <string name="incoming_call">Appel entrant</string>
+    <string name="call_ring">Appel…</string>
+    <string name="call_ended">Appel terminé</string>
+    <string name="call_connecting">Appel en cours de connexion…</string>
+    <string name="call_connected">Appel établi</string>
+    <string name="call">Appel</string>
+    <string name="settings_call_ringtone_dialog_title">Sélectionner la sonnerie pour les appels :</string>
+    <string name="settings_call_ringtone_title">Sonnerie d’appel entrant</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Utilisera %s comme assistant quand votre serveur d’accueil n’en offre pas (votre adresse IP sera partagée lors d’un appel)</string>
+    <string name="settings_call_ringtone_use_default_stun">Autoriser le serveur d’assistance d’appel de secours</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Utiliser la sonnerie par défaut de ${app_name} pour les appels entrants</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Demander une confirmation avant de lancer un appel</string>
+    <string name="settings_call_show_confirmation_dialog_title">Éviter les appels accidentels</string>
+    <string name="settings_call_category">Appels</string>
+    <string name="room_info_room_topic">Sujet du salon</string>
+    <string name="room_info_room_name">Nom du salon</string>
+    <string name="today">Aujourd’hui</string>
+    <string name="yesterday">Hier</string>
+    <string name="attachment_remaining_time_minutes">%1$d min %2$d s</string>
+    <string name="attachment_remaining_time_seconds">%d s</string>
+    <string name="compression_opt_list_small">Petit</string>
+    <string name="compression_opt_list_medium">Moyen</string>
+    <string name="compression_opt_list_large">Grand</string>
+    <string name="compression_opt_list_original">Original</string>
+    <string name="compression_options">Envoyer en tant que</string>
+    <string name="groups_list">Liste des Groupes</string>
+    <string name="read_receipts_list">Liste des accusés de lecture</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Veuillez lancer ${app_name} sur un autre appareil qui peut déchiffrer le message pour qu’il puisse envoyer les clés à cette session.</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">Demande envoyée</string>
+    <string name="e2e_re_request_encryption_key_sent">Demande de clé envoyée.</string>
+    <string name="e2e_re_request_encryption_key">Redemander les clés de chiffrement à vos autres sessions.</string>
+    <string name="login_error_user_in_use">Ce nom d’utilisateur est déjà utilisé</string>
+    <string name="login_error_limit_exceeded">Trop de requêtes ont été envoyées</string>
+    <string name="login_error_not_json">Ne contient pas de JSON valide</string>
+    <string name="login_error_bad_json">JSON malformé</string>
+    <string name="login_error_unknown_token">Le jeton d’accès fourni n’a pas été reconnu</string>
+    <string name="error_unauthorized">Non autorisé, identifiants d’authentification valides manquants</string>
+    <string name="login_error_forbidden">Nom d’utilisateur/mot de passe invalide</string>
+    <string name="login_error_ssl_handshake">Votre appareil utilise une version obsolète du protocole de sécurité TLS, vulnérable aux attaques. Pour votre sécurité vous ne pourrez pas vous connecter</string>
+    <string name="login_error_ssl_other">Erreur SSL.</string>
+    <string name="login_error_ssl_peer_unverified">Erreur SSL : l\'identité du pair n\'a pas été vérifiée.</string>
+    <string name="login_error_homeserver_not_found">Impossible de joindre le serveur d’accueil à cette URL, veuillez la vérifier</string>
+    <string name="login_error_no_homeserver_found">Ce n’est pas une adresse de serveur Matrix valide</string>
+    <string name="login_error_unknown_host">Cette URL est injoignable, veuillez la vérifier</string>
+    <string name="login_error_invalid_home_server">Veuillez saisir une URL valide</string>
+    <string name="login_error_unable_register">Impossible de s’inscrire</string>
+    <string name="login_error_registration_network_error">Impossible de s’inscrire : erreur réseau</string>
+    <string name="login_error_unable_login">Impossible de se connecter</string>
+    <string name="login_error_network_error">Impossible de se connecter : erreur réseau</string>
+    <string name="login_error_must_start_http">L’URL doit commencer par http[s]://</string>
+    <string name="auth_accept_policies">Veuillez lire et accepter les politiques de ce serveur d’accueil :</string>
+    <string name="auth_reset_password_success_message">Votre mot de passe a été réinitialisé.
+\n
+\nVous avez été déconnecté de toutes les sessions et ne recevrez plus de notifications. Pour réactiver les notifications, reconnectez-vous sur chaque appareil.</string>
+    <string name="auth_reset_password_missing_password">Un nouveau mot de passe doit être saisi.</string>
+    <string name="auth_identity_server">Serveur d’identité :</string>
+    <string name="auth_home_server">Serveur d’accueil :</string>
+    <string name="auth_username_in_use">Nom d’utilisateur déjà utilisé</string>
+    <string name="auth_recaptcha_message">Ce serveur d’accueil souhaite s’assurer que vous n’êtes pas un robot</string>
+    <string name="auth_use_server_options">Utiliser des options de serveur personnalisées (avancé)</string>
+    <string name="auth_password_dont_match">Les mots de passe ne correspondent pas</string>
+    <string name="auth_invalid_token">Jeton non valide</string>
+    <string name="auth_missing_phone">Numéro de téléphone manquant</string>
+    <string name="auth_msisdn_already_defined">Le numéro de téléphone est déjà défini.</string>
+    <string name="auth_missing_password">Mot de passe manquant</string>
+    <string name="auth_invalid_password">Mot de passe trop court (6 min)</string>
+    <string name="auth_invalid_user_name">Les noms d’utilisateurs ne peuvent contenir que des lettres, des nombres, des points, des traits d’union et des tirets bas</string>
+    <string name="auth_invalid_login_param">Nom d’utilisateur et/ou mot de passe incorrect</string>
+    <string name="auth_repeat_new_password_placeholder">Confirmez votre nouveau mot de passe</string>
+    <string name="auth_repeat_password_placeholder">Répéter le mot de passe</string>
+    <string name="auth_opt_phone_number_placeholder">Numéro de téléphone (facultatif)</string>
+    <string name="auth_phone_number_placeholder">Numéro de téléphone</string>
+    <string name="auth_add_phone_message_2">Renseignez un numéro de téléphone pour être éventuellement découvrable par les personnes qui vous connaissent.</string>
+    <string name="auth_user_name_placeholder">Nom d’utilisateur</string>
+    <string name="auth_new_password_placeholder">Nouveau mot de passe</string>
+    <string name="auth_password_placeholder">Mot de passe</string>
+    <string name="auth_return_to_login">Retourner à l’écran de connexion</string>
+    <string name="auth_skip">Ignorer</string>
+    <string name="auth_submit">Valider</string>
+    <string name="auth_register">Créer un compte</string>
+    <string name="notice_room_kick_by_you">Vous avez expulsé %1$s</string>
+    <string name="notice_room_kick">%1$s a expulsé %2$s</string>
+    <string name="notice_room_reject_by_you">Vous avez rejeté l’invitation</string>
+    <string name="notice_room_reject">%1$s a rejeté l’invitation</string>
+    <string name="notice_direct_room_leave_by_you">Vous avez quitté le salon</string>
+    <string name="notice_direct_room_leave">%1$s a quitté le salon</string>
+    <string name="notice_room_leave_by_you">Vous avez quitté le salon</string>
+    <string name="notice_room_leave">%1$s est parti du salon</string>
+    <string name="notice_direct_room_join_by_you">Vous avez rejoint le salon</string>
+    <string name="notice_direct_room_join">%1$s a rejoint le salon</string>
+    <string name="notice_room_join_by_you">Vous avez rejoint le salon</string>
+    <string name="notice_room_join">%1$s a rejoint le salon</string>
+    <string name="notice_room_invite_you">%1$s vous a invité</string>
+    <string name="notice_room_invite_by_you">Vous avez invité %1$s</string>
+    <string name="notice_room_invite">%1$s a invité %2$s</string>
+    <string name="notice_direct_room_created_by_you">Vous avez créé la conversation</string>
+    <string name="notice_direct_room_created">%1$s a créé la conversation</string>
+    <string name="notice_room_created_by_you">Vous avez créé le salon</string>
+    <string name="notice_room_created">%1$s a créé le salon</string>
+    <string name="notice_room_invite_no_invitee_by_you">Votre invitation</string>
+    <string name="notice_room_invite_no_invitee">invitation de %s</string>
+    <string name="summary_you_sent_sticker">Vous avez envoyé un autocollant.</string>
+    <string name="summary_user_sent_sticker">%1$s a envoyé un autocollant.</string>
+    <string name="summary_you_sent_image">Vous avez envoyé une image.</string>
+    <string name="summary_user_sent_image">%1$s a envoyé une image.</string>
+    <string name="summary_message">%1$s : %2$s</string>
 </resources>
\ No newline at end of file

From 05993c36c4483eabfc2fafbe7710f598b81b5d13 Mon Sep 17 00:00:00 2001
From: Jeanne Lavoie <j.lavoie@net-c.ca>
Date: Sat, 10 Apr 2021 16:35:05 +0000
Subject: [PATCH 036/350] Translated using Weblate (French)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 1bb02454ec..29e0d1a881 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -427,7 +427,7 @@
     <string name="ssl_do_not_trust">Ne pas faire confiance</string>
     <string name="ssl_logout_account">Se déconnecter</string>
     <string name="ssl_remain_offline">Ignorer</string>
-    <string name="room_details_title">Information sur le salon</string>
+    <string name="room_details_title">Informations sur le salon</string>
     <string name="room_details_people">Participants</string>
     <string name="room_details_files">Fichiers</string>
     <string name="room_details_settings">Paramètres</string>
@@ -606,8 +606,8 @@
     <string name="send_bug_report_sent">Le rapport d’anomalie a bien été envoyé</string>
     <string name="send_bug_report_failed">L’envoi du rapport d’anomalie a échoué (%s)</string>
     <string name="auth_invalid_user_name">Les noms d’utilisateurs ne peuvent contenir que des lettres, des nombres, des points, des traits d’union et des tirets bas</string>
-    <string name="auth_invalid_email">Cela ne ressemble pas à une adresse e-mail valide</string>
-    <string name="auth_invalid_phone">Cela ne ressemble pas à un numéro de téléphone valide</string>
+    <string name="auth_invalid_email">Ceci ne ressemble pas à une adresse e-mail valide</string>
+    <string name="auth_invalid_phone">Ceci ne ressemble pas à un numéro de téléphone valide</string>
     <string name="auth_email_already_defined">Cette adresse e-mail est déjà utilisée.</string>
     <string name="auth_email_validation_message">Veuillez vérifier votre e-mail pour continuer votre inscription</string>
     <string name="auth_threepid_warning_message">L’inscription avec e-mail et numéro de téléphone à la fois n’est pas prise en charge tant que l’API n’existe pas. Seul le numéro de téléphone sera pris en compte.
@@ -2629,7 +2629,7 @@
     <string name="call_held_by_user">%s a mis l’appel en attente</string>
     <string name="call_hold_action">Mettre en attente</string>
     <string name="call_resume_action">Reprendre</string>
-    <string name="error_unauthorized">Non autorisé, identifiants d\'authentification valides manquants</string>
+    <string name="error_unauthorized">Non autorisé, identifiants d’authentification valides manquants</string>
     <string name="dialog_edit_hint">Nouvelle valeur</string>
     <string name="action_return">Revenir</string>
     <string name="action_unpublish">Dé-publier</string>

From 2563bc98794bca84c85157ddf44ad483b073d70c Mon Sep 17 00:00:00 2001
From: Oymate <dhruboadittya96@gmail.com>
Date: Sat, 10 Apr 2021 08:05:45 +0000
Subject: [PATCH 037/350] Translated using Weblate (Bengali (Bangladesh))

Currently translated at 51.4% (1215 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bn_BD/
---
 vector/src/main/res/values-bn-rBD/strings.xml | 1381 ++++++++++++++++-
 1 file changed, 1380 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-bn-rBD/strings.xml b/vector/src/main/res/values-bn-rBD/strings.xml
index a6b3daec93..db2ee10bbc 100644
--- a/vector/src/main/res/values-bn-rBD/strings.xml
+++ b/vector/src/main/res/values-bn-rBD/strings.xml
@@ -1,2 +1,1381 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="summary_user_sent_image">%1$s একটি ছবি পাঠিয়েছে।</string>
+    <string name="new_recovery_method_popup_description">একটি নতুন সুরক্ষিত বার্তা কুঞ্জি ব্যাকআপ সনাক্ত করা হয়েছে।
+\n
+\nআপনি যদি নতুন পুনরুদ্ধারের পদ্ধতি সেট না করে থাকেন তবে একজন আক্রমণকারী আপনার অ্যাকাউন্ট অ্যাক্সেস করার চেষ্টা করছেন। আপনার অ্যাকাউন্ট পাসওয়ার্ড পরিবর্তন করুন এবং সেটিংসে অবিলম্বে একটি নতুন পুনরুদ্ধার পদ্ধতি সেট করুন।</string>
+    <plurals name="keys_backup_restore_success_description_part2">
+        <item quantity="one">%d টি নতুন কী এই ডিভাইসে যোগ করা হয়েছে।</item>
+        <item quantity="other">%d টি নতুন কী এই ডিভাইসে যোগ করা হয়েছে।</item>
+    </plurals>
+    <string name="keys_backup_restore_with_key_helper">আপনার পুনরুদ্ধারের কুঞ্জি হারিয়ে গেছে\? আপনি সেটিংস একটি নতুন সেট আপ করতে পারেন।</string>
+    <string name="keys_backup_restore_use_recovery_key">আপনার পুনরুদ্ধার কী ব্যবহার করুন</string>
+    <string name="keys_backup_restore_with_passphrase">আপনার এনক্রিপ্ট করা বার্তাগুলির ইতিহাস আনলক করতে আপনার পুনরুদ্ধার পাসফ্রেজটি ব্যবহার করুন</string>
+    <string name="keys_backup_restore_is_getting_backup_version">ব্যাকআপ সংস্করণ আনছে…</string>
+    <string name="keys_backup_setup_skip_msg">আপনি লগ আউট বা এই ডিভাইসটি হারাতে পারলে আপনি আপনার বার্তাগুলির অ্যাক্সেস হারিয়ে ফেলতে পারেন।</string>
+    <string name="keys_backup_setup_skip_title">তুমি কি নিশ্চিত\?</string>
+    <string name="keys_backup_setup_backup_started_message">আপনার এনক্রিপশন কীগুলি এখন ব্যাকগ্রাউন্ডে আপনার হোমসার্ভারে ব্যাক আপ করা হচ্ছে। প্রাথমিক ব্যাকআপটি কয়েক মিনিট সময় নিতে পারে।</string>
+    <string name="keys_backup_setup_backup_started_title">ব্যাকআপ শুরু হয়েছে</string>
+    <string name="unexpected_error">অপ্রত্যাশিত ত্রুটি</string>
+    <string name="recovery_key">পুনরুদ্ধার কী</string>
+    <string name="keys_backup_setup_step3_generating_key_status">পাসফ্রেজ ব্যবহার করে পুনরুদ্ধার কী তৈরি করা হচ্ছে, এই প্রক্রিয়াটি কয়েক সেকেন্ড সময় নিতে পারে।</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">এর সাথে পুনরুদ্ধার কী ভাগ করুন…</string>
+    <string name="keys_backup_setup_step3_please_make_copy">দয়া করে একটি অনুলিপি করুন</string>
+    <string name="keys_backup_setup_override_stop">থামুন</string>
+    <string name="keys_backup_setup_override_replace">প্রতিস্থাপন</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">দেখে মনে হচ্ছে আপনার অন্য সেশন থেকে ইতিমধ্যে সেটআপ কী ব্যাকআপ রয়েছে। আপনি কি এটি তৈরি করছেন তার সাথে প্রতিস্থাপন করতে চান\?</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">আপনার হোম সার্ভারে ইতিমধ্যে একটি ব্যাকআপ রয়েছে</string>
+    <string name="recovery_key_export_saved">পুনরুদ্ধার কী সংরক্ষণ করা হয়েছে।</string>
+    <string name="recovery_key_export_saved_as_warning">পুনরুদ্ধার কীটি \'%s\' তে সংরক্ষণ করা হয়েছে।
+\n
+\nসতর্কতা: অ্যাপ্লিকেশনটি আনইনস্টল করা হলে এই ফাইলটি মুছে যেতে পারে।</string>
+    <string name="keys_backup_setup_step3_save_button_title">ফাইল হিসাবে সংরক্ষণ করুন</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">অংশভাগ</string>
+    <string name="keys_backup_setup_step3_copy_button_title">রিকভারি কী সংরক্ষণ করুন</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">আমি একটি অনুলিপি তৈরি করেছি</string>
+    <string name="keys_backup_setup_step3_button_title">সম্পন্ন</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">আপনার পুনরুদ্ধার কীটি কোথাও খুব সুরক্ষিত রাখুন যেমন একটি পাসওয়ার্ড পরিচালক (বা নিরাপদ)</string>
+    <string name="keys_backup_setup_step3_text_line2">আপনার পুনরুদ্ধার কীটি একটি সুরক্ষা জাল - আপনি যদি আপনার পাসফ্রেজ ভুলে যান তবে আপনি এটি আপনার এনক্রিপ্ট করা বার্তাগুলির অ্যাক্সেস পুনরুদ্ধার করতে ব্যবহার করতে পারেন।
+\nআপনার পুনরুদ্ধার কীটি কোথাও খুব সুরক্ষিত রাখুন যেমন একটি পাসওয়ার্ড পরিচালক (বা নিরাপদ)</string>
+    <string name="keys_backup_setup_step3_text_line1">আপনার কীগুলি ব্যাক আপ করা হচ্ছে।</string>
+    <string name="keys_backup_setup_step3_success_title">সাফল্য!</string>
+    <string name="keys_backup_setup_step2_skip_button_title">(উন্নত) পুনরুদ্ধার কী সহ সেট আপ করুন</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">বা, আপনার ব্যাকআপটিকে পুনরুদ্ধার কী দ্বারা সুরক্ষিত করুন, এটি কোথাও নিরাপদ সাশ্রয় করুন।</string>
+    <string name="keys_backup_setup_creating_backup">ব্যাকআপ তৈরি করা হচ্ছে</string>
+    <string name="keys_backup_setup_step2_button_title">পাসফ্রেজ সেট করুন</string>
+    <string name="keys_backup_setup_step2_text_description">আমরা আপনার হোমসভারে আপনার কীগুলির একটি এনক্রিপ্ট করা অনুলিপি সঞ্চয় করব। আপনার ব্যাকআপটিকে সুরক্ষিত রাখতে একটি পাসফ্রেজ দিয়ে সুরক্ষিত করুন।
+\n
+\nসর্বাধিক সুরক্ষার জন্য, এটি আপনার অ্যাকাউন্টের পাসওয়ার্ডের থেকে আলাদা হওয়া উচিত।</string>
+    <string name="keys_backup_setup_step2_text_title">একটি পাসফ্রেজ দিয়ে আপনার ব্যাকআপ সুরক্ষিত করুন।</string>
+    <string name="keys_backup_setup_step1_manual_export">ম্যানুয়ালি কী রপ্তানি করুন</string>
+    <string name="keys_backup_setup_step1_advanced">(উন্নত)</string>
+    <string name="keys_backup_setup">কী ব্যাকআপ ব্যবহার শুরু করুন</string>
+    <string name="keys_backup_setup_step1_description">এনক্রিপ্ট করা কক্ষের বার্তাগুলি শেষ-থেকে-শেষ এনক্রিপশন সহ সুরক্ষিত। এই বার্তাগুলি পড়ার জন্য কেবলমাত্র আপনার এবং প্রাপকের (গুলি) কী রয়েছে।
+\n
+\n আপনার কীগুলি এড়াতে নিরাপদে ব্যাক আপ দিন।</string>
+    <string name="keys_backup_setup_step1_title">এনক্রিপ্ট করা বার্তাগুলি কখনই হারাবেন না</string>
+    <string name="keys_backup_no_session_error">কোনও ম্যাট্রিক্স সেশন উপলব্ধ নেই</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">আপনি যদি এলিমেন্টটি পুনরুদ্ধার কী তৈরি করতে চান তবে দয়া করে পাসফ্রেজটি মুছুন।</string>
+    <string name="passphrase_passphrase_too_weak">পাসফ্রেজটি খুব দুর্বল</string>
+    <string name="passphrase_empty_error_message">দয়া করে একটি পাসফ্রেজ লিখুন</string>
+    <string name="passphrase_passphrase_does_not_match">পাসফ্রেজ মেলে নি</string>
+    <string name="passphrase_enter_passphrase">পাসফ্রেজ প্রবেশ করুন</string>
+    <string name="passphrase_confirm_passphrase">পাসফ্রেজ নিশ্চিত করুন</string>
+    <string name="passphrase_create_passphrase">পাসফ্রেজ তৈরি করুন</string>
+    <string name="no_valid_google_play_services_apk">কোনও বৈধ গুগল প্লে পরিষেবা APK পাওয়া যায় নি। বিজ্ঞপ্তিগুলি সঠিকভাবে কাজ করতে পারে না।</string>
+    <string name="x_plus">%d+</string>
+    <string name="plus_x">+%d</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="generic_label">%1$s:</string>
+    <string name="show_info_area_only_errors">শুধুমাত্র ত্রুটির জন্য</string>
+    <string name="show_info_area_messages_and_errors">বার্তা এবং ত্রুটির জন্য</string>
+    <string name="show_info_area_always">সর্বদা</string>
+    <string name="settings_info_area_show">তথ্য অঞ্চলটি দেখান</string>
+    <string name="merged_events_collapse">বন্ধ</string>
+    <string name="merged_events_expand">সম্প্রসারিত</string>
+    <string name="unknown_error">দুঃখিত, একটি ত্রুটি ঘটেছে</string>
+    <string name="error_lazy_loading_not_supported_by_home_server">আপনার হোমসার্ভারটি এখনও সদস্যদের অলস লোডিং সমর্থন করে না। পরে চেষ্টা করুন।</string>
+    <string name="settings_lazy_loading_description">প্রথম দর্শনে কেবল রুমের সদস্যদের লোড করে কর্মক্ষমতা বাড়ান।</string>
+    <string name="settings_lazy_loading_title">রুম সদস্যরাদের অলস লোড করুন</string>
+    <string name="resource_limit_hard_contact">এই পরিষেবাটি ব্যবহার চালিয়ে যেতে দয়া করে %s করুন।</string>
+    <string name="resource_limit_soft_contact">এই সীমাটি বৃদ্ধি পেতে দয়া করে %s করুন।</string>
+    <string name="resource_limit_hard_mau">এই হোমসার্ভারটি তার মাসিক সক্রিয় ব্যবহারকারীর সীমাতে ছুঁয়েছে।</string>
+    <string name="resource_limit_soft_mau"> এই হোমসার্ভারটি তার মাসিক অ্যাক্টিভ ব্যবহারকারীর সীমাটিতে আঘাত করেছে তাই <b> কিছু ব্যবহারকারী লগ ইন করতে পারবেন না </b>।</string>
+    <string name="resource_limit_hard_default">এই হোমসার্ভারটি এর অন্যতম এক রিসোর্স সীমা অতিক্রম করেছে।</string>
+    <string name="resource_limit_soft_default">এই হোমসার্ভারটি এর একটি রিসোর্স সীমা অতিক্রম করেছে সুতরাং <b> কিছু ব্যবহারকারী লগ ইন করতে পারবেন না </b>।</string>
+    <string name="resource_limit_contact_admin">আপনার পরিষেবা প্রশাসকের সাথে যোগাযোগ করুন</string>
+    <string name="resource_limit_contact_action">প্রশাসকের সাথে যোগাযোগ করুন</string>
+    <string name="resource_limit_exceeded_title">সংস্থান সীমা অতিক্রম করেছে</string>
+    <string name="room_tombstone_predecessor_link">পুরানো বার্তা দেখতে এখানে ক্লিক করুন</string>
+    <string name="room_tombstone_continuation_description">এই ঘরটি অন্য কথোপকথনের একটি ধারাবাহিকতা</string>
+    <string name="room_tombstone_continuation_link">কথোপকথন এখানে অবিরত</string>
+    <string name="room_tombstone_versioned_description">এই ঘরটি প্রতিস্থাপন করা হয়েছে এবং এটি আর সক্রিয় নেই</string>
+    <string name="error_empty_field_your_password">আপনার পাসওয়ার্ড দিন।</string>
+    <string name="error_empty_field_enter_user_name">দয়া করে একটি ব্যবহারকারীর নাম লিখুন।</string>
+    <string name="deactivate_account_submit">অ্যাকাউন্ট নিষ্ক্রিয় করুন</string>
+    <string name="deactivate_account_prompt_password">চালিয়ে যেতে, দয়া করে আপনার পাসওয়ার্ড লিখুন:</string>
+    <string name="deactivate_account_delete_checkbox">আমার অ্যাকাউন্টটি নিষ্ক্রিয় করার সময় আমি যে সমস্ত বার্তা প্রেরণ করেছি তা ভুলে যান (সতর্কতা: এটি ভবিষ্যতের ব্যবহারকারীদের কথোপকথনের একটি অসম্পূর্ণ দৃশ্য দেখতে পাবে)</string>
+    <string name="deactivate_account_content">এটি আপনার অ্যাকাউন্টকে স্থায়ীভাবে অকেজো করে তুলবে। আপনি লগ ইন করতে সক্ষম হবেন না এবং কেউ একই ব্যবহারকারীর আইডি পুনরায় নিবন্ধন করতে সক্ষম হবেন না। এটি আপনার অ্যাকাউন্টের অংশ নিচ্ছে এমন সমস্ত কক্ষ ছেড়ে দেবে এবং এটি আপনার পরিচয় সার্ভার থেকে আপনার অ্যাকাউন্টের বিশদ সরিয়ে দেবে। <b> এই ক্রিয়াটি অপরিবর্তনীয় </b>।
+\n
+\nআপনার অ্যাকাউন্টটি নিষ্ক্রিয় করা <b> ডিফল্টরূপে আমাদের পাঠানো বার্তাগুলি ভুলে যাওয়ার কারণ নয় </b>। আপনি যদি আমাদের বার্তা ভুলে যেতে চান তবে দয়া করে নীচের বাক্সটি টিক দিন।
+\n
+\nম্যাট্রিক্সে বার্তার দৃশ্যমানতা ইমেলের অনুরূপ। আমাদের আপনার বার্তাগুলি ভুলে যাওয়ার অর্থ হ\'ল আপনি যে বার্তাগুলি প্রেরণ করেছেন সেগুলি কোনও নতুন বা নিবন্ধিত ব্যবহারকারীদের সাথে ভাগ করা হবে না, তবে নিবন্ধিত ব্যবহারকারীরা যাদের ইতিমধ্যে এই বার্তাগুলিতে অ্যাক্সেস রয়েছে তাদের কপিটিতে এখনও অ্যাক্সেস থাকবে।</string>
+    <string name="deactivate_account_title">অ্যাকাউন্ট নিষ্ক্রিয় করুন</string>
+    <string name="dialog_user_consent_submit">এখনই পর্যালোচনা করুন</string>
+    <string name="dialog_user_consent_content">"%1$s হোমসার্ভারটি ব্যবহার চালিয়ে যেতে আপনাকে অবশ্যই শর্তাদিটি কে পর্যালোচনা এবং সম্মত  করতে হবে।"</string>
+    <string name="avatar">আবতার</string>
+    <string name="notice_avatar">অবতার নোট করুন</string>
+    <string name="receipt_avatar">রিসিপ্ট অবতার</string>
+    <string name="forget_room">ঘর ভুলে যান</string>
+    <string name="rejoin">পুনরায় যুক্ত</string>
+    <string name="reason_colon">কারণ: %1$s</string>
+    <string name="has_been_banned">%2$s দ্বারা আপনাকে %1$s থেকে নিষিদ্ধ করা হয়েছে।</string>
+    <string name="has_been_kicked">আপনি %1$s থেকে %2$s দ্বারা লাথি খেয়েছেন</string>
+    <string name="group_no_long_description">সম্প্রদায় প্রশাসক এই সম্প্রদায়ের জন্য দীর্ঘ বিবরণ সরবরাহ করেনি।</string>
+    <plurals name="group_rooms">
+        <item quantity="one">১ টি ঘর</item>
+        <item quantity="other">%d টি ঘর</item>
+    </plurals>
+    <plurals name="group_members">
+        <item quantity="one">১ জন সদস্য</item>
+        <item quantity="other">%d জন সদস্য</item>
+    </plurals>
+    <string name="filter_group_rooms">গোষ্ঠীর ঘরগুলো ফিল্টার করুন</string>
+    <string name="filter_group_members">গোষ্ঠীর সদস্যদের ফিল্টার করুন</string>
+    <string name="invited">আমন্ত্রিত</string>
+    <string name="joined">যোগ করেছেন</string>
+    <string name="rooms">ঘরগুলি</string>
+    <string name="no_users_placeholder">কোন ব্যবহারকারি নেই</string>
+    <string name="group_details_rooms">ঘরগুলি</string>
+    <string name="group_details_people">লোক</string>
+    <string name="group_details_home">ঘর</string>
+    <string name="community_id_hint">উদাহরণ</string>
+    <string name="community_id">সম্প্রদায়ের আইডি</string>
+    <string name="community_name_hint">উদাহরণ</string>
+    <string name="community_name">সম্প্রদায়ের নাম</string>
+    <string name="create_community">সম্প্রদায় তৈরি করুন</string>
+    <string name="create">সৃষ্টি</string>
+    <string name="encrypted_message">এনক্রিপ্ট করা বার্তা</string>
+    <string name="notification_noisy">সশব্দ</string>
+    <string name="notification_silent">নিঃশব্দ</string>
+    <string name="notification_off">অফ</string>
+    <string name="markdown_has_been_disabled">মার্কডাউন অক্ষম করা হয়েছে।</string>
+    <string name="markdown_has_been_enabled">মার্কডাউন সক্ষম করা হয়েছে।</string>
+    <string name="command_description_clear_scalar_token">ম্যাট্রিক্স অ্যাপ্লিকেশন ব্যবস্থাপনা ঠিক করতে</string>
+    <string name="command_description_markdown">অন/অফ মার্কডাউন</string>
+    <string name="command_description_nick">আপনার প্রদর্শনের ডাকনাম পরিবর্তন করে</string>
+    <string name="command_description_kick_user">প্রদত্ত আইডি সহ ব্যবহারকারীকে কিক্ করে</string>
+    <string name="command_description_topic">রুমের টপিক সেট করুন</string>
+    <string name="command_description_part_room">কক্ষ ছেড়ে দিন</string>
+    <string name="command_description_join_room">প্রদত্ত ওরফে সহ রুমে যোগ দেয়</string>
+    <string name="command_description_invite_user">প্রদত্ত আইডি সহ ব্যবহারকারীকে বর্তমান কক্ষ এ আমন্ত্রণ জানায়</string>
+    <string name="command_description_deop_user">প্রদত্ত আইডি সহ ব্যবহারকারীকে ডিওপ করে</string>
+    <string name="command_description_op_user">ব্যবহারকারীর পাওয়ার স্তর নির্ধারণ করুন</string>
+    <string name="command_description_unban_user">প্রদত্ত আইডি সহ ব্যবহারকারীকে নিষিদ্ধ তালিকা থেকে বের করে</string>
+    <string name="command_description_ban_user">দেওয়া আইডি সঙ্গে ব্যবহারকারী কে নিষিদ্ধ করে</string>
+    <string name="command_description_emote">কর্ম প্রদর্শন করে</string>
+    <string name="command_problem_with_parameters">কমান্ড \"%s\" আরও পেরামিটার প্রয়োজন, অথবা কিছু পেরামিটার ভুল।</string>
+    <string name="unrecognized_command">অজ্ঞাত কম্যান্ড: %s</string>
+    <string name="command_error">কম্যান্ড এর ত্রুটি</string>
+    <string name="conference_call_warning_message">কনফারেন্স কল এখনো ডেভেলপমেন্ট এ আছে আর নির্ভরযোগ্য নাও হতে পারে।</string>
+    <string name="conference_call_warning_title">সতর্কবাণী!</string>
+    <string name="ignore_request_short_label">উপেক্ষা</string>
+    <string name="ignore_request">অনুরোধ উপেক্ষা করুন</string>
+    <string name="key_share_request">কুঞ্জি ভাগ অনুরোধ</string>
+    <string name="share_without_verifying_short_label">ভাগ</string>
+    <string name="share_without_verifying">যাচাই না করে শেয়ার করুন</string>
+    <string name="start_verification_short_label">যাচাই</string>
+    <string name="start_verification">যাচাই শুরু করুন</string>
+    <string name="your_unverified_device_requesting_with_info">একটি যাচাইকরণ সেশান এনক্রিপশন কুঞ্জি অনুরোধ করছে।
+\nসেশানের নাম: %1$s
+\nশেষ দেখা হয়েছে: %2$s
+\nআপনি অন্য সেশানে লগ ইন না করলে, এই অনুরোধটি উপেক্ষা করুন।</string>
+    <string name="your_unverified_device_requesting">আপনার যাচাই না করা সেশান \'%s\' এনক্রিপশন কুঞ্জি অনুরোধ করছে।</string>
+    <string name="you_added_a_new_device_with_info">একটি নতুন সেশান এনক্রিপশন কুঞ্জি অনুরোধ করছে।
+\nসেশানের নাম: %1$s
+\nশেষ দেখা হয়েছে: %2$s
+\nআপনি অন্য সেশানে লগ ইন না করলে, এই অনুরোধটি উপেক্ষা করুন।</string>
+    <string name="you_added_a_new_device">আপনি একটি নতুন সেশান \'%s\' যোগ করেছেন, যা এনক্রিপশন কীগুলির জন্য অনুরোধ করছে।</string>
+    <string name="widget_integration_review_terms">চালিয়ে যেতে আপনার এই পরিষেবার শর্তাদি স্বীকার করতে হবে।</string>
+    <string name="settings_labs_enable_send_voice_summary">এই বিকল্প বার্তা রেকর্ড করার জন্য একটি তৃতীয় পক্ষের অ্যাপ্লিকেশন প্রয়োজন।</string>
+    <string name="settings_labs_enable_send_voice">ভয়েস বার্তা পাঠান</string>
+    <string name="settings_labs_keyboard_options_to_send_message">বার্তা পাঠাবার জন্য কীবোর্ড এর এন্টার বোতাম প্রয়োগ করুন</string>
+    <string name="settings_labs_native_camera_summary">কাস্টম ক্যামেরা স্ক্রীনের পরিবর্তে সিস্টেম ক্যামেরাটি শুরু করে।</string>
+    <string name="settings_labs_native_camera">নেটিভ ক্যামেরা ব্যবহার করুন</string>
+    <string name="room_add_matrix_apps">ম্যাট্রিক্স এপ্লিকেশনগুলি যোগ করুন</string>
+    <string name="integration_manager_not_configured">কোনও ইন্টিগ্রেশন ম্যানেজার কনফিগার করা নেই।</string>
+    <string name="widget_integration_invalid_parameter">একটি পেরামিটার বৈধ নয়।</string>
+    <string name="widget_integration_missing_parameter">একটি প্রয়োজনীয় প্যারামিটারটি অনুপস্থিত আছে।</string>
+    <string name="widget_integration_room_not_visible">রুম %s দৃশ্যমান নয়।</string>
+    <string name="widget_integration_missing_user_id">অনুরোধে user_id অনুপস্থিত।</string>
+    <string name="widget_integration_missing_room_id">অনুরোধে room_id অনুপস্থিত।</string>
+    <string name="widget_integration_no_permission_in_room">আপনি এই রুমে এটা করার অনুমতি নেই।</string>
+    <string name="widget_integration_must_be_in_room">আপনি এই রুমে নেই।</string>
+    <string name="widget_integration_positive_power_level">শক্তি স্তর ইতিবাচক পূর্ণসংখ্যা হতে হবে।</string>
+    <string name="widget_integration_failed_to_send_request">অনুরোধ পাঠাতে ব্যর্থ।</string>
+    <string name="widget_integration_unable_to_create">উইজেট তৈরি করতে অক্ষম।</string>
+    <string name="room_widget_webview_read_protected_media">ডিআরএম সুরক্ষিত মিডিয়া পড়ুন</string>
+    <string name="room_widget_webview_access_microphone">মাইক্রোফোন ব্যবহার করুন</string>
+    <string name="room_widget_webview_access_camera">ক্যামেরা ব্যবহার করুন</string>
+    <string name="room_widget_resource_decline_permission">সব অবরুদ্ধ</string>
+    <string name="room_widget_resource_grant_permission">অনুমতি</string>
+    <string name="room_widget_resource_permission_title">এই উইজেটটি নিম্নলিখিত সংস্থানগুলি ব্যবহার করতে চায়:</string>
+    <string name="error_jitsi_not_supported_on_old_device">দুঃখিত, জিটসির সাথে কনফারেন্স কলগুলি পুরোনো ডিভাইসগুলিতে সমর্থিত নয় (৬.০ এর নীচে এন্ড্রোইড অপারেটিং সিস্টেম সহ ডিভাইসগুলি)</string>
+    <string name="room_widget_permission_room_id">কক্ষের আইডি</string>
+    <string name="room_widget_permission_widget_id">উইজেট আইডি</string>
+    <string name="room_widget_permission_theme">আপনার থিম</string>
+    <string name="room_widget_permission_user_id">আপনার ব্যবহারকারীর আইডি</string>
+    <string name="room_widget_permission_avatar_url">আপনার অবতার URL</string>
+    <string name="room_widget_permission_display_name">আপনার প্রদশনীয় নাম</string>
+    <string name="room_widget_revoke_access">আমার জন্য অ্যাক্সেস প্রত্যাহার করুন</string>
+    <string name="room_widget_open_in_browser">ব্রাউজারে খুলুন</string>
+    <string name="room_widget_reload">উইজেট পুনরায় লোড করুন</string>
+    <string name="room_widget_failed_to_load">উইজেট লোড করতে ব্যর্থ।
+\n%s</string>
+    <string name="room_widget_permission_shared_info_title">এটি ব্যবহার করে ডেটা %s এর সাথে ভাগ করে নিতে পারে:</string>
+    <string name="room_widget_permission_webview_shared_info_title">এটি ব্যবহার করে কুকিজ সেট করতে পারে এবং %s এর সাথে ডেটা ভাগ করা যায়:</string>
+    <string name="room_widget_permission_added_by">এই উইজেটটি যুক্ত করেছেন:</string>
+    <string name="room_widget_permission_title">উইজেট লোড করুন</string>
+    <string name="room_widget_activity_title">উইজেট</string>
+    <string name="active_widgets_title">সক্রিয় উইজেটগুলি</string>
+    <string name="active_widget_view_action">দেখুন</string>
+    <plurals name="active_widgets">
+        <item quantity="one">১ টি সক্রিয় উইজেট</item>
+        <item quantity="other">%d টা সক্রিয় উইজেট</item>
+    </plurals>
+    <string name="widget_delete_message_confirmation">আপনি কি এই রুমে উইজেট মুছে ফেলতে চান\?</string>
+    <string name="settings_labs_create_conference_with_jitsi">Jitsi সঙ্গে কনফারেন্স কল তৈরি করুন</string>
+    <string name="widget_creation_failure">উইজেট এর নির্মাণ ব্যর্থ হয়েছে</string>
+    <string name="widget_no_power_to_manage">আপনি এই রুমে উইজেট পরিচালনা করার অনুমতি প্রয়োজন</string>
+    <string name="huge">বিপুল</string>
+    <string name="largest">বৃহত্তম</string>
+    <string name="larger">বৃহত্তর</string>
+    <string name="large">বড়</string>
+    <string name="normal">সাধারন</string>
+    <string name="small">ছোট</string>
+    <string name="tiny">অতি ক্ষুদ্র</string>
+    <string name="font_size">অক্ষর এর আকার</string>
+    <string name="historical_placeholder">ঐতিহাসিক জন্য অনুসন্ধান করুন</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_inline_reply_failed">** পাঠাতে ব্যর্থ - দয়া করে রুম খুলুন</string>
+    <string name="notification_sender_me">আমি</string>
+    <string name="notification_new_invitation">নতুন আমন্ত্রণগুলি</string>
+    <string name="notification_new_messages">নতুন বার্তাগুলি</string>
+    <string name="notification_unknown_room_name">রুম</string>
+    <string name="notification_unknown_new_event">নতুন ইভেন্ট</string>
+    <string name="notification_unread_notified_messages_in_room">%2$s এ %1$s</string>
+    <plurals name="notification_compat_summary_title">
+        <item quantity="one">%d টি বিজ্ঞপ্তি</item>
+        <item quantity="other">%d টি বিজ্ঞপ্তি</item>
+    </plurals>
+    <plurals name="notification_compat_summary_line_for_room">
+        <item quantity="one">%1$s: ১ টি বার্তা</item>
+        <item quantity="other">%1$s: %2$d টি বার্তা</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages_in_room_rooms">
+        <item quantity="one">১ টি রুম</item>
+        <item quantity="other">%d টি রুম</item>
+    </plurals>
+    <string name="settings_background_fdroid_sync_mode">পটভূমি সিঙ্ক মোড (পরীক্ষামূলক)</string>
+    <string name="settings_background_sync">পটভূমি সিঙ্ক্রোনাইজেশন</string>
+    <string name="settings_messages_sent_by_bot">বোট দ্বারা পাঠানো বার্তাগুলি</string>
+    <string name="settings_call_invitations">কল এর আমন্ত্রণগুলি</string>
+    <string name="settings_invited_to_room">যখন আমি একটি রুম আমন্ত্রিত</string>
+    <string name="settings_messages_in_group_chat">গ্রুপ চ্যাটে বার্তা</string>
+    <string name="settings_messages_in_one_to_one">এক থেকে এক চ্যাট বার্তা</string>
+    <string name="settings_containing_my_user_name">আমার ব্যবহারকারী নাম ধারণকারী বার্তা</string>
+    <string name="settings_containing_my_display_name">আমার প্রদর্শন নাম ধারণকারী বার্তা</string>
+    <string name="settings_system_preferences_summary">"LED\'র  রং, কম্পন, শব্দ নির্বাচন করুন…"</string>
+    <string name="settings_silent_notifications_preferences">নীরব বিজ্ঞপ্তিগুলি কনফিগার করুন</string>
+    <string name="settings_call_notifications_preferences">কল বিজ্ঞপ্তিগুলি কনফিগার করুন</string>
+    <string name="settings_noisy_notifications_preferences">হাল্লা বিজ্ঞপ্তিগুলি কনফিগার করুন</string>
+    <string name="settings_turn_screen_on">স্ক্রিন টি ৩ সেকেন্ডের জন্য চালু করুন</string>
+    <string name="settings_enable_this_device">এই সেশানের জন্য বিজ্ঞপ্তি সক্রিয় করুন</string>
+    <string name="settings_enable_all_notif">এই অ্যাকাউন্টের জন্য বিজ্ঞপ্তি সক্রিয় করুন</string>
+    <string name="settings_notification_ringtone">বিজ্ঞপ্তি শব্দ</string>
+    <string name="settings_notification_privacy_message_content_not_shown">• বিজ্ঞপ্তিগুলি <b>বার্তা সামগ্রী দেখাবে না</b></string>
+    <string name="settings_notification_privacy_nosecure_message_content">• বিজ্ঞপ্তিগুলি তে <b>মেটা এবং বার্তা ডেটা</b> থাকে</string>
+    <string name="settings_notification_privacy_secure_message_content">• বিজ্ঞপ্তিটির বার্তা সামগ্রী <b>ম্যাট্রিক্স হোমসার্ভার থেকে নিরাপদে সরাসরি অবস্থিত হয়</b></string>
+    <string name="settings_notification_privacy_metadata">• বিজ্ঞপ্তিগুলি তে শুধুমাত্র মেটাডেটা থাকে</string>
+    <string name="settings_notification_privacy_fcm">• বিজ্ঞপ্তি Firebase ক্লাউড মেসেজিং মাধ্যমে পাঠানো হয়</string>
+    <string name="settings_notification_privacy_no_background_sync">অ্যাপগুলি ব্যাকগ্রাউন্ডে হোম সার্ভারের সাথে সংযোগ করার প্রয়োজন করার প্রয়োজন <b>নেই</b> , এটি ব্যাটারির ব্যবহারকে কমাতে পারে</string>
+    <string name="settings_notification_privacy_need_permission">অ্যাপ্লিকেশন ব্যাকগ্রাউন্ডে চালানোর অনুমতি প্রয়োজন</string>
+    <string name="settings_notification_privacy_reduced">হ্রাস গোপনীয়তা</string>
+    <string name="settings_notification_privacy_normal">সাধারণ</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">অপ্টিমাইজেশান অবহেলা</string>
+    <string name="settings_troubleshoot_test_battery_failed">যদি কোনও ব্যবহারকারী কোনও ডিভাইসটিকে নির্দিষ্ট সময়ের জন্য আনপ্লাগ এবং স্থিতিশীল রাখে তবে স্ক্রীন বন্ধের সাথে ডিভাইসটি ডোজ মোডে প্রবেশ করে। এটি অ্যাপ্লিকেশানগুলিকে নেটওয়ার্ক অ্যাক্সেস করতে বাধা দেয় এবং তাদের কাজ, সিঙ্ক এবং মান অ্যালার্মগুলি স্থগিত করে।</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} ব্যাটারি অপ্টিমাইজেশান দ্বারা প্রভাবিত হয় না।</string>
+    <string name="settings_troubleshoot_test_battery_title">ব্যাটারি অপ্টিমাইজেশান</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">সীমাবদ্ধগুলি নিষ্ক্রিয়</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">ব্যাকগ্রউন্ডের সীমাবদ্ধতা রিমোট এর জন্য সক্রিয় করা হয়েছে।
+\nঅ্যাপ্লিকেশন যেটি করার চেষ্টা করে সেটি ব্যাকগ্রাউন্ডে থাকা অবস্থায় আক্রমনাত্মকভাবে সীমিত হবে এবং এটি বিজ্ঞপ্তিগুলিতে প্রভাবিত হতে পারে।
+\n%1$s</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">ব্যাকগ্রউন্ডের সীমাবদ্ধতা ${app_name} এর জন্য নিষ্ক্রিয় করা হয়েছে। এই পরীক্ষা মোবাইল ডেটা ব্যবহার করে চালানো উচিত (ওয়াইফাই না)।
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_title">ব্যাকগ্রাউন্ড এর সীমাবদ্ধতা চেক করুন</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">বুট থেকে শুরু করা সক্রিয় করুন</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">ডিভাইসটি পুনরায় চালু হওয়ার সময় পরিষেবাটি শুরু হবে না, আপনি একবার ${app_name} টি খোলা না হওয়া পর্যন্ত বিজ্ঞপ্তি পাবেন না।</string>
+    <string name="settings_troubleshoot_test_service_boot_success">ডিভাইসটি পুনরায় চালু হলে পরিষেবা শুরু হবে।</string>
+    <string name="settings_troubleshoot_test_service_boot_title">বুট করার সময় শুরু</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">পরিষেবা পুনরায় আরম্ভ করতে ব্যর্থ হয়েছে</string>
+    <string name="settings_troubleshoot_test_service_restart_success">সেবা টি হত্যা করা হয়েছে এবং স্বয়ংক্রিয়ভাবে পুনরায় আরম্ভ করা হয়েছে।</string>
+    <string name="settings_troubleshoot_test_service_restart_title">বিজ্ঞপ্তি পরিষেবা অটো-পুনরায়-আরম্ভ</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">পরিসেবা আরম্ভ</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">বিজ্ঞপ্তিগুলির সেবা চলছে না।
+\nঅপ্প্লিকেশনটি পুনরায় আরম্ভ করার চেষ্টা করুন।</string>
+    <string name="settings_troubleshoot_test_foreground_service_startedt_success">বিজ্ঞপ্তিগুলির সেবা চলছে।</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_title">বিজ্ঞপ্তিগুলির সেবা</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">হোম সার্ভারে FCM টোকেন নিবন্ধন করতে ব্যর্থ হয়েছে:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCM টোকেন সফলভাবে হোম সার্ভারে নিবন্ধিত।</string>
+    <string name="settings_troubleshoot_test_token_registration_title">টোকেন নিবন্ধন</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">একাউন্ট যোগ করুন</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nএই ত্রুটি ${app_name} এর নিয়ন্ত্রণের বাইরে। ফোনে কোন গুগল একাউন্ট নেই। অ্যাকাউন্ট ম্যানেজার খুলুন এবং একটি গুগল একাউন্ট যোগ করুন।</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
+\nএই ত্রুটি ${app_name} এর নিয়ন্ত্রণের বাইরে। এটা বিভিন্ন কারণে ঘটতে পারে। আপনি পরে পুনরায় চেষ্টা করলে হয়তো এটি কাজ করবে, আপনি এটিও পরীক্ষা করতে পারেন যে Google Play পরিষেবাটি সিস্টেম সেটিংসে ডেটা ব্যবহারের ক্ষেত্রে সীমাবদ্ধ নয়, অথবা আপনার ডিভাইসের ঘড়ি সঠিক, বা এটি কাস্টম রমতে ঘটতে পারে।</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
+\nএই ত্রুটিটি ${app_name} এর নিয়ন্ত্রণের বাইরে এবং Google এর মতে, এই ত্রুটিটি ইঙ্গিত করে যে ডিভাইসটিতে FCM এর সাথে নিবন্ধিত অনেকগুলি অ্যাপ্লিকেশন রয়েছে। ত্রুটিগুলি কেবলমাত্র অ্যাপ্লিকেশনের চরম সংখ্যাগুলিতে ঘটে থাকে, তাই এটি গড় ব্যবহারকারীকে প্রভাবিত করবে না।</string>
+    <string name="settings_troubleshoot_test_fcm_failed">FCM টোকেন উদ্ধার করতে ব্যর্থ হয়েছে:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_success">FCM টোকেন সফলভাবে উদ্ধার করা হয়েছে:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_title">Firebase এর টোকেন</string>
+    <string name="settings_troubleshoot_test_play_services_quickfix">Play Services ঠিক করুন</string>
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} পুশ বার্তার প্রদানের জন্য Google Play পরিষেবাদি ব্যবহার করে কিন্তু এটি সঠিকভাবে কনফিগার করা বলে মনে হচ্ছে না:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_play_services_success">গুগল প্লে সার্ভিসেস APK পাওয়া গেছে এবং আপ টু ডেট রয়েছে।</string>
+    <string name="settings_troubleshoot_test_play_services_title">Play Services পরীক্ষা</string>
+    <string name="settings_troubleshoot_test_bing_settings_quickfix">সেটিংস যাচাই করুন</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">কাস্টম নিয়ম লোড করতে ব্যর্থ হয়েছে, আবার চেষ্টা করুন।</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">কিছু বিজ্ঞপ্তি আপনার কাস্টম সেটিংস এ নিষ্ক্রিয় করা হয়েছে।</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">লক্ষ্য করুন যে কিছু বার্তা টাইপ নীরব করা হয়েছে (কোন শব্দ ছাড়াই একটি বিজ্ঞপ্তি তৈরি করবে)।</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">কাস্টম সেটিংস।</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">সক্ষম</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">বিজ্ঞপ্তি এই সেশানের জন্য অনুমতি দেওয়া হয় নি।
+\n${app_name} এর সেটিংস যাচাই করুন।</string>
+    <string name="settings_troubleshoot_test_device_settings_success">বিজ্ঞপ্তি এই সেশানের জন্য সক্রিয় করা হয়েছে।</string>
+    <string name="settings_troubleshoot_test_device_settings_title">সেশান সেটিংস।</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">সক্ষম</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">বিজ্ঞপ্তি আপনার অ্যাকাউন্টের জন্য নিষ্ক্রিয় করা হয়েছে।
+\nঅনুগ্রহ করে একাউন্ট সেটিংস যাচাই করে নিন।</string>
+    <string name="settings_troubleshoot_test_account_settings_success">বিজ্ঞাপ্তি আপনার একাউন্টএর জন্য সক্রিয় করা হোক.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">অক্কোউন্টের সেটিংস।</string>
+    <string name="open_settings">সেটিংস খুলুন</string>
+    <string name="settings_troubleshoot_test_system_settings_failed">বিজ্ঞাপ্তিকে সিস্টেমের সেটিংস এর মাধ্যমে নিষ্ক্রিয় করা হয়েছে।
+\nদেয়া করে সিস্টেমের সেটিংসগুলি যাচাই করে নিন।</string>
+    <string name="settings_troubleshoot_test_system_settings_success">বিজ্ঞাপ্তিকে সিস্টেমের সেটিংস এর মাধ্যমে সক্রিয় করা হয়েছে।</string>
+    <string name="settings_troubleshoot_test_system_settings_title">সিস্টেমের সেটিংস।</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">এক অথবা অধিক পরীক্ষা ব্যর্থ হয়েছে,দয়া করে জমা করুন একটা গুরুত্বপূর্ণ খসড়া যেটা সাহায্য করবে অনুসন্ধান করতে।</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">এক অথবা অধিক পরীক্ষা বার্থ হয়েছে,প্রস্তাবিত ঠিক করে চেষ্টা করুন(es).</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">সাধারণ লক্ষণ ঠিক আছে.যদি আপনি এখনও কোনো প্রজ্ঞাপন পাননি,দয়াকরে জমা করুন একটা গুরুত্বপূর্ণ খসড়া যেটা সাহায্য করবে তদন্ত করতে।</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">(%1$d of %2$d) চলছে…</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">পরীক্ষাগুলি চালাও</string>
+    <string name="settings_troubleshoot_diagnostic">ডায়াগনস্টিকস এর সমস্যা সমাধান</string>
+    <string name="settings_notification_troubleshoot">বিজ্ঞপ্তিগুলি সমাধান করুন</string>
+    <string name="settings_notification_privacy">বিজ্ঞপ্তির গোপনীয়তা</string>
+    <string name="settings_notification_by_event">ঘটনা দ্বারা বিজ্ঞপ্তির গুরুত্ব</string>
+    <string name="settings_notification_advanced">উন্নত বিজ্ঞপ্তি সেটিংস</string>
+    <string name="settings_add_3pid_authentication_needed">প্রমাণীকরণ প্রয়োজন</string>
+    <string name="settings_add_3pid_confirm_password_title">আপনার পাসওয়ার্ড নিশ্চিত করুন</string>
+    <string name="settings_app_info_link_summary">সিস্টেম সেটিংস অ্যাপ্লিকেশন তথ্য প্রদর্শন করুন।</string>
+    <string name="settings_app_info_link_title">আবেদন তথ্য</string>
+    <string name="settings_add_phone_number">যোগ করুন ফোন নম্বর</string>
+    <string name="settings_phone_number">ফোন</string>
+    <string name="settings_add_email_address">যোগ করুন ইমেইল এর ঠিকানা</string>
+    <string name="settings_email_address">ইমেইল</string>
+    <string name="settings_display_name">প্রদশনীয় নাম</string>
+    <string name="settings_profile_picture">নথির ছবি</string>
+    <string name="room_sliding_menu_privacy_policy">গোপনীয় পন্থা</string>
+    <string name="room_sliding_menu_copyright">গ্রন্থস্বত্ব</string>
+    <string name="room_sliding_menu_third_party_notices">তৃতীয় পক্ষের বিগপ্তি</string>
+    <string name="room_sliding_menu_term_and_conditions">শর্তাবলী</string>
+    <string name="room_sliding_menu_version_x">সংস্করণ %s</string>
+    <string name="room_sliding_menu_version">সংস্করণ</string>
+    <string name="room_sliding_menu_settings">সেটিংস</string>
+    <string name="room_sliding_menu_messages">বার্তা</string>
+    <string name="room_settings_add_homescreen_shortcut">ঘরের পর্দার ছোটোখাটো যোগ করুন</string>
+    <string name="room_settings_forget">ভুলেযাওয়া</string>
+    <string name="room_settings_leave_conversation">ত্যাগ করুন কথোপকথন</string>
+    <string name="room_settings_direct_chat">সরাসরি চ্যাট</string>
+    <string name="room_settings_de_prioritize">অনাগ্রাধিকার</string>
+    <string name="room_settings_favourite">প্রিয়</string>
+    <string name="room_settings_mute">নিঃশব্দ</string>
+    <string name="room_settings_mention_only">শুধুমাত্র উল্লেখ করুন</string>
+    <string name="room_settings_all_messages">সব বার্তাগুলি</string>
+    <string name="room_settings_all_messages_noisy">সব বার্তা (হইচই)</string>
+    <string name="directory_searching_title">খোঁজা হচ্ছে নির্দেশনা…</string>
+    <plurals name="directory_search_rooms_for">
+        <item quantity="one">%২$s এর জন্য ঘর খোঁজা হয়েছে %১$s</item>
+        <item quantity="other">%২$s এর জন্য ঘরগুলি খোঁজা হয়েছে %১$s</item>
+    </plurals>
+    <plurals name="directory_search_rooms">
+        <item quantity="one">একটা ঘর</item>
+        <item quantity="other">%d ঘরগুলি</item>
+    </plurals>
+    <string name="directory_search_results_title">ব্রাউস নির্দেশনা</string>
+    <string name="room_recents_join_room_prompt">আদর্শ ঘরের পরিচয় অথবা একটা ঘর আর উপনাম</string>
+    <string name="room_recents_join_room_title">যোগকরুন একটা ঘর</string>
+    <string name="room_recents_join_room">যোগদান করুন ঘরে</string>
+    <string name="room_recents_create_room">ঘর তৈরিকরা</string>
+    <string name="room_recents_start_chat">চ্যাট শুরু করুন</string>
+    <string name="room_recents_invites">আমন্ত্রণ</string>
+    <string name="room_recents_low_priority">কম গুরুত্ব</string>
+    <string name="room_recents_conversations">ঘরগুলি</string>
+    <string name="room_recents_favourites">প্রিয়</string>
+    <string name="room_recents_directory">নির্দেশক</string>
+    <string name="room_recents_join">যোগদান</string>
+    <string name="tab_title_search_files">নথি</string>
+    <string name="tab_title_search_people">লোকজন</string>
+    <string name="tab_title_search_messages">বার্তাগুলি</string>
+    <string name="tab_title_search_rooms">ঘর</string>
+    <string name="search_no_results">কোনো ফলাফল নেই</string>
+    <string name="search_members_hint">ছাঁকুন ঘরের সংখ্যাগুলো</string>
+    <string name="search_hint">খোঁজা</string>
+    <string name="room_event_action_cancel_download">নামানো বাতিল করুন</string>
+    <string name="room_event_action_cancel_upload">আপলোড বাতিল করুন</string>
+    <string name="room_event_action_report_prompt_ignore_user">ব্যাবহারকারির কাছ থেকে আপনি কি সব বার্তা লোকাতে চান\?উল্লেখ্য এই প্রতিক্রিয়াটি চালু করবেন এবং এটি কিছু সময় নিতে পারে।</string>
+    <string name="room_event_action_report_prompt_reason">বিষয়বস্তুর বিবরণী দেয়ার জন কারণ</string>
+    <string name="room_details_people_present_group_name">যোগ করেছেন</string>
+    <string name="room_details_people_invited_group_name">আমন্ত্রিত</string>
+    <string name="malformed_id">বিকৃত পরিচয়।একটি ইমেইল ঠিকানা বা একটি মাধ্যমিক পরিচয় হতে হবে যেমন \'@localpart:domain\'</string>
+    <plurals name="room_details_selected">
+        <item quantity="one">%d নির্বাচিত</item>
+        <item quantity="other"></item>
+    </plurals>
+    <string name="room_details_settings">সেটিংস</string>
+    <string name="room_details_files">নথিগুলি</string>
+    <string name="room_details_people">লোকজন</string>
+    <string name="room_details_title">ঘরের বিস্তারিত</string>
+    <string name="ssl_only_accept">কেবলমাত্র সার্ভার প্রশাসকটি উপরের মেলে এমন একটি আঙুলের ছাপ প্রকাশ করলেই শংসাপত্রটি গ্রহণ করবে।</string>
+    <string name="ssl_expected_existing_expl">"সার্টিফিকেটটি পূর্বে বিশ্বাসযোগ্য এক থেকে একে বিশ্বস্ত নয়.সার্ভারটি এটির শংসাপত্র পুনর্বিকরণ করেছে।অনুমোদিত আঙুলের ছাপ এর জন্য  সার্ভার প্রশাসকের সাথে যোগাযোগ করুন।"</string>
+    <string name="ssl_unexpected_existing_expl">শংসাপত্র আপনার ফোন দ্বারা বিশ্বাস করা হয় যে এক থেকে পরিবর্তীত হয়েছে। এটি অত্যন্ত অস্বাভাবিক। আপনি এই নতুন শংসাপত্র গ্রহণ না করা বাঞ্চনীয়।</string>
+    <string name="ssl_cert_new_account_expl">যদি সার্ভার এডমিনিস্ট্রেটর বলে থাকেন যে এটি প্রত্যাশিত,নিচের আঙুলের ছাপ প্রদত্ত আঙুলের ছাপ মেলে নিশ্চিত করুন।</string>
+    <string name="ssl_cert_not_trust">"এর অর্থ এই যে কেউ দূষিতভাবে আপনার ট্রাফিক কে আটকাতে পারে অথবা আপনার ফোন রিমোট সার্ভার দ্বারা সর্বরাহিত শংসাপত্রের উপর বিশ্বাস করে  না."</string>
+    <string name="ssl_could_not_verify">রিমোট সার্ভারএর পরিচয় যাচাই করা হয়নি।</string>
+    <string name="ssl_fingerprint_hash">আঙুলেরছাপ(%s):</string>
+    <string name="ssl_remain_offline">উপেক্ষাকরা</string>
+    <string name="ssl_logout_account">লগআউট</string>
+    <string name="ssl_do_not_trust">বিশ্বাস করবেন না</string>
+    <string name="ssl_trust">আস্থাস্থাপন</string>
+    <plurals name="room_new_messages_notification">
+        <item quantity="one">১টি নতুন বার্তা</item>
+        <item quantity="other">%d টি নতুন বার্তা</item>
+    </plurals>
+    <string name="room_do_not_have_permission_to_post">আপনার এই রুমে পোস্ট করার অনুমতি নেই</string>
+    <string name="room_message_file_not_found">ফাইল খুঁজে পাওয়া যায় নি</string>
+    <string name="room_delete_unsent_messages">অপ্রত্যাশিত বার্তা মুছে দিন</string>
+    <string name="room_resend_unsent_messages">অপ্রচলিত বার্তা আবার পাঠান</string>
+    <string name="room_prompt_cancel">সব বাতিল করুন</string>
+    <string name="room_prompt_resend">সব আবার পাঠান</string>
+    <string name="room_unknown_devices_messages_notification">অজানা সেশান উপস্থিত থাকার কারণে বার্তা পাঠানো হয় নি। %1$s বা %2$s এখন\?</string>
+    <string name="room_unsent_messages_notification">বার্তা পাঠানো হয় নি। %1$s বা %2$s এখন\?</string>
+    <string name="room_offline_notification">সার্ভারের সাথে সংযুক্তি হারিয়ে গেছে।</string>
+    <string name="room_message_placeholder_reply_to_not_encrypted">একটি উত্তর পাঠান (এনক্রিপশনবিহীন)…</string>
+    <string name="room_message_placeholder_reply_to_encrypted">একটি এনক্রিপ্ট করা উত্তর পাঠান…</string>
+    <string name="room_message_placeholder_not_encrypted">একটি বার্তা পাঠান (এনক্রিপশনবিহীন)…</string>
+    <string name="room_message_placeholder_encrypted">একটি এনক্রিপ্ট করা বার্তা পাঠান…</string>
+    <string name="room_many_users_are_typing">%1$s আর %2$s এবং অন্যরা টাইপ করছেন…</string>
+    <string name="room_two_users_are_typing">%1$s আর %2$s টাইপ করছেন…</string>
+    <string name="room_one_user_is_typing">%s টাইপ করছেন…</string>
+    <string name="room_menu_search">অনুসন্ধান</string>
+    <string name="people_search_invite_by_id_dialog_hint">ইমেইল বা ম্যাট্রিক্স আইডি</string>
+    <string name="people_search_invite_by_id_dialog_description">এক বা একাধিক ইমেইল ঠিকানা বা ম্যাট্রিক্স আইডি লিখুন</string>
+    <string name="people_search_invite_by_id_dialog_title">আইডি দ্বারা ব্যবহারকারী আমন্ত্রণ কর</string>
+    <string name="people_search_filter_text">শুধুমাত্র ম্যাট্রিক্স ব্যবহারকারীরা</string>
+    <string name="people_search_user_directory">ব্যবহারকারী নির্দেশিকা (%s)</string>
+    <string name="people_search_local_contacts">স্থানীয় যোগাযোগ (%d)</string>
+    <string name="people_search_invite_by_id"><u>আইডি দ্বারা আমন্ত্রিত</u></string>
+    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
+    <string name="room_participants_invite_join_names_and">%1$s আর %2$s</string>
+    <string name="room_participants_invite_join_names">"%1$s, "</string>
+    <string name="room_participants_invite_prompt_msg">আপনি এই চ্যাটে %s কে আমন্ত্রণ জানাতে চান\?</string>
+    <string name="reason_hint">কারণ</string>
+    <string name="room_participants_unban_prompt_msg">নিষিদ্ধ মুক্ত ব্যবহারকারীরা আবার ঘরে যোগদানের অনুমতি দেওয়া হবে।</string>
+    <string name="summary_you_sent_image">আপনি একটি ছবি পাঠিয়েছেন।</string>
+    <string name="room_participants_ban_prompt_msg">নিষিদ্ধ ব্যবহারকারীরা তাদের এই ঘর থেকে কীক মেরে দেবে এবং আবার যোগদান করতে বাধা দেবেন।</string>
+    <string name="room_participants_unban_title">ব্যবহারকারী কে নিষেধাজ্ঞা মুক্ত করুন</string>
+    <string name="room_participants_ban_reason">নিষিদ্ধ করার কারণ</string>
+    <string name="room_participants_ban_title">ব্যবহারকারীকে নিষিদ্ধ করুন</string>
+    <string name="room_participants_kick_prompt_msg">কীক করা ব্যবহারকারী কে তাদের এই ঘর থেকে সরিয়ে দেবে।
+\n
+\nতাদের আবার যোগদানের হাত থেকে বাঁচাতে আপনার পরিবর্তে ওদেরকে নিষিদ্ধ করা উচিত।</string>
+    <string name="room_participants_kick_reason">কীক করার কারণ</string>
+    <string name="room_participants_kick_title">ব্যবহারকারী কে কীক করুন</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">আপনি কি নিশ্চিত যে আপনি এই ব্যবহারকারীর জন্য আমন্ত্রণটি বাতিল করতে চান\?</string>
+    <string name="room_participants_action_cancel_invite_title">আমন্ত্রণ বাতিল করুন</string>
+    <string name="room_participants_action_unignore">উপেক্ষা</string>
+    <string name="room_participants_action_unignore_prompt_msg">এই ব্যবহারকারী কে উপেক্ষা তালিকা থেকে সরালে তাদের থেকে সমস্ত বার্তা আবার দেখাবে।</string>
+    <string name="room_participants_action_unignore_title">উপেক্ষা তালিকা থেকে ব্যবহারকারীকে সরান</string>
+    <string name="room_participants_action_ignore">উপেক্ষা</string>
+    <string name="room_participants_action_ignore_prompt_msg">এই ব্যবহারকারীর উপেক্ষা করা আপনার ভাগ করা কক্ষগুলি থেকে তাদের বার্তা সরিয়ে দেবে।
+\n
+\nআপনি সাধারণ সেটিংসে যে কোনও সময় এই ক্রিয়াটি বিপরীত করতে পারেন।</string>
+    <string name="room_participants_action_ignore_title">ব্যবহারকারীকে উপেক্ষা করুন</string>
+    <string name="room_participants_power_level_demote">হীনপদস্থ</string>
+    <string name="room_participants_power_level_demote_warning_prompt">আপনি নিজেকে হ্রাসকারী হিসাবে আপনি এই পরিবর্তনটিকে পূর্বাবস্থায় ফিরিয়ে আনতে পারবেন না, আপনি যদি রুমের সর্বশেষ সুবিধাযুক্ত ব্যবহারকারী হন তবে সুযোগ সুবিধাগুলি ফিরে পাওয়া অসম্ভব।</string>
+    <string name="room_participants_power_level_demote_warning_title">নিজেকে হিনপদস্থ করবেন\?</string>
+    <string name="room_participants_power_level_prompt">আপনি এই পরিবর্তনটি পূর্বাবস্থায় ফিরিয়ে আনতে সক্ষম হবেন না যেহেতু আপনি ব্যবহারকারীকে একই শক্তি স্তর হিসাবে প্রচার করার জন্য প্রচার করছেন।
+\nআপনি কি নিশ্চিত\?</string>
+    <string name="room_participants_action_devices_list">সেশান তালিকা প্রদর্শন কর</string>
+    <string name="room_participants_action_mention">উল্লেখ</string>
+    <string name="room_participants_invite_search_another_user">ব্যবহারকারী আইডি, নাম বা ইমেইল</string>
+    <string name="room_participants_action_set_admin">অ্যাডমিন কর</string>
+    <string name="room_participants_action_set_moderator">মডারেটর কর</string>
+    <string name="room_participants_action_set_default_power_level">স্বাভাবিক ব্যবহারকারী তে রিসেট করুন</string>
+    <string name="room_participants_action_kick">পদাঘাত</string>
+    <string name="compression_options">পাঠান যেমন</string>
+    <plurals name="membership_changes">
+        <item quantity="one">১ সদস্যাতা পরিবর্তন</item>
+        <item quantity="other">%d সদস্যাতা পরিবর্তন</item>
+    </plurals>
+    <string name="groups_list">গোষ্ঠীগুলি সারি</string>
+    <string name="read_receipts_list">পড়ো প্রাপ্তিগুলি সারি</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">দয়া করে শুরু করুন ${app_name} অন্য সেশান যেটা পারে বর্ণনা করতে বার্তা কে সুতরাং এটা পারে পাঠাতে চাবিগুলো কে যন্ত্র তে.</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">অনুরোধ পাঠানো</string>
+    <string name="e2e_re_request_encryption_key_sent">চাবির অনুরোধ পাঠানো।</string>
+    <string name="e2e_re_request_encryption_key"><u>পুনরায় অনুরোধ এনক্রিপশন চাবিগুলি</u>আপনার অন্য সেশানগুলি থেকে।</string>
+    <string name="login_error_login_email_not_yet">এই ইমেইল লিংক যেটা এখনো ক্লিক করা হয়নি</string>
+    <string name="login_error_user_in_use">এই ব্যাবহারকারী আগেও নাম ব্যবহার করে ছিল</string>
+    <string name="login_error_limit_exceeded">অনেকগুলো অনুরোধ পাঠানো হয়েছে</string>
+    <string name="login_error_not_json">ধারণ করছে না সঠিক JSON</string>
+    <string name="login_error_bad_json">বিকৃত JSON</string>
+    <string name="login_error_unknown_token">প্রবেশকারী টোকেনটা চিনতে নির্দিষ্ট ছিলো না</string>
+    <string name="login_error_forbidden">অবৈধ ব্যাবহারকারির নাম/সংকেত শব্দ</string>
+    <string name="login_error_ssl_handshake">আপনার যন্ত্র একটি সেকেলে TLS নিরাপত্তা খসড়া চুক্তি,অরক্ষিত সংঘর্ষ করতে ,আপনার নিত্যাপাত্তার জন্য আপনি সম্পর্ক করতে পারবেন না</string>
+    <string name="login_error_ssl_other">এসএসএল ত্রুটি।</string>
+    <string name="login_error_ssl_peer_unverified">এসএসএল ত্রুটি: পিয়ারের পরিচয় যাচাই করা হয়নি।</string>
+    <string name="login_error_homeserver_not_found">এই ইউআরএলে কোনও হোম সার্ভারে পৌঁছানো যায় না, দয়া করে এটি পরীক্ষা করে দেখুন</string>
+    <string name="login_error_no_homeserver_found">এটি কোনও বৈধ ম্যাট্রিক্স সার্ভারের ঠিকানা নয়</string>
+    <string name="login_error_unknown_host">এই URL টি পৌঁছানোর যোগ্য নয়, দয়া করে এটি পরীক্ষা করুন</string>
+    <string name="login_error_invalid_home_server">একটি বৈধ URL প্রবেশ করুন</string>
+    <string name="login_error_unable_register_mail_ownership">নিবন্ধন করতে অক্ষম: ইমেইল মালিকানা ব্যর্থতা</string>
+    <string name="login_error_unable_register">নিবন্ধন করতে অক্ষম</string>
+    <string name="login_error_registration_network_error">নিবন্ধন করতে অক্ষম: নেটওয়ার্ক ত্রুটি</string>
+    <string name="login_error_unable_login">লগইন করতে অক্ষম</string>
+    <string name="login_error_network_error">লগ ইন করতে ব্যর্থ: নেটওয়ার্ক ত্রুটি</string>
+    <string name="login_error_must_start_http">URL টি http[s]:// দিয়ে শুরু করতে হবে</string>
+    <string name="auth_accept_policies">পর্যালোচনা করুন এবং এই হোমসার্ভার এর নীতিগুলি গ্রহণ করুন:</string>
+    <string name="auth_reset_password_success_message">আপনার পাসওয়ার্ড পুনরায় সেট করা হয়েছে।
+\n
+\nআপনি সমস্ত সেশান থেকে লগ আউট করা হয়েছে এবং আর পুশ বিজ্ঞপ্তি পাবেন না। বিজ্ঞপ্তিগুলি পুনরায় সক্ষম করতে, প্রতিটি ডিভাইসে পুনরায় লগ ইন করুন।</string>
+    <string name="auth_reset_password_error_unauthorized">ইমেল ঠিকানা যাচাই করতে ব্যর্থ: ইমেলটিতে লিঙ্কে আপনি ক্লিক করেছেন তা নিশ্চিত করুন</string>
+    <string name="auth_reset_password_email_validation_message">একটি ইমেল %s কে পাঠানো হয়েছে। একবার এটিতে থাকা লিঙ্কটি অনুসরণ করার পরে, নীচে ক্লিক করুন।</string>
+    <string name="auth_reset_password_missing_password">একটি নতুন পাসওয়ার্ড প্রবেশ করা আবশ্যক।</string>
+    <string name="auth_reset_password_missing_email">আপনার অ্যাকাউন্টের সাথে যুক্ত ইমেল ঠিকানা প্রবেশ করা আবশ্যক।</string>
+    <string name="auth_reset_password_message">আপনার পাসওয়ার্ড পুনরায় সেট করতে, আপনার অ্যাকাউন্টের সাথে যুক্ত ইমেল ঠিকানাটি প্রবেশ করান:</string>
+    <string name="auth_reset_password_next_step_button">আমি আমার ইমেইল ঠিকানা যাচাই করেছি</string>
+    <string name="auth_identity_server">পরিচয় সার্ভার:</string>
+    <string name="auth_home_server">হোম সার্ভার:</string>
+    <string name="auth_username_in_use">ব্যবহারকারীর নাম ব্যবহার করা</string>
+    <string name="auth_recaptcha_message">এই হোম সার্ভার আপনি একটি রোবট না সেটা নিশ্চিত করবে</string>
+    <string name="auth_threepid_warning_message">ইমেইল এবং ফোন নম্বরের সাথে একযোগে নিবন্ধীকরণ এখনও সমর্থিত নয় যতক্ষন না API উপলব্ধ হয়ে। শুধুমাত্র ফোন নম্বর অ্যাকাউন্ট গ্রহণ করা হবে।
+\n
+\nআপনি সেটটিংসে গিয়ে আপনার প্রোফাইলে আপনার ইমেল যোগ করতে পারেন।</string>
+    <string name="auth_email_validation_message">নিবন্ধন চালিয়ে যেতে আপনার ইমেইল চেক করুন</string>
+    <string name="auth_use_server_options">কাস্টম সার্ভার বিকল্প ব্যবহার করুন (উন্নত)</string>
+    <string name="auth_forgot_password">পাসওয়ার্ড ভুলে গেছেন\?</string>
+    <string name="auth_password_dont_match">পাসওয়ার্ডগুলি মিলছে না</string>
+    <string name="auth_invalid_token">অবৈধ টোকেন</string>
+    <string name="auth_missing_email_or_phone">অনুপস্থিত ইমেইল ঠিকানা বা ফোন নম্বর</string>
+    <string name="auth_missing_phone">অনুপস্থিত ফোন নম্বর</string>
+    <string name="auth_missing_email">অনুপস্থিত ইমেইল ঠিকানা</string>
+    <string name="auth_email_already_defined">এই ইমেইল ঠিকানা ইতিমধ্যে সংজ্ঞায়িত করা হয়।</string>
+    <string name="auth_invalid_phone">এটি একটি বৈধ ফোন নম্বরের মতো দেখাচ্ছে না</string>
+    <string name="auth_invalid_email">এটি একটি বৈধ ইমেল ঠিকানা মত দেখাচ্ছে না</string>
+    <string name="auth_missing_password">নিখোঁজ পাসওয়ার্ড</string>
+    <string name="auth_invalid_password">পাসওয়ার্ড খুব ছোট (সর্বনিম্ন ৬)</string>
+    <string name="auth_invalid_user_name">ব্যবহারকারীর নামগুলিতে শুধুমাত্র অক্ষর, সংখ্যা, বিন্দু, হাইফেন এবং আন্ডারস্কোর থাকতে পারে</string>
+    <string name="auth_invalid_login_param">ভুল ব্যবহারকারীর নাম এবং / অথবা পাসওয়ার্ড</string>
+    <string name="auth_repeat_new_password_placeholder">আপনার নতুন পাসওয়ার্ড নিশ্চিত করুন</string>
+    <string name="auth_repeat_password_placeholder">পুনরাবৃত্তি পাসওয়ার্ড</string>
+    <string name="auth_opt_phone_number_placeholder">ফোন নাম্বার (ঐচ্ছিক)</string>
+    <string name="auth_phone_number_placeholder">ফোন নম্বর</string>
+    <string name="auth_opt_email_placeholder">ইমেইল ঠিকানা (ঐচ্ছিক)</string>
+    <string name="auth_email_placeholder">ইমেইল ঠিকানা</string>
+    <string name="auth_add_email_and_phone_message_2">অ্যাকাউন্ট পুনরুদ্ধারের জন্য একটি ইমেল সেট করুন। আপনার পরিচিত লোকদের দ্বারা বিকল্প হিসাবে আবিষ্কারের জন্য পরে ইমেল বা ফোন ব্যবহার করুন।</string>
+    <string name="auth_add_email_phone_message_2">অ্যাকাউন্ট পুনরুদ্ধারের জন্য একটি ইমেল সেট করুন। আপনার পরিচিত লোকদের দ্বারা বিকল্প হিসাবে আবিষ্কারের জন্য পরে ইমেল বা ফোন ব্যবহার করুন।</string>
+    <string name="auth_add_phone_message_2">একটি ফোন সেট করুন এবং পরে আপনাকে জারা চেনে সেই লোকেদের দ্বারা বিকল্প হিসাবে আবিষ্কার করার জন্য।</string>
+    <string name="auth_add_email_message_2">অ্যাকাউন্ট পুনরুদ্ধারের জন্য একটি ইমেল সেট করুন এবং পরে আপনাকে চিনে এমন লোকেরা ইচ্ছিকভাবে আবিষ্কারযোগ্য।</string>
+    <string name="auth_user_name_placeholder">ব্যবহারকারীর নাম</string>
+    <string name="auth_new_password_placeholder">নতুন পাসওয়ার্ড</string>
+    <string name="auth_password_placeholder">পাসওয়ার্ড</string>
+    <string name="auth_user_id_placeholder">ইমেল বা ব্যবহারকারীর নাম</string>
+    <string name="auth_return_to_login">লগইন স্ক্রিনে ফায়ার আসুন</string>
+    <string name="auth_send_reset_email">রিসেট ইমেইল পাঠান</string>
+    <string name="auth_skip">বাদ</string>
+    <string name="auth_submit">জমা</string>
+    <string name="auth_register">অ্যাকাউন্ট তৈরি করুন</string>
+    <string name="auth_login_sso">একক সাইন অন দিয়ে সাইন ইন করুন</string>
+    <string name="auth_login">লগ ইন</string>
+    <string name="error_no_external_application_found">দুঃখিত, এই কর্মটি সম্পন্ন করার জন্য কোন বাহ্যিক অ্যাপ্লিকেশন খুঁজে পাওয়া যায়নি।</string>
+    <string name="go_on_with">সঙ্গে যান…</string>
+    <string name="no_sticker_application_dialog_content">আপনার বর্তমানে সক্রিয় কোন স্টিকার প্যাক নেই।
+\n
+\nএখন কিছু যোগ করবেন\?</string>
+    <string name="option_take_video">ভিডিও নিন</string>
+    <string name="option_take_photo">ছবি তোল</string>
+    <string name="option_take_photo_video">ছবি বা ভিডিও নিন</string>
+    <string name="option_send_sticker">স্টিকার পাঠাও</string>
+    <string name="option_send_files">ফাইলগুলো পাঠাও</string>
+    <string name="call_format_turn_hd_on">এইচডি চালু করুন</string>
+    <string name="call_format_turn_hd_off">এইচডি বন্ধ করুন</string>
+    <string name="call_camera_back">পেছনের</string>
+    <string name="call_camera_front">সম্মুখ</string>
+    <string name="call_switch_camera">ক্যামেরা স্যুইচ করুন</string>
+    <string name="sound_device_wireless_headset">বেতার হেডসেট</string>
+    <string name="sound_device_headset">হেডসেট</string>
+    <string name="sound_device_speaker">স্পিকার</string>
+    <string name="sound_device_phone">ফোন</string>
+    <string name="call_select_sound_device">সাউন্ড ডিভাইস নির্বাচন করুন</string>
+    <string name="call_failed_no_connection_description">রিয়েল টাইম সংযোগ স্থাপন করতে ব্যর্থ।
+\nকলগুলি নির্ভরযোগ্যতার সাথে কাজ করার জন্য দয়া করে আপনার হোমসার্ভারের প্রশাসককে একটি টার্ন সার্ভার কনফিগার করতে বলুন।</string>
+    <string name="template_call_failed_no_connection">এলিমেন্ট কল ব্যর্থ</string>
+    <string name="call_failed_dont_ask_again">আবার আমাকে জিজ্ঞাসা করবেন না</string>
+    <string name="call_failed_no_ice_use_alt">%s ব্যবহার করার চেষ্টা করুন</string>
+    <string name="call_failed_no_ice_description">কলগুলি নির্ভরযোগ্যভাবে কাজ করার জন্য দয়া করে আপনার হোমসার্ভার (%1$s) এর প্রশাসককে একটি টার্ন সার্ভার কনফিগার করতে বলুন।
+\n
+\nবিকল্পভাবে, আপনি পাবলিক সার্ভারটি %2$s এ ব্যবহার করার চেষ্টা করতে পারেন, তবে এটি নির্ভরযোগ্য হবে না এবং এটি আপনার সার্ভারের সাথে আপনার আইপি ঠিকানাটি ভাগ করে দেবে। আপনি সেটিংসে এটি পরিচালনা করতে পারেন।</string>
+    <string name="call_failed_no_ice_title">ভুল কনফিগার্ড সার্ভারের কারণে কল ব্যর্থ হয়েছে</string>
+    <string name="start_video_call_prompt_msg">আপনি কি একটি ভিডিও কল শুরু করতে চাওয়ার বিষয়ে নিশ্চিত\?</string>
+    <string name="start_voice_call_prompt_msg">আপনি কি একটি ভয়েস কল শুরু করতে চাওয়ার বিষয়ে নিশ্চিত\?</string>
+    <string name="start_new_chat_prompt_msg">আপনি কি %s এর সাথে একটি নতুন চ্যাট শুরু করতে চান\?</string>
+    <string name="option_send_voice">ভয়েস পাঠান</string>
+    <string name="start_video_call">ভিডিও কল শুরু করুন</string>
+    <string name="start_voice_call">ভয়েস কল শুরু করুন</string>
+    <string name="start_new_chat">নতুন চ্যাট শুরু করুন</string>
+    <string name="search">অনুসন্ধান</string>
+    <string name="identity_url">আইডেন্টিটি সার্ভার ইউআরএল</string>
+    <string name="hs_url">হোম সার্ভার ইউআরএল</string>
+    <string name="logout">সাইন আউট</string>
+    <string name="login">লগ ইন</string>
+    <string name="create_account">অ্যাকাউন্ট তৈরি করুন</string>
+    <string name="username">ব্যবহারকারীর নাম</string>
+    <string name="join_room">রুমে যোগদান</string>
+    <string name="read_receipt">অধীত</string>
+    <string name="send_files_in">মধ্যে পাঠান</string>
+    <string name="send_bug_report_progress">উন্নতি (%s%%)</string>
+    <string name="send_bug_report_failed">বাগ রিপোর্ট পাঠানো ব্যর্থ হয়েছে (%s)</string>
+    <string name="send_bug_report_sent">বাগ রিপোর্ট সফলভাবে পাঠানো হয়েছে</string>
+    <string name="send_bug_report_rage_shake">বাগ রিপোর্ট করার জন্য জোরে ঝাঁকান</string>
+    <string name="send_bug_report_app_crashed">অ্যাপ্লিকেশন শেষ সময় ক্র্যাশ হয়েছে। আপনি ক্র্যাশ রিপোর্ট স্ক্রিনটি খুলতে চান\?</string>
+    <string name="send_bug_report_alert_message">আপনি হতাশায় ফোন কম্পন করা বলে মনে হচ্ছে। আপনি বাগ রিপোর্ট স্ক্রিন খুলতে চান\?</string>
+    <string name="send_bug_report_logs_description">সমস্যাগুলির নির্ণয়ের জন্য, এই ক্লায়েন্ট থেকে লগগুলি এই বাগ রিপোর্টটি পাঠানো হবে। লগ এবং স্ক্রিনশট সহ এই বাগ রিপোর্টটি সর্বজনীনভাবে দৃশ্যমান হবে না। আপনি যদি শুধুমাত্র উপরের পাঠ্যটি পাঠাতে চান তবে অনুগ্রহ করে আনটিক করুন:</string>
+    <string name="send_bug_report_placeholder">এখানে আপনার সমস্যা বর্ণনা করুন</string>
+    <string name="send_bug_report_description_in_english">যদি সম্ভব হয়, ইংরেজি বিবরণ লিখুন।</string>
+    <string name="send_bug_report_description">বাগ বর্ণনা করুন। আপনি কি করেছিলেন\? আপনি কি ঘটতে আশা করেন\? আসলে কি ঘটেছে\?</string>
+    <string name="send_bug_report">বাগ রিপোর্ট</string>
+    <string name="send_bug_report_include_screenshot">স্ক্রিনশট পাঠান</string>
+    <string name="send_bug_report_include_crash_logs">ক্র্যাশ লগগুলি পাঠান</string>
+    <string name="send_bug_report_include_logs">লগগুলি পাঠান</string>
+    <string name="no_group_placeholder">কোন গ্রুপ নেই</string>
+    <string name="groups_header">সম্প্রদায়গুলি</string>
+    <string name="groups_invite_header">আমন্ত্রণ</string>
+    <plurals name="public_room_nb_users">
+        <item quantity="one">১ জন ব্যবহারকারী</item>
+        <item quantity="other">%d জন ব্যবহারকারী</item>
+    </plurals>
+    <string name="no_public_room_placeholder">কোন পাবলিক রুম উপলব্ধ নেই</string>
+    <string name="no_room_placeholder">কোন রুম নেই</string>
+    <string name="rooms_directory_header">রুমের ডিরেক্টরি</string>
+    <string name="rooms_header">রুমগুলি</string>
+    <string name="people_no_identity_server">কোনও পরিচয় সার্ভার কনফিগার করা নেই।</string>
+    <string name="no_result_placeholder">কোন ফলাফল নেই</string>
+    <string name="template_no_contact_access_placeholder">আপনি রায়টকে আপনার স্থানীয় পরিচিতি অ্যাক্সেস করার অনুমতি দেয় নি</string>
+    <string name="no_conversation_placeholder">কথাবার্তা নেই</string>
+    <string name="matrix_only_filter">শুধুমাত্র ম্যাট্রিক্সের যোগাযোগগুলি</string>
+    <string name="user_directory_header">ব্যবহারকারী ডিরেক্টরি</string>
+    <string name="local_address_book_header">স্থানীয় ঠিকানার বই</string>
+    <string name="direct_chats_header">কথাবার্তাগুলি</string>
+    <string name="system_alerts_header">সিস্টেম সতর্কতাগুলি</string>
+    <string name="low_priority_header">কম অগ্রাধিকার</string>
+    <string name="invitations_header">আমন্ত্রণগুলি</string>
+    <string name="home_filter_placeholder_groups">কমিউনিটির নামগুলি ফিল্টার কর</string>
+    <string name="home_filter_placeholder_rooms">রুমের নামগুলি ফিল্টার কর</string>
+    <string name="home_filter_placeholder_people">বেক্তিগুলি ফিল্টার কর</string>
+    <string name="home_filter_placeholder_favorites">ফেভারিটগুলি ফিল্টার কর</string>
+    <string name="home_filter_placeholder_home">রুমের নাম ফিল্টার কর</string>
+    <string name="bottom_action_groups">সম্প্রদায়গুলি</string>
+    <string name="bottom_action_rooms">রুম</string>
+    <string name="bottom_action_people">জনসাধারণ</string>
+    <string name="bottom_action_favourites">প্রিয়</string>
+    <string name="bottom_action_notification">বিজ্ঞপ্তিগুলি</string>
+    <string name="bottom_action_home">হোম</string>
+    <string name="dialog_title_success">সাফল্য</string>
+    <string name="dialog_title_error">ত্রুটি</string>
+    <string name="dialog_title_warning">সতর্কতা</string>
+    <string name="dialog_title_confirmation">প্রতিপাদন</string>
+    <string name="disable">অক্ষম</string>
+    <string name="copied_to_clipboard">ক্লিপবোর্ডে অনুলিপি করা হয়েছে</string>
+    <string name="action_copy">অনুলিপি</string>
+    <string name="action_close">বন্ধ</string>
+    <string name="action_open">খুলুন</string>
+    <string name="action_mark_room_read">পঠিত হিসেবে চিহ্নিত</string>
+    <string name="action_quick_reply">দ্রুত উত্তর</string>
+    <string name="action_historical">ঐতিহাসিক</string>
+    <string name="action_mark_all_as_read">সবগুলো পঠিত বলে সনাক্ত কর</string>
+    <string name="action_global_search">গ্লোবাল অনুসন্ধান</string>
+    <string name="action_video_call">ভিডিও কল</string>
+    <string name="action_voice_call">ভয়েস কল</string>
+    <string name="action_sign_out_confirmation_simple">আপনি সাইন আউট করতে চান\?</string>
+    <string name="action_sign_out">সিগণ আউট</string>
+    <string name="actions">ক্রিয়াকলাপ</string>
+    <string name="action_exit">প্রস্থান</string>
+    <string name="call_notification_hangup">বন্ধ করুন</string>
+    <string name="call_notification_reject">পতন</string>
+    <string name="call_notification_answer">গ্রহণ</string>
+    <string name="decline">পতন</string>
+    <string name="review">পর্যালোচনা</string>
+    <string name="ignore">উপেক্ষা</string>
+    <string name="abort">বাতিল</string>
+    <string name="done">সম্পন্ন</string>
+    <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' একটি উপনাম জন্য বৈধ বিন্যাস নয়</string>
+    <string name="room_settings_addresses_invalid_format_dialog_title">অবৈধ উদীয়মান বিন্যাস</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' একটি বৈধ সম্প্রদায় আইডি নয়</string>
+    <string name="room_settings_invalid_group_format_dialog_title">অবৈধ কমিউনিটি আইডি</string>
+    <string name="room_settings_add_new_group">নতুন সম্প্রদায় আইডি (উদাঃ +foo:matrix.org)</string>
+    <string name="room_settings_no_flair">এই রুম কোন সম্প্রদায়ের জন্য ফ্লেয়ার দেখাচ্ছে না</string>
+    <string name="room_settings_addresses_add_new_address">নতুন ঠিকানা (যেমন #foo:matrix.org)</string>
+    <string name="room_settings_addresses_no_local_addresses">এই রুমে কোন স্থানীয় ঠিকানা নেই</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">এই সেশান থেকে এই রুমে যাচাই করা সেশানগুলিতে এনক্রিপ্ট করা বার্তাগুলি কখনও প্রেরণ করবেন না।</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">শুধুমাত্র যাচাই সেশানে এনক্রিপ্ট করুন</string>
+    <string name="room_settings_labs_end_to_end_warnings">এনক্রিপশন সক্রিয় করতে সক্ষম হবার জন্য আপনাকে লগআউট করতে হবে।</string>
+    <string name="room_settings_labs_end_to_end_is_active">শেষ থেকে শেষ এনক্রিপশন সক্রিয় আছে</string>
+    <string name="room_settings_labs_end_to_end">শেষ থেকে শেষ এনক্রিপশন</string>
+    <string name="room_settings_labs_warning_message">এই অপ্রত্যাশিত উপায়ে বিরতি পারে যে পরীক্ষামূলক বৈশিষ্ট্য। সতর্কতার সাথে ব্যবহার করুন।</string>
+    <string name="room_settings_labs_pref_title">ল্যাবস</string>
+    <string name="room_settings_addresses_pref_title">ঠিকানা</string>
+    <string name="room_settings_room_internal_id">এই রুম এর অভ্যন্তরীণ আইডি</string>
+    <string name="room_settings_category_advanced_title">উন্নত</string>
+    <plurals name="room_settings_banned_users_count">
+        <item quantity="one">%d নিষিদ্ধ ব্যবহারকারী</item>
+        <item quantity="other">%d নিষিদ্ধ ব্যবহারকারী</item>
+    </plurals>
+    <string name="room_settings_banned_users_title">নিষিদ্ধ ব্যবহারকারীরা</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">রুম এর লিঙ্ক জানেন যে কেউ, অতিথি সহ</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">রুমের লিঙ্কটি যে কেউ জানে, অতিথিদের ছাড়া</string>
+    <string name="room_settings_room_access_entry_only_invited">শুধুমাত্র যারা আমন্ত্রিত হয়েছে</string>
+    <string name="room_settings_room_access_warning">একটি রুম লিঙ্ক করার জন্য এটি একটি ঠিকানা থাকতে হবে।</string>
+    <string name="room_settings_read_history_entry_members_only_joined">সদস্য শুধুমাত্র (তারা যোগদান করে)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">সদস্য শুধুমাত্র (তারা আমন্ত্রিত ছিল)</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">সদস্য শুধুমাত্র (এই বিকল্পটি নির্বাচন করার সময় থেকে)</string>
+    <string name="room_settings_read_history_entry_anyone">যে কেউ</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">কে এই রুম অ্যাক্সেস করতে পারেন\?</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">কে ইতিহাস পড়তে পারে\?</string>
+    <string name="room_settings_room_read_history_rules_pref_title">কক্ষ ইতিহাস পাঠযোগ্যতা</string>
+    <string name="room_settings_room_access_rules_pref_title">রুম অ্যাক্সেস</string>
+    <string name="room_settings_room_notifications_title">বিজ্ঞপ্তিগুলি</string>
+    <string name="room_settings_directory_visibility">রুমের তালিকা তে এই রুম টি যোগ করুন</string>
+    <string name="room_settings_category_access_visibility_title">অ্যাক্সেস এবং দৃশ্যমানতা</string>
+    <string name="room_settings_tag_pref_entry_none">কেউ না</string>
+    <string name="room_settings_tag_pref_entry_low_priority">কম অগ্রাধিকার</string>
+    <string name="room_settings_tag_pref_entry_favourite">প্রিয়</string>
+    <string name="room_settings_tag_pref_dialog_title">হিসেবে ট্যাগ করা:</string>
+    <string name="room_settings_room_tag">রুমের ট্যাগ</string>
+    <string name="room_settings_topic">বিষয়</string>
+    <string name="room_settings_room_name">রুমের নাম</string>
+    <string name="room_settings_room_photo">রুমের ছবি</string>
+    <string name="media_saving_period_forever">চিরতরে</string>
+    <string name="media_saving_period_1_month">১ মাস</string>
+    <string name="media_saving_period_1_week">১ সপ্তা</string>
+    <string name="media_saving_period_3_days">৩ দিন</string>
+    <string name="settings_without_flair">আপনি বর্তমানে কোন সম্প্রদায়ের সদস্য নন।</string>
+    <string name="settings_flair">ফ্লেয়ার</string>
+    <string name="settings_play_shutter_sound">শাটার শব্দ চালান</string>
+    <string name="media_source_choose">চয়ন</string>
+    <string name="settings_default_media_source">ডিফল্ট মিডিয়া উৎস</string>
+    <string name="compression_opt_list_choose">চয়ন</string>
+    <string name="settings_default_compression">ডিফল্ট কম্প্রেশন</string>
+    <string name="settings_media">মিডিয়া</string>
+    <string name="account_additional_info">"অতিরিক্ত তথ্য:  %s"</string>
+    <string name="account_phone_number_error">আপনার ফোন নম্বর যাচাই করার সময় একটি ত্রুটি ঘটেছে।</string>
+    <string name="settings_phone_number_code">কোড</string>
+    <string name="settings_phone_number_verification_error">আপনার ফোন নম্বর যাচাই করার সময় ত্রুটি হয়েছে</string>
+    <string name="settings_phone_number_verification_error_empty_code">অ্যাক্টিভেশন কোড প্রবেশ করান</string>
+    <string name="settings_phone_number_verification_instruction">আমরা একটি অ্যাক্টিভেশন কোড দিয়ে একটি এসএমএস পাঠিয়েছি। নীচের এই কোড লিখুন দয়া করে।</string>
+    <string name="settings_phone_number_verification">ফোন যাচাইকরণ</string>
+    <string name="settings_phone_number_error">নির্বাচিত দেশের জন্য অবৈধ ফোন নম্বর</string>
+    <string name="settings_phone_number_label">ফোন নম্বর</string>
+    <string name="settings_phone_number_country_error">একটি দেশ নির্বাচন করুন</string>
+    <string name="settings_phone_number_country_label">দেশ</string>
+    <string name="settings_select_country">দেশ বেঁচে নিন</string>
+    <string name="settings_delete_threepid_confirmation">আপনি কি %1$s %2$s সরাতে নিশ্চিত\?</string>
+    <string name="settings_delete_notification_targets_confirmation">আপনি এই বিজ্ঞপ্তি লক্ষ্য অপসারণ করতে চান আপনি কি নিশ্চিত\?</string>
+    <string name="passwords_do_not_match">পাসওয়ার্ড মিলছে না</string>
+    <string name="settings_unignore_user">%s থেকে সব বার্তা দেখতে চান\?
+\n
+\nমনে রাখবেন যে এই পদক্ষেপটি অ্যাপ্লিকেশনটি পুনরায় চালু করবে এবং এটি কিছু সময় নিতে পারে।</string>
+    <string name="settings_password_updated">আপনার পাসওয়ার্ড আপডেট করা হয়েছে</string>
+    <string name="settings_fail_to_update_password_invalid_current_password">পাসওয়ার্ড বৈধ নয়</string>
+    <string name="settings_fail_to_update_password">পাসওয়ার্ড আপডেট করতে ব্যর্থ হয়েছে</string>
+    <string name="settings_change_password_submit">পাসওয়ার্ড আপডেট করুন</string>
+    <string name="settings_confirm_password">নিশ্চিত কর নতুন পাসওয়ার্ড</string>
+    <string name="settings_new_password">নতুন পাসওয়ার্ড</string>
+    <string name="settings_old_password">বর্তমান পাসওয়ার্ড</string>
+    <string name="settings_change_password">পাসওয়ার্ড পরিবর্তন করুন</string>
+    <string name="settings_password">পাসওয়ার্ড</string>
+    <string name="account_email_error">আপনার ইমেল ঠিকানা যাচাই করার সময় একটি ত্রুটি ঘটেছে।</string>
+    <string name="account_phone_number_already_used_error">এই ফোন নম্বর ইতিমধ্যে ব্যবহার করা আছে।</string>
+    <string name="account_email_not_found_error">এই ইমেইল ঠিকানা পাওয়া যায় নি।</string>
+    <string name="account_email_already_used_error">এই ইমেইলটা ইতোমধ্যে ব্যবহৃত হচ্ছে।</string>
+    <string name="account_email_validation_error">ইমেইল ঠিকানা যাচাই করতে অক্ষম। আপনার ইমেইল চেক করুন এবং লিঙ্কে ক্লিক করুন। একবার সম্পন্ন হলে, অবিরত ক্লিক করুন।</string>
+    <string name="account_email_validation_message">আপনার ইমেইল চেক করুন এবং লিঙ্কে ক্লিক করুন। একবার সম্পন্ন হলে, অবিরত ক্লিক করুন।</string>
+    <string name="account_email_validation_title">যাচাই মুলতুবি</string>
+    <string name="settings_select_language">ভাষা বেছে নিন</string>
+    <string name="settings_interface_language">ভাষা</string>
+    <string name="settings_user_interface">ব্যবহারকারী ইন্টারফেস</string>
+    <string name="disabled_integration_dialog_content">এটি করতে সেটিংসে \'একীকরণের অনুমতি দিন\' সক্ষম করুন।</string>
+    <string name="disabled_integration_dialog_title">সংহতকরণ অক্ষম করা হয়েছে</string>
+    <string name="settings_integration_manager">ইন্টিগ্রেশন ম্যানেজার</string>
+    <string name="settings_integration_allow">সংহতকরণের অনুমতি দিন</string>
+    <string name="settings_identity_server">পরিচয় সার্ভার</string>
+    <string name="settings_home_server">হোম সার্ভার</string>
+    <string name="settings_logged_in">লগ ইন করুন</string>
+    <string name="devices_delete_submit_button_label">জমা দিন</string>
+    <string name="devices_delete_pswd">পাসওয়ার্ড:</string>
+    <string name="devices_delete_dialog_title">প্রমাণীকরণ</string>
+    <string name="devices_delete_dialog_text">এই অপারেশন অতিরিক্ত প্রমাণীকরণ প্রয়োজন।
+\nচালিয়ে যেতে, আপনার পাসওয়ার্ড লিখুন।</string>
+    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+    <string name="devices_details_last_seen_title">শেষ দেখা</string>
+    <string name="devices_details_device_name">সর্বজনীন নাম আপডেট করুন</string>
+    <string name="devices_details_name_title">সর্বজনীন নাম</string>
+    <string name="devices_details_id_title">আইডি</string>
+    <string name="devices_details_dialog_title">সেশানের তথ্য</string>
+    <string name="settings_data_save_mode_summary">ডেটা সংরক্ষণ মোড একটি নির্দিষ্ট ফিল্টার প্রয়োগ করে যাতে উপস্থিতি আপডেট এবং টাইপিং বিজ্ঞপ্তি ফিল্টার করা হয়।</string>
+    <string name="settings_data_save_mode">ডেটা সংরক্ষণ মোড</string>
+    <string name="settings_opt_in_of_analytics_ok">হ্যাঁ, আমি সাহায্য করতে চাই!</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">আমাদের ${app_name} উন্নত করতে সাহায্য করার জন্য বিশ্লেষণ সক্রিয় করুন।</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} আমাদের অ্যাপ্লিকেশন উন্নত করার অনুমতি দেওয়ার জন্য বেনামী বিশ্লেষণ সংগ্রহ করে।</string>
+    <string name="settings_opt_in_of_analytics">বিশ্লেষণ তথ্য পাঠান</string>
+    <string name="settings_analytics">বৈশ্লেষিক ন্যায়</string>
+    <string name="startup_notification_fdroid_battery_optim_button_grant">অনুমতি প্রদান করুন</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">নির্ভরযোগ্য বিজ্ঞপ্তি পেতে ${app_name} কম প্রভাব ব্যাকগ্রাউন্ড সংযোগ রাখা প্রয়োজন।
+\nপরবর্তী স্ক্রিনে আপনাকে দাঙ্গাটি সর্বদা ব্যাকগ্রাউন্ডে চালানোর অনুমতি দেওয়া হবে, দয়া করে স্বীকার করুন।</string>
+    <string name="startup_notification_fdroid_battery_optim_title">পটভূমি সংযোগ</string>
+    <string name="startup_notification_privacy_button_other">অন্য বিকল্প চয়ন করুন</string>
+    <string name="startup_notification_privacy_button_grant">অনুমতি প্রদান করুন</string>
+    <string name="template_startup_notification_privacy_message">সুরক্ষিতভাবে এবং ব্যক্তিগতভাবে আপনার বিজ্ঞপ্তি পরিচালনা করতে ${app_name} পটভূমিতে চালাতে পারে। এই ব্যাটারি ব্যবহার প্রভাবিত হতে পারে।</string>
+    <string name="startup_notification_privacy_title">বিজ্ঞপ্তি\'র গোপনীয়তা</string>
+    <string name="settings_discovery_manage">আপনার আবিষ্কারের সেটিংস পরিচালনা করুন।</string>
+    <string name="settings_discovery_category">আবিষ্কার</string>
+    <string name="settings_deactivate_my_account">আমার একাউন্ট নিষ্ক্রিয় করুন</string>
+    <string name="settings_deactivate_account_section">একাউন্ট নিষ্ক্রিয়</string>
+    <string name="reset_secure_backup_warning">এটি আপনার বর্তমান কী বা বাক্যাংশটি প্রতিস্থাপন করবে।</string>
+    <string name="reset_secure_backup_title">আপনার বিদ্যমান ব্যাকআপের জন্য একটি নতুন সুরক্ষা কী তৈরি করুন বা একটি নতুন সুরক্ষা বাক্য সেট করুন।</string>
+    <string name="settings_secure_backup_section_info">আপনার সার্ভারে এনক্রিপশন কীগুলি ব্যাক আপ করে এনক্রিপ্ট করা বার্তাগুলি এবং ডেটাতে অ্যাক্সেস হারানোর বিরুদ্ধে সুরক্ষা।</string>
+    <string name="settings_secure_backup_enter_to_setup">এই ডিভাইসে সেট আপ করুন</string>
+    <string name="settings_secure_backup_reset">সুরক্ষিত ব্যাকআপ পুনরায় সেট করুন</string>
+    <string name="settings_secure_backup_setup">সুরক্ষিত ব্যাকআপ সেট আপ করুন</string>
+    <string name="settings_secure_backup_manage">পরিচালনা</string>
+    <string name="settings_secure_backup_section_title">সুরক্ষিত ব্যাকআপ</string>
+    <string name="settings_send_message_with_enter_summary">নরম কীবোর্ডের প্রবেশ বোতামটি লাইন বিরতি যোগ করার পরিবর্তে বার্তা পাঠাবে</string>
+    <string name="settings_send_message_with_enter">এন্টার বোতাম টিপে বার্তা পাঠান</string>
+    <string name="settings_preview_media_before_sending">পাঠানোর আগে মিডিয়া প্রিভিউ কর</string>
+    <string name="settings_vibrate_on_mention">একটি ব্যবহারকারী উল্লেখ এর সময় কম্পন করুন</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">অবতার এবং প্রদর্শন নাম পরিবর্তন অন্তর্ভুক্ত।</string>
+    <string name="settings_show_avatar_display_name_changes_messages">অ্যাকাউন্ট ইভেন্ট দেখান</string>
+    <string name="settings_show_join_leave_messages_summary">আমন্ত্রণ, kicks, এবং নিষেধাজ্ঞা অনিবন্ধিত হয়।</string>
+    <string name="settings_show_join_leave_messages">যোগ এবং ছাড়া তথ্য দেখান</string>
+    <string name="settings_show_read_receipts_summary">একটি বিস্তারিত তালিকা জন্য পঠন প্রাপ্তি ক্লিক করুন।</string>
+    <string name="settings_show_read_receipts">পাঠানো প্রাপ্তি দেখান</string>
+    <string name="settings_12_24_timestamps">১২-ঘন্টা ফরম্যাটে টাইমস্ট্যাম্প দেখান</string>
+    <string name="settings_always_show_timestamps">সব বার্তা জন্য টাইমস্ট্যাম্প প্রদর্শন করুন</string>
+    <string name="settings_send_markdown_summary">প্রেরিত হওয়ার আগে মার্কডাউন সিনট্যাক্স ব্যবহার করে বার্তাগুলি ফরম্যাট করুন। এটি ইটালিক পাঠ্য প্রদর্শনের জন্য তারকাচিহ্নগুলি ব্যবহার করার মতো উন্নত ফর্ম্যাটিংয়ের জন্য অনুমতি দেয়।</string>
+    <string name="settings_send_markdown">মার্কডাউন বিন্যাস</string>
+    <string name="settings_send_typing_notifs_summary">অন্যান্য ব্যবহারকারীদের কে আপনি টাইপ করছেন সেটা জানান।</string>
+    <string name="settings_send_typing_notifs">টাইপিং বিজ্ঞপ্তি পাঠান</string>
+    <string name="settings_inline_url_preview_summary">বার্তাগুলি মধ্যে থাকা লিংকগুলি প্রিভিউ করে যখন আপনার হোম সার্ভার এই বৈশিষ্ট্য টি সাপোর্ট করে।</string>
+    <string name="settings_inline_url_preview">ইনলাইন URL পূর্বরূপ</string>
+    <string name="settings_devices_list">সেশানগুলি</string>
+    <string name="settings_pin_unread_messages">অপঠিত বার্তা সঙ্গে পিন কক্ষগুলি</string>
+    <string name="settings_pin_missed_notifications">মিস বিজ্ঞপ্তি সঙ্গে পিন রুমগুলি</string>
+    <string name="settings_home_display">হোম প্রদর্শন</string>
+    <string name="settings_contacts_phonebook_country">ফোনবুকের দেশ</string>
+    <string name="settings_contacts_app_permission">পরিচিতিগুলির অনুমতি</string>
+    <string name="settings_contact">স্থানীয় যোগাযোগগুলি</string>
+    <string name="settings_notifications_targets">বিজ্ঞপ্তি লক্ষ্যমাত্রা</string>
+    <string name="settings_cryptography_manage_keys">ক্র্রিপ্টোগ্রাফি কুঞ্জি ব্যবস্থাপনা</string>
+    <string name="settings_cryptography">ক্রিপ্টোগ্রাফি</string>
+    <string name="settings_integrations_summary">বট, সেতু, উইজেট এবং স্টিকার প্যাকগুলি পরিচালনা করতে ইন্টিগ্রেশন ম্যানেজার ব্যবহার করুন।
+\nইন্টিগ্রেশন ম্যানেজাররা কনফিগারেশন ডেটা গ্রহণ করে এবং উইজেটগুলি সংশোধন করতে, রুম আমন্ত্রন প্রেরণ করতে এবং আপনার পক্ষে পাওয়ার স্তর নির্ধারণ করতে পারে।</string>
+    <string name="settings_integrations">ঐক্যবদ্ধতা</string>
+    <string name="settings_advanced">উন্নত</string>
+    <string name="settings_other">অন্যান্য</string>
+    <string name="settings_ignored_users">উপেক্ষিত ব্যবহারকারীদের</string>
+    <string name="settings_notifications">বিজ্ঞপ্তিগুলি</string>
+    <string name="settings_user_settings">ব্যবহারকারী সেটিংস</string>
+    <string name="settings_clear_media_cache">মিডিয়া ক্যাশে পরিষ্কার করুন</string>
+    <string name="settings_clear_cache">ক্যাশে পরিষ্কার করুন</string>
+    <string name="settings_keep_media">মিডিয়া রাখুন</string>
+    <string name="settings_privacy_policy">গোপনীয়তা নীতি</string>
+    <string name="settings_copyright">কপিরাইট</string>
+    <string name="settings_third_party_notices">তৃতীয় পক্ষের নোটিশ</string>
+    <string name="settings_app_term_conditions">শর্তাবলী</string>
+    <string name="settings_olm_version">olm সংস্করণ</string>
+    <string name="settings_version">সংস্করণ</string>
+    <string name="settings_set_sync_delay">প্রতিটি সিঙ্কের মধ্যে বিলম্ব</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nসিঙ্কটি ডিভাইসের সংস্থান (ব্যাটারি) বা অবস্থার (ঘুম) উপর নির্ভর করে পিছিয়ে যেতে পারে।</string>
+    <string name="settings_set_workmanager_delay">পছন্দের সিঙ্ক ব্যবধান</string>
+    <string name="settings_set_sync_timeout">সিঙ্ক অনুরোধ সময়সীমার</string>
+    <string name="settings_enable_background_sync">ব্যাকগ্রাউন্ড সিঙ্ক সক্ষম করুন</string>
+    <string name="settings_start_on_boot">বুট করার সময় শুরু</string>
+    <string name="settings_background_sync_update_error">সেটিংস আপডেট করতে ব্যর্থ।</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">অ্যাপটি ব্যাকগ্রাউন্ডে থাকা অবস্থায় আপনাকে আগত বার্তাগুলি সম্পর্কে অবহিত করা হবে না।</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">কোনও পটভূমি সিঙ্ক না</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">রায়ট নির্দিষ্ট সময়ে সময়ে পটভূমিতে সিঙ্ক হবে (কনফিগারযোগ্য)।
+\nএটি রেডিও এবং ব্যাটারির ব্যবহারকে প্রভাবিত করবে, রায়ট ইভেন্টগুলি শুনছে বলে জানিয়ে একটি স্থায়ী বিজ্ঞপ্তি প্রদর্শিত হবে।</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">রিয়েল টাইম জন্য অনুকূলিত</string>
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">রায়ট এমনভাবে পটভূমিতে সিঙ্ক হবে যা ডিভাইসের সীমিত সংস্থান (ব্যাটারি) সংরক্ষণ করে।
+\nআপনার ডিভাইস রিসোর্স স্থিতির উপর নির্ভর করে সিঙ্কটি অপারেটিং সিস্টেম দ্বারা পিছিয়ে যেতে পারে।</string>
+    <string name="settings_background_fdroid_sync_mode_battery">ব্যাটারির জন্য অনুকূলিত</string>
+    <string name="skip">বাদ</string>
+    <string name="accept">স্বীকার</string>
+    <string name="offline">অফলাইন</string>
+    <string name="invite">আমন্ত্রণ</string>
+    <string name="or">বা</string>
+    <string name="send_anyway">যেকোন ভাবেই পাঠাও</string>
+    <string name="call_anyway">যেকোন ভাবেই কল করুন</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">কনফারেন্স কল এনক্রিপ্ট কক্ষগুলিতে সমর্থিত নয়</string>
+    <string name="device_information">সেশানের তথ্য</string>
+    <string name="missing_permissions_title_to_start_conf_call">কল শুরু করা গেলো না</string>
+    <string name="missing_permissions_to_start_conf_call">আপনি এই রুমে একটি সম্মেলন শুরু করার জন্য আমন্ত্রণ করার অনুমতি প্রয়োজন</string>
+    <string name="missing_permissions_error">অনুপস্থিত অনুমতিগুলির কারণে, এই পদক্ষেপটি সম্ভব নয়।</string>
+    <string name="missing_permissions_warning">অনুপস্থিত অনুমতিগুলির কারণে, কিছু বৈশিষ্ট্য অনুপস্থিত হতে পারে…</string>
+    <string name="cannot_start_call">কল শুরু করা যাচ্ছে না, পরে চেষ্টা করুন</string>
+    <string name="ongoing_conference_call_video">ভিডিও</string>
+    <string name="ongoing_conference_call_voice">ধ্বনি</string>
+    <string name="ongoing_conference_call">চলমান সম্মেলন কল।
+\n %1$s বা %2$s হিসাবলে জুড়ুন</string>
+    <string name="dismiss">বাতিল</string>
+    <string name="pause_video">থামাও</string>
+    <string name="play_video">চালু</string>
+    <string name="active_call">সক্রিয় কল</string>
+    <string name="report_content">কন্টেন্ট রিপোর্ট করুন</string>
+    <string name="disconnect">বিযুক্ত</string>
+    <string name="revoke">রদ কর</string>
+    <string name="none">কোনটা না</string>
+    <string name="rename">পুনঃনামকরণ</string>
+    <string name="delete">মুছুন</string>
+    <string name="view_decrypted_source">ডিক্রিপ্টেড সোর্স দেখুন</string>
+    <string name="view_source">সোর্স দেখুন</string>
+    <string name="permalink">পার্মালিঙ্ক</string>
+    <string name="forward">ফরওয়ার্ড</string>
+    <string name="later">পরে</string>
+    <string name="clear">পরিষ্কার</string>
+    <string name="speak">বলা</string>
+    <string name="share">ভাগ</string>
+    <string name="download">ডাউনলোড</string>
+    <string name="quote">উদ্ধৃতি</string>
+    <string name="redact">অপসারণ</string>
+    <string name="resend">আবার পাঠান</string>
+    <string name="send">পাঠান</string>
+    <string name="stay">থাক</string>
+    <string name="leave">ত্যাগ</string>
+    <string name="save">সংরক্ষিত</string>
+    <string name="cancel">বাতিল</string>
+    <string name="ok">ঠিক</string>
+    <string name="loading">লোড হচ্ছে…</string>
+    <string name="dialog_title_third_party_licences">তৃতীয় পক্ষের লাইসেন্সগুলি</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">আপনি সাইন আউট করার আগে আপনার কী ব্যাক আপ না হওয়া পর্যন্ত আপনার এনক্রিপ্ট হওয়া বার্তাগুলিতে অ্যাক্সেস হারাবেন।</string>
+    <string name="backup">ব্যাকআপ</string>
+    <string name="are_you_sure">আপনি কি নিশ্চিত\?</string>
+    <string name="keys_backup_activate">কী ব্যাকআপ ব্যবহার করুন</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">কী ব্যাকআপ করছে…</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">আমি আমার এনক্রিপ্টেড বার্তা চাই না</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">আপনার এনক্রিপ্ট করা বার্তাগুলির অ্যাক্সেস হারাতে এড়াতে আপনার সমস্ত সেশানগুলিতে নিরাপদ কী ব্যাকআপ সক্রিয় থাকা উচিত।</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">অগ্রগতি কী ব্যাকআপ। আপনি এখন সাইন আউট করলে আপনি আপনার এনক্রিপ্ট করা বার্তাগুলির অ্যাক্সেস হারাবেন।</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">আপনি এখন সাইন আউট করলে আপনার এনক্রিপ্ট হওয়া বার্তাগুলি হারিয়ে ফেলবেন</string>
+    <string name="keys_backup_is_not_finished_please_wait">কী ব্যাকআপ শেষ হয়নি, দয়া করে অপেক্ষা করুন …</string>
+    <string name="title_activity_verify_device">সেশন যাচাই করুন</string>
+    <string name="title_activity_keys_backup_restore">কী ব্যাকআপ ব্যবহার করুন</string>
+    <string name="title_activity_keys_backup_setup">কী ব্যাকআপ</string>
+    <string name="title_activity_choose_sticker">একটি স্টিকার পাঠান</string>
+    <string name="title_activity_group_details">সম্প্রদায়ের বিবরণ</string>
+    <string name="title_activity_bug_report">বাগ রিপোর্ট</string>
+    <string name="title_activity_historical">ঐতিহাসিক</string>
+    <string name="title_activity_member_details">সদস্যের বিবরণ</string>
+    <string name="title_activity_settings">সেটিংস</string>
+    <string name="title_activity_room">ঘর</string>
+    <string name="title_activity_home">বার্তাগুলি</string>
+    <string name="notification_silent_notifications">নীরব বিজ্ঞপ্তিগুলি</string>
+    <string name="notification_noisy_notifications">সশব্দ বিজ্ঞপ্তিগুলি</string>
+    <string name="notification_listening_for_events">ইভেন্টের জন্য শোনা হচ্ছে</string>
+    <string name="notification_sync_in_progress">সিংক্রোনাইজ হচ্ছে…</string>
+    <string name="notification_sync_init">সেবা আরম্ভ করা হচ্ছে</string>
+    <string name="black_theme">কালো থিম</string>
+    <string name="dark_theme">গাঢ় থিম</string>
+    <string name="light_theme">হালকা থিম</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (অজানা অ্যালগরিদম %1$s )।</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (অজানা অ্যালগরিদম %2$s)।</string>
+    <string name="notice_end_to_end_ok_by_you">আপনি শেষ থেকে শেষ এনক্রিপশন চালু করেছেন।</string>
+    <string name="notice_end_to_end_ok">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে।</string>
+    <string name="notice_room_guest_access_forbidden_by_you">আপনি অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছেন।</string>
+    <string name="notice_room_guest_access_forbidden">%1$s অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছে।</string>
+    <string name="notice_room_guest_access_can_join_by_you">আপনি অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছেন।</string>
+    <string name="notice_room_guest_access_can_join">%1$s অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছে।</string>
+    <string name="notice_room_canonical_alias_unset_by_you">আপনি এই ঘরের মূল ঠিকানা সরিয়েছেন।</string>
+    <string name="notice_room_canonical_alias_unset">%1$s এই ঘরের মূল ঠিকানা সরিয়ে নিয়েছে।</string>
+    <string name="notice_room_canonical_alias_set_by_you">আপনি এই ঘরের মূল ঠিকানাটি %1$s তে সেট করেছেন।</string>
+    <string name="notice_room_canonical_alias_set">%1$s এই ঘরের মূল ঠিকানাটি %2$s তে সেট করে।</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">আপনি %1$s যোগ করেছেন এবং %2$s কে এই ঘরের ঠিকানা হিসাবে সরিয়ে দিয়েছেন।</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s %2$s যোগ করেছে এবং %3$s গুলি এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="one">আপনি এই ঘরের ঠিকানা হিসাবে %1$s সরিয়েছেন।</item>
+        <item quantity="other">আপনি এই ঘরের ঠিকানা হিসাবে %1$s গুলি সরিয়েছেন।</item>
+    </plurals>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s সরানো হয়েছে।</item>
+        <item quantity="other">%1$s %3$s কে এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="one">আপনি এই কক্ষের জন্য ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
+        <item quantity="other">আপনি এই কক্ষের ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s যুক্ত করেছে।</item>
+        <item quantity="other">%1$s এই ঘরের ঠিকানাগুলি হিসাবে %2$s যুক্ত করেছে।</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s %2$s এর আমন্ত্রণ ফেরত নিয়েছে। কারণ: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s এর জন্য আমন্ত্রণ গ্রহণ করেছেন। কারণ: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">আপনি %1$s এর কক্ষে যোগদানের জন্য আমন্ত্রণটি বাতিল করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s %2$s এর কক্ষে যোগদানের আমন্ত্রণ বাতিল করে দিয়েছিল। কারণ: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">আপনি %1$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ প্রেরণ করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s রুমের সাথে যোগ দিতে %2$s কে একটি আমন্ত্রণ পাঠিয়েছেন। কারণ: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">আপনি %1$s কে নিষিদ্ধ করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s %2$s কে নিষিদ্ধ করেছে। কারণ: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">আপনি %1$s কে নিষিদ্ধ মুক্ত করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s %2$s কে নিষিদ্ধ তালিকা থেকে মুক্ত করেছে। কারণ: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">আপনি %1$s কে কীক করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s %2$s কে কিক করেছে। কারণ: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">আপনি আমন্ত্রণটি বাতিল করেছেন। কারণ: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s আমন্ত্রণ বাতিল করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">আপনি কক্ষ ছেড়ে দিয়েছেন। কারণ: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s রুম ছেড়ে দিয়েছে। কারণ: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">আপনি কক্ষে যোগ দিয়েছেন। কারণ: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s রুম এ যোগ দিয়েছে। কারণ: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s আপনাকে আমন্ত্রণ করেছে। কারণ: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">আপনি %1$s কে আমন্ত্রিত করেছেন। কারণ: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s আমন্ত্রিত করেছেন %2$s কে। কারণ: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">আপনার আমন্ত্রণ। কারণ: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s এর আমন্ত্রণ। কারণ: %2$s</string>
+    <string name="clear_timeline_send_queue">প্রেরণ সারি পরিষ্কার করুন</string>
+    <string name="event_status_sending_message">বার্তা প্রেরণ করা হচ্ছে …</string>
+    <string name="initial_sync_start_importing_account_data">প্রাথমিক সিঙ্ক:
+\nঅ্যাকাউন্ট ডেটা আমদানি করা হচ্ছে</string>
+    <string name="initial_sync_start_importing_account_groups">প্রাথমিক সিঙ্ক:
+\nসম্প্রদায়গুলি আমদানি করা হচ্ছে</string>
+    <string name="initial_sync_start_importing_account_left_rooms">প্রাথমিক সিঙ্ক:
+\nছেড়ে দেওয়া কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">প্রাথমিক সিঙ্ক:
+\nআমন্ত্রিত করা কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">প্রাথমিক সিঙ্ক:
+\nযোগ করা কক্ষগুলিতে আমদানি করা হিচ্ছে</string>
+    <string name="initial_sync_start_importing_account_rooms">প্রাথমিক সিঙ্ক:
+\nকক্ষগুলি আমদানি করা হচ্ছে</string>
+    <string name="initial_sync_start_importing_account_crypto">প্রাথমিক সিঙ্ক:
+\nক্রিপ্টো আমদানি হচ্ছে</string>
+    <string name="initial_sync_start_importing_account">প্রাথমিক সিঙ্ক:
+\nঅ্যাকাউন্ট আমদানি করা হচ্ছে…</string>
+    <string name="room_displayname_empty_room">খালি কক্ষ</string>
+    <plurals name="room_displayname_three_and_more_members">
+        <item quantity="one">%1$s এবং অন্য ১ জন</item>
+        <item quantity="other">%1$s এবং অন্যান্য %2$d জন</item>
+    </plurals>
+    <string name="room_displayname_two_members">%1$s এবং %2$s</string>
+    <string name="room_displayname_room_invite">কক্ষ আমন্ত্রণ</string>
+    <string name="room_displayname_invite_from">%s থেকে আমন্ত্রণ করুন</string>
+    <string name="medium_phone_number">ফোন নম্বর</string>
+    <string name="medium_email">ইমেল ঠিকানা</string>
+    <string name="room_error_join_failed_empty_room">খালি কক্ষে পুনরায় যোগদান করা বর্তমানে সম্ভব নয়।</string>
+    <string name="matrix_error">ম্যাট্রিক্স ত্রুটি</string>
+    <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
+    <string name="message_failed_to_upload">চিত্র আপলোড করতে ব্যর্থ</string>
+    <string name="unable_to_send_message">বার্তা পাঠাতে অক্ষম</string>
+    <string name="could_not_redact">পুনরায় প্রতিক্রিয়া করতে পারেনি</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">প্রেরকের ডিভাইস আমাদের এই বার্তার জন্য কীগুলি প্রেরণ করেনি।</string>
+    <string name="notice_crypto_unable_to_decrypt">** ডিক্রিপ্ট করতে অক্ষম: %s **</string>
+    <string name="notice_power_level_diff">%1$s %2$s থেকে %3$s পর্যন্ত</string>
+    <string name="notice_power_level_changed">%1$s %2$s এর পাওয়ার স্তর পরিবর্তন করেছে।</string>
+    <string name="notice_power_level_changed_by_you">আপনি %1$s এর পাওয়ার স্তর পরিবর্তন করেছেন।</string>
+    <string name="power_level_custom_no_value">কাস্টম</string>
+    <string name="power_level_custom">কাস্টম (%1$d)</string>
+    <string name="power_level_default">ডিফল্ট</string>
+    <string name="power_level_moderator">নিয়ামক</string>
+    <string name="power_level_admin">অ্যাডমিন</string>
+    <string name="notice_widget_modified_by_you">আপনি %1$s উইজেট পরিবর্তন করেছেন</string>
+    <string name="notice_widget_modified">%1$s %2$s উইজেট পরিবর্তন করেছেন</string>
+    <string name="notice_widget_removed_by_you">আপনি %1$s উইজেট সরিয়েছেন</string>
+    <string name="notice_widget_removed">%1$s %2$s উইজেট সরিয়ে দিয়েছেন</string>
+    <string name="notice_widget_added_by_you">আপনি %1$s উইজেট যুক্ত করেছেন</string>
+    <string name="notice_widget_added">%1$s %2$s উইজেট যুক্ত করেছে</string>
+    <string name="notice_room_third_party_registered_invite_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন</string>
+    <string name="notice_room_third_party_registered_invite">%1$s %2$s এর জন্য আমন্ত্রণটি গ্রহণ করেছে</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">আপনি %1$s এর কক্ষে যোগদানের জন্য আমন্ত্রণটি বাতিল করেছেন</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s %2$s এর কক্ষে যোগদানের আমন্ত্রণ বাতিল করে দিয়েছিল</string>
+    <string name="notice_room_third_party_invite_by_you">আপনি %1$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ প্রেরণ করেছেন</string>
+    <string name="notice_room_third_party_invite">%1$s %2$s কে ঘরে যোগদানের জন্য একটি আমন্ত্রণ পাঠিয়েছে</string>
+    <string name="notice_profile_change_redacted_by_you">আপনি আপনার প্রোফাইল %1$s আপডেট করেছেন</string>
+    <string name="notice_profile_change_redacted">%1$s তাদের প্রোফাইল %2$s আপডেট করেছে</string>
+    <string name="notice_event_redacted_by_with_reason">%1$s দ্বারা বার্তা সরানো হয়েছে [কারণ: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">বার্তা সরানো হয়েছে [কারণ:%1$s]</string>
+    <string name="notice_event_redacted_by">%1$s দ্বারা বার্তা সরানো হয়েছে</string>
+    <string name="notice_event_redacted">বার্তা সরানো হয়েছে</string>
+    <string name="notice_room_avatar_removed_by_you">আপনি কক্ষের অবতার সরিয়েছেন</string>
+    <string name="notice_room_avatar_removed">%1$s কক্ষের অবতার সরিয়ে নিয়েছে</string>
+    <string name="notice_room_topic_removed_by_you">আপনি কক্ষের বিষয়টিকে সরিয়ে দিয়েছেন</string>
+    <string name="notice_room_topic_removed">%1$s কক্ষের বিষয় মুছে ফেলেছে</string>
+    <string name="notice_room_name_removed_by_you">আপনি কক্ষের নাম সরিয়েছেন</string>
+    <string name="notice_room_name_removed">%1$s কক্ষের নাম সরিয়েছে</string>
+    <string name="notice_avatar_changed_too">(আবতারটিও পরিবর্তন করা হয়েছিল)</string>
+    <string name="notice_voip_finished">ভিওআইপি সম্মেলন শেষ হয়েছে</string>
+    <string name="notice_voip_started">ভিওআইপি সম্মেলন শুরু হয়েছে</string>
+    <string name="notice_requested_voip_conference_by_you">আপনি একটি ভিওআইপি সম্মেলনের অনুরোধ করেছেন</string>
+    <string name="notice_requested_voip_conference">%1$s একটি ভিওআইপি সম্মেলনের জন্য অনুরোধ করেছে</string>
+    <string name="notice_room_update_by_you">আপনি এই কক্ষটি আপগ্রেড করেছেন।</string>
+    <string name="notice_room_update">%s এই কক্ষটিকে আপগ্রেড করেছে।</string>
+    <string name="notice_end_to_end_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (%1$s)</string>
+    <string name="notice_end_to_end">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (%2$s)</string>
+    <string name="notice_room_visibility_unknown">অজানা (%s)।</string>
+    <string name="notice_room_visibility_world_readable">যে কেউ।</string>
+    <string name="notice_room_visibility_shared">সমস্ত কক্ষের সদস্য।</string>
+    <string name="notice_room_visibility_joined">কক্ষের সমস্ত সদস্য, যখন থেকে তারা যোগদান করেছিল।</string>
+    <string name="notice_room_visibility_invited">কক্ষের সমস্ত সদস্য, যখন থেকে তারা আমন্ত্রিত।</string>
+    <string name="notice_made_future_room_visibility_by_you">আপনি ভবিষ্যতের কক্ষ ইতিহাস %1$s এর কাছে দৃশ্যমান করেছেন</string>
+    <string name="notice_made_future_room_visibility">%1$s ভবিষ্যতের ঘরের ইতিহাস %2$s এর কাছে দৃশ্যমান করে তুলেছে</string>
+    <string name="notice_ended_call_by_you">আপনি কলটি শেষ করেছেন।</string>
+    <string name="notice_ended_call">%s কলটি শেষ করেছেন।</string>
+    <string name="notice_answered_call_by_you">আপনি কলটি উত্তর দিয়েছেন।</string>
+    <string name="notice_answered_call">%s কলটির উত্তর দিয়েছে।</string>
+    <string name="notice_call_candidates_by_you">আপনি কল সেটআপ করার জন্য ডেটা প্রেরণ করেছেন।</string>
+    <string name="notice_call_candidates">কল সেটআপ করার জন্য %s ডেটা প্রেরণ করেছে।</string>
+    <string name="notice_placed_voice_call_by_you">আপনি একটি ভয়েস কল দিয়েছেন।</string>
+    <string name="notice_placed_voice_call">%s একটি ভয়েস কল দিয়েছে।</string>
+    <string name="notice_placed_video_call_by_you">আপনি একটি ভিডিও কল করেছেন।</string>
+    <string name="notice_placed_video_call">%s একটি ভিডিও কল স্থাপন করেছিল।</string>
+    <string name="notice_room_name_changed_by_you">আপনি কক্ষের নাম এতে পরিবর্তন করেছেন:%1$s</string>
+    <string name="notice_room_name_changed">%1$s রুম এর নাম এতে পরিবর্তন করেছে: %2$s</string>
+    <string name="notice_room_avatar_changed_by_you">আপনি কক্ষের অবতারটি পরিবর্তন করেছেন</string>
+    <string name="notice_room_avatar_changed">%1$s কক্ষের অবতারটি পরিবর্তন করেছে</string>
+    <string name="notice_room_topic_changed_by_you">আপনি বিষয়টিকে এতে পরিবর্তন করেছেন: %1$s</string>
+    <string name="notice_room_topic_changed">%1$s বিষয় টি এতে পরিবর্তন করেছে: %2$s</string>
+    <string name="notice_display_name_removed_by_you">আপনি আপনার প্রদর্শনের নামটি সরিয়ে দিয়েছেন (যেটা ছিল %1$s)</string>
+    <string name="notice_display_name_removed">%1$s নিজের প্রদর্শন নাম মুছে দিয়েছে (%2$s)</string>
+    <string name="notice_display_name_changed_from_by_you">আপনি আপনার প্রদর্শনের নামটি %1$s থেকে %2$s এ পরিবর্তন করেছেন</string>
+    <string name="notice_display_name_changed_from">%1$s নিজের প্রদর্শন নাম %2$s থেকে %3$s তে পরিবর্তন করেছে</string>
+    <string name="notice_display_name_set_by_you">আপনি আপনার প্রদর্শনের নামটি %1$s তে সেট করেছেন</string>
+    <string name="notice_display_name_set">%1$s নিজের প্রদর্শন নাম %2$s রেখেছে</string>
+    <string name="notice_avatar_url_changed_by_you">আপনি আপনার অবতারটি পরিবর্তন করেছেন</string>
+    <string name="notice_avatar_url_changed">%1$s নিজের অবতার পরিবর্তন করেছে</string>
+    <plurals name="notification_unread_notified_messages_in_room_msgs">
+        <item quantity="one">১ টি অপঠিত বিজ্ঞপ্তি বার্তা</item>
+        <item quantity="other">%d টি অপঠিত বিজ্ঞপ্তি বার্তা</item>
+    </plurals>
+    <plurals name="notification_unread_notified_messages">
+        <item quantity="one">১ টি অপঠিত বিজ্ঞপ্তি বার্তা</item>
+        <item quantity="other">%d টি অপঠিত বিজ্ঞপ্তি বার্তা</item>
+    </plurals>
+    <string name="lock_screen_hint">এখানে টাইপ করুন…</string>
+    <string name="directory_server_native_rooms">সমস্ত নেটিভ %s রুমগুলি</string>
+    <string name="directory_server_all_rooms_on_server">%s সার্ভার থেকে সব রুমগুলি</string>
+    <string name="directory_server_placeholder">হোমসেরভের ইউআরএল</string>
+    <string name="directory_server_type_homeserver">পাবলিক রুমগুলি তালিকায় পেতে একটি হোমসেরভের টাইপ করুন</string>
+    <string name="directory_server_fail_to_retrieve_server">সার্ভার অনুপলব্ধ বা ওভারলোড হতে পারে</string>
+    <string name="select_room_directory">একটি রুম ডিরেক্টরি নির্বাচন করুন</string>
+    <string name="unknown_devices_alert_message">এই রুমে অজানা সেশান রয়েছে যা যাচাই করা হয়নি।
+\nএর অর্থ এই যে সেশানগুলি যে ব্যবহারকারীদের দাবি করে সেগুলির সাথে সেশানগুলির কোনও নিশ্চয়তা নেই।
+\nআমরা আপনাকে চালিয়ে যাওয়ার আগে প্রতিটি সেশানের জন্য যাচাইকরণ প্রক্রিয়ার মধ্য দিয়ে যেতে পরামর্শ দিই তবে আপনি যদি পছন্দ করেন তবে যাচাই না করে বার্তাটি পুনরায় পাঠাতে পারেন।
+\n
+\nঅজানা সেশানগুলি:</string>
+    <string name="unknown_devices_alert_title">রুমে অজানা সেশান রয়েছে</string>
+    <string name="encryption_information_verify_key_match">আমি যে কি মেলে মেলে যাচাই</string>
+    <string name="encryption_information_verify_device_warning2">এটি মিললে, নীচের যাচাই বাটন টিপুন। যদি এটি না হয় তবে অন্য কেউ এই সেশানটিকে আটক করছে এবং আপনাকে সম্ভবত এটি কালো তালিকাভুক্ত করা উচিত। ভবিষ্যতে এই যাচাই প্রক্রিয়া আরো পরিশীলিত হবে।</string>
+    <string name="encryption_information_verify_device_warning">এই সেশানটি বিশ্বাসযোগ্য হতে পারে তা যাচাই করতে, অন্য কোন উপায়ে (যেমন ব্যক্তি বা ফোন কল) ব্যবহার করে তার মালিকের সাথে যোগাযোগ করুন এবং এই সেশানটির জন্য তাদের ব্যবহারকারী সেটিংসে এ কুঞ্জি দেখছে তা তাদের জিজ্ঞাসা করুন নীচের কুঞ্জিটির সাথে মেলে কিনা:</string>
+    <string name="encryption_information_verify_device">সেশান যাচাই করুন</string>
+    <string name="encryption_information_unblock">কালোতালিকাযুক্ত না</string>
+    <string name="encryption_information_block">কালোতালিকা</string>
+    <string name="encryption_information_unverify">অযাচাই</string>
+    <string name="encryption_information_verify">যাচাই করুন</string>
+    <string name="encryption_information_none">কেউ না</string>
+    <string name="encryption_information_unknown_ip">অজ্ঞাত ip</string>
+    <string name="encryption_information_unknown_device">অজ্ঞাত সেশান</string>
+    <string name="encryption_information_blocked">কালোতালিকাভুক্ত</string>
+    <string name="encryption_information_verified">প্রতিপাদিত</string>
+    <string name="encryption_information_not_verified">যাচাই করা হয়নি</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">এই সেশান থেকে যাচাই করা সেশানগুলিতে এনক্রিপ্ট করা বার্তাগুলি কখনও প্রেরণ করবেন না।</string>
+    <string name="encryption_never_send_to_unverified_devices_title">শুধুমাত্র যাচাই সেশানে এনক্রিপ্ট করুন</string>
+    <string name="encryption_import_import">ইম্পোর্ট</string>
+    <string name="encryption_import_room_keys_summary">একটি স্থানীয় ফাইল থেকে কুঞ্জি ইম্পোর্ট করুন</string>
+    <string name="encryption_import_room_keys">রুমের কুঞ্জিগুলি ইমপোর্ট করুন</string>
+    <string name="encryption_import_e2e_room_keys">E2E রুমের কুনজিগুলি ইম্পোর্ট করুন</string>
+    <string name="encryption_settings_manage_message_recovery_summary">কুঞ্জি ব্যাকআপ পরিচালনা করুন</string>
+    <string name="encryption_message_recovery">এনক্রিপ্ট করা বার্তা পুনরুদ্ধার</string>
+    <string name="encryption_exported_successfully">কীগুলি সফলভাবে উত্পাদন হয়েছিল</string>
+    <string name="encryption_export_saved_as">E2E রুম কীগুলি \'%s\' তে সংরক্ষিত হয়েছে।
+\n
+\nসতর্কতা: অ্যাপ্লিকেশন আনইনস্টল হলে এই ফাইল মুছে যেতে পারে।</string>
+    <string name="encryption_export_notice">এক্সপোর্ট করা কুঞ্জিগুলি এনক্রিপ্ট করার জন্য একটি পাসফ্রেজ তৈরি করুন। কুঞ্জিগুলি ইম্পোর্ট করতে সক্ষম হবার জন্য আপনাকে একই পাসফ্রেজটি প্রবেশ করতে হবে।</string>
+    <string name="encryption_export_export">এক্সপোর্ট</string>
+    <string name="encryption_export_room_keys_summary">একটি স্থানীয় ফাইলে কুঞ্জি এক্সপোর্ট করুন</string>
+    <string name="encryption_export_room_keys">রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
+    <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
+    <string name="encryption_information_ed25519_fingerprint">Ed25519 ফিঙ্গারপ্রিন্ট</string>
+    <string name="encryption_information_verification">প্রতিপাদন</string>
+    <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>
+    <string name="encryption_information_device_id">আইডি</string>
+    <string name="encryption_information_name">সর্বজনীন নাম</string>
+    <string name="device_name_warning">একটি সেশানের সর্বজনীন নাম আপনি যাদের সাথে যোগাযোগ করেন তাদের কাছে দৃশ্যমান</string>
+    <string name="encryption_information_device_name_with_warning">সর্বজনীন নাম (যাদের সাথে আপনি যোগাযোগ করেন তাদের কাছে দৃশ্যমান)</string>
+    <string name="encryption_information_device_name">সর্বজনীন নাম</string>
+    <string name="encryption_information_sender_device_information">প্রেরক সেশান তথ্য</string>
+    <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
+    <string name="encryption_information_session_id">সেশন আইডি</string>
+    <string name="encryption_information_algorithm">অ্যালগরিদম</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">ED25519 ফিঙ্গারপ্রিন্ট কুঞ্জি স্বীকৃত</string>
+    <string name="encryption_information_curve25519_identity_key">Curve25519 পরিচয় কুঞ্জি</string>
+    <string name="encryption_information_user_id">ব্যবহারকারীর প্রমানপত্র</string>
+    <string name="encryption_information_device_info">ঘটনা তথ্য</string>
+    <string name="encryption_information_title">শেষ থেকে শেষ এনক্র্যাপশনের তথ্য</string>
+    <string name="failed_to_load_timeline_position">%s এই রুমের টাইমলাইনে একটি নির্দিষ্ট বিন্দু লোড করার চেষ্টা করছিল কিন্তু এটি খুঁজে পেতে অক্ষম।</string>
+    <string name="settings_theme">থিম</string>
+    <string name="directory_title">নির্দেশিকা</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">এনক্রিপশন সক্রিয় করুন
+\n(সতর্কতা: আবার নিষ্ক্রিয় করা যাবে না!)</string>
+    <string name="room_settings_addresses_e2e_disabled">এনক্রিপশন এই রুমে নিষ্ক্রিয় করা আছে।</string>
+    <string name="room_settings_addresses_e2e_enabled">এনক্রিপশন এই রুমে সক্রিয় করা আছে।</string>
+    <string name="room_settings_copy_room_address">রুমের ঠিকানা অনুলিপি করুন</string>
+    <string name="room_settings_copy_room_id">রুমের আইডি অনুলিপি করুন</string>
+    <string name="room_settings_unset_main_address">প্রধান ঠিকানা হিসাবে আনসেট করুন</string>
+    <string name="room_settings_set_main_address">প্রধান ঠিকানা হিসাবে সেট করুন</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_title">প্রধান ঠিকানা সতর্কতা</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">আপনার এই রুমের জন্য নির্দিষ্ট কোন প্রধান ঠিকানা থাকবে না।</string>
+    <string name="room_participants_action_unban">নিষেধাজ্ঞা মুক্ত</string>
+    <string name="room_participants_action_ban">নিষেধাজ্ঞা</string>
+    <string name="room_participants_action_remove">এই রুমে থেকে সরান</string>
+    <string name="room_participants_action_leave">এই রুম ছাড়ো</string>
+    <string name="room_participants_action_cancel_invite">আমন্ত্রণ বাতিল করুন</string>
+    <string name="room_participants_action_invite">আমন্ত্রণ</string>
+    <string name="room_participants_header_devices">সেশানগুলি</string>
+    <string name="room_participants_header_direct_chats">সরাসরি বার্তা</string>
+    <string name="room_participants_header_call">কল</string>
+    <string name="room_participants_header_admin_tools">অ্যাডমিন সরঞ্জাম</string>
+    <string name="room_participants_ago">%1$s %2$s পূর্বে</string>
+    <string name="room_participants_now">এখুন %1$s</string>
+    <string name="room_participants_idle">অলস</string>
+    <string name="room_participants_offline">অফলাইন</string>
+    <string name="room_participants_online">অনলাইন</string>
+    <string name="room_participants_create">সৃষ্টি</string>
+    <string name="room_participants_remove_prompt_msg">আপনি কি এই চ্যাট থেকে %s মুছে ফেলতে চান\?</string>
+    <string name="room_participants_leave_prompt_msg">আপনি কি রুম ছেড়ে যেতে চান\?</string>
+    <string name="room_participants_leave_prompt_title">রুম ছেড়ে দিন</string>
+    <plurals name="format_time_d">
+        <item quantity="one">১ দিন</item>
+        <item quantity="other">%d দিন</item>
+    </plurals>
+    <plurals name="format_time_h">
+        <item quantity="one">১ ঘন্টা</item>
+        <item quantity="other">%d ঘন্টা</item>
+    </plurals>
+    <plurals name="format_time_m">
+        <item quantity="one">১ মিনিট</item>
+        <item quantity="other">%d মিনিট</item>
+    </plurals>
+    <plurals name="format_time_s">
+        <item quantity="one">১ সেকেন্ড</item>
+        <item quantity="other">%d সেকেন্ড</item>
+    </plurals>
+    <string name="room_title_one_member">১ জন সদস্য</string>
+    <plurals name="room_title_members">
+        <item quantity="one">১ জন সদস্য</item>
+        <item quantity="other">"%d  জন সদস্য"</item>
+    </plurals>
+    <plurals name="room_header_active_members_count">
+        <item quantity="one">১ সক্রিয় সদস্য</item>
+        <item quantity="other">%d সক্রিয় সদস্য</item>
+    </plurals>
+    <string name="room_creation_add_member">সদস্য যোগ করুন</string>
+    <string name="room_creation_title">নতুন বার্তা</string>
+    <string name="invite_no_identity_server_error">এই ক্রিয়াটি সম্পাদন করতে আপনার সেটিংসে একটি পরিচয় সার্ভার যুক্ত করুন।</string>
+    <string name="room_preview_room_interactions_disabled">এটি এই রুমে একটি পূর্বরূপ। রুম মিথস্ক্রিয়া নিষ্ক্রিয় করা হয়েছে।</string>
+    <string name="room_preview_try_join_an_unknown_room_default">একটা রুম</string>
+    <string name="room_preview_try_join_an_unknown_room">আপনি %s অ্যাক্সেস করার চেষ্টা করছেন। আপনি কি আলোচনায় অংশ নিতে চান\?</string>
+    <string name="room_preview_unlinked_email_warning">এই আমন্ত্রণটি %s কে পাঠানো হয়েছিল, যা এই অ্যাকাউন্টের সাথে যুক্ত নয়।
+\nআপনি একটি পৃথক অ্যাকাউন্ট দিয়ে লগইন করতে চান, অথবা আপনার অ্যাকাউন্টে এই ইমেল যোগ করতে পারেন।</string>
+    <string name="room_preview_invitation_format">আপনি এই রুমে %s দ্বারা যোগ দিতে আমন্ত্রিত হয়েছেন</string>
+    <string name="room_jump_to_first_unread">প্রথম অপঠিত বার্তা তে ঝাঁপ দাও।</string>
+    <string name="room_sync_in_progress">সিঙ্ক করা হচ্ছে…</string>
+    <string name="open_chat_header">হেডার খোলো</string>
+    <string name="list_members">সদস্যদের তালিকা</string>
+    <string name="reject">প্রত্যাখ্যান</string>
+    <string name="preview">প্রিভিউ</string>
+    <string name="join">যোগদান</string>
+    <string name="remove">অপসারণ</string>
+    <string name="_continue">প্রলম্বিত</string>
+    <string name="no">না</string>
+    <string name="yes">হ্যাঁ</string>
+    <string name="media_slider_saved_message">ডাউনলোডে সংরক্ষণ করবেন\?</string>
+    <string name="media_slider_saved">সংরক্ষিত</string>
+    <string name="permissions_action_not_performed_missing_permissions">দুঃখিত। কর্ম সঞ্চালিত না, অনুপস্থিত অনুমতির জন্য</string>
+    <string name="template_permissions_msg_contacts_warning_other_androids">রায়ট অন্যান্য ম্যাট্রিক্স ব্যবহারকারীদের তাদের ইমেল এবং ফোন নম্বরগুলির উপর ভিত্তি করে আপনার ঠিকানা বইটি চেক করতে পারে।
+\n
+\nআপনি এই উদ্দেশ্যে আপনার ঠিকানা বই ভাগ করতে সম্মত হন\?</string>
+    <string name="template_permissions_rationale_msg_contacts">রায়ট অন্যান্য ম্যাট্রিক্স ব্যবহারকারীদের তাদের ইমেল এবং ফোন নম্বরগুলির উপর ভিত্তি করে আপনার ঠিকানা বইটি চেক করতে পারে। আপনি যদি এই উদ্দেশ্যে আপনার ঠিকানা বইটি ভাগ করে নিতে সম্মত হন তবে দয়া করে পরবর্তী পপ-আপটিতে অ্যাক্সেসের অনুমতি দিন।</string>
+    <string name="template_permissions_rationale_msg_camera_and_audio">ভিডিও কল সম্পাদনের জন্য ${app_name} আপনার ক্যামেরা এবং আপনার মাইক্রোফোন অ্যাক্সেস করার অনুমতির প্রয়োজন।
+\n
+\nকল করতে সক্ষম হতে পরবর্তী পপ আপ অ্যাক্সেস অনুমতি দিন।</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">"
+\n
+\nদেয়া করে অনুমতিদিন প্রবেশ করতে পরের pop-up এ যেটা কল করতে সক্ষম।"</string>
+    <string name="template_permissions_rationale_msg_record_audio">${app_name} এর প্রয়োজন অনুমতি নিয়ে প্রবেশ করতে আপনার মাইক্রোফোন আর মাধ্যমে শোনার কালএর সঞ্চালনা করতে।</string>
+    <string name="permissions_rationale_msg_camera_explanation">"
+\n
+\nদয়াকরে অনুমতি দিন প্রবেশ করাতে পরের পপ -আপ কে যেটা ডাকতে সক্ষম।"</string>
+    <string name="template_permissions_rationale_msg_camera">${app_name} এর প্রয়োজন অনুমতি নিয়ে প্রবেশে করতে আপনার ছবি তোলার যন্ত্র থেকে ছবি নিতে এবং দৃষ্টি রেকর্ড ডাকতে।</string>
+    <string name="template_permissions_rationale_msg_storage">${app_name} এর প্রয়াজন অনুমতি নিতে আপনার ছবি এবং দৃশ্য রেকর্ড কে গ্রন্থাগার থেকে পাঠিয়ে জমার জায়গায় সংযুক্ত করতে।
+\nদেয়া করে অনুমতি দিন প্রবেশ করতে পরের pop-up কে যেটা সক্ষম আপনার নথি কে আপনার ফোন থেকে পাঠাতে।</string>
+    <string name="permissions_rationale_popup_title">তথা</string>
+    <string name="media_picker_cannot_record_video">পারছেন না দৃশ্য নথি করতে</string>
+    <string name="media_picker_both_capture_title">নাও একটা ছবি অথবা একটা দৃশ্য রেকর্ড</string>
+    <string name="call_error_answered_elsewhere">ডাক আর উত্তর দেওয়া হয়েছে অনত্র</string>
+    <string name="call_error_camera_init_failed">ক্যামেরাটি আরাম্ভ করতে পারছেন না</string>
+    <string name="call_error_ice_failed">মাধ্যম সংযোগ ব্যর্থ হয়েছে</string>
+    <string name="call_error_user_not_responding">দূরবর্তী এর একটি ধার নিতে ব্যর্থ হচ্ছে।</string>
+    <string name="return_to_call">কল ফিরে যান</string>
+    <string name="active_call_with_duration">অ্যাক্টিভ কল (%s)</string>
+    <string name="video_call_in_progress">দৃশ্য-রেকর্ড ডাক এর অগ্রগতি…</string>
+    <string name="call_in_progress">ডাক এর অগ্রগতি…</string>
+    <string name="incoming_voice_call">প্রবেশ কথাবলার ডাক</string>
+    <string name="incoming_video_call">প্রবেশ দৃশ্য-রেকর্ড ডাক</string>
+    <string name="incoming_call">আসা ডাক</string>
+    <string name="call_ring">ডাকাহচ্ছে…</string>
+    <string name="call_ended">কল শেষ হলো</string>
+    <string name="call_connecting">কল সংযোগ হচ্ছে।…</string>
+    <string name="call_connected">কল সংযুক্ত হয়েছিলো</string>
+    <string name="call">ডাকা</string>
+    <string name="settings_call_ringtone_dialog_title">নির্বাচন করুন রিংটোন কল আর জন্য:</string>
+    <string name="settings_call_ringtone_title">আসা কল এর রিংটোন</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">আপনার হোমসার্ভার একটি প্রস্তাব না দিলে সহায়তা হিসাবে %s ব্যবহার করবে (আপনার আইপি ঠিকানা কল করার সময় ভাগ করা হবে)</string>
+    <string name="settings_call_ringtone_use_default_stun">ফ্যালব্যাক কল সহায়তা সার্ভারকে অনুমতি দিন</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">ব্যবহার করছেন অনুপস্থিত ${app_name} রিংটোন আগামী ডাক এর জন্য</string>
+    <string name="settings_call_category">ডাকা</string>
+    <string name="room_info_room_topic">ঘরএর বিষয়</string>
+    <string name="room_info_room_name">ঘরএর নাম</string>
+    <string name="today">আজ</string>
+    <string name="yesterday">গতকাল</string>
+    <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
+    <string name="attachment_remaining_time_seconds">%d s</string>
+    <string name="attachment_cancel_upload">বাতিল করুন আপলোড\?</string>
+    <string name="attachment_cancel_download">বাতিল করুন নামানো নথি\?</string>
+    <string name="compression_opt_list_small">ছোট</string>
+    <string name="compression_opt_list_medium">মাধ্যম</string>
+    <string name="compression_opt_list_large">বড়</string>
+    <string name="compression_opt_list_original">খাঁটি</string>
+    <string name="notice_room_withdraw_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন</string>
+    <string name="notice_room_withdraw">%1$s %2$s এর আমন্ত্রণ ফেরত নিয়েছে</string>
+    <string name="notice_room_ban_by_you">আপনি %1$s কে নিষিদ্ধ করেছেন</string>
+    <string name="notice_room_ban">%1$s %2$s কে নিষিদ্ধ করেছে</string>
+    <string name="notice_room_unban_by_you">আপনি %1$s কে নিষিদ্ধ মুক্ত করেছেন</string>
+    <string name="notice_room_unban">%1$s %2$s কে নিষিদ্ধ তালিকা থেকে মুক্ত করেছে</string>
+    <string name="notice_room_kick_by_you">আপনি %1$s কে কীক করেছেন</string>
+    <string name="notice_room_kick">%1$s %2$s কে কিক করেছে</string>
+    <string name="notice_room_reject_by_you">আপনি আমন্ত্রণটি বাতিল করেছেন</string>
+    <string name="notice_room_reject">%1$s আমন্ত্রণ টি বাতিল করেছে</string>
+    <string name="notice_room_leave_by_you">আপনি কক্ষ ছেড়ে দিয়েছেন</string>
+    <string name="notice_room_leave">%1$s রুম ছেড়ে দিয়েছে</string>
+    <string name="notice_room_join_by_you">আপনি কক্ষে যোগ দিয়েছেন</string>
+    <string name="notice_room_join">%1$s রুম এ যোগ দিয়েছে</string>
+    <string name="notice_room_invite_you">%1$s আপনাকে আমন্ত্রণ করেছে</string>
+    <string name="notice_room_invite_by_you">আপনি %1$s কে আমন্ত্রিত করেছেন</string>
+    <string name="notice_room_invite">%1$s %2$s কে আমন্ত্রণ করেছে</string>
+    <string name="notice_room_created_by_you">আপনি কক্ষটি তৈরি করেছেন</string>
+    <string name="notice_room_created">%1$s কক্ষটি তৈরি করেছেন</string>
+    <string name="notice_room_invite_no_invitee_by_you">আপনার আমন্ত্রণ</string>
+    <string name="notice_room_invite_no_invitee">%s এর আমন্ত্রণ</string>
+    <string name="summary_you_sent_sticker">আপনি একটি স্তিকার পাঠিয়েছেন।</string>
+    <string name="summary_user_sent_sticker">%1$s একটি স্তিকার পাঠিয়েছে।</string>
+    <string name="summary_message">%1$s: %2$s</string>
+</resources>
\ No newline at end of file

From 6c30e90dd9de4687f32b6aba5608b34d4478a899 Mon Sep 17 00:00:00 2001
From: Jeanne Lavoie <j.lavoie@net-c.ca>
Date: Sat, 10 Apr 2021 17:05:04 +0000
Subject: [PATCH 038/350] Translated using Weblate (Italian)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
---
 vector/src/main/res/values-it/strings.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index fcb805ef30..2438b5d2ce 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -599,8 +599,8 @@
     <string name="room_event_action_report_prompt_ignore_user">Desideri nascondere tutti i messaggi di questo utente\? 
 \n
 \nTieni presente che questa azione riavvierà l\'app e ciò potrebbe richiedere molto tempo.</string>
-    <string name="room_event_action_cancel_upload">Annulla l\'upload</string>
-    <string name="room_event_action_cancel_download">Annulla il download</string>
+    <string name="room_event_action_cancel_upload">Annulla il caricamento</string>
+    <string name="room_event_action_cancel_download">Annulla lo scaricamento</string>
     <!-- Search -->
     <string name="search_hint">Cerca</string>
     <string name="search_members_hint">Cerca tra i membri della stanza</string>
@@ -1084,20 +1084,20 @@
     <string name="room_tombstone_predecessor_link">Clicca qui per vedere i messaggi precedenti</string>
     <string name="missing_permissions_error">Non hai permessi sufficienti per effettuare questa azione.</string>
     <plurals name="format_time_s">
-        <item quantity="one">%ds</item>
-        <item quantity="other">%ds</item>
+        <item quantity="one">%d s</item>
+        <item quantity="other">%d s</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">%dm</item>
-        <item quantity="other">%dm</item>
+        <item quantity="one">%d min</item>
+        <item quantity="other">%d min</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="one">%dh</item>
-        <item quantity="other">%dh</item>
+        <item quantity="one">%d h</item>
+        <item quantity="other">%d h</item>
     </plurals>
     <plurals name="format_time_d">
-        <item quantity="one">%dd</item>
-        <item quantity="other">%dd</item>
+        <item quantity="one">%d g.</item>
+        <item quantity="other">%d g.</item>
     </plurals>
     <string name="room_participants_now">%1$s ora</string>
     <string name="room_participants_ago">%1$s %2$s fa</string>

From 984342a6ddc2f9a2d4c677c8c331c14bab2b105f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Sun, 11 Apr 2021 21:07:08 +0200
Subject: [PATCH 039/350] Upgrade com.likethesalad.android:string-reference to
 1.2.2

Compatible with gradle7, see https://github.com/LikeTheSalad/android-string-reference/issues/11
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d645382015..3268cfa084 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.3'
-        classpath "com.likethesalad.android:string-reference:1.2.1"
+        classpath "com.likethesalad.android:string-reference:1.2.2"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From 5ca71a10ec9d8aa0f2c1c2ae1a957c453937f5e8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Apr 2021 10:46:03 +0200
Subject: [PATCH 040/350] Changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index a73551cc33..79fc7eba95 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,7 @@ SDK API changes ⚠️:
  -
 
 Build 🧱:
- -
+ - Upgrade to gradle 7
 
 Test:
  -

From bb9258cc47b68ad429a6ab2e9d3aebdc5ee20666 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 07:21:36 +0000
Subject: [PATCH 041/350] Bump oss-licenses-plugin from 0.10.3 to 0.10.4

Bumps oss-licenses-plugin from 0.10.3 to 0.10.4.

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3268cfa084..537a78992d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.google.gms:google-services:4.3.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1'
-        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.3'
+        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.4'
         classpath "com.likethesalad.android:string-reference:1.2.2"
 
         // NOTE: Do not place your application dependencies here; they belong

From 05b35f53d416adb26350eb586cec5f1d54885f48 Mon Sep 17 00:00:00 2001
From: Thai Localization <thailocalization@protonmail.com>
Date: Sun, 11 Apr 2021 19:59:29 +0000
Subject: [PATCH 042/350] Translated using Weblate (Thai)

Currently translated at 12.2% (290 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/th/
---
 vector/src/main/res/values-th/strings.xml | 114 +++++++++++++++-------
 1 file changed, 80 insertions(+), 34 deletions(-)

diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml
index c677202fe5..a89dc740ac 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@@ -14,19 +14,19 @@
     <string name="title_activity_home">ข้อความ</string>
     <string name="title_activity_room">ห้อง</string>
     <string name="title_activity_settings">การตั้งค่า</string>
-    <string name="title_activity_member_details">ข้อมูลสมาชิก</string>
+    <string name="title_activity_member_details">รายละเอียดสมาชิก</string>
     <string name="ok">ตกลง</string>
     <string name="cancel">ยกเลิก</string>
     <string name="save">บันทึก</string>
     <string name="leave">ออก</string>
     <string name="send">ส่ง</string>
     <string name="download">ดาวน์โหลด</string>
-    <string name="share">แชร์</string>
+    <string name="share">แบ่งปัน</string>
     <string name="speak">พูด</string>
     <string name="delete">ลบ</string>
     <string name="rename">เปลี่ยนชื่อ</string>
     <string name="skip">ข้าม</string>
-    <string name="title_activity_choose_sticker">ส่งสติกเกอร์</string>
+    <string name="title_activity_choose_sticker">ส่งสติ๊กเกอร์</string>
     <string name="loading">กำลังโหลด…</string>
     <string name="forward">ส่งต่อ</string>
     <string name="none">ไม่มี</string>
@@ -40,13 +40,13 @@
     <string name="bottom_action_people">ผู้คน</string>
     <string name="bottom_action_rooms">ห้อง</string>
     <string name="bottom_action_groups">ชุมชน</string>
-    <string name="invitations_header">การเชิญ</string>
+    <string name="invitations_header">คำเชิญ</string>
     <string name="system_alerts_header">การแจ้งเตือนจากระบบ</string>
     <string name="template_no_contact_access_placeholder">คุณไม่ได้อนุญาตให้ ${app_name} เข้าถึงรายชื่อผู้ติดต่อในเครื่อง</string>
     <string name="no_result_placeholder">ไม่มีผลลัพธ์</string>
     <string name="no_room_placeholder">ไม่มีห้อง</string>
     <plurals name="public_room_nb_users">
-        <item quantity="other">ผู้ใช้ %d คน</item>
+        <item quantity="other">%d ผู้ใช้</item>
     </plurals>
     <string name="groups_invite_header">เชิญ</string>
     <string name="groups_header">ชุมชน</string>
@@ -54,11 +54,11 @@
     <string name="send_bug_report_description_in_english">ถ้าเป็นไปได้ โปรดเขียนคำอธิบายเป็นภาษาอังกฤษ</string>
     <string name="send_bug_report_placeholder">อธิบายปัญหาของคุณที่นี่</string>
     <string name="send_files_in">ส่งไปยัง</string>
-    <string name="join_room">เข้าห้อง</string>
+    <string name="join_room">เข้าร่วมห้อง</string>
     <string name="username">ชื่อผู้ใช้</string>
     <string name="create_account">สร้างบัญชี</string>
     <string name="login">เข้าสู่ระบบ</string>
-    <string name="logout">ออกจากระบบ</string>
+    <string name="logout">ลงชื่อออก</string>
     <string name="search">ค้นหา</string>
     <string name="start_new_chat">เริ่มแชทใหม่</string>
     <string name="call_failed_no_ice_use_alt">ลองโดยใช้ %s</string>
@@ -73,7 +73,7 @@
     <string name="call_camera_back">หลัง</string>
     <string name="call_format_turn_hd_off">ปิด HD</string>
     <string name="call_format_turn_hd_on">เปิด HD</string>
-    <string name="option_send_sticker">ส่งสติกเกอร์</string>
+    <string name="option_send_sticker">ส่งสติ๊กเกอร์</string>
     <string name="auth_login">เข้าสู่ระบบ</string>
     <string name="auth_register">สร้างบัญชี</string>
     <string name="auth_submit">ส่ง</string>
@@ -94,11 +94,11 @@
     <string name="room_info_room_name">ชื่อห้อง</string>
     <string name="today">วันนี้</string>
     <string name="yesterday">เมื่อวาน</string>
-    <string name="attachment_remaining_time_minutes">%1$d นาที %2$d วิ</string>
-    <string name="attachment_remaining_time_seconds">%d วิ</string>
-    <string name="compression_opt_list_small">ขนาดเล็ก</string>
-    <string name="compression_opt_list_medium">ขนาดกลาง</string>
-    <string name="compression_opt_list_large">ขนาดใหญ่</string>
+    <string name="attachment_remaining_time_minutes">%1$d นาที %2$d วินาที</string>
+    <string name="attachment_remaining_time_seconds">%d วินาที</string>
+    <string name="compression_opt_list_small">เล็ก</string>
+    <string name="compression_opt_list_medium">กลาง</string>
+    <string name="compression_opt_list_large">ใหญ่</string>
     <string name="compression_opt_list_original">ต้นฉบับ</string>
     <string name="compression_options">ส่งเป็น</string>
     <string name="groups_list">รายการกลุ่ม</string>
@@ -136,14 +136,14 @@
     <string name="action_quick_reply">ตอบกลับด่วน</string>
     <string name="action_video_call">การโทรวิดีโอ</string>
     <string name="action_voice_call">การโทรเสียง</string>
-    <string name="action_sign_out">ออกจากระบบ</string>
+    <string name="action_sign_out">ลงชื่อออก</string>
     <string name="action_exit">ออก</string>
     <string name="call_notification_hangup">วางสาย</string>
     <string name="call_notification_reject">ปฏิเสธ</string>
     <string name="call_notification_answer">ยอมรับ</string>
     <string name="decline">ปฏิเสธ</string>
     <string name="ignore">เพิกเฉย</string>
-    <string name="done">เรียบร้อย</string>
+    <string name="done">เสร็จสิ้น</string>
     <string name="accept">ยอมรับ</string>
     <string name="offline">ออฟไลน์</string>
     <string name="invite">เชิญ</string>
@@ -151,22 +151,22 @@
     <string name="missing_permissions_title_to_start_conf_call">ไม่สามารถเริ่มการโทร</string>
     <string name="audio_meeting">เริ่มการประชุมเสียง</string>
     <string name="video_meeting">เริ่มการประชุมวิดีโอ</string>
-    <string name="start_chatting">เริ่มสนทนา</string>
+    <string name="start_chatting">เริ่มแชท</string>
     <string name="reset">รีเซ็ต</string>
     <string name="dismiss">ปิดทิ้ง</string>
     <string name="disconnect">เลิกเชื่อมต่อ</string>
     <string name="view_decrypted_source">ดูต้นฉบับที่ถอดรหัสแล้ว</string>
     <string name="view_source">ดูต้นฉบับ</string>
-    <string name="later">ไว้ภายหลัง</string>
-    <string name="redact">ลบออก</string>
-    <string name="resend">ส่งซ้ำ</string>
+    <string name="later">ภายหลัง</string>
+    <string name="redact">เอาออก</string>
+    <string name="resend">ส่งใหม่</string>
     <string name="stay">อยู่</string>
     <string name="backup">สำรองข้อมูล</string>
     <string name="are_you_sure">คุณแน่ใจหรือไม่\?</string>
-    <string name="title_activity_group_details">ข้อมูลชุมชน</string>
+    <string name="title_activity_group_details">รายละเอียดชุมชน</string>
     <string name="system_theme">ค่าเริ่มต้นของระบบ</string>
     <string name="settings_add_email_address">เพิ่มที่อยู่อีเมล</string>
-    <string name="settings_phone_number">หมายเลขโทรศัพท์</string>
+    <string name="settings_phone_number">โทรศัพท์</string>
     <plurals name="directory_search_rooms_for">
         <item quantity="other">พบ %1$s ห้องสำหรับ %2$s</item>
     </plurals>
@@ -189,10 +189,10 @@
     <string name="room_details_settings">การตั้งค่า</string>
     <string name="room_details_files">ไฟล์</string>
     <string name="room_details_people">ผู้คน</string>
-    <string name="room_details_title">ข้อมูลห้อง</string>
+    <string name="room_details_title">รายละเอียดห้อง</string>
     <string name="room_permissions_change_topic">เปลี่ยนหัวข้อ</string>
     <string name="room_permissions_upgrade_the_room">อัปเกรดห้อง</string>
-    <string name="room_permissions_enable_room_encryption">เปิดใช้การเข้ารหัสห้อง</string>
+    <string name="room_permissions_enable_room_encryption">เปิดใช้งานการเข้ารหัสห้อง</string>
     <string name="room_permissions_change_settings">เปลี่ยนการตั้งค่า</string>
     <string name="room_permissions_invite_users">เชิญผู้ใช้</string>
     <string name="room_permissions_send_messages">ส่งข้อความ</string>
@@ -204,7 +204,7 @@
     </plurals>
     <string name="room_message_placeholder_not_encrypted">ส่งข้อความ (ไม่เข้ารหัส)…</string>
     <string name="room_message_placeholder_encrypted">ส่งข้อความที่เข้ารหัส…</string>
-    <string name="room_many_users_are_typing">%1$s และ %2$s และคนอื่น ๆ กำลังพิมพ์…</string>
+    <string name="room_many_users_are_typing">%1$s และ %2$s และอื่น ๆ กำลังพิมพ์…</string>
     <string name="room_two_users_are_typing">%1$s และ %2$s กำลังพิมพ์…</string>
     <string name="room_one_user_is_typing">%s กำลังพิมพ์…</string>
     <string name="room_menu_search">ค้นหา</string>
@@ -212,8 +212,8 @@
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
     <string name="reason_hint">เหตุผล</string>
     <string name="room_participants_action_kick">เตะ</string>
-    <string name="room_participants_action_unban">เลิกแบน</string>
-    <string name="room_participants_action_ban">แบน</string>
+    <string name="room_participants_action_unban">เลิกห้าม</string>
+    <string name="room_participants_action_ban">ห้าม</string>
     <string name="room_participants_action_leave">ออกจากห้องนี้</string>
     <string name="room_participants_action_invite">เชิญ</string>
     <string name="room_participants_header_direct_chats">ข้อความโดยตรง</string>
@@ -225,16 +225,16 @@
     <string name="room_participants_offline">ออฟไลน์</string>
     <string name="room_participants_online">ออนไลน์</string>
     <string name="room_participants_create">สร้าง</string>
-    <string name="room_participants_leave_prompt_msg">คุณแน่ใจหรือไม่ว่าต้องการออกจากห้อง</string>
+    <string name="room_participants_leave_prompt_msg">คุณแน่ใจหรือไม่ว่าต้องการออกจากห้อง\?</string>
     <string name="room_participants_leave_prompt_title">ออกจากห้อง</string>
     <plurals name="format_time_s">
-        <item quantity="other">%d วิ</item>
+        <item quantity="other">%d วินาที</item>
     </plurals>
     <plurals name="format_time_m">
         <item quantity="other">%d นาที</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="other">%d ชม.</item>
+        <item quantity="other">%d ชั่วโมง</item>
     </plurals>
     <plurals name="format_time_d">
         <item quantity="other">%d วัน</item>
@@ -245,7 +245,7 @@
     <string name="room_jump_to_first_unread">ไปที่ข้อความแรกที่ยังไม่ได้อ่าน</string>
     <string name="list_members">แสดงรายชื่อสมาชิก</string>
     <string name="reject">ปฏิเสธ</string>
-    <string name="preview">ตัวอย่าง</string>
+    <string name="preview">แสดงตัวอย่าง</string>
     <string name="join">เข้าร่วม</string>
     <string name="_continue">ดำเนินการต่อ</string>
     <string name="no">ไม่</string>
@@ -254,14 +254,60 @@
     <string name="settings_call_show_confirmation_dialog_summary">ต้องยืนยันว่าต้องการโทรจริง ๆ ก่อนที่จะเริ่มการโทร</string>
     <string name="settings_call_show_confirmation_dialog_title">ป้องกันการโทรโดยไม่ได้ตั้งใจ</string>
     <string name="room_info_room_topic">หัวข้อห้อง</string>
-    <string name="attachment_cancel_upload">ยกเลิกการอัปโหลดหรือไม่\?</string>
-    <string name="attachment_cancel_download">ยกเลิกการดาวน์โหลดหรือไม่\?</string>
+    <string name="attachment_cancel_upload">ยกเลิกการอัปโหลด\?</string>
+    <string name="attachment_cancel_download">ยกเลิกการดาวน์โหลด\?</string>
     <string name="e2e_re_request_encryption_key_dialog_title">ส่งคำขอแล้ว</string>
-    <string name="login_error_invalid_home_server">โปรดระบุ URL ที่ถูกต้อง</string>
+    <string name="login_error_invalid_home_server">โปรดป้อน URL ที่ถูกต้อง</string>
     <string name="login_error_must_start_http">URL ต้องขึ้นต้นด้วย http[s]://</string>
     <string name="option_send_voice">ส่งข้อความเสียง</string>
     <string name="matrix_only_filter">เฉพาะรายชื่อผู้ติดต่อ Matrix</string>
     <string name="no_public_room_placeholder">ไม่มีห้องสาธารณะ</string>
     <string name="abort">ยกเลิก</string>
-    <string name="action_mark_all_as_read">ระบุทั้งหมดว่าอ่านแล้ว</string>
+    <string name="action_mark_all_as_read">ทำเครื่องหมายทั้งหมดว่าอ่านแล้ว</string>
+    <string name="summary_user_sent_sticker">%1$s ได้ส่งสติ๊กเกอร์</string>
+    <string name="summary_you_sent_sticker">คุณได้ส่งสติ๊กเกอร์</string>
+    <string name="notice_room_invite_no_invitee">คำเชิญของ %s</string>
+    <string name="notice_room_invite_no_invitee_by_you">คำเชิญของคุณ</string>
+    <string name="notice_room_created">%1$s ได้สร้างห้อง</string>
+    <string name="notice_direct_room_created">%1$s ได้สร้างการสนทนา</string>
+    <string name="notice_direct_room_created_by_you">คุณได้สร้างการสนทนา</string>
+    <string name="notice_room_invite">%1$s ได้เชิญ %2$s</string>
+    <string name="notice_room_invite_by_you">คุณได้เชิญ %1$s</string>
+    <string name="notice_room_join">%1$s ได้เข้าร่วมห้อง</string>
+    <string name="notice_room_join_by_you">คุณได้เข้าร่วมห้อง</string>
+    <string name="notice_direct_room_join">%1$s ได้เข้าร่วม</string>
+    <string name="notice_room_leave_by_you">คุณได้ออกจากห้อง</string>
+    <string name="notice_room_created_by_you">คุณได้สร้างห้อง</string>
+    <string name="notice_room_invite_you">%1$s ได้เชิญคุณ</string>
+    <string name="notice_direct_room_join_by_you">คุณได้เข้าร่วม</string>
+    <string name="notice_room_leave">%1$s ได้ออกจากห้อง</string>
+    <string name="soft_logout_signin_submit">ลงชื่อเข้า</string>
+    <string name="soft_logout_signin_title">ลงชื่อเข้า</string>
+    <string name="login_msisdn_confirm_submit">ถัดไป</string>
+    <string name="login_reset_password_submit">ถัดไป</string>
+    <string name="login_signin">ลงชื่อเข้า</string>
+    <string name="login_signup">ลงทะเบียน</string>
+    <string name="directory_searching_title">กำลังค้นหาไดเรกทอรี…</string>
+    <string name="directory_search_results_title">เรียกดูไดเรกทอรี</string>
+    <string name="room_recents_join_room_title">เข้าร่วมห้อง</string>
+    <string name="room_recents_join_room">เข้าร่วมห้อง</string>
+    <string name="room_recents_create_room">สร้างห้อง</string>
+    <string name="room_recents_start_chat">เริ่มแชท</string>
+    <string name="room_recents_conversations">ห้อง</string>
+    <string name="room_recents_directory">ไดเรกทอรี</string>
+    <string name="room_details_people_present_group_name">เข้าร่วมแล้ว</string>
+    <string name="people_search_user_directory">ไดเรกทอรีผู้ใช้ (%s)</string>
+    <string name="room_participants_action_set_admin">ทำให้เป็นผู้ดูแล</string>
+    <string name="room_participants_action_set_moderator">ทำให้เป็นผู้ควบคุม</string>
+    <string name="room_participants_action_remove">เอาออกจากห้องนี้</string>
+    <string name="room_title_one_member">1 สมาชิก</string>
+    <plurals name="room_title_members">
+        <item quantity="other">%d สมาชิก</item>
+    </plurals>
+    <string name="option_send_files">ส่งไฟล์</string>
+    <string name="user_directory_header">ไดเรกทอรีผู้ใช้</string>
+    <string name="clear">ล้าง</string>
+    <string name="room_sync_in_progress">กำลังซิงค์…</string>
+    <string name="remove">เอาออก</string>
+    <string name="room_recents_favourites">รายการโปรด</string>
 </resources>
\ No newline at end of file

From f23eb425a13e9a0d78504d74e4e373cd562722d5 Mon Sep 17 00:00:00 2001
From: Salamandar <felix@piedallu.me>
Date: Mon, 12 Apr 2021 08:51:14 +0000
Subject: [PATCH 043/350] Translated using Weblate (French)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
---
 fastlane/metadata/android/fr/full_description.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fastlane/metadata/android/fr/full_description.txt b/fastlane/metadata/android/fr/full_description.txt
index 7604384dd1..066b94868b 100644
--- a/fastlane/metadata/android/fr/full_description.txt
+++ b/fastlane/metadata/android/fr/full_description.txt
@@ -17,6 +17,8 @@ Element vous donne le contrôle en vous laissant choisir qui héberge vos conver
 2. Héberger vous-même votre compte en installant un serveur sur votre propre machine
 3. Créer un compte sur un serveur personnalisé en souscrivant sur la plateforme d'hébergement « Element Matrix Services » (EMS)
 
+<b>Pourquoi choisir Element ?</b>
+
 <b>VOS DONNÉES VOUS APPARTIENNENT</b> : vous décidez où stocker vos données et messages. Ils vous appartiennent et vous les maîtrisez. Aucune multinationale ne viendra extraire vos données pour les envoyer au plus offrant.
 
 <b>MESSAGERIE ET COLLABORATION OUVERTES</b> : vous pouvez discuter avec tout le réseau Matrix, qu’ils utilisent Element ou une autre application Matrix, même s’ils utilisent une autre plateforme de messagerie telle que Slack, IRC ou XMPP.

From ce7e00a499c7adf0aaf8d5fec559ad7a3a6e82fa Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 13 Apr 2021 11:48:12 +0300
Subject: [PATCH 044/350] Fix send state image color on dark theme.

---
 CHANGES.md                                              | 2 +-
 vector/src/main/res/layout/item_timeline_event_base.xml | 2 ++
 vector/src/main/res/values/colors.xml                   | 6 ++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3012560ed6..9c50c2a2ee 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  -
 
 Bugfix 🐛:
- -
+ - Message states cosmetic changes (#3007)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index f9562f65b0..0515ace033 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -145,6 +145,7 @@
         android:layout_marginBottom="4dp"
         android:contentDescription="@string/event_status_a11y_sending"
         android:src="@drawable/ic_sending_message"
+        android:tint="?riotx_text_tertiary"
         android:visibility="gone"
         tools:visibility="visible" />
 
@@ -158,6 +159,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="4dp"
+        android:tint="?riotx_text_tertiary"
         android:visibility="gone"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index 7561e6f843..f4a026bea3 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -198,10 +198,8 @@
 
     <attr name="riotx_text_tertiary" format="color" />
     <color name="riotx_text_tertiary_light">#FF8D99A5</color>
-    <!-- TODO Pick color from Figma, I do not know where to find it -->
-    <color name="riotx_text_tertiary_dark">#FF8D99A5</color>
-    <!-- TODO Pick color from Figma, I do not know where to find it -->
-    <color name="riotx_text_tertiary_black">#FF8D99A5</color>
+    <color name="riotx_text_tertiary_dark">#FF8E99A4</color>
+    <color name="riotx_text_tertiary_black">#FF8E99A4</color>
 
     <attr name="riotx_text_primary_body_contrast" format="color" />
     <color name="riotx_text_primary_body_contrast_light">#FF61708B</color>

From 2116ff91cc9eeb8d45870f574e49f4b18c3ac6b2 Mon Sep 17 00:00:00 2001
From: Moo <hazap@hotmail.com>
Date: Tue, 13 Apr 2021 19:52:50 +0000
Subject: [PATCH 045/350] Added translation using Weblate (Lithuanian)

---
 fastlane/metadata/android/nb/changelogs/40100170.txt | 2 ++
 fastlane/metadata/android/nb/changelogs/40101010.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/nb/changelogs/40100170.txt
 create mode 100644 fastlane/metadata/android/nb/changelogs/40101010.txt

diff --git a/fastlane/metadata/android/nb/changelogs/40100170.txt b/fastlane/metadata/android/nb/changelogs/40100170.txt
new file mode 100644
index 0000000000..3593e50e05
--- /dev/null
+++ b/fastlane/metadata/android/nb/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: Bugfikser!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/nb/changelogs/40101010.txt b/fastlane/metadata/android/nb/changelogs/40101010.txt
new file mode 100644
index 0000000000..2d80855ed8
--- /dev/null
+++ b/fastlane/metadata/android/nb/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: Forbedringer i ytelse og bugfikser!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.1

From afe617357db373bc84e2a5935113c6060751e273 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 07:08:48 +0000
Subject: [PATCH 046/350] Bump zxcvbn from 1.4.0 to 1.4.1

Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.4.0...1.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 760a5d0743..a47ab84f7a 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -388,7 +388,7 @@ dependencies {
     implementation 'androidx.browser:browser:1.3.0'
 
     // Passphrase strength helper
-    implementation 'com.nulab-inc:zxcvbn:1.4.0'
+    implementation 'com.nulab-inc:zxcvbn:1.4.1'
 
     //Alerter
     implementation 'com.tapadoo.android:alerter:7.0.1'

From 39f304a57b4bd5d09f990a4d3df66afaf09e4272 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 07:09:03 +0000
Subject: [PATCH 047/350] Bump big_image_viewer_version from 1.7.1 to 1.8.0

Bumps `big_image_viewer_version` from 1.7.1 to 1.8.0.

Updates `BigImageViewer` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `GlideImageLoader` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `ProgressPieIndicator` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `GlideImageViewFactory` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 760a5d0743..aec8f4be0b 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -294,7 +294,7 @@ dependencies {
     def fragment_version = '1.3.2'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'
-    def big_image_viewer_version = '1.7.1'
+    def big_image_viewer_version = '1.8.0'
     def glide_version = '4.12.0'
     def moshi_version = '1.12.0'
     def daggerVersion = '2.34'

From 30b415e77ecdb1a4c381c5c6936e647107112b00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Apr 2021 07:09:19 +0000
Subject: [PATCH 048/350] Bump daggerVersion from 2.34 to 2.34.1

Bumps `daggerVersion` from 2.34 to 2.34.1.

Updates `dagger` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Updates `dagger-compiler` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 669444d563..42519bf95a 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -112,7 +112,7 @@ dependencies {
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
-    def daggerVersion = '2.34'
+    def daggerVersion = '2.34.1'
     def work_version = '2.5.0'
     def retrofit_version = '2.9.0'
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 760a5d0743..0595c0c510 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -297,7 +297,7 @@ dependencies {
     def big_image_viewer_version = '1.7.1'
     def glide_version = '4.12.0'
     def moshi_version = '1.12.0'
-    def daggerVersion = '2.34'
+    def daggerVersion = '2.34.1'
     def autofill_version = "1.1.0"
     def work_version = '2.5.0'
     def arch_version = '2.1.0'

From e467e2ca08a973fa6a649e52a7cad180797a276e Mon Sep 17 00:00:00 2001
From: yostyle <yoanp@element.io>
Date: Wed, 14 Apr 2021 11:35:21 +0200
Subject: [PATCH 049/350] Expose directUserId in RoomSummary

---
 .../org/matrix/android/sdk/api/session/room/model/RoomSummary.kt | 1 +
 .../android/sdk/internal/database/mapper/RoomSummaryMapper.kt    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index 9455a83aff..8a2aecd76d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -36,6 +36,7 @@ data class RoomSummary constructor(
         val canonicalAlias: String? = null,
         val aliases: List<String> = emptyList(),
         val isDirect: Boolean = false,
+        val directUserId: String? = null,
         val joinedMembersCount: Int? = 0,
         val invitedMembersCount: Int? = 0,
         val latestPreviewableEvent: TimelineEvent? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 6dc70b60fc..d6b46ae436 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -43,6 +43,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                 topic = roomSummaryEntity.topic ?: "",
                 avatarUrl = roomSummaryEntity.avatarUrl ?: "",
                 isDirect = roomSummaryEntity.isDirect,
+                directUserId = roomSummaryEntity.directUserId ?: "",
                 latestPreviewableEvent = latestEvent,
                 joinedMembersCount = roomSummaryEntity.joinedMembersCount,
                 invitedMembersCount = roomSummaryEntity.invitedMembersCount,

From 699b1429b73cb217bf9cafd32bb65349f33aed11 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 14 Apr 2021 12:42:47 +0200
Subject: [PATCH 050/350] Simplify `LoginFlowResult` model

---
 .../sdk/api/auth/data/LoginFlowResult.kt      | 16 +++---
 .../auth/DefaultAuthenticationService.kt      | 28 +++++-----
 .../app/features/login/LoginViewModel.kt      | 52 +++++++++----------
 .../signout/soft/SoftLogoutViewModel.kt       | 28 +++++-----
 4 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
index f1f9ba3916..7d1407c0d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
@@ -16,12 +16,10 @@
 
 package org.matrix.android.sdk.api.auth.data
 
-sealed class LoginFlowResult {
-    data class Success(
-            val supportedLoginTypes: List<String>,
-            val ssoIdentityProviders: List<SsoIdentityProvider>?,
-            val isLoginAndRegistrationSupported: Boolean,
-            val homeServerUrl: String,
-            val isOutdatedHomeserver: Boolean
-    ) : LoginFlowResult()
-}
+data class LoginFlowResult(
+        val supportedLoginTypes: List<String>,
+        val ssoIdentityProviders: List<SsoIdentityProvider>?,
+        val isLoginAndRegistrationSupported: Boolean,
+        val homeServerUrl: String,
+        val isOutdatedHomeserver: Boolean
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index e26286ad2f..46256f4b81 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -144,16 +144,14 @@ internal class DefaultAuthenticationService @Inject constructor(
         }
         return result.fold(
                 {
-                    if (it is LoginFlowResult.Success) {
-                        // The homeserver exists and up to date, keep the config
-                        // Homeserver url may have been changed, if it was a Riot url
-                        val alteredHomeServerConnectionConfig = homeServerConnectionConfig.copy(
-                                homeServerUri = Uri.parse(it.homeServerUrl)
-                        )
+                    // The homeserver exists and up to date, keep the config
+                    // Homeserver url may have been changed, if it was a Riot url
+                    val alteredHomeServerConnectionConfig = homeServerConnectionConfig.copy(
+                            homeServerUri = Uri.parse(it.homeServerUrl)
+                    )
 
-                        pendingSessionData = PendingSessionData(alteredHomeServerConnectionConfig)
-                                .also { data -> pendingSessionStore.savePendingSessionData(data) }
-                    }
+                    pendingSessionData = PendingSessionData(alteredHomeServerConnectionConfig)
+                            .also { data -> pendingSessionStore.savePendingSessionData(data) }
                     it
                 },
                 {
@@ -307,12 +305,12 @@ internal class DefaultAuthenticationService @Inject constructor(
         val loginFlowResponse = executeRequest(null) {
             authAPI.getLoginFlows()
         }
-        return LoginFlowResult.Success(
-                loginFlowResponse.flows.orEmpty().mapNotNull { it.type },
-                loginFlowResponse.flows.orEmpty().firstOrNull { it.type == LoginFlowTypes.SSO }?.ssoIdentityProvider,
-                versions.isLoginAndRegistrationSupportedBySdk(),
-                homeServerUrl,
-                !versions.isSupportedBySdk()
+        return LoginFlowResult(
+                supportedLoginTypes = loginFlowResponse.flows.orEmpty().mapNotNull { it.type },
+                ssoIdentityProviders = loginFlowResponse.flows.orEmpty().firstOrNull { it.type == LoginFlowTypes.SSO }?.ssoIdentityProvider,
+                isLoginAndRegistrationSupported = versions.isLoginAndRegistrationSupportedBySdk(),
+                homeServerUrl = homeServerUrl,
+                isOutdatedHomeserver = !versions.isSupportedBySdk()
         )
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index 792c74e019..dd1b024b31 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -773,34 +773,34 @@ class LoginViewModel @AssistedInject constructor(
                 null
             }
 
-            if (data is LoginFlowResult.Success) {
-                // Valid Homeserver, add it to the history.
-                // Note: we add what the user has input, data.homeServerUrl can be different
-                rememberHomeServer(homeServerConnectionConfig.homeServerUri.toString())
+            data ?: return@launch
 
-                val loginMode = when {
-                    // SSO login is taken first
-                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)
-                            && data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
-                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)                 -> LoginMode.Sso(data.ssoIdentityProviders)
-                    data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)            -> LoginMode.Password
-                    else                                                                  -> LoginMode.Unsupported
-                }
+            // Valid Homeserver, add it to the history.
+            // Note: we add what the user has input, data.homeServerUrl can be different
+            rememberHomeServer(homeServerConnectionConfig.homeServerUri.toString())
 
-                // FIXME We should post a view event here normally?
-                setState {
-                    copy(
-                            asyncHomeServerLoginFlowRequest = Uninitialized,
-                            homeServerUrl = data.homeServerUrl,
-                            loginMode = loginMode,
-                            loginModeSupportedTypes = data.supportedLoginTypes.toList()
-                    )
-                }
-                if ((loginMode == LoginMode.Password && !data.isLoginAndRegistrationSupported)
-                        || data.isOutdatedHomeserver) {
-                    // Notify the UI
-                    _viewEvents.post(LoginViewEvents.OutdatedHomeserver)
-                }
+            val loginMode = when {
+                // SSO login is taken first
+                data.supportedLoginTypes.contains(LoginFlowTypes.SSO)
+                        && data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
+                data.supportedLoginTypes.contains(LoginFlowTypes.SSO)                 -> LoginMode.Sso(data.ssoIdentityProviders)
+                data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)            -> LoginMode.Password
+                else                                                                  -> LoginMode.Unsupported
+            }
+
+            // FIXME We should post a view event here normally?
+            setState {
+                copy(
+                        asyncHomeServerLoginFlowRequest = Uninitialized,
+                        homeServerUrl = data.homeServerUrl,
+                        loginMode = loginMode,
+                        loginModeSupportedTypes = data.supportedLoginTypes.toList()
+                )
+            }
+            if ((loginMode == LoginMode.Password && !data.isLoginAndRegistrationSupported)
+                    || data.isOutdatedHomeserver) {
+                // Notify the UI
+                _viewEvents.post(LoginViewEvents.OutdatedHomeserver)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
index 2c0b78a546..4bce45dfc2 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
@@ -100,21 +100,21 @@ class SoftLogoutViewModel @AssistedInject constructor(
                 null
             }
 
-            if (data is LoginFlowResult.Success) {
-                val loginMode = when {
-                    // SSO login is taken first
-                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)
-                            && data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
-                    data.supportedLoginTypes.contains(LoginFlowTypes.SSO)                 -> LoginMode.Sso(data.ssoIdentityProviders)
-                    data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)            -> LoginMode.Password
-                    else                                                                  -> LoginMode.Unsupported
-                }
+            data ?: return@launch
 
-                setState {
-                    copy(
-                            asyncHomeServerLoginFlowRequest = Success(loginMode)
-                    )
-                }
+            val loginMode = when {
+                // SSO login is taken first
+                data.supportedLoginTypes.contains(LoginFlowTypes.SSO)
+                        && data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD) -> LoginMode.SsoAndPassword(data.ssoIdentityProviders)
+                data.supportedLoginTypes.contains(LoginFlowTypes.SSO)                 -> LoginMode.Sso(data.ssoIdentityProviders)
+                data.supportedLoginTypes.contains(LoginFlowTypes.PASSWORD)            -> LoginMode.Password
+                else                                                                  -> LoginMode.Unsupported
+            }
+
+            setState {
+                copy(
+                        asyncHomeServerLoginFlowRequest = Success(loginMode)
+                )
             }
         }
     }

From 89c2662e09ea290ff6a00011d7b967d5fb830dd7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 14 Apr 2021 12:44:48 +0200
Subject: [PATCH 051/350] Fix social login button rendering on old OS

---
 .../vector/app/features/login/LoginFragment.kt   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
index 5ba1fa394b..85ed6702ad 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
@@ -91,18 +91,29 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
                 SignMode.SignUp             -> {
                     views.loginField.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_USERNAME)
                     views.passwordField.setAutofillHints(HintConstants.AUTOFILL_HINT_NEW_PASSWORD)
-                    views.loginSocialLoginButtons.mode = SocialLoginButtonsView.Mode.MODE_SIGN_UP
                 }
                 SignMode.SignIn,
                 SignMode.SignInWithMatrixId -> {
                     views.loginField.setAutofillHints(HintConstants.AUTOFILL_HINT_USERNAME)
                     views.passwordField.setAutofillHints(HintConstants.AUTOFILL_HINT_PASSWORD)
-                    views.loginSocialLoginButtons.mode = SocialLoginButtonsView.Mode.MODE_SIGN_IN
                 }
             }.exhaustive
         }
     }
 
+    private fun setupSocialLoginButtons(state: LoginViewState) {
+        when (state.signMode) {
+            SignMode.Unknown            -> error("developer error")
+            SignMode.SignUp             -> {
+                views.loginSocialLoginButtons.mode = SocialLoginButtonsView.Mode.MODE_SIGN_UP
+            }
+            SignMode.SignIn,
+            SignMode.SignInWithMatrixId -> {
+                views.loginSocialLoginButtons.mode = SocialLoginButtonsView.Mode.MODE_SIGN_IN
+            }
+        }.exhaustive
+    }
+
     private fun submit() {
         cleanupUi()
 
@@ -277,6 +288,7 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
 
         setupUi(state)
         setupAutoFill(state)
+        setupSocialLoginButtons(state)
         setupButtons(state)
 
         when (state.asyncLoginAction) {

From 877e0ca5c6c3c5dd00b686fc47c6cafa86ac88f3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 14 Apr 2021 12:48:33 +0200
Subject: [PATCH 052/350] compact code

---
 .../java/im/vector/app/features/login/LoginFragment.kt | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
index 85ed6702ad..389895c179 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
@@ -102,15 +102,11 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
     }
 
     private fun setupSocialLoginButtons(state: LoginViewState) {
-        when (state.signMode) {
+        views.loginSocialLoginButtons.mode = when (state.signMode) {
             SignMode.Unknown            -> error("developer error")
-            SignMode.SignUp             -> {
-                views.loginSocialLoginButtons.mode = SocialLoginButtonsView.Mode.MODE_SIGN_UP
-            }
+            SignMode.SignUp             -> SocialLoginButtonsView.Mode.MODE_SIGN_UP
             SignMode.SignIn,
-            SignMode.SignInWithMatrixId -> {
-                views.loginSocialLoginButtons.mode = SocialLoginButtonsView.Mode.MODE_SIGN_IN
-            }
+            SignMode.SignInWithMatrixId -> SocialLoginButtonsView.Mode.MODE_SIGN_IN
         }.exhaustive
     }
 

From 057295c155b206ff6b0498c081707a7c1b5268ba Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 14 Apr 2021 20:12:57 +0200
Subject: [PATCH 053/350] Cleanup

---
 .../src/main/java/im/vector/app/features/login/LoginViewModel.kt | 1 -
 .../im/vector/app/features/signout/soft/SoftLogoutViewModel.kt   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index dd1b024b31..ce68ff4f38 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -43,7 +43,6 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.HomeServerHistoryService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
-import org.matrix.android.sdk.api.auth.data.LoginFlowResult
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.auth.login.LoginWizard
 import org.matrix.android.sdk.api.auth.registration.FlowResult
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
index 4bce45dfc2..5fa14b7f08 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt
@@ -33,7 +33,6 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.login.LoginMode
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
-import org.matrix.android.sdk.api.auth.data.LoginFlowResult
 import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber

From d6e495f79f826e241bb05a335e6841c4c46b42c1 Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Tue, 13 Apr 2021 10:20:18 +0000
Subject: [PATCH 054/350] Translated using Weblate (German)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index c60e226b7b..1899bfdf59 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2735,4 +2735,5 @@
     <string name="event_status_failed_messages_warning">Senden der Nachricht gescheitert</string>
     <string name="event_status_a11y_sending">Wird gesendet</string>
     <string name="event_status_sent_message">Nachricht gesendet</string>
+    <string name="call_transfer_consult_first">Zuerst nachfragen</string>
 </resources>
\ No newline at end of file

From b683c45bd860342195acba9e6191b7b37e048ce5 Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Wed, 14 Apr 2021 17:23:18 +0000
Subject: [PATCH 055/350] Translated using Weblate (German)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
---
 fastlane/metadata/android/de/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/de/changelogs/40101030.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/de/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/de/changelogs/40101030.txt

diff --git a/fastlane/metadata/android/de/changelogs/40101020.txt b/fastlane/metadata/android/de/changelogs/40101020.txt
new file mode 100644
index 0000000000..32fabf7c2f
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Leistungsverbesserung und Fehlerbehebungen!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/de/changelogs/40101030.txt b/fastlane/metadata/android/de/changelogs/40101030.txt
new file mode 100644
index 0000000000..7e6dc25033
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Leistungsverbesserung und Fehlerbehebungen!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.3

From 80e67281c6b41296c3491ac389251f6b76bb723c Mon Sep 17 00:00:00 2001
From: oksya8and8 <darknessyasuko@protonmail.com>
Date: Wed, 14 Apr 2021 13:26:09 +0000
Subject: [PATCH 056/350] Translated using Weblate (Japanese)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ja/
---
 .../android/ja/changelogs/40100100.txt        |  2 ++
 .../android/ja/changelogs/40100110.txt        |  2 ++
 .../android/ja/changelogs/40100120.txt        |  2 ++
 .../android/ja/changelogs/40100130.txt        |  2 ++
 .../android/ja/changelogs/40100140.txt        |  2 ++
 .../android/ja/changelogs/40100150.txt        |  2 ++
 .../android/ja/changelogs/40100160.txt        |  2 ++
 .../android/ja/changelogs/40100170.txt        |  2 ++
 .../android/ja/changelogs/40101000.txt        |  2 ++
 .../android/ja/changelogs/40101010.txt        |  2 ++
 .../android/ja/changelogs/40101020.txt        |  2 ++
 .../android/ja/changelogs/40101030.txt        |  2 ++
 .../metadata/android/ja/full_description.txt  | 30 +++++++++++++++++++
 .../metadata/android/ja/short_description.txt |  1 +
 fastlane/metadata/android/ja/title.txt        |  1 +
 15 files changed, 56 insertions(+)
 create mode 100644 fastlane/metadata/android/ja/changelogs/40100100.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40100110.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40100120.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40100130.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40100140.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40100150.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40100160.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40100170.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40101010.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/ja/changelogs/40101030.txt
 create mode 100644 fastlane/metadata/android/ja/full_description.txt
 create mode 100644 fastlane/metadata/android/ja/short_description.txt
 create mode 100644 fastlane/metadata/android/ja/title.txt

diff --git a/fastlane/metadata/android/ja/changelogs/40100100.txt b/fastlane/metadata/android/ja/changelogs/40100100.txt
new file mode 100644
index 0000000000..8359a12964
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40100100.txt
@@ -0,0 +1,2 @@
+今回の新バージョンでは、主にバグの修正と改善が行われています。メッセージの送信がより速くなりました。
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.10
diff --git a/fastlane/metadata/android/ja/changelogs/40100110.txt b/fastlane/metadata/android/ja/changelogs/40100110.txt
new file mode 100644
index 0000000000..c93db421af
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40100110.txt
@@ -0,0 +1,2 @@
+今回の新バージョンでは、主にUI（ユーザーインターフェース）とUX（ユーザーエクスペリエンス）の向上が図られています。友達を招待したり、QRコードを読み取って素早くDMを作成できるようになりました。
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/ja/changelogs/40100120.txt b/fastlane/metadata/android/ja/changelogs/40100120.txt
new file mode 100644
index 0000000000..aace2ef79f
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40100120.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: URLプレビュー、新しい絵文字、新しいルーム設定機能、それにクリスマスには雪が！
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/ja/changelogs/40100130.txt b/fastlane/metadata/android/ja/changelogs/40100130.txt
new file mode 100644
index 0000000000..97633621c5
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40100130.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: URLプレビュー、新しい絵文字、新しいルーム設定機能、それにクリスマスには雪が！
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/ja/changelogs/40100140.txt b/fastlane/metadata/android/ja/changelogs/40100140.txt
new file mode 100644
index 0000000000..c340663127
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: 部屋の許可、自動のテーマ切替、そして多くのバグを修正しました。
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/ja/changelogs/40100150.txt b/fastlane/metadata/android/ja/changelogs/40100150.txt
new file mode 100644
index 0000000000..42f28c7bea
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: ソーシャルログインに対応しました。
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/ja/changelogs/40100160.txt b/fastlane/metadata/android/ja/changelogs/40100160.txt
new file mode 100644
index 0000000000..8b5196998a
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.15 and https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/ja/changelogs/40100170.txt b/fastlane/metadata/android/ja/changelogs/40100170.txt
new file mode 100644
index 0000000000..586b01cb2b
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: バグの修正！
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/ja/changelogs/40101000.txt b/fastlane/metadata/android/ja/changelogs/40101000.txt
new file mode 100644
index 0000000000..25bbd7ab87
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/ja/changelogs/40101010.txt b/fastlane/metadata/android/ja/changelogs/40101010.txt
new file mode 100644
index 0000000000..35ba933069
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/ja/changelogs/40101020.txt b/fastlane/metadata/android/ja/changelogs/40101020.txt
new file mode 100644
index 0000000000..88e3c79ca8
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/ja/changelogs/40101030.txt b/fastlane/metadata/android/ja/changelogs/40101030.txt
new file mode 100644
index 0000000000..87d191b226
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+このバージョンの主な変更点: パフォーマンスの向上とバグの修正！
+すべての変更履歴はこちら: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/ja/full_description.txt b/fastlane/metadata/android/ja/full_description.txt
new file mode 100644
index 0000000000..855eb309c9
--- /dev/null
+++ b/fastlane/metadata/android/ja/full_description.txt
@@ -0,0 +1,30 @@
+Elementはまったく新しいタイプのメッセンジャーアプリです。
+
+1. あなた自身がプライバシーをコントロールすることを可能にします。
+2. Matrixネットワークにいる誰とでも通信できることはもちろん、Slackなどのアプリとの連携によって他のネットワークとも通信ができます。
+3. 広告、データ収集、バックドア、ユーザーの囲い込みから逃れることができます。
+4. エンドツーエンド暗号化とクロス署名によってあなたを保護します。
+
+Elementは非中央集権型でオープンソースであるため、他のメッセンジャーアプリとは完全に異なっています。
+
+Elementはあなた自身でサーバーをホストすることも、サーバーを選ぶこともできます。これによってあなたのデータと会話に関するプライバシーや所有権はあなた自身で管理できるようになります。さらに、あなたは他のElementユーザーと話せるだけでなくオープンネットワークへのアクセスも可能です。とてもセキュアです。
+
+Elementは、オープンな分散型通信の標準規格であるMatrixで動作するため、これらすべてを実現することができています。
+
+Elementではあなたの会話をどのサーバーでホストするか決めることができます。アプリでは、さまざまな方法で選択できます。
+
+1. matrix.orgの公開サーバーで無料のアカウントを取得します。
+2. あなた自身のハードウェアでサーバーを動かし、アカウントを管理します。
+3. Element Matrix Servicesのホスティングプラットフォームに登録することで、カスタムサーバー上のアカウントを取得できます。
+
+<b>なぜElementを選ぶべきなのか？</b>
+
+<b>データの所有権</b>: 自分でデータやメッセージを保管する場所を決めることができます。あなたが所有権を持ってコントロールすることで、第三者にあなたのデータを渡したり、ビッグデータを収集する巨大テック企業に依存する必要がなくなります。
+
+<b>開かれたネットワークと共同作業</b>: Matrixネットワーク内の他の誰とでも、あるいはElementや他のMatrixアプリを使っているかどうかに関わらず、またSlack、IRC、XMPPのような他のメッセージングシステムを使っているかどうかに関わらず、チャットすることができます。
+
+<b>はるかに安全</b>: 本物のエンドツーエンド暗号化（会話に参加している者のみがメッセージを読める）と会話参加者の真正性を確認するためクロス署名によって。
+
+<b>完全なるコミュニケーションの訪れ</b>: テキスト、音声通話、ビデオ通話、ファイル共有、画面共有、連携機能、ボット、ウィジェットなどのコミュニケーションに必要な機能の全てが実装されています。ルームやコミュニティを立ち上げて連絡を取り合い、物事をスムーズに成し遂げることができます。
+
+<b>いつでもどこでも！</b>: すべてのデバイスとウェブ（https://app.element.io）でメッセージの履歴が完全に同期されるため、どこにいても連絡を取ることができます。
diff --git a/fastlane/metadata/android/ja/short_description.txt b/fastlane/metadata/android/ja/short_description.txt
new file mode 100644
index 0000000000..c3991b7a93
--- /dev/null
+++ b/fastlane/metadata/android/ja/short_description.txt
@@ -0,0 +1 @@
+安全な分散型チャットとVoIP。あなたの情報が第三者から守られます。
diff --git a/fastlane/metadata/android/ja/title.txt b/fastlane/metadata/android/ja/title.txt
new file mode 100644
index 0000000000..376f4a95de
--- /dev/null
+++ b/fastlane/metadata/android/ja/title.txt
@@ -0,0 +1 @@
+Element（エレメントメッセンジャー）

From 103e693c7eaac5695322d260a46a5ab1c35a8694 Mon Sep 17 00:00:00 2001
From: Thai Localization <thailocalization@protonmail.com>
Date: Wed, 14 Apr 2021 07:00:26 +0000
Subject: [PATCH 057/350] Translated using Weblate (Thai)

Currently translated at 12.6% (300 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/th/
---
 vector/src/main/res/values-th/strings.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml
index a89dc740ac..1fbb9c70c3 100644
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@@ -153,7 +153,7 @@
     <string name="video_meeting">เริ่มการประชุมวิดีโอ</string>
     <string name="start_chatting">เริ่มแชท</string>
     <string name="reset">รีเซ็ต</string>
-    <string name="dismiss">ปิดทิ้ง</string>
+    <string name="dismiss">ปิด</string>
     <string name="disconnect">เลิกเชื่อมต่อ</string>
     <string name="view_decrypted_source">ดูต้นฉบับที่ถอดรหัสแล้ว</string>
     <string name="view_source">ดูต้นฉบับ</string>
@@ -310,4 +310,14 @@
     <string name="room_sync_in_progress">กำลังซิงค์…</string>
     <string name="remove">เอาออก</string>
     <string name="room_recents_favourites">รายการโปรด</string>
+    <string name="settings_password">รหัสผ่าน</string>
+    <string name="settings_change_password">เปลี่ยนรหัสผ่าน</string>
+    <string name="settings_category_timeline">เส้นเวลา</string>
+    <string name="notice_direct_room_leave_by_you">คุณได้ออกจากห้อง</string>
+    <string name="notice_direct_room_leave">%1$s ได้ออกจากห้อง</string>
+    <string name="ssl_remain_offline">เพิกเฉย</string>
+    <string name="room_permissions_change_room_name">เปลี่ยนชื่อห้อง</string>
+    <string name="room_permissions_ban_users">ห้ามผู้ใช้</string>
+    <string name="ssl_fingerprint_hash">ลายนิ้วมือ (%s):</string>
+    <string name="room_participants_action_ignore_title">เพิกเฉยผู้ใช้</string>
 </resources>
\ No newline at end of file

From 14e80855b4200173c716bb731466df9622e2d58a Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Tue, 13 Apr 2021 10:46:38 +0000
Subject: [PATCH 058/350] Translated using Weblate (Swedish)

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
---
 fastlane/metadata/android/sv/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/sv/changelogs/40101030.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/sv/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/sv/changelogs/40101030.txt

diff --git a/fastlane/metadata/android/sv/changelogs/40101020.txt b/fastlane/metadata/android/sv/changelogs/40101020.txt
new file mode 100644
index 0000000000..229793ab31
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: prestandaförbättringar och buggfixar!
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/sv/changelogs/40101030.txt b/fastlane/metadata/android/sv/changelogs/40101030.txt
new file mode 100644
index 0000000000..7e0f8c80d2
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: prestandaförbättringar och buggfixar!
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.3

From ffb05ccc772a6e1c03b01a1c31e918ba1ef6b7df Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Tue, 13 Apr 2021 10:45:07 +0000
Subject: [PATCH 059/350] Translated using Weblate (Swedish)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 31ac8d13c6..c1be9f5678 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2672,4 +2672,5 @@
     <string name="event_status_a11y_sent">Skickad</string>
     <string name="event_status_a11y_sending">Skickar</string>
     <string name="settings_category_room_directory">Rumskatalog</string>
+    <string name="event_status_sent_message">Meddelande skickat</string>
 </resources>
\ No newline at end of file

From c2c8f929026efb46e043babc6fb2d342c886f35c Mon Sep 17 00:00:00 2001
From: oksya8and8 <darknessyasuko@protonmail.com>
Date: Wed, 14 Apr 2021 16:02:23 +0000
Subject: [PATCH 060/350] Translated using Weblate (Japanese)

Currently translated at 58.9% (1393 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
---
 vector/src/main/res/values-ja/strings.xml | 414 ++++++++++++++++++++--
 1 file changed, 387 insertions(+), 27 deletions(-)

diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 13ef9801af..c1f95326cb 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -116,7 +116,7 @@
     <string name="direct_chats_header">会話</string>
     <string name="no_public_room_placeholder">公開された部屋がありません</string>
     <plurals name="public_room_nb_users">
-        <item quantity="other">%d 名</item>
+        <item quantity="other">%d名</item>
     </plurals>
     <string name="send_bug_report">バグを報告</string>
     <string name="send_bug_report_description">不具合の内容と状況の説明をお願い致します。あなたは何をしましたか？何が起こると思いますか？実際何が起こったのですか？</string>
@@ -355,7 +355,7 @@
     <string name="option_take_photo_video">写真または動画を撮影</string>
     <string name="auth_send_reset_email">初期化メール送信</string>
     <string name="template_permissions_rationale_msg_camera">写真撮影やビデオ通話には, ${app_name}アプリに端末のカメラの使用を許可する必要があります.</string>
-    <string name="cannot_start_call">通話を開始できませんでした。後ほど試してください。</string>
+    <string name="cannot_start_call">通話を開始できませんでした。後ほどお試しください</string>
     <string name="missing_permissions_warning">権限が無いため、一部の機能を利用できない可能性があります…</string>
     <string name="missing_permissions_to_start_conf_call">この部屋で会議を開始するためには招待権限が必要です</string>
     <string name="send_anyway">とにかく送る</string>
@@ -388,9 +388,9 @@
     <string name="auth_missing_email_or_phone">電子メールアドレスまたは電話番号が違います</string>
     <string name="auth_use_server_options">接続先サーバを指定する(追加設定)</string>
     <string name="auth_invalid_token">指定が正しくありません</string>
-    <string name="auth_threepid_warning_message">電子メールと電話番号の同時登録は, まだシステムが対応できません. 電話番号だけの登録は可能です.
-
-お手数おかけしますが, 後ほど個人情報設定から電子メールアドレスを登録してください.</string>
+    <string name="auth_threepid_warning_message">メールと電話番号の同時登録はまだシステムが対応できませんが、電話番号だけの登録は可能です。
+\n
+\n設定からプロフィールにメールアドレスを追加できます。</string>
     <string name="auth_recaptcha_message">接続先サーバ側かが、機械による自動登録ではなく、あなたが人間であることを確認したいとのことです</string>
     <string name="auth_username_in_use">ユーザ名はすでに使用されています</string>
     <string name="auth_home_server">接続先サーバ:</string>
@@ -401,9 +401,9 @@
     <string name="auth_reset_password_missing_password">新しいパスワードの入力が必要です.</string>
     <string name="auth_reset_password_email_validation_message">%s へ電子メールが送信されました. リンクをたどったら以下をクリックしてください.</string>
     <string name="auth_reset_password_error_unauthorized">電子メールアドレスの確認に失敗しました: 電子メールのリンクをクリックしたことを確認してください</string>
-    <string name="auth_reset_password_success_message">あなたのパスワードは初期化されました.
-
-あなたはすべての端末から切断しており、プッシュ通知を受け取ることはありません。通知を再度有効にするには、各端末に再度ログインします。</string>
+    <string name="auth_reset_password_success_message">パスワードがリセットされました。
+\n
+\nすべてのセッションからログアウトしたため、プッシュ通知を受け取れなくなりました。通知を再び有効にするには、各デバイスで再ログインをお願いします。</string>
     <string name="login_error_unable_register_mail_ownership">登録ができません : 電子メールがあなた個人のものであるか確認できません</string>
     <string name="login_error_unknown_token">指定されたアクセストークンが認識されませんでした</string>
     <string name="login_error_bad_json">不正な形式のJSON</string>
@@ -516,9 +516,9 @@
 \n
 \n通話をするには、次のポップアップでアクセスできるように設定してください。"</string>
     <string name="template_permissions_rationale_msg_record_audio">${app_name}アプリは、音声通話を実行するためにマイクへアクセスするための許可が必要です。</string>
-    <string name="permissions_rationale_msg_record_audio_explanation">
-
-通話をするには、次のポップアップでアクセスできるようにしてください。</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">"
+\n
+\n通話をするためには、次のポップアップでアクセスを許可してください。"</string>
     <string name="template_permissions_rationale_msg_camera_and_audio">ビデオ通話を行うには、カメラとマイクにアクセスするための権限が${app_name}アプリに必要です。
 
 通話をするには、次のポップアップでのアクセスを許可してください。</string>
@@ -674,11 +674,11 @@ ${app_name}アプリがあなたの電話帳へアクセスすることを許可
     <string name="start_voice_call_prompt_msg">音声通話を開始して本当によろしいですか？</string>
     <string name="start_video_call_prompt_msg">本当にビデオ通話を開始しますか？</string>
     <string name="groups_list">グループリスト</string>
-    <string name="room_participants_ban_prompt_msg">このユーザが対話に参加するのを本当にブロックしますか？</string>
+    <string name="room_participants_ban_prompt_msg">ユーザーを禁止するとこの部屋から追い出され、二度と参加できなくなります。</string>
     <string name="room_settings_all_messages_noisy">すべてのメッセージ (大音量)</string>
     <string name="room_settings_all_messages">すべてのメッセージ</string>
     <string name="room_settings_mute">ミュート</string>
-    <string name="room_settings_add_homescreen_shortcut">ホーム画面へのショートカットを作成</string>
+    <string name="room_settings_add_homescreen_shortcut">ホーム画面にショートカットを作成</string>
     <string name="settings_inline_url_preview">インラインURLプレビュー</string>
     <string name="room_settings_room_notifications_title">通知</string>
     <string name="room_settings_no_flair">この部屋はコミュニティの特色を表示していません</string>
@@ -714,13 +714,13 @@ ${app_name}アプリがあなたの電話帳へアクセスすることを許可
     <string name="rejoin">再参加</string>
     <string name="send_bug_report_rage_shake">バグを報告するには端末を降ってください</string>
     <plurals name="membership_changes">
-        <item quantity="other">%d権限の変更</item>
+        <item quantity="other">%dメンバーシップの変更</item>
     </plurals>
     <string name="list_members">参加者を表示</string>
     <string name="open_chat_header">見出しを開く</string>
     <string name="room_sync_in_progress">同期中…</string>
     <plurals name="room_header_active_members_count">
-        <item quantity="other">%d名のオンラインの参加者</item>
+        <item quantity="other">%d名の参加者</item>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="other">%d名</item>
@@ -729,7 +729,7 @@ ${app_name}アプリがあなたの電話帳へアクセスすることを許可
         <item quantity="other">%d件の新しいメッセージ</item>
     </plurals>
     <plurals name="directory_search_rooms">
-        <item quantity="other">%d 部屋</item>
+        <item quantity="other">%d部屋</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
         <item quantity="other">%2$s に %1$s 部屋見つかりました</item>
@@ -753,26 +753,26 @@ ${app_name}アプリがあなたの電話帳へアクセスすることを許可
     <string name="send_bug_report_description_in_english">可能であれば、英語で説明を書いてください。</string>
     <string name="option_send_voice">音声を送信</string>
     <string name="option_send_sticker">スタンプを送信</string>
-    <string name="no_sticker_application_dialog_content">現在使用可能なスタンプパックがありません。
-
-今いくつか追加しますか？</string>
-    <string name="go_on_with">…で続行</string>
+    <string name="no_sticker_application_dialog_content">使用可能なスタンプパックがありません。 
+\n
+\n追加しますか？</string>
+    <string name="go_on_with">続行する…</string>
     <string name="error_no_external_application_found">申し訳ありません、この操作を完了するための外部アプリが見つかりません。</string>
     <string name="e2e_re_request_encryption_key">他のデバイスから <u>暗号鍵を再度要求</u> します。</string>
     <string name="e2e_re_request_encryption_key_sent">鍵のリクエストが送信されました。</string>
     <string name="e2e_re_request_encryption_key_dialog_title">リクエスト送信済</string>
     <string name="template_e2e_re_request_encryption_key_dialog_content">鍵をこのデバイスに送信できるように、メッセージを復号化できる他のデバイスで${app_name}を起動してください。</string>
     <plurals name="format_time_s">
-        <item quantity="other">%d 秒</item>
+        <item quantity="other">%d秒</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="other">%d 分</item>
+        <item quantity="other">%d分</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="other">%d 時間</item>
+        <item quantity="other">%d時間</item>
     </plurals>
     <plurals name="format_time_d">
-        <item quantity="other">%d 日</item>
+        <item quantity="other">%d日</item>
     </plurals>
     <string name="room_participants_now">現在 %1$s</string>
     <string name="room_participants_ago">%2$s 前 %1$s</string>
@@ -782,7 +782,7 @@ ${app_name}アプリがあなたの電話帳へアクセスすることを許可
     <string name="room_message_placeholder_reply_to_encrypted">暗号化された返信を送信…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">返信を送信 (未暗号化)…</string>
     <plurals name="room_details_selected">
-        <item quantity="other">%d 個選択済</item>
+        <item quantity="other">%d個選択済</item>
     </plurals>
     <string name="settings_notification_privacy_reduced">低プライバシー</string>
     <string name="settings_notification_privacy_secure_message_content">• 通知中のメッセージの内容は <b>Matrixのホームサーバから直接安全に入手しています</b></string>
@@ -903,7 +903,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="ongoing_conference_call_voice">音声</string>
     <string name="ongoing_conference_call_video">ビデオ</string>
     <string name="settings_notification_advanced">詳細な通知設定</string>
-    <string name="settings_background_fdroid_sync_mode">バックグラウンド同期モード (実験)</string>
+    <string name="settings_background_fdroid_sync_mode">バックグラウンド同期モード</string>
     <string name="settings_background_fdroid_sync_mode_battery">バッテリーを考慮して最適化</string>
     <string name="settings_background_fdroid_sync_mode_real_time">リアルタイム性を重視して最適化</string>
     <string name="settings_background_fdroid_sync_mode_disabled">バックグラウンド同期を行わない</string>
@@ -1142,7 +1142,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="settings_call_show_confirmation_dialog_summary">通話の開始前に確認する</string>
     <string name="settings_call_show_confirmation_dialog_title">意図しない通話を阻止する</string>
     <string name="login_error_ssl_handshake">お使いの端末は脆弱性のある古いTLSセキュリティプロトコルを使用しています、このセキュリティでは接続できません</string>
-    <string name="login_error_ssl_other">SSLエラー</string>
+    <string name="login_error_ssl_other">SSLエラー。</string>
     <string name="login_error_ssl_peer_unverified">SSLエラー:相手のアイデンティティが認証されていません。</string>
     <string name="login_error_homeserver_not_found">このURLからホームサーバーに接続できませんでした、ご確認ください</string>
     <string name="login_error_no_homeserver_found">有効なMatrixサーバーアドレスではありません</string>
@@ -1196,4 +1196,364 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="user_directory_search_hint">名前または ID で検索</string>
     <string name="direct_room_user_list_known_title">既知のユーザー</string>
     <string name="invalid_qr_code_uri">無効な QR コード (無効な URI)！</string>
+    <string name="passwords_do_not_match">パスワードが一致しません</string>
+    <string name="account_email_error">メールアドレスの確認中にエラーが発生しました。</string>
+    <string name="disabled_integration_dialog_content">これを行うには設定からインテグレーションを許可を有効にしてください。</string>
+    <string name="disabled_integration_dialog_title">インテグレーションが無効になっています</string>
+    <string name="settings_integration_manager">インテグレーションマネージャー（統合管理）</string>
+    <string name="settings_integration_allow">インテグレーションを許可</string>
+    <string name="settings_data_save_mode_summary">データセーブモードでは、特定のフィルターを適用することで、プレゼンスの更新やタイピングの通知がフィルタリングされます。</string>
+    <string name="settings_troubleshoot_test_fcm_success">FCMトークンが正常に取得されました:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_title">Firebaseトークン</string>
+    <string name="settings_troubleshoot_test_play_services_quickfix">Playサービスを修正する</string>
+    <string name="settings_troubleshoot_test_play_services_success">GooglePlayサービスAPKは利用可能で最新の状態になっています。</string>
+    <string name="settings_troubleshoot_test_play_services_title">Playサービスチェック</string>
+    <string name="settings_troubleshoot_test_bing_settings_quickfix">設定を確認する</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">カスタムルールの読み込みに失敗しました。再試行してください。</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">一部の通知はカスタム設定で無効になっています。</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">一部のメッセージがサイレントに設定されていることに注意してください（音を出さずに通知します）。</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">1つ以上のテストが失敗しました。調査に役立つバグレポートを送信してください。</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">1つ以上のテストが失敗しました。提案された修正を試してください。</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">基本的な診断はOKです。 それでも通知が届かない場合は、調査に役立つバグレポートを送信してください。</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">実行中... (%1$dの %2$d)</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">テストを実行する</string>
+    <string name="settings_troubleshoot_diagnostic">診断トラブルシューティング</string>
+    <string name="settings_notification_by_event">イベントごとの通知の優先順位</string>
+    <string name="error_threepid_auth_failed">メールであなたに送ったリンクをクリックして確認してください。</string>
+    <string name="settings_remove_three_pid_confirmation_content">%sを削除しますか？</string>
+    <string name="settings_add_3pid_authentication_needed">認証が必要です</string>
+    <string name="settings_add_3pid_confirm_password_title">あなたのパスワードを確認する</string>
+    <string name="search_is_not_supported_in_e2e_room">暗号化された部屋での検索はまだサポートされていません。</string>
+    <string name="search_banned_user_hint">禁止されたユーザーをフィルタリングする</string>
+    <string name="room_permissions_change_topic">トピックを変更する</string>
+    <string name="room_permissions_upgrade_the_room">ルームをアップグレード</string>
+    <string name="room_permissions_send_m_room_server_acl_events">m.room.server_acl eventsを送信します</string>
+    <string name="room_permissions_change_permissions">権限を変更する</string>
+    <string name="room_permissions_change_room_name">部屋名を変更する</string>
+    <string name="room_permissions_change_history_visibility">履歴を見えるように変更する</string>
+    <string name="room_permissions_enable_room_encryption">部屋の暗号化を有効にする</string>
+    <string name="room_permissions_change_main_address_for_the_room">部屋のメインアドレスを変更する</string>
+    <string name="room_permissions_change_room_avatar">部屋のアバターを変更する</string>
+    <string name="room_permissions_modify_widgets">ウィジェットを変更する</string>
+    <string name="room_permissions_notify_everyone">全員に通知する</string>
+    <string name="room_permissions_remove_messages_sent_by_others">他の人から送信されたメッセージを削除する</string>
+    <string name="room_permissions_ban_users">禁止ユーザー</string>
+    <string name="room_permissions_kick_users">キックユーザー</string>
+    <string name="room_permissions_change_settings">設定を変更する</string>
+    <string name="room_permissions_invite_users">招待されたユーザー</string>
+    <string name="room_permissions_send_messages">メッセージを送る</string>
+    <string name="room_permissions_default_role">デフォルトルール</string>
+    <string name="room_permissions_notice_read_only">部屋のさまざまな部分を変更するための必要な役割を更新する権限がありません</string>
+    <string name="room_permissions_notice">部屋のさまざまな部分を変更するために必要な役割を選択します</string>
+    <string name="room_settings_permissions_title">部屋の権限</string>
+    <string name="room_permissions_title">権限</string>
+    <string name="room_settings_permissions_subtitle">部屋のさまざまな部分を変更するために必要な役割を表示し更新します。</string>
+    <string name="room_participants_unban_prompt_msg">ユーザーの禁止を解除すると、ユーザーは再び部屋に参加できるようになります。</string>
+    <string name="room_participants_ban_title">禁止されたユーザー</string>
+    <string name="room_participants_ban_reason">禁止の理由</string>
+    <string name="room_participants_unban_title">ユーザーの禁止を解除する</string>
+    <string name="room_participants_kick_prompt_msg">キックするユーザーは、この部屋から削除されます。
+\n
+\n再び参加するのを防ぐためには永久追放する必要があります。</string>
+    <string name="room_participants_kick_reason">キックする理由</string>
+    <string name="room_participants_kick_title">ユーザーをキックする</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">このユーザーの招待をキャンセルしてよろしいですか？</string>
+    <string name="room_participants_action_cancel_invite_title">招待をキャンセル</string>
+    <string name="room_participants_action_unignore_prompt_msg">このユーザーを解除すると、そのユーザーからのすべてのメッセージが再び表示されます。</string>
+    <string name="room_participants_action_unignore_title">ユーザーを無視しない</string>
+    <string name="room_participants_action_ignore_prompt_msg">このユーザーを無視すると、あなたが共有している部屋からそのユーザーのメッセージが削除されます。
+\n
+\nこの動作は設定からいつでも元に戻すことができます。</string>
+    <string name="room_participants_action_ignore_title">ユーザーを無視する</string>
+    <string name="room_participants_power_level_demote">広角</string>
+    <string name="room_participants_power_level_demote_warning_prompt">あなたは自分自身を降格させているので、この変更を元に戻すことはできません。あなたが部屋の中で最後の特権ユーザーである場合、特権を取り戻すことはできません。</string>
+    <string name="room_participants_power_level_demote_warning_title">降格しますか？</string>
+    <string name="room_participants_action_cancel_invite">招待をキャンセル</string>
+    <string name="room_participants_leave_private_warning">この部屋は公開されていません。 招待なしで再参加することはできません。</string>
+    <string name="invite_no_identity_server_error">このアクションを実行するには、設定にIDサーバーを追加します。</string>
+    <string name="permissions_denied_add_contact">連絡先へのアクセスを許可します。</string>
+    <string name="permissions_denied_qr_code">QRコードをスキャンするには、カメラへのアクセスを許可する必要があります。</string>
+    <string name="call_held_by_you">通話をかけました</string>
+    <string name="call_held_by_user">%sが通話をかけました</string>
+    <string name="call_hold_action">かける</string>
+    <string name="return_to_call">コールし直す</string>
+    <string name="call_resume_action">通話をやり直す</string>
+    <string name="active_call_with_duration">アクティブな通話（%s）</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">ホームサーバーにアシスト機能を提供しない場合は、代わりに%sを使用します（IPアドレスは通話中に共有されます）</string>
+    <string name="video_call_in_progress">ビデオ通話が行われています…</string>
+    <string name="settings_call_ringtone_use_default_stun">フォールバックコールアシストサーバーを許可する</string>
+    <string name="error_unauthorized">有効な認証情報ではありません</string>
+    <string name="template_call_failed_no_connection">${app_name} 呼び出し失敗</string>
+    <string name="call_failed_no_ice_description">通話が確実に機能させるためには、ホームサーバー(%1$s)の管理者にTURNサーバーの設定を依頼してください。
+\n
+\n代わりに、%2$sのパブリックサーバーを使用することもできますが、信頼性は低く、あなたのIPアドレスがそのサーバーと共有されてしまいます。これは設定から管理することができます。</string>
+    <string name="settings_room_directory_show_all_rooms_summary">ルームディレクトリのすべての部屋を詳しい説明を含めて表示します。</string>
+    <string name="settings_room_directory_show_all_rooms">部屋の詳しい説明を表示する</string>
+    <string name="settings_category_room_directory">ルームディレクトリ</string>
+    <string name="dialog_edit_hint">新着情報</string>
+    <string name="action_return">戻る</string>
+    <string name="action_unpublish">非公開</string>
+    <string name="action_switch">切り替える</string>
+    <string name="action_add">加える</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$sはエンドツーエンド暗号化 (認識されていないアルゴリズム%2$s) をオンにしました。</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">エンドツーエンド暗号化 (認識されていないアルゴリズム%1$s) をオンにしました。</string>
+    <string name="start_chatting">会話を始める</string>
+    <string name="notice_end_to_end_ok">%1$sがエンドツーエンド暗号化をオンにしました。</string>
+    <string name="notice_end_to_end_ok_by_you">エンドツーエンド暗号化をオンにしました。</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">ゲストが部屋に入るのを防いでいます。</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$sはゲストが部屋に参加するのを妨げました。</string>
+    <string name="notice_room_guest_access_forbidden_by_you">ゲストが部屋に参加するのを妨ぎました。</string>
+    <string name="notice_room_guest_access_forbidden">%1$sはゲストが部屋に参加するのを妨ぎました。</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">ここへのゲストの入室を許可しました。</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$sはここにゲストが参加することを許可しました。</string>
+    <string name="notice_room_guest_access_can_join_by_you">この部屋へのゲストの入室を許可しました。</string>
+    <string name="notice_room_guest_access_can_join">%1$s がゲストの部屋への参加を許可しました。</string>
+    <string name="system_theme">システムデフォルト</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">この部屋のメインおよび代替のアドレスを変更しました。</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">この部屋の代替アドレスを変更しました。</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
+        <item quantity="other">この部屋の代替アドレス%1$sを削除しました。</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added_by_you">
+        <item quantity="other">この部屋の代替アドレス%1$sを追加しました。</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset_by_you">この部屋のメインアドレスを削除しました。</string>
+    <string name="notice_room_canonical_alias_set_by_you">この部屋のメイン・アドレスを%1$sに設定しました。</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">この部屋のアドレスとして、%1$sを追加し%2$sを削除しました。</string>
+    <plurals name="notice_room_aliases_removed_by_you">
+        <item quantity="other">この部屋のアドレスの%1$sを削除しました。</item>
+    </plurals>
+    <string name="notice_room_withdraw_with_reason_by_you">%1$sの招待を取り消しました。理由:%2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">%1$sの招待を受諾しました%2$。理由:%2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">%1$sの部屋への招待を取り消しました。理由:%2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">%1$sにルームへの招待状を送りました。理由:%2$s</string>
+    <string name="notice_requested_voip_conference_by_you">VoIPカンファレンスをリクエストしました</string>
+    <string name="notice_room_server_acl_updated_title_by_you">この部屋のサーバのACLを変更しました。</string>
+    <string name="notice_room_server_acl_set_title_by_you">この部屋のサーバACLを設定しました。</string>
+    <string name="notice_direct_room_update_by_you">ここをアップグレードしました。</string>
+    <string name="notice_room_update_by_you">この部屋をアップグレードしました。</string>
+    <string name="notice_ended_call_by_you">通話を終えました。</string>
+    <string name="notice_answered_call_by_you">通話に応えました。</string>
+    <string name="notice_call_candidates_by_you">通話を設定するためのデータを送信しました。</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">この部屋のアドレスを変更しました。</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s はこの部屋のメインおよび代替アドレスを変更しました。</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s がこの部屋のアドレスを変更しました。</string>
+    <string name="notice_room_canonical_alias_alternative_changed">%1$sはこの部屋の代替アドレスを変更しました。</string>
+    <plurals name="notice_room_canonical_alias_alternative_removed">
+        <item quantity="other">%1$s がこの部屋の代替アドレス%2$sを削除しました。</item>
+    </plurals>
+    <plurals name="notice_room_canonical_alias_alternative_added">
+        <item quantity="other">%1$s はこの部屋の代替アドレス%2$sを追加しました。</item>
+    </plurals>
+    <string name="notice_room_canonical_alias_unset">%1$sがこの部屋のメインアドレスを削除しました。</string>
+    <string name="notice_room_canonical_alias_set">%1$sがこの部屋のメインアドレスを%2$sに設定しました。</string>
+    <string name="notice_room_aliases_added_and_removed">%1$sはこの部屋のアドレスとして %2$sを追加し%3$sを削除しました。</string>
+    <plurals name="notice_room_aliases_removed">
+        <item quantity="other">%1$s はこの部屋のアドレスの%2$sを削除しました。</item>
+    </plurals>
+    <plurals name="notice_room_aliases_added_by_you">
+        <item quantity="other">この部屋のアドレスとして%1$sが追加されました。</item>
+    </plurals>
+    <string name="notice_room_third_party_invite_with_reason">%1$sが%2$s にルームへの招待を送りました。理由:%3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$sが%2$sの部屋への招待を取り消しました。理由:%3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$sが %2$sの招待を承諾しました。理由:%3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$sは%2$sの招待を取り下げました。理由:%3$s</string>
+    <plurals name="notice_room_aliases_added">
+        <item quantity="other">%1$sはこの部屋のアドレスとして%2$sを追加しました。</item>
+    </plurals>
+    <string name="notice_profile_change_redacted_by_you">あなたのプロフィールが更新されました %1$s</string>
+    <string name="notice_room_server_acl_updated_title">%sがこの部屋のサーバのACLを変更しました。</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">・サーバーにマッチするIPリテラルを禁止されています。</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">・サーバーにマッチするIPリテラルを許可されています。</string>
+    <string name="notice_room_server_acl_set_allowed">・%sに一致するサーバは許可されています。</string>
+    <string name="notice_room_server_acl_set_banned">・%sに一致するサーバは禁止されています。</string>
+    <string name="notice_room_server_acl_set_title">%sがこの部屋のサーバACLを設定しました。</string>
+    <string name="notice_direct_room_update">%sがここをアップグレードしました。</string>
+    <string name="notice_room_update">%sがこの部屋をアップグレードしました。</string>
+    <string name="notice_end_to_end_by_you">エンドツーエンド暗号化をオンにしました (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">将来の部屋のメッセージを %1$sに見えるようにしました</string>
+    <string name="notice_made_future_room_visibility_by_you">将来の部屋の履歴を %1$sに見えるようにしました</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s は将来のメッセージを %2$sに見えるようにしました</string>
+    <string name="notice_call_candidates">%sが通話を設定するためのデータを送信しました。</string>
+    <string name="notice_placed_voice_call_by_you">通話をしました。</string>
+    <string name="notice_placed_video_call_by_you">ビデオ通話をしました。</string>
+    <string name="notice_room_ban_with_reason_by_you">あなたが%1$sを永久追放しました。理由: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$sが%2$sを永久追放しました。理由: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">あなたが%1$sの禁止を解除しました。理由: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$sが%2$sの禁止を解除しました。理由: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">あなたは%1$sをキックしました。理由: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$sが%2$sをキックしました。理由: %3$s</string>
+    <string name="notice_room_reject_with_reason_by_you">あなたは招待を拒否しました。理由: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s は招待を拒否しました。理由: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">退出しました。理由: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$sが退出しました。理由: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">あなたがこの部屋を退出しました。理由: %1$s</string>
+    <string name="initial_sync_start_importing_account_left_rooms">初期同期:
+\n退出した部屋のインポート</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">初期同期：
+\n招待された部屋のインポート</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">初期同期:
+\n参加した部屋のインポート</string>
+    <string name="notice_room_leave_with_reason">%1$sがこの部屋を退出しました。理由: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">あなたがこの部屋に参加しました。理由: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$sがこの部屋に参加しました。理由: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">あなたがこの部屋に参加しました。理由: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$sがこの部屋に参加しました。理由: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$sがあなたを招待しました。 理由: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">あなたが%1$sを招待しました。 理由: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$sが%2$sを招待しました。 理由: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">あなたの招待です。理由: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$sの招待です。理由: %2$s</string>
+    <string name="clear_timeline_send_queue">送信キューのクリア</string>
+    <string name="event_status_sending_message">メッセージを送っています…</string>
+    <string name="event_status_sent_message">メッセージを送る</string>
+    <string name="initial_sync_start_importing_account_data">初期同期:
+\nアカウントデータをインポート</string>
+    <string name="initial_sync_start_importing_account_groups">初期同期:
+\nコミュニティをインポート</string>
+    <string name="initial_sync_start_importing_account_rooms">初期同期:
+\n部屋をインポート</string>
+    <string name="initial_sync_start_importing_account_crypto">初期同期:
+\n暗号をインポート</string>
+    <string name="initial_sync_start_importing_account">初期同期:
+\nアカウントをインポートしています…</string>
+    <string name="initial_sync_start_downloading">初期同期:
+\nデータをダウンロードしています…</string>
+    <string name="initial_sync_start_server_computing">初期同期:
+\nサーバーからの応答を待っています…</string>
+    <string name="room_displayname_empty_room_was">空の部屋（%sでした）</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="other">%1$sと%2$sと%3$sそれに%4$dその他</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$sと%2$sと%3$sそれに%4$s</string>
+    <string name="room_displayname_3_members">%1$sと%2$s それに%3$s</string>
+    <string name="notice_power_level_diff">%1$sを%2$sから%3$sへ</string>
+    <string name="notice_power_level_changed">%2$sが%1$sの権限を変更しました。</string>
+    <string name="notice_power_level_changed_by_you">%1$sの権限を変更しました。</string>
+    <string name="power_level_custom_no_value">カスタム</string>
+    <string name="power_level_custom">カスタム (%1$d)</string>
+    <string name="power_level_default">デフォルト</string>
+    <string name="power_level_moderator">モデレーター</string>
+    <string name="power_level_admin">管理者</string>
+    <string name="notice_widget_jitsi_modified_by_you">あなたが %1$sがビデオ会議を変更しました</string>
+    <string name="notice_widget_jitsi_modified">%1$sがビデオ会議を変更しました</string>
+    <string name="notice_widget_jitsi_added_by_you">ビデオ会議を開始しました</string>
+    <string name="notice_widget_jitsi_removed_by_you">ビデオ会議を終了しました</string>
+    <string name="notice_widget_jitsi_removed">%1$sがビデオ会議を開始しました</string>
+    <string name="notice_widget_jitsi_added">%1$sがビデオ会議を開始しました</string>
+    <string name="notice_widget_modified_by_you">あなたは%1$sウィジェットを変更しました</string>
+    <string name="notice_widget_modified">%1$sは%2$sウィジェットを変更しました</string>
+    <string name="notice_widget_removed_by_you">あなたは%1$sウィジェットを削除しました</string>
+    <string name="notice_widget_removed">%1$sが %2$sウィジェットを削除しました</string>
+    <string name="notice_widget_added_by_you">あなたは%1$sウィジェットを追加しました</string>
+    <string name="notice_room_third_party_registered_invite_by_you">あなたは %1$sの招待を受けました</string>
+    <string name="notice_widget_added">%1$sが %2$sウィジェットを追加しました</string>
+    <string name="notice_room_name_changed_by_you">部屋名を変更しました:%1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">あなたは%1$sの招待を取り消しました</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$sが%2$sの招待を取り消しました</string>
+    <string name="notice_direct_room_third_party_invite_by_you">あなたは%1$sを招待しました</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">あなたは%1$sの部屋への招待を取り消しました</string>
+    <string name="notice_room_third_party_revoked_invite">%1$sが%2$sの部屋への招待を取り消しました</string>
+    <string name="notice_direct_room_third_party_invite">%1$sが%2$sを招待しました</string>
+    <string name="notice_room_third_party_invite_by_you">あなたは%1$sに部屋への招待を送りました</string>
+    <string name="notice_event_redacted_by_with_reason">メッセージが%1$sによって削除されました [理由: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">メッセージが削除されました [理由: %1$s]</string>
+    <string name="notice_event_redacted_by">%1$sがメッセージを削除しました</string>
+    <string name="notice_event_redacted">メッセージを削除</string>
+    <string name="notice_room_avatar_removed_by_you">部屋のアバターを削除しました</string>
+    <string name="notice_room_avatar_removed">%1$s が部屋のアバターを削除しました</string>
+    <string name="notice_room_topic_removed_by_you">部屋のトピックを削除しました</string>
+    <string name="notice_room_name_removed_by_you">部屋名を削除しました</string>
+    <string name="startup_notification_fdroid_battery_optim_button_grant">許可を与える</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name}は、信頼できる通知を受け取るために、影響の少ないバックグラウンド接続を維持する必要があります。
+\n次の画面で、${app_name}を常にバックグラウンドで実行することを許可するように求められます。同意してください。</string>
+    <string name="startup_notification_fdroid_battery_optim_title">バックグラウンド接続</string>
+    <string name="settings_discovery_manage">ディスカバリー設定を管理します。</string>
+    <string name="settings_discovery_category">ディスカバリー（発見）</string>
+    <string name="reset_secure_backup_warning">これにより、現在のキーまたはフレーズが置き換えられます。</string>
+    <string name="reset_secure_backup_title">新しいセキュリティキーを生成するか、既存のバックアップに新しいセキュリティフレーズを設定します。</string>
+    <string name="settings_secure_backup_section_info">サーバー上の暗号化キーをバックアップすることにより、暗号化されたメッセージとデータへのアクセスが失われるのを防ぎます。</string>
+    <string name="settings_show_emoji_keyboard_summary">メッセージ作成画面に絵文字キーボードを開くボタンを追加する</string>
+    <string name="settings_show_emoji_keyboard">絵文字キーボードを表示する</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">アバターと表示名の変更が含まれます。</string>
+    <string name="settings_show_avatar_display_name_changes_messages">アカウントイベントを表示する</string>
+    <string name="settings_show_join_leave_messages_summary">招待、キック、禁止は影響を受けません。</string>
+    <string name="settings_show_room_member_state_events_summary">招待/入室/退室/キック/禁止イベントや、アバター/表示名の変更など。</string>
+    <string name="settings_show_join_leave_messages">入室と退室イベントの表示</string>
+    <string name="settings_chat_effects_description">Use /confettiコマンドを使用するか、❄️または🎉を含むメッセージを送信します</string>
+    <string name="settings_chat_effects_title">チャットでエフェクトを表示する</string>
+    <string name="settings_show_room_member_state_events">部屋のメンバーのイベントを表示する</string>
+    <string name="settings_inline_url_preview_summary">ホームサーバーがこの機能をサポートしている場合は、チャット内のリンクをプレビューします。</string>
+    <string name="settings_integrations_summary">インテグレーションマネージャーを使用して、ボット、ブリッジ、ウィジェット、およびステッカーパックの管理をします。
+\nインテグレーションマネージャーは、構成データを受信し、ウィジェットを変更したり、部屋の招待状を送信したり、ユーザーに代わって権限を設定したりできます。</string>
+    <string name="settings_background_sync_update_error">設定の更新に失敗しました。</string>
+    <string name="settings_integrations">インテグレーション（統合）</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">アプリがバックグラウンドにある場合、着信メッセージは通知されません。</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name}は正確な時間に定期的にバックグラウンドで同期します（構成可能）。
+\nこれはラジオとバッテリーの使用量に影響し$ {app_name}がイベントをリッスンしていることを示す永続的な通知が表示されます。</string>
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name}は、デバイスの限られたリソース（バッテリー）を維持する方法でバックグラウンド同期をします。
+\nデバイスの状態によっては、OSによって同期が延期される場合があります。</string>
+    <string name="settings_system_preferences_summary">LEDの色、振動、音を選択してください…</string>
+    <string name="settings_silent_notifications_preferences">サイレント通知を構成する</string>
+    <string name="settings_call_notifications_preferences">通話の通知を設定する</string>
+    <string name="settings_noisy_notifications_preferences">うるさい通知を設定する</string>
+    <string name="settings_notification_privacy_no_background_sync">アプリはバックグラウンドでホームサーバーに接続する<b>必要がない</b>ためバッテリー使用量を減らすことができます</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">最適化を無視する</string>
+    <string name="settings_troubleshoot_test_battery_failed">画面をオフにした状態でデバイスのプラグを抜いて一定時間静止したままにすると、デバイスは機内モードになります。 これにより、アプリがネットワークにアクセスできなくなり、ジョブ、同期、および標準のアラームが防止されます。</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_failed">${app_name}に対してバックグラウンド制限が有効になっています。
+\nアプリがバックグラウンドで実行しようとすると積極的に制限され、通知に影響を与える可能性があります。
+\n%1$s</string>
+    <string name="template_settings_troubleshoot_test_bg_restricted_success">${app_name}のバックグラウンド制限は無効になっています。 このテストは、モバイル（WIFIでない）を使用して実行する必要があります。
+\n%1$s</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">デバイスを再起動してもサービスは開始されません。${app_name}が一度開かれるまで通知は届きません。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_service_not_available">%1$s
+\nこのエラーは${app_name}の管理外です。 これはいくつかの理由で発生する可能性があります。 後で再試行すればうまくいくかもしれません。システム設定でGoogle Play Serviceのデータ使用量が制限されていないか、デバイスの時刻が正しいかどうか、もしくはカスタムROMで起こることがあります。</string>
+    <string name="template_settings_add_3pid_flow_not_supported">${app_name}モバイルからこれを行うことはできません</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name}はバッテリー最適化の影響を受けません。</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">制限を無効にする</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">起動時の開始を有効にする</string>
+    <string name="settings_troubleshoot_test_service_boot_success">デバイスを再起動するとサービスが開始されます。</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">サービスの再起動に失敗しました</string>
+    <string name="settings_troubleshoot_test_service_restart_success">サービスが強制終了され、自動的に再起動されました。</string>
+    <string name="settings_troubleshoot_test_service_restart_title">通知サービスの自動再起動</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">開始する</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">通知サービスが実行されていません。
+\nアプリケーションを再起動してみてください。</string>
+    <string name="settings_troubleshoot_test_foreground_service_startedt_success">通知サービスが機能しています。</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_title">通知サービス</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">通知がクリックされました！</string>
+    <string name="settings_troubleshoot_test_notification_notice">通知をクリックしてください。 通知が表示されない場合は、システム設定を確認してください。</string>
+    <string name="settings_troubleshoot_test_notification_title">通知を表示</string>
+    <string name="settings_troubleshoot_test_push_notification_content">通知を表示しています。 クリックしてください！</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">プッシュの受信に失敗しました。 解決策は、アプリケーションを再インストールすることです。</string>
+    <string name="settings_troubleshoot_test_push_loop_success">アプリケーションはプッシュを受信しています</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">アプリケーションはプッシュを待っています</string>
+    <string name="settings_troubleshoot_test_push_loop_title">テストプッシュ</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">FCMトークンのホームサーバーへの登録に失敗しました。
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCMトークンがホームサーバーに正常に登録されました。</string>
+    <string name="settings_troubleshoot_test_token_registration_title">トークンの登録</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">アカウントを追加する</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
+\nこのエラーは、${app_name}の管理外です。スマホにはGoogleアカウントがありません。アカウントマネージャーを開いて、Googleアカウントを追加してください。</string>
+    <string name="template_settings_troubleshoot_test_fcm_failed_too_many_registration">%1$s
+\nこのエラーは${app_name}の管理外であり、Googleによると、このエラーは、デバイスにFCMに登録されているアプリが多すぎることを示しています。 このエラーは、アプリの数が極端に多い場合にのみ発生するため、平均的なユーザーには影響しません。</string>
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name}はGoogle Playサービスを使用してプッシュメッセージを配信していますが、正しく設定されていないようです:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_failed">FCMトークンの取得に失敗しました:
+\n%1$s</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉すべてのサーバーの参加を禁止されています！この部屋は使用できなくなりました。</string>
+    <string name="notice_room_server_acl_updated_no_change">変化がありません。</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• サーバーにマッチするIPリテラルが禁止されるようになりました。</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• サーバーにマッチするIPリテラルが許可されるようになりました。</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• %sに一致するサーバーが許可リストから削除されました。</string>
+    <string name="notice_room_server_acl_updated_allowed">• %sに一致するサーバーが許可されるようになりました。</string>
+    <string name="notice_room_server_acl_updated_was_banned">• %sに一致するサーバーが禁止リストから削除されました。</string>
+    <string name="notice_room_server_acl_updated_banned">• %sに一致するサーバーは禁止されました。</string>
+    <plurals name="two_and_some_others_read">
+        <item quantity="other">%1$sや %2$sそれに%3$dに他の人も読みました</item>
+    </plurals>
+    <string name="three_users_read">%1$sや %2$sそれに%3$sが読みました</string>
+    <string name="command_description_plain">メッセージをマークダウンとして解釈せずにプレーンテキストとして送信する</string>
 </resources>
\ No newline at end of file

From 3b256dd8a0034ddaf5758ec436d32db02af9dd18 Mon Sep 17 00:00:00 2001
From: Moo <hazap@hotmail.com>
Date: Tue, 13 Apr 2021 20:04:13 +0000
Subject: [PATCH 061/350] Translated using Weblate (Lithuanian)

Currently translated at 1.3% (32 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lt/
---
 vector/src/main/res/values-lt/strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/values-lt/strings.xml b/vector/src/main/res/values-lt/strings.xml
index db63c9385a..6eb730da63 100644
--- a/vector/src/main/res/values-lt/strings.xml
+++ b/vector/src/main/res/values-lt/strings.xml
@@ -3,12 +3,12 @@
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s išsiuntė vaizdą.</string>
     <string name="summary_user_sent_sticker">%1$s išsiuntė lipduką.</string>
-    <string name="notice_room_invite_no_invitee">%s pakvietimas</string>
+    <string name="notice_room_invite_no_invitee">Naudotojo %s pakvietimas</string>
     <string name="notice_room_join_by_you">Jūs prisijungėte prie kambario</string>
     <string name="notice_room_join">%1$s prisijungė prie kambario</string>
     <string name="notice_room_invite_you">%1$s pakvietė jus</string>
-    <string name="notice_room_invite_by_you">Jūs pakvietėte %1$s</string>
-    <string name="notice_room_invite">%1$s pakvietė %2$s</string>
+    <string name="notice_room_invite_by_you">Jūs pakvietėte naudotoją %1$s</string>
+    <string name="notice_room_invite">%1$s pakvietė naudotoją %2$s</string>
     <string name="notice_direct_room_created_by_you">Jūs sukūrėte diskusiją</string>
     <string name="notice_direct_room_created">%1$s sukūrė diskusiją</string>
     <string name="notice_room_created_by_you">Jūs sukūrėte kambarį</string>
@@ -17,13 +17,13 @@
     <string name="summary_you_sent_sticker">Jūs išsiuntėte lipduką.</string>
     <string name="summary_you_sent_image">Jūs išsiuntėte vaizdą.</string>
     <string name="notice_room_withdraw_by_you">Jūs atšaukėte %1$s pakvietimą</string>
-    <string name="notice_room_withdraw">%1$s atšaukė %2$s pakvietimą</string>
+    <string name="notice_room_withdraw">%1$s atšaukė naudotojo %2$s pakvietimą</string>
     <string name="notice_room_ban_by_you">Jūs užblokavote %1$s</string>
-    <string name="notice_room_ban">%1$s užblokavo %2$s</string>
+    <string name="notice_room_ban">%1$s užblokavo naudotoją %2$s</string>
     <string name="notice_room_unban_by_you">Jūs atblokavote %1$s</string>
-    <string name="notice_room_unban">%1$s atblokavo %2$s</string>
+    <string name="notice_room_unban">%1$s atblokavo naudotoją %2$s</string>
     <string name="notice_room_kick_by_you">Jūs išmetėte %1$s</string>
-    <string name="notice_room_kick">%1$s išmetė %2$s</string>
+    <string name="notice_room_kick">%1$s išmetė naudotoją %2$s</string>
     <string name="notice_room_reject_by_you">Jūs atmetėte pakvietimą</string>
     <string name="notice_room_reject">%1$s atmetė pakvietimą</string>
     <string name="notice_direct_room_leave_by_you">Jūs išėjote iš kambario</string>

From c4401d2927b770a10460ec1086afa8c4589ac99e Mon Sep 17 00:00:00 2001
From: Line <LineAirline@protonmail.com>
Date: Wed, 14 Apr 2021 22:20:42 +0000
Subject: [PATCH 062/350] Translated using Weblate (Latvian)

Currently translated at 81.5% (1928 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
---
 vector/src/main/res/values-lv/strings.xml | 379 ++++++++++++++++++++++
 1 file changed, 379 insertions(+)

diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index ee98765a7c..032c3d4d39 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -1773,4 +1773,383 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
 \nLejupielādē datus…</string>
     <string name="initial_sync_start_server_computing">Sākotnējā sinhronizācija:
 \nGaida servera atbildi…</string>
+    <string name="labs_show_unread_notifications_as_tab">Pievienojiet speciālu cilni priekš nelasītiem paziņojumiem galvenajā ekrānā.</string>
+    <string name="labs_swipe_to_reply_in_timeline">Ieslēgt pavilkšanas žestu, lai atbildētu uz ziņu</string>
+    <string name="no_message_edits_found">Netika atrasti rediģējumi</string>
+    <string name="message_edits">Rediģētas Ziņas</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Rādīt pilnīgu vēsturi šifrētajās istabās</string>
+    <string name="import_e2e_keys_from_file">Importējiet E2E atslēgas no faila \"%1$s\".</string>
+    <string name="keys_backup_unable_to_get_keys_backup_data">Kļūda radās vācot atslēgu dublējumu datus</string>
+    <string name="keys_backup_unable_to_get_trust_info">Kļūda radās vācot uzticības informāciju</string>
+    <string name="change_room_directory_network">Mainīt tīklu</string>
+    <string name="error_no_network">Nav tīkla. Lūdzu, pārbaudiet savu interneta savienojumu.</string>
+    <string name="malformed_message">Malformēts notikums, nevar parādīt</string>
+    <string name="event_redacted_by_admin_reason">Notikumu pārvalda administrators</string>
+    <string name="event_redacted_by_user_reason">Lietotājs izdzēsa notikumu</string>
+    <string name="settings_show_redacted_summary">Rādīt vietu priekš izdzēstām ziņām</string>
+    <string name="settings_show_redacted">Rādīt izdzēstās ziņas</string>
+    <string name="message_view_reaction">Apskatīt Reakcijas</string>
+    <string name="message_add_reaction">Pievienot Reakciju</string>
+    <string name="reactions_like">Patīk</string>
+    <string name="reactions_agree">Piekrist</string>
+    <string name="room_list_people_empty_body">Jūsu sarunas tiks parādītas šeit. Nospiediet + ekrāna labējā, apakšējā stūrī, lai sāktu sarunas.</string>
+    <string name="room_list_catchup_welcome_body">Apskatiet nelasītas ziņas šeit</string>
+    <string name="room_list_catchup_welcome_title">Laipni lūgti mājās!</string>
+    <string name="room_list_catchup_empty_title">Viss panākts!</string>
+    <string name="invited_by">Jūs ielūdza %s</string>
+    <string name="room_list_empty">Pievienojieties istabai, lai sāktu lietot lietotni.</string>
+    <string name="sas_error_unknown">Nezināma Kļūda</string>
+    <string name="sas_error_m_user_error">Lietotāju neatbilstība</string>
+    <string name="sas_error_m_key_mismatch">Atslēgu neatbilstība</string>
+    <string name="sas_error_m_invalid_message">Tika saņemta nederīga ziņa</string>
+    <string name="sas_error_m_unexpected_message">Sesija saņēma negaidītu ziņu</string>
+    <string name="sas_error_m_mismatched_sas">SAS nav vienādi</string>
+    <string name="sas_verification_request_notification_channel_title">Atslēgu Verifikācija</string>
+    <string name="sas_legacy_verification_button_title">Izmantot veco verifikāciju.</string>
+    <string name="sas_decimal_description">Pārbaudiet šo sesiju, apstiprinot skaitļus, kas parādās uz ekrāniem</string>
+    <string name="sas_emoji_description">Pārbaudiet šo sesiju, apstiprinot Emoji, kas parādās uz ekrāniem</string>
+    <string name="sas_incoming_request_description">Pārbaudiet šo sesiju, lai atzīmētu to kā uzticamu. Uzticēšanās sesijai palīdz saziņas biedriem uzturēt mierīgu prātu, izmantojot E2E šifrētus ziņojumus.</string>
+    <string name="sas_incoming_request_description_2">Apstiprinot šo sesiju atzīmēs to kā uzticamu, un arī atzīmēs to kā uzticamu jūsu saziņas biedram.</string>
+    <string name="sas_incoming_request_title">Ienākošs verifikācijas pieprasījums</string>
+    <string name="sas_verify_start_button_title">Sākt verificēt</string>
+    <string name="sas_security_advise">Lai nodrošinātu maksimālu drošību, mēs iesakām to darīt personīgi vai izmantot citus uzticamus saziņas līdzekļus.</string>
+    <string name="sas_verify_title">Apstipriniet, salīdzinot īsu teksta virkni.</string>
+    <string name="invalid_or_expired_credentials">Jūs tikāt izrakstīts, dēļ nepareiziem vai novecojušiem datiem.</string>
+    <string name="autodiscover_well_known_autofill_confirm">Izmantot konfigurāciju</string>
+    <string name="keys_backup_info_title_signature">Paraksts</string>
+    <string name="keys_backup_info_keys_all_backup_up">Visas atslēgas dublētas</string>
+    <string name="secure_backup_setup">Iestatiet Drošo Dublēšanu</string>
+    <string name="keys_backup_banner_in_progress">Dublē jūsu atslēgas. Tas var aizņemt vairākas minūtes…</string>
+    <string name="keys_backup_banner_update_line2">Pārvaldīt Atslēgu Dublējumā</string>
+    <string name="keys_backup_banner_update_line1">Jauna šifrēto ziņu atslēga</string>
+    <string name="keys_backup_banner_recover_line2">Izmantot Atslēgu Dublēšanu</string>
+    <string name="keys_backup_banner_recover_line1">Nekad nezaudējiet šifrētās ziņas</string>
+    <string name="keys_backup_banner_setup_line2">Sāciet lietot Atslēgu Dublēšanu</string>
+    <string name="keys_backup_banner_setup_line1">Nekad nezaudējiet šifrētās ziņas</string>
+    <string name="new_recovery_method_popup_description">Ir konstatēts jauns šifrēto ziņu atslēgu dublējums.
+\n
+\nJa neesat iestatījis jauno atgūšanas metodi, uzbrucējs var mēģināt piekļūt jūsu kontam. Nomainiet savu konta paroli un nekavējoties iestatiet jaunu konta atkopšanas metodi Iestatījumos.</string>
+    <string name="new_recovery_method_popup_title">Jauns Atslēgu Dublējums</string>
+    <string name="keys_backup_settings_delete_confirm_message">Dzēst savu dublēto šifrēšanas atslēgu no servera\? Jūs vairs nevarēsiet izmantot atkopšanas atsļēgu, lai lasītu šifrēto ziņu vēsturi.</string>
+    <string name="keys_backup_settings_delete_confirm_title">Izdzēst dublējumu</string>
+    <string name="keys_backup_settings_checking_backup_state">Pārbauda dublējuma statusu</string>
+    <string name="keys_backup_settings_delete_backup_error">Neizdevās izdzēst dublējumu (%s)</string>
+    <string name="keys_backup_settings_deleting_backup">Izdzēš dublējumu…</string>
+    <string name="keys_backup_settings_delete_backup_button">Izdzēst Dublējumu</string>
+    <string name="keys_backup_restore_success_title">Dublējums Atgūts %s !</string>
+    <string name="keys_backup_unlock_button">Atbloķēt Vēsturi</string>
+    <string name="keys_backup_restoring_importing_keys_waiting_message">Importē atslēgas…</string>
+    <string name="keys_backup_restoring_downloading_backup_waiting_message">Lejupielādē atslēgas…</string>
+    <string name="keys_backup_restore_with_recovery_key">Izmantojiet savu Atgūšanas Atslēgu, lai atbloķētu savu šifrēto ziņu vēsturi</string>
+    <string name="keys_backup_restore_use_recovery_key">izmantojiet savu atgūšanas atslēgu</string>
+    <string name="settings_show_join_leave_messages_summary">Lietotāju ielūgšana, izmešana un aizliegšana tika neaizskarta.</string>
+    <string name="settings_noisy_notifications_preferences">Konfigurēt Skaļās Notifikācijas</string>
+    <string name="settings_notification_privacy_nosecure_message_content">• Notifikācijas satur <b> meta un ziņu datus</b></string>
+    <string name="settings_notification_privacy_metadata">• Notifikācijas satur tikai meta datus</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">Izslēgt ierobežojumus</string>
+    <string name="settings_troubleshoot_test_bg_restricted_title">Pārbaudīt fona ierobežojumus</string>
+    <string name="settings_troubleshoot_test_service_restart_success">Pakalpojums tika beigts un restartēts automātiski.</string>
+    <string name="settings_troubleshoot_test_service_restart_title">Notifikāciju Pakalpojuma Auto-Restartēšana</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_failed">Notifikāciju Pakalpojums nestrādā.
+\nMēģiniet restartēt aplikāciju.</string>
+    <string name="settings_troubleshoot_test_foreground_service_startedt_success">Notifikāciju Pakalpojums strādā.</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">Notifikācija tika nospiesta!</string>
+    <string name="settings_troubleshoot_test_token_registration_failed">Neizdevās reģistrēt FCM žetonu serverī:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_success">FCM žetons veiksmīgi reģistrēts serverī.</string>
+    <string name="settings_troubleshoot_test_fcm_success">FCM žetons veiksmīgi saņemts:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_failed">FCM žetons netika saņemts:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_token_registration_title">Žetona Reģistrācija</string>
+    <string name="template_settings_troubleshoot_test_play_services_failed">${app_name} izmanto Google Play pakalpojumus, lai nodrošinātu ziņu pakalpojumu, bet tas nešķiet pareizi konfigurēts:
+\n%1$s</string>
+    <string name="no_sticker_application_dialog_content">Jums pašlaik nav iespējotas uzlīmes.
+\n
+\nPievienojiet dažas tagad\?</string>
+    <string name="call_failed_no_connection_description">Neizdevās izveidot reālā laika savienojumu.
+\nLūdzu, jautājiet sava servera administratoram, lai konfigurētu PAGRIEZIENA serveri, lai zvani strādātu uzticami.</string>
+    <string name="call_failed_no_ice_description">Lūdzu, jautājiet jūsu servera administratoram (%1$s), lai konfigurētu PAGRIEZIENA serveri, lai zvani strādātu uzticami.
+\n
+\nAlternatīvi, jūs varat mēģināt izmantot publisko serveri %2$s, bet tas nebūs tik uzticams, un tas dalīs jūsu IP adresi ar šo serveri. To var arī pārvaldīt iestatījumos.</string>
+    <string name="settings_integrations_summary">Izmantojiet Integrācijas Pārvaldnieku, lai pārvaldītu botus, tiltus, logrīkus un uzlīmes.
+\nIntegrācijas Pārvaldnieks saņem konfigurācijas datus un var modificēt logrīkus, sūtīt istabu uzaicinājumus jūsu vārdā.</string>
+    <string name="settings_set_workmanager_delay_summary">%s
+\nSinhronizācija var tikt atlikta atkarībā no ierīces resursiem (akumulatora).</string>
+    <string name="settings_set_workmanager_delay">Vēlamais Sinhronizācijas Intervāls</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Jūs nesaņemsiet jaunas notifikācijas, kad aplikācija ir fonā.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">Bez fona sinhronizācijas</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">Optimizēts reālajam laikam</string>
+    <string name="settings_background_fdroid_sync_mode">Fona Sinhronizācijas Režīms</string>
+    <string name="settings_system_preferences_summary">Izvēlaites LED krāsu, vibrāciju, skaņu…</string>
+    <string name="settings_silent_notifications_preferences">Konfigurēt Klusās Notifikācijas</string>
+    <string name="settings_call_notifications_preferences">Konfigurēt Zvanu Notifikācijas</string>
+    <string name="settings_troubleshoot_test_service_boot_success">Pakalpojums startēsies, kad ierīce būs restartēta.</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">Pakalpojumam neizdevās restartēties</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Sākt Pakalpojumu</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_title">Notifikāciju Pakalpojums</string>
+    <string name="settings_troubleshoot_test_notification_title">Notifikāciju Displejs</string>
+    <string name="settings_troubleshoot_test_play_services_success">Google Play Servisu APK ir pieejams un atjaunināts.</string>
+    <string name="search_banned_user_hint">Filtrēt aizliegtos lietotājus</string>
+    <string name="template_e2e_re_request_encryption_key_dialog_content">Lūdzu palaidiet ${app_name} citā ierīcē, kas var atšifrēt ziņu, lai tā varētu nosūtīt šīs sesijas atslēgas.</string>
+    <string name="error_unauthorized">Neautorizēts, trūkstošas autentifikācijas apliecības</string>
+    <string name="error_no_external_application_found">Atvainojiet, nav atrasta ārēja aplikācija, lai pabeigtu šo darbību.</string>
+    <string name="go_on_with">turpināt ar…</string>
+    <string name="template_call_failed_no_connection">${app_name} Zvans Neizdevās</string>
+    <string name="call_failed_dont_ask_again">Nejautāt man atkal</string>
+    <string name="call_failed_no_ice_use_alt">Mēģiniet izmantot %s</string>
+    <string name="send_bug_report_include_key_share_history">Sūtīt atslēgu dalības vēsturi</string>
+    <string name="settings_room_directory_show_all_rooms_summary">Rādīt visas istabas direktorijā, tostarp istabas ar vecuma ierobežotu saturu.</string>
+    <string name="settings_room_directory_show_all_rooms">Rādīt istabas ar vecuma ierobežojumu</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Visi serveri ir aizliegti piedalīties! Šo istabu vairs nevar izmantot.</string>
+    <string name="notice_room_server_acl_updated_no_change">Nekas nemainīts.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servers ar vienādu IP tagad ir aizliegts.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servers ar vienādu IP ir atļauts.</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Servers vienāds ar %s tika noņemts no atļautā saraksta.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Servers vienāds ar %s tagad ir atļauts.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Servers vienāds ar %s tika noņemts no aizliegtā saraksta.</string>
+    <string name="notice_room_server_acl_updated_banned">• Servers vienāds ar %s tagad ir aizliegts.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Jūs nomainījāt servera ACL šai istabai.</string>
+    <string name="notice_room_server_acl_updated_title">%s nomainīja servera ACL šai istabai.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servers ar vienādu IP ir aizliegts.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">• Servers ar vienādu IP ir atļauts.</string>
+    <string name="notice_room_server_acl_set_allowed">• Servers vienāds ar %s ir atļauts.</string>
+    <string name="notice_room_server_acl_set_banned">• Servers vienāds ar %s ir aizliegts.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Jūs iestatījāt servera ACL šai istabai.</string>
+    <string name="notice_room_server_acl_set_title">%s iestatīja servera ACL šai istabai.</string>
+    <string name="notice_direct_room_update_by_you">Jūs atjauninājāt šeit.</string>
+    <string name="notice_direct_room_update">%s atjaunināti šeit.</string>
+    <string name="system_alerts_header">Sistēmas Brīdinājumi</string>
+    <string name="action_unpublish">Nepublicēt</string>
+    <string name="call_notification_hangup">Nolikt</string>
+    <string name="call_anyway">Zvanīt Tāpat</string>
+    <string name="failed_to_remove_widget">Neizdevās noņemt logrīku</string>
+    <string name="failed_to_add_widget">Neizdevās ielādēt logrīku</string>
+    <string name="notification_sync_init">Startē pakalpojumu</string>
+    <string name="event_status_sent_message">Ziņa aizsūtīta</string>
+    <string name="notice_widget_jitsi_modified_by_you">Jūs modificējāt video konferenci</string>
+    <string name="notice_widget_jitsi_modified">%1$s modificēja video konferenci</string>
+    <string name="notice_widget_jitsi_removed_by_you">Jūs beidzāt video konferenci</string>
+    <string name="notice_widget_jitsi_removed">%1$s beidza video konferenci</string>
+    <string name="notice_widget_jitsi_added_by_you">Jūs sākāt video konferenci</string>
+    <string name="notice_widget_jitsi_added">%1$s sāka video konferenci</string>
+    <string name="notice_widget_modified_by_you">Jūs modificējāt %1$s logrīku</string>
+    <string name="notice_widget_modified">%1$s modificēja %2$s logrīku</string>
+    <string name="notice_widget_removed_by_you">Jūs noņēmāt %1$s logrīku</string>
+    <string name="notice_widget_removed">%1$s noņēma %2$s logrīku</string>
+    <string name="notice_widget_added_by_you">Jūs pievienojāt %1$s logrīku</string>
+    <string name="notice_widget_added">%1$s pievienoja %2$s logrīku</string>
+    <string name="keys_backup_restore_with_passphrase">Izmantojiet savu atgūšanas frāzi, lai atbloķētu</string>
+    <string name="keys_backup_setup_skip_msg">Jūs varētu zaudēt piekļuvi savām ziņām, ja izrakstīsities vai pazaudēsiet šo ierīci.</string>
+    <string name="keys_backup_setup_backup_started_title">Dublējums Sākts</string>
+    <string name="recovery_key">Atgūšanas Atslēga</string>
+    <string name="keys_backup_setup_step3_please_make_copy">Lūdzu uztaisiet kopiju</string>
+    <string name="keys_backup_setup_override_stop">Stop</string>
+    <string name="keys_backup_setup_override_replace">Aizvietot</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">Dublējums jau pastāv jūsu serverī</string>
+    <string name="recovery_key_export_saved">Atgūšanas atslēgas tika saglabātas.</string>
+    <string name="recovery_key_export_saved_as_warning">Atgūšanas atslēga ir saglabāta \"%s\".
+\n
+\nBRĪDINĀJUMS: Šis fails var tikt dzēsts, ja aplikācija ir atinstalēta.</string>
+    <string name="keys_backup_setup_step3_save_button_title">Saglabāt kā Failu</string>
+    <string name="keys_backup_setup_step3_copy_button_title">Saglabāt Atgūšanas Atslēgu</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Es uztaisīju kopiju</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Saglabājiet savu atgūšanas atslēgu kaut kur ļoti drošā vietā, piemēram, paroles pārvaldniekā (vai seifā)</string>
+    <string name="keys_backup_setup_step3_text_line2">Jūsu atkopšanas atslēga ir drošības tīkls - to var izmantot, lai atjaunotu piekļuvi jūsu šifrētajām ziņām, ja esat aizmirsis savu paroles frāzi.
+\nSaglabājiet savu atgūšanas atslēgu kaut kur ļoti drošā vietā, piemēram, paroles pārvaldniekā (vai seifā)</string>
+    <string name="keys_backup_setup_step3_text_line1">Jūsu atslēgas tiek dublētas.</string>
+    <string name="keys_backup_setup_step3_success_title">Izdevās !</string>
+    <string name="keys_backup_setup_step2_skip_button_title">(Advancēti) Iestatīt ar Atgūšanas Atslēgu</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Vai, aizsargājiet jūsu dublējumu ar Atgūšanas Atslēgu, saglabājot to drošā vietā.</string>
+    <string name="keys_backup_setup_creating_backup">Taisa Dublējumu</string>
+    <string name="keys_backup_setup_step2_button_title">Iestatīt Frāzi</string>
+    <string name="keys_backup_setup_step2_text_description">Mēs saglabāsim šifrētu jūsu atslēgu kopiju savā serverī. Aizsargājiet savu dublējumu ar frāzi, lai tā būtu droši aizsargāta.
+\n
+\nLai nodrošinātu maksimālu drošību, tam jāatšķiras no jūsu konta paroles.</string>
+    <string name="keys_backup_setup_step2_text_title">Aizsargājiet savu dublējumu ar Frāzi.</string>
+    <string name="keys_backup_setup_step1_manual_export">Manuāli eksportēt atslēgas</string>
+    <string name="keys_backup_setup_step1_advanced">(Advancēti)</string>
+    <string name="keys_backup_setup">Sākt izmantot Atslēgu Dublēšanu</string>
+    <string name="keys_backup_setup_step1_description">Ziņojumi šifrētās istabās ir nodrošināti ar E2E šifrēšanu. Tikai jums un saņēmējam (-iem) ir atslēgas, lai izlasītu šos ziņojumus.
+\n
+\nDroši dublējiet atslēgas, lai izvairītos no viņu zaudēšanas.</string>
+    <string name="keys_backup_setup_step1_title">Nekad nepazaudējiet šifrētās ziņas</string>
+    <string name="keys_backup_no_session_error">Nav pieejama Matrix sesija</string>
+    <string name="settings_info_area_show">Rādīt info laukumu</string>
+    <string name="settings_lazy_loading_description">Palieliniet veiktspēju, ielādējot tikai tos lietotājus, kuri ir redzami.</string>
+    <string name="settings_lazy_loading_title">Slinki ielādēt istabas lietotājus</string>
+    <string name="resource_limit_hard_mau">Šis serveris ir sasniedzis savu ikmēneša aktīvo lietotāju limitu.</string>
+    <string name="resource_limit_soft_mau"> Šis serveris ir sasniedzis savu ikmēneša aktīvo lietotāju limitu, tāpēc <b> daži lietotāji nevarēs pierakstīties </b>.</string>
+    <string name="resource_limit_hard_default">Šis serveris ir pārsniedzis vienu no saviem resursu ierobežojumiem.</string>
+    <string name="resource_limit_soft_default">Šis servers ir pārsniedzis vienu no saviem resursu ierobežojumiem, tāpēc <b> daži lietotāji nevarēs ierakstīties </b>.</string>
+    <string name="resource_limit_contact_admin">kontaktēt jūsu pakalpojuma administratoru</string>
+    <string name="resource_limit_contact_action">Kontaktēt Administratoru</string>
+    <string name="resource_limit_exceeded_title">Resursu Limits Pārsniegts</string>
+    <string name="error_empty_field_your_password">Lūdzu ievadiet paroli.</string>
+    <string name="error_empty_field_enter_user_name">Lūdzu ievadiet lietotājvārdu.</string>
+    <string name="deactivate_account_delete_checkbox">Lūdzu aizmirst visas ziņas, ko esmu nosūtījis, kad mans konts ir deaktivizēts (Brīdinājums: šis nākotnes lietotājiem neļaus redzēt visu sarunu kontekstu)</string>
+    <string name="deactivate_account_content">Tas padarīs jūsu kontu nelietojamu. Jūs nevarēsiet ierakstīties, un neviens nevarēs atkārtoti reģistrēt to pašu lietotāja ID. Tas liks jūsu kontu atstāt visas istabas, kurās piedalās, un tas noņems jūsu konta datus no jūsu identitātes servera. <b> Šī darbība ir neatgriezeniska </b>.
+\n
+\nDeaktivizējot savu kontu <b>, pēc noklusējuma, neliek mums aizmirst jūsu nosūtītās ziņas </b>. Ja jūs vēlētos, lai mēs aizmirstu jūsu ziņas, lūdzu, atzīmējiet zemāk redzamo lodziņu.
+\n
+\nZiņu redzamība Matrix ir līdzīga e-pastam. Mums aizmirst jūsu ziņas nozīmē, ka ziņas, ko esat nosūtījis, netiks rādītas jauniem vai nereģistrētiem lietotājiem, bet reģistrētiem lietotājiem, kuriem jau ir piekļuve šīm ziņām, joprojām būs piekļuve to kopijai.</string>
+    <string name="key_share_request">Atslēgas Dalīšanās Pieprasījums</string>
+    <string name="settings_labs_enable_send_voice_summary">Šij opcijai ir nepieciešama trešās partijas aplikācija, lai ierakstītu ziņas.</string>
+    <string name="room_no_active_widgets">Nav aktīvu logrīku</string>
+    <string name="room_widget_webview_access_microphone">Izmantot mikrofonu</string>
+    <string name="room_widget_webview_access_camera">Izmantot kameru</string>
+    <string name="room_widget_resource_decline_permission">Bloķēt Visu</string>
+    <string name="room_widget_resource_grant_permission">Atļaut</string>
+    <string name="room_widget_resource_permission_title">Šis logrīks vēlas izmantos tālāk norādītos resursus:</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">Iziet no pašreizējās konferences un pāriet uz citu\?</string>
+    <string name="error_jitsi_not_supported_on_old_device">Atvainojiet, konferences zvani ar Jitsi netiek atbalstīti vecās ierīces (ierīces ar Android OS zem 6.0)</string>
+    <string name="room_widget_permission_room_id">Istabas ID</string>
+    <string name="room_widget_permission_widget_id">Logrīka ID</string>
+    <string name="room_widget_permission_theme">Jūsu motīvs</string>
+    <string name="room_widget_permission_user_id">Jūsu lietotāja ID</string>
+    <string name="room_widget_permission_avatar_url">Jūsu avatāra URL</string>
+    <string name="room_widget_revoke_access">Atsaukt piekļuvi man</string>
+    <string name="room_widget_open_in_browser">Atvērt pārlūkprogrammā</string>
+    <string name="room_widget_reload">Pārlādēt logrīku</string>
+    <string name="room_widget_failed_to_load">Neizdevās ielādēt logrīku.
+\n%s</string>
+    <string name="room_widget_permission_added_by">Šis logrīks bija pievienots no:</string>
+    <string name="room_widget_permission_title">Ielādēt Logrīku</string>
+    <string name="room_widget_activity_title">Logrīks</string>
+    <string name="active_widgets_title">Aktīvie logrīki</string>
+    <string name="encryption_settings_manage_message_recovery_summary">Pārvaldīt Atslēgu Dublējumu</string>
+    <string name="encryption_message_recovery">Šifrētu Ziņu Atgūšana</string>
+    <string name="room_alias_publish_to_directory">Publicēt šo istabu uz %1$s istabu sadaļu\?</string>
+    <string name="room_alias_action_unpublish">Nepublicēt šo adresi</string>
+    <string name="room_alias_action_publish">Publicēt šo adresi</string>
+    <string name="room_alias_address_empty">Nevienu citu publicētu adrešu nav.</string>
+    <string name="room_alias_address_empty_can_add">Nav publicētu adrešu pagaidām, pievienojat vienu apakšā.</string>
+    <string name="room_alias_publish">Publicēt šo istabu uz %1$s istabu sadaļu\?</string>
+    <string name="room_alias_unpublish_confirmation">Nepublicēt adresi \"%1$s\"\?</string>
+    <string name="room_alias_published_alias_add_manually_submit">Publicēt</string>
+    <string name="room_alias_published_alias_add_manually">Publicēt jaunu adresi manuāli</string>
+    <string name="room_alias_published_alias_main">Šī ir galvenā adrese</string>
+    <string name="settings_without_flair">Jūs pašlaik neesat kādas kopienas dalībnieks.</string>
+    <string name="template_settings_opt_in_of_analytics_prompt">Lūdzu, ieslēdziet analītiku, lai palīdzētu mums uzlabot ${app_name}.</string>
+    <string name="template_settings_opt_in_of_analytics_summary">${app_name} apkopo anonīmu analītiku, lai ļautu mums uzlabot aplikāciju.</string>
+    <string name="startup_notification_fdroid_battery_optim_button_grant">Iedot atļauju</string>
+    <string name="template_startup_notification_fdroid_battery_optim_message">${App_name} ir nepieciešams fona savienojums, lai spētu laicīgi piegādāt notifikācijas.
+\nNākamajā ekrānā tiks piedāvāts atļaut ${app_name}, lai vienmēr darbotos fonā, lūdzu piekrītat.</string>
+    <string name="startup_notification_fdroid_battery_optim_title">Fona savienojums</string>
+    <string name="startup_notification_privacy_button_other">Izvēlaties citu opciju</string>
+    <string name="startup_notification_privacy_button_grant">Dot atļauju</string>
+    <string name="template_startup_notification_privacy_message">${app_name} var darboties fonā, lai droši un privāti pārvaldītu jūsu paziņojumus. Tas var ietekmēt akumulatora izmantošanu.</string>
+    <string name="startup_notification_privacy_title">Notifikāciju Privātums</string>
+    <string name="reset_secure_backup_warning">Šis aizvietos jūsu esošo Atslēgu vai Frāzi.</string>
+    <string name="reset_secure_backup_title">Izveidot jaunu Drošības Atslēgu vai iestatīt jaunu Drošības Frāzi jūsu esošajam dublējumam.</string>
+    <string name="settings_secure_backup_enter_to_setup">Iestatīt uz šīs ierīces</string>
+    <string name="settings_secure_backup_reset">Atiestatīt Drošo Dublējumu</string>
+    <string name="settings_secure_backup_manage">Pārvaldīt</string>
+    <string name="settings_show_emoji_keyboard_summary">Pievienot pogu ziņu ievades laukā priekš Emoji</string>
+    <string name="settings_show_emoji_keyboard">Rādīt Emoji tastatūru</string>
+    <string name="settings_send_message_with_enter_summary">Tastatūras Enter poga sūtīs ziņu, tā vietā lai pievienotu jaunu rindkopu</string>
+    <string name="settings_send_message_with_enter">Sūtīt ziņu ar Enter</string>
+    <string name="settings_show_avatar_display_name_changes_messages_summary">Iekļauj avatāra un vārda maiņas</string>
+    <string name="settings_show_avatar_display_name_changes_messages">Rādīt konta notikumus</string>
+    <string name="settings_show_join_leave_messages">Rādīt cilvēku pievienošanos vai iziešanu</string>
+    <string name="settings_show_room_member_state_events_summary">Ietver uzaicinājumus/pievienošanos/aiziešanu/izmešanu/noteikumu pārkāpšanas/profila bildes izmaiņas.</string>
+    <string name="settings_chat_effects_description">Izmantojiet /konfeti komandu vai nosūtiet ziņu, kas satur ❄️ or 🎉</string>
+    <string name="settings_chat_effects_title">Rādīt sarunu efektus</string>
+    <string name="settings_show_room_member_state_events">Rādīt istabas lietotāju vārda, profila bildes, utl. maiņu</string>
+    <string name="settings_show_read_receipts_summary">Nospiediet izlasīšanas simbolu, priekš detalizētas informācijas.</string>
+    <string name="settings_show_read_receipts">Rādīt vai ziņa ir izlasīta/neizlasīta</string>
+    <string name="settings_send_markdown_summary">Formatēt ziņas advancēti. Tas ļauj uzlabot formatējumu, piemēram, izmantojot zvaigznītes, lai parādītu slīprakstu tekstu.</string>
+    <string name="settings_send_markdown">Advancēts formatējums</string>
+    <string name="settings_cryptography_manage_keys">Kriptogrāfijas Atslēgu Pārvaldība</string>
+    <string name="settings_send_typing_notifs_summary">Ļaut citiem lietotājiem zināt, ka jūs rakstāt.</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Jūs skatāties ziņojumā! Klikšķiniet šeit!</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Pievienot Kontu</string>
+    <string name="settings_troubleshoot_test_fcm_title">Firebase Tokens</string>
+    <string name="settings_troubleshoot_test_play_services_quickfix">Salabot Play Servisus</string>
+    <string name="error_threepid_auth_failed">Pārliecinieties, ka esat nospiedis uz saites e-pasta ziņojumā, ko esam nosūtījuši jums.</string>
+    <string name="settings_background_fdroid_sync_mode_battery">Optimizēts akumulatoram</string>
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${App_name} sinhronizēsies fonā, tā lai ietaupītu telefona bateriju.
+\nAtkarībā no ierīces baterijas stāvokļa, sinhronizāciju var atcelt operētājsistēma.</string>
+    <string name="settings_notification_privacy_need_permission">Aplikācijai vajag atļauju, lai strādātu fonā</string>
+    <string name="settings_notification_privacy_reduced">Samazināts privātums</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">Ignorēt optimizāciju</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${App_name} neietekmē akumulatora optimizācija.</string>
+    <string name="settings_troubleshoot_test_battery_title">Akumulatora Optimizācija</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">Ieslēgt Aplikācijas palaišanu kopā ar telefonu</string>
+    <string name="settings_troubleshoot_test_play_services_title">Play Servisu Pārbaude</string>
+    <string name="settings_troubleshoot_test_bing_settings_quickfix">Pārbaudiet Iestatījumus</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Neizdevās ielādēt pielāgotos noteikumus, lūdzu, mēģiniet vēlreiz.</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">Daži paziņojumi ir izslēgti jūsu pielāgotos iestatījumos.</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Ievērojiet, ka daži ziņojumi ir iestatīti kā klusi (paziņojumi pienāks bez skaņas).</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">Pielāgoti Iestatījumi.</string>
+    <string name="template_settings_troubleshoot_test_device_settings_failed">Paziņojumi nav ieslēgti šai sesijai.
+\nLūdzu, pārbaudiet ${app_name} iestatījumus.</string>
+    <string name="settings_troubleshoot_test_device_settings_success">Paziņojumi ir ieslēgti šai sesijai.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">Sesijas Iestatījumi.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Paziņojumi ir atspējoti jūsu kontā.
+\nLūdzu, pārbaudiet konta iestatījumus.</string>
+    <string name="settings_troubleshoot_test_account_settings_success">Paziņojumi ir ieslēgti jūsu kontam.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">Konta iestatījumi.</string>
+    <string name="settings_troubleshoot_test_system_settings_failed">Paziņojumi ir izslēgti sistēmas iestatījumos.
+\nLūdzu, pārbaudiet sistēmas iestatījumus.</string>
+    <string name="settings_troubleshoot_test_system_settings_success">Paziņojumi ir ieslēgti sistēmas iestatījumos.</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Sistēmas iestatījumi.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Viens vai vairāki testi nav izdevušies, lūdzu, iesniedziet kļūdu ziņojumu, lai palīdzētu mums izmeklēt.</string>
+    <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Viens vai vairāki testi nav izdevušies, mēģiniet ieteiktos labojumus.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">Pēc izskata ir labi. Ja jūs joprojām nesaņemat paziņojumus, lūdzu, iesniedziet kļūdu ziņojumu, lai palīdzētu mums izmeklēšanā.</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">Palaist Testus</string>
+    <string name="settings_troubleshoot_diagnostic">Pārbaudes diagnostika</string>
+    <string name="settings_notification_troubleshoot">Paziņojumu pārbaude</string>
+    <string name="settings_notification_privacy">Notifikāciju privātums</string>
+    <string name="settings_notification_by_event">Paziņojumu svarīgums</string>
+    <string name="settings_notification_advanced">Advancēti Notifikāciju Iestatījumi</string>
+    <string name="call_held_by_you">Jūs apturējāt zvanu</string>
+    <string name="call_held_by_user">%s apturēja zvanu</string>
+    <string name="call_hold_action">Apturēt</string>
+    <string name="call_resume_action">Turpināt</string>
+    <string name="settings_call_ringtone_dialog_title">Izvēlieties zvana signālu:</string>
+    <string name="settings_call_ringtone_title">Ienākoša zvana signāls</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Izmantos %s kā rezervi, kad jūsu serveris nepiedāvā vienu (jūsu IP adrese tiks dalīta sarunas laikā)</string>
+    <string name="settings_call_ringtone_use_default_stun">Atļaut rezerves zvanu palīdzības serveri</string>
+    <string name="template_settings_call_ringtone_use_app_ringtone">Izmantot noklusējuma $ {app_name} zvana signālu ienākošajiem zvaniem</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Pirms zvana uzsākšanas lūgt apstiprinājumu</string>
+    <string name="settings_call_show_confirmation_dialog_title">Novērst nejaušu zvanu</string>
+    <string name="login_error_ssl_handshake">Jūsu ierīce izmanto novecojušu TLS drošības protokolu, jūsu drošībai jūs nevarēsiet savienoties</string>
+    <string name="login_error_ssl_peer_unverified">SSL kļūda: Peer identitāte nav pārbaudīta.</string>
+    <string name="login_error_ssl_other">SSL kļūda.</string>
+    <string name="login_error_homeserver_not_found">Šī URL serveris nav sasniedzams, lūdzu, pārbaudiet to</string>
+    <string name="login_error_no_homeserver_found">Šī nav derīga Matrix servera adrese</string>
+    <string name="login_error_unknown_host">Šis URL nav sasniedzams, lūdzu, pārbaudiet to</string>
+    <string name="auth_accept_policies">Lūdzu, pārskatiet un pieņemiet šī servera noteikumus:</string>
+    <string name="auth_add_email_and_phone_message_2">Iestatiet e-pastu, lai atgūtu kontu, aizmirstot paroli. Izmantojiet vēlāk e-pastu vai tālruni, lai Jums zināmi cilvēki varētu ar Jums sazināties.</string>
+    <string name="auth_add_email_phone_message_2">Iestatiet e-pastu, lai atgūtu kontu, aizmirstot paroli. Izmantojiet vēlāk e-pastu vai tālruni, lai Jums zināmi cilvēki varētu ar Jums sazināties.</string>
+    <string name="auth_add_phone_message_2">Iestatiet telefona numuru, lai Jums zināmi cilvēki varētu ar Jums sazināties.</string>
+    <string name="auth_add_email_message_2">Iestatiet e-pastu, lai atgūtu kontu aizmirstot paroli, vai lai Jums zināmi cilvēki varētu ar Jums sazināties.</string>
+    <string name="call_format_turn_hd_on">Ieslēgt HD</string>
+    <string name="call_format_turn_hd_off">Izslēgt HD</string>
+    <string name="call_camera_front">Priekšējā</string>
+    <string name="call_switch_camera">Pārslēgt kameru</string>
+    <string name="call_select_sound_device">Izvēlieties Skaņas Ierīci</string>
+    <string name="audio_video_meeting_description">Sanāksmes izmanto Jitsi drošības un atļauju politiku. Visi cilvēki, kas pašlaik atrodas telpā, redzēs aicinājumu pievienoties, kamēr notiek jūsu sanāksme.</string>
+    <string name="audio_meeting">Sākt audio sanāksmi</string>
+    <string name="video_meeting">Sākt video sanāksmi</string>
+    <string name="conference_call_in_progress">Konference jau notiek!</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Jums nav atļaujas sākt zvanu</string>
+    <string name="no_permissions_to_start_webrtc_call">Jums nav atļaujas sākt zvanu šajā istabā</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Jums nav atļaujas sākt konferences zvanu</string>
+    <string name="missing_permissions_error">Trūkstošo atļauju dēļ, šī darbība nav iespējama.</string>
+    <string name="start_chatting">Sākt Sarunu</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Ja jūs nedublēsiet atslēgas pirms izrakstīšanās, zaudēsiet piekļuvi jūsu šifrētām ziņām.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Drošs Atslēgu Dublējums jābūt ieslēgts visās jūsu sesijās, lai izvairītos no piekļuves zaudēšanas jūsu šifrētām ziņām.</string>
+    <string name="backup">Dublēt</string>
+    <string name="keys_backup_activate">Izmantot Atslēgu Dublējumu</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Dublē atslēgas…</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Es nevēlos manas šifrētās ziņas</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Notiek atslēgu dublējums. Ja jūs izrakstīsities tagad, jūs zaudēsiet piekļuvi jūsu šifrētām ziņām.</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Jūs zaudēsiet savas šifrētās ziņas, ja izrakstīsities tagad</string>
+    <string name="keys_backup_is_not_finished_please_wait">Atslēgu dublējums nav pabeigts, lūdzu uzgaidiet…</string>
+    <string name="title_activity_keys_backup_restore">Izmantot Atslēgu Dublējumu</string>
+    <string name="title_activity_keys_backup_setup">Atslēgu Dublējums</string>
+    <string name="notice_room_update_by_you">Jūs atjauninājāt šo istabu.</string>
+    <string name="notice_room_update">%s atjaunināja šo istabu.</string>
 </resources>
\ No newline at end of file

From ea8b3ccdf664801bb46d62716a15c89c4a59abb3 Mon Sep 17 00:00:00 2001
From: Vivek K J <VIVEKKJ2004@gmail.com>
Date: Wed, 14 Apr 2021 13:15:10 +0000
Subject: [PATCH 063/350] Translated using Weblate (Malayalam)

Currently translated at 31.4% (744 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 115 ++++++++++++++++++++++
 1 file changed, 115 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index 2cef400e8e..f394245469 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -693,4 +693,119 @@
     <string name="notice_room_canonical_alias_unset">%1$s ഈ മുറിയുടെ പ്രധാന വിലാസം നീക്കംചെയ്‌തു.</string>
     <string name="notice_room_canonical_alias_set_by_you">ഈ മുറിയുടെ പ്രധാന വിലാസം %1$s ആയി നിങ്ങൾ സജ്ജമാക്കി.</string>
     <string name="event_status_sent_message">സന്ദേശം അയച്ചു</string>
+    <string name="direct_room_user_list_contacts_title">കോൺടാക്റ്റുകൾ</string>
+    <string name="direct_room_user_list_recent_title">പുതുതായത്</string>
+    <string name="edited_suffix">(എഡിറ്റുചെയ്തത്)</string>
+    <string name="send_file_step_idle">കാത്തിരിക്കുന്നു…</string>
+    <string name="push_gateway_item_format">Format:</string>
+    <string name="push_gateway_item_url">Url:</string>
+    <string name="push_gateway_item_device_name">session_name:</string>
+    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="settings_expert">വിദഗ്ദ്ധൻ</string>
+    <string name="settings_preferences">മുൻ‌ഗണനകൾ</string>
+    <string name="settings_general_title">പൊതുവായ</string>
+    <string name="create_room_public_title">പരസ്യമായത്</string>
+    <string name="create_room_topic_hint">വിഷയം</string>
+    <string name="create_room_name_hint">പേര്</string>
+    <string name="create_room_action_create">സൃഷ്ടിക്കുക</string>
+    <string name="fab_menu_create_room">മുറികൾ</string>
+    <string name="action_change">മാറ്റുക</string>
+    <string name="reactions">പ്രതികരണങ്ങൾ</string>
+    <string name="reactions_like">ലൈക്ക്</string>
+    <string name="reactions_agree">സമ്മതിക്കുക</string>
+    <string name="title_activity_emoji_reaction_picker">പ്രതികരണങ്ങൾ</string>
+    <string name="room_list_rooms_empty_title">മുറികൾ</string>
+    <string name="room_list_people_empty_title">സംഭാഷണങ്ങൾ</string>
+    <string name="global_retry">വീണ്ടും ശ്രമിക്കുക</string>
+    <string name="reply">മറുപടി</string>
+    <string name="edit">തിരുത്തുക</string>
+    <string name="sas_verified">പരിശോധിച്ചുറപ്പിച്ചു!</string>
+    <string name="keys_backup_info_title_signature">ഒപ്പ്</string>
+    <string name="keys_backup_info_title_algorithm">അൽഗോരിതം</string>
+    <string name="keys_backup_info_title_version">പതിപ്പ്</string>
+    <string name="keys_backup_setup_override_stop">നിർത്തുക</string>
+    <string name="keys_backup_setup_override_replace">മാറ്റിസ്ഥാപിക്കുക</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">പങ്കിടുക</string>
+    <string name="keys_backup_setup_step3_button_title">ചെയ്‌തു</string>
+    <string name="keys_backup_setup_step1_advanced">(വിപുലമായത്)</string>
+    <string name="x_plus">%d+</string>
+    <string name="plus_x">+%d</string>
+    <string name="generic_label">%1$s:</string>
+    <string name="show_info_area_always">എല്ലായ്പ്പോഴും</string>
+    <string name="merged_events_collapse">സങ്കോചിപ്പിക്കുക</string>
+    <string name="merged_events_expand">വിപുലീകരിക്കുക</string>
+    <string name="avatar">അവതാർ</string>
+    <string name="rejoin">വീണ്ടും ചേരുക</string>
+    <string name="invited">ക്ഷണിച്ചു</string>
+    <string name="joined">ചേർന്നു</string>
+    <string name="rooms">മുറികൾ</string>
+    <string name="group_details_rooms">മുറികൾ</string>
+    <string name="group_details_people">ആളുകൾ</string>
+    <string name="group_details_home">പൂമുഖം</string>
+    <string name="community_id_hint">ഉദാഹരണം</string>
+    <string name="community_name_hint">ഉദാഹരണം</string>
+    <string name="create">സൃഷ്ടിക്കൂ</string>
+    <string name="notification_noisy">ശബ്ദമേറിയത്</string>
+    <string name="notification_silent">നിശബ്ദത</string>
+    <string name="notification_off">ഓഫ്</string>
+    <string name="conference_call_warning_title">മുന്നറിയിപ്പ്!</string>
+    <string name="ignore_request_short_label">അവഗണിക്കൂ</string>
+    <string name="share_without_verifying_short_label">പങ്കിടുക</string>
+    <string name="start_verification_short_label">ഉറപ്പാക്കൂ</string>
+    <string name="room_widget_resource_grant_permission">അനുവദിക്കുക</string>
+    <string name="room_widget_activity_title">വിജറ്റ്</string>
+    <string name="active_widget_view_action">കാണുക</string>
+    <string name="huge">വൻ വലുപ്പമേറിയത്</string>
+    <string name="largest">ഏറ്റവും വലുത്</string>
+    <string name="larger">വളരെ വലുത്</string>
+    <string name="large">വലുത്</string>
+    <string name="normal">സാധാരണ</string>
+    <string name="small">ചെറുത്</string>
+    <string name="tiny">തീരെച്ചെറുത്</string>
+    <string name="notification_sender_me">ഞാൻ</string>
+    <string name="notification_unknown_room_name">മുറി</string>
+    <string name="encryption_information_block">കരിമ്പട്ടിക</string>
+    <string name="encryption_information_verify">ഉറപ്പാക്കൂ</string>
+    <string name="encryption_information_none">ഒന്നുമില്ല</string>
+    <string name="encryption_information_blocked">കരിമ്പട്ടികയിൽ പെടുത്തി</string>
+    <string name="encryption_information_verified">പരിശോധിച്ചുറപ്പിച്ചു</string>
+    <string name="encryption_information_verification">സ്ഥിരീകരണം</string>
+    <string name="encryption_information_algorithm">അൽഗോരിതം</string>
+    <string name="settings_theme">തീം</string>
+    <string name="directory_title">മേല്‍വിലാസപ്പട്ടിക</string>
+    <string name="room_settings_labs_pref_title">ലാബുകൾ</string>
+    <string name="room_settings_addresses_pref_title">വിലാസങ്ങൾ</string>
+    <string name="room_settings_category_advanced_title">വിപുലമായവ</string>
+    <string name="room_settings_read_history_entry_anyone">ആർക്കും</string>
+    <string name="room_alias_published_alias_add_manually_submit">പ്രസിദ്ധീകരിക്കുക</string>
+    <string name="room_settings_room_notifications_title">അറിയിപ്പുകൾ</string>
+    <string name="room_settings_tag_pref_entry_none">ഒന്നുമില്ല</string>
+    <string name="room_settings_tag_pref_entry_favourite">പ്രിയപ്പെട്ടവ</string>
+    <string name="media_saving_period_forever">എന്നേക്കും</string>
+    <string name="media_source_choose">തിരഞ്ഞെടുക്കുക</string>
+    <string name="compression_opt_list_choose">തിരഞ്ഞെടുക്കുക</string>
+    <string name="settings_media">മാധ്യമം</string>
+    <string name="settings_password">രഹസ്യവാക്ക്</string>
+    <string name="devices_delete_pswd">രഹസ്യവാചകം:</string>
+    <string name="devices_delete_dialog_title">പ്രാമാണീകരണം</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="settings_analytics">അനലിറ്റിക്സ്</string>
+    <string name="settings_discovery_category">കണ്ടെത്തൽ</string>
+    <string name="settings_secure_backup_manage">നിയന്ത്രിക്കുക</string>
+    <string name="settings_cryptography">ക്രിപ്റ്റോഗ്രഫി</string>
+    <string name="settings_integrations">സംയോജകങ്ങൾ</string>
+    <string name="settings_copyright">പകർപ്പാവകാശം</string>
+    <string name="settings_version">പതിപ്പ്</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">പ്രാപ്തമാക്കുക</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">പ്രാപ്തമാക്കുക</string>
+    <string name="room_sliding_menu_copyright">പകർപ്പാവകാശം</string>
+    <string name="room_settings_mute">നിശബ്ദമാക്കുക</string>
+    <string name="room_recents_invites">കഷണങ്ങൾ</string>
+    <string name="room_recents_join">ചേരുക</string>
+    <string name="search_hint">തിരയുക</string>
+    <string name="ssl_remain_offline">അവഗണിക്കുക</string>
+    <string name="room_participants_action_unban">നിരോധനം മാറ്റുക</string>
+    <string name="room_participants_header_devices">സെഷനുകൾ</string>
 </resources>
\ No newline at end of file

From c6a493848e87b623ccf36730cde23278e652c7e9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 16 Apr 2021 16:13:16 +0200
Subject: [PATCH 064/350] Fix a race condition: Push can be received before the
 Gateway API returns

---
 .../sdk/api/session/pushers/PushersService.kt     |  5 +++--
 .../troubleshoot/TestPushFromPushGateway.kt       | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 9ea820f5b3..a5ec100f64 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -66,12 +66,13 @@ interface PushersService {
 
     /**
      * Directly ask the push gateway to send a push to this device
+     * If successful, the push gateway has accepted the request. In this case, the app should receive a Push with the provided eventId.
+     * In case of error, PusherRejected will be thrown. In this case it means that the pushkey is not valid.
+     *
      * @param url the push gateway url (full path)
      * @param appId the application id
      * @param pushkey the FCM token
      * @param eventId the eventId which will be sent in the Push message. Use a fake eventId.
-     * @param callback callback to know if the push gateway has accepted the request. In this case, the app should receive a Push with the provided eventId.
-     *                 In case of error, PusherRejected failure can happen. In this case it means that the pushkey is not valid.
      */
     suspend fun testPush(url: String,
                          appId: String,
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index ad4b9ecb01..15c7e88bac 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -42,8 +42,10 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
     : TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
 
     private var action: Job? = null
+    private var pushReceived: Boolean = false
 
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+        pushReceived = false
         val fcmToken = FcmHelper.getFcmToken(context) ?: run {
             status = TestStatus.FAILED
             return
@@ -55,9 +57,15 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
                 status = result
                         .fold(
                                 {
-                                    // Wait for the push to be received
-                                    description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_waiting_for_push)
-                                    TestStatus.RUNNING
+                                    if (pushReceived) {
+                                        // Push already received (race condition)
+                                        description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_success)
+                                        TestStatus.SUCCESS
+                                    } else {
+                                        // Wait for the push to be received
+                                        description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_waiting_for_push)
+                                        TestStatus.RUNNING
+                                    }
                                 },
                                 {
                                     description = if (it is PushGatewayFailure.PusherRejected) {
@@ -73,6 +81,7 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
     }
 
     override fun onPushReceived() {
+        pushReceived = true
         description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_success)
         status = TestStatus.SUCCESS
     }

From 0903cb8bf15950a141b0e69ced30ed9ba5457a3c Mon Sep 17 00:00:00 2001
From: Soheil Khanalipur <soheil@disroot.org>
Date: Fri, 16 Apr 2021 10:21:52 +0000
Subject: [PATCH 065/350] Translated using Weblate (Persian)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
---
 vector/src/main/res/values-fa/strings.xml | 25 ++++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 7937f4f4b2..ee58a8e508 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -223,7 +223,7 @@
     <string name="notification_listening_for_events">در حال گوش دادن به رویدادها</string>
     <string name="title_activity_home">پیام‌ها</string>
     <string name="title_activity_room">اتاق</string>
-    <string name="title_activity_settings">تنظیمات</string>
+    <string name="title_activity_settings">ساماندهی</string>
     <string name="title_activity_member_details">جزئیات اعضا</string>
     <string name="title_activity_bug_report">گزارش اشکال</string>
     <string name="loading">در حال بارگذاری…</string>
@@ -394,11 +394,11 @@
     <string name="settings_call_category">تماس‌ها</string>
     <string name="call">تماس</string>
     <string name="media_slider_saved">ذخیره شد</string>
-    <string name="yes">بله</string>
-    <string name="no">نه</string>
+    <string name="yes">بَلِہ</string>
+    <string name="no">نَه</string>
     <string name="media_slider_saved_message">در دانلودها ذخیره شود؟</string>
     <string name="_continue">ادامه</string>
-    <string name="remove">حذف</string>
+    <string name="remove">زُدودَن</string>
     <string name="join">پیوستن</string>
     <string name="preview">پیش‌نمایش</string>
     <string name="reject">رد کردن</string>
@@ -449,7 +449,7 @@
     <string name="room_participants_header_admin_tools">ابزارهای مدیر</string>
     <string name="room_participants_header_call">تماس</string>
     <string name="room_participants_header_direct_chats">گپ‌های مستقیم</string>
-    <string name="room_participants_header_devices">نشست‌ها</string>
+    <string name="room_participants_header_devices">نِشَست‌ھا</string>
     <string name="room_participants_action_invite">دعوت</string>
     <string name="room_participants_action_leave">ترک این اتاق</string>
     <string name="room_participants_action_remove">حذف از این اتاق</string>
@@ -545,7 +545,7 @@
     <string name="settings_add_3pid_confirm_password_title">تأیید گذرواژه‌تان</string>
     <string name="template_settings_add_3pid_flow_not_supported">نمی‌توانید با المنت همراه، این کار را بکنید</string>
     <string name="settings_add_3pid_authentication_needed">نیاز به تأیید هویت است</string>
-    <string name="settings_notification_advanced">تنظمیات پیش‌رفتهٔ آگاهی</string>
+    <string name="settings_notification_advanced">ساماندھیِ پیشرَفتِہ‌یِ آگَہداد</string>
     <string name="settings_notification_troubleshoot">آگاهی‌های رفع‌اشکال</string>
     <string name="settings_troubleshoot_test_system_settings_success">آگاهی‌ها در تنظیمات سامانه به کار افتاده‌اند.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">آگاهی‌ّا در تنظیمات سامانه از کار افتاده‌اند.
@@ -805,7 +805,7 @@
     <string name="room_jump_to_first_unread">پریدن به نخستین پیام خوانده نشده.</string>
     <string name="room_preview_invitation_format">شما برای پیوستن به این اتاق توسط %s دعوت شدید</string>
     <string name="room_preview_try_join_an_unknown_room_default">یک اتاق</string>
-    <string name="room_creation_title">گپ جدید</string>
+    <string name="room_creation_title">گَپِ نو</string>
     <string name="room_creation_add_member">افزودن عضو</string>
     <plurals name="room_header_active_members_count">
         <item quantity="one">%d عضو فعّال</item>
@@ -852,7 +852,7 @@
     <string name="pause_video">توقف</string>
     <string name="action_copy">رونوشت</string>
     <string name="dialog_title_success">موفقیت</string>
-    <string name="bottom_action_notification">اعلان‌ها</string>
+    <string name="bottom_action_notification">آگَہداد</string>
     <string name="dismiss">خاتمه</string>
     <string name="no_permissions_to_start_conf_call">اجازهٔ شروع تماس کنفرانسی در این اتاق را ندارید</string>
     <string name="no_permissions_to_start_webrtc_call">اجازهٔ شروع تماس در این اتاق را ندارید</string>
@@ -913,10 +913,10 @@
     <string name="people_search_invite_by_id_dialog_title">دعوت کاربر با شناسه</string>
     <string name="people_search_invite_by_id_dialog_description">لطفاً یک یا چند نشانی رایانامه یا شناسهٔ ماتریکس را وارد کنید</string>
     <string name="people_search_invite_by_id_dialog_hint">رایانامه یا شناسهٔ ماتریکس</string>
-    <string name="room_menu_search">جست‌وجو</string>
-    <string name="room_one_user_is_typing">%s دارد می‌نویسد…</string>
-    <string name="room_two_users_are_typing">%1$s و %2$s دارند می‌نویسند…</string>
-    <string name="room_many_users_are_typing">%1$s و %2$s و دیگران دارند می‌نویسند…</string>
+    <string name="room_menu_search">جُستُجو</string>
+    <string name="room_one_user_is_typing">%s دارد می‌نِویسَد…</string>
+    <string name="room_two_users_are_typing">%1$s و %2$s دارَند می‌نِویسَند…</string>
+    <string name="room_many_users_are_typing">%1$s و %2$s و دیگَران دارَند می‌نِویسَند…</string>
     <string name="room_message_placeholder_encrypted">فرستادن پیام رمزشده…</string>
     <string name="room_message_placeholder_not_encrypted">فرستادن پیام (رمز نشده)…</string>
     <string name="room_offline_notification">اتّصال به کارساز از دست رفت.</string>
@@ -2672,4 +2672,5 @@
     <string name="settings_room_directory_show_all_rooms_summary">نمایش همه‌ی اتاق‌های داخل فهرست.</string>
     <string name="settings_room_directory_show_all_rooms">نمایش‌ها همه‌ی اتاق‌ها</string>
     <string name="settings_category_room_directory">فهرست اتاق‌ها</string>
+    <string name="event_status_sent_message">پَیام فِرِستاده شُد</string>
 </resources>
\ No newline at end of file

From e3e0139d2be8803955adf698fd68affa7becca3e Mon Sep 17 00:00:00 2001
From: GokdenizK <gokdeniz_6167@hotmail.com>
Date: Fri, 16 Apr 2021 10:18:58 +0000
Subject: [PATCH 066/350] Translated using Weblate (Turkish)

Currently translated at 68.0% (1609 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
---
 vector/src/main/res/values-tr/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml
index 4739830ea4..3e80f9f496 100644
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@@ -1816,4 +1816,8 @@
     <string name="notice_room_update_by_you">Bu odayı geliştirdiniz.</string>
     <string name="notice_room_update">%s bu odayı geliştirdi.</string>
     <string name="notice_end_to_end_by_you">Uçtan uca şifrelemeyi açtınız (%1$s)</string>
+    <string name="notice_widget_modified">%1$s %2$s widgetını düzenledi</string>
+    <string name="notice_widget_removed">%1$s %2$s widgetını kaldırdı</string>
+    <string name="notice_end_to_end">%1$s uçtan uca şifrelemeyi etkinleştirdi (%2$s)</string>
+    <string name="notice_room_visibility_unknown">bilinmeyen (%s).</string>
 </resources>
\ No newline at end of file

From f8be8140790757ee7b1ada14ac5175e108503e1b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 10:49:47 +0200
Subject: [PATCH 067/350] RegistrationWizard.createAccount() parameters are now
 all optional, following Matrix spec (#3205)

---
 CHANGES.md                                                    | 2 +-
 .../android/sdk/api/auth/registration/RegistrationWizard.kt   | 4 +++-
 .../internal/auth/registration/DefaultRegistrationWizard.kt   | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 57582d884a..c9b155f7ad 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,7 +14,7 @@ Translations 🗣:
  -
 
 SDK API changes ⚠️:
- -
+ - RegistrationWizard.createAccount() parameters are now all optional, following Matrix spec (#3205)
 
 Build 🧱:
  - Upgrade to gradle 7
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
index 38a5a77291..f059bf26c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
@@ -20,7 +20,9 @@ interface RegistrationWizard {
 
     suspend fun getRegistrationFlow(): RegistrationResult
 
-    suspend fun createAccount(userName: String, password: String, initialDeviceDisplayName: String?): RegistrationResult
+    suspend fun createAccount(userName: String?,
+                              password: String?,
+                              initialDeviceDisplayName: String?): RegistrationResult
 
     suspend fun performReCaptcha(response: String): RegistrationResult
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 4a3d53a8fc..4a156e74cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -66,8 +66,8 @@ internal class DefaultRegistrationWizard(
         return performRegistrationRequest(params)
     }
 
-    override suspend fun createAccount(userName: String,
-                                       password: String,
+    override suspend fun createAccount(userName: String?,
+                                       password: String?,
                                        initialDeviceDisplayName: String?): RegistrationResult {
         val params = RegistrationParams(
                 username = userName,

From ef1ed28ac5f176664cf360363cd0ba88819fb816 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 16:04:59 +0200
Subject: [PATCH 068/350] Fix color issues when the system theme is changed
 (#2738)

---
 CHANGES.md                                                      | 1 +
 .../im/vector/app/features/configuration/VectorConfiguration.kt | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 57582d884a..c188c1d145 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
+ - Fix color issues when the system theme is changed (#2738)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
index 394eca030b..a2d190bd69 100644
--- a/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
+++ b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
@@ -39,6 +39,8 @@ class VectorConfiguration @Inject constructor(private val context: Context) {
             Timber.v("## onConfigurationChanged(): restore the expected value ${VectorLocale.applicationLocale}")
             Locale.setDefault(VectorLocale.applicationLocale)
         }
+        // Night mode may have changed
+        ThemeUtils.init(context)
     }
 
     fun applyToApplicationContext() {

From 5862c8cb607bac840cec094537c21d2b32fa8b1c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 17:08:17 +0200
Subject: [PATCH 069/350] Reduce usage of rxSingle when it's easy to do it

---
 .../java/org/matrix/android/sdk/rx/RxRoom.kt  | 11 --------
 .../org/matrix/android/sdk/rx/RxSession.kt    | 11 --------
 .../vector/app/core/mvrx/ResultExtension.kt   | 26 +++++++++++++++++++
 .../createdirect/CreateDirectRoomViewModel.kt | 16 +++++++-----
 .../home/room/detail/RoomDetailViewModel.kt   | 16 +++++++-----
 5 files changed, 46 insertions(+), 34 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/mvrx/ResultExtension.kt

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
index 21db4e1893..3f61ca0103 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
@@ -19,9 +19,7 @@ package org.matrix.android.sdk.rx
 import android.net.Uri
 import io.reactivex.Completable
 import io.reactivex.Observable
-import io.reactivex.Single
 import kotlinx.coroutines.rx2.rxCompletable
-import kotlinx.coroutines.rx2.rxSingle
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.identity.ThreePid
@@ -91,15 +89,6 @@ class RxRoom(private val room: Room) {
         return room.getMyReadReceiptLive().asObservable()
     }
 
-    fun loadRoomMembersIfNeeded(): Single<Unit> = rxSingle {
-        room.loadRoomMembersIfNeeded()
-    }
-
-    fun joinRoom(reason: String? = null,
-                 viaServers: List<String> = emptyList()): Single<Unit> = rxSingle {
-        room.join(reason, viaServers)
-    }
-
     fun liveEventReadReceipts(eventId: String): Observable<List<ReadReceipt>> {
         return room.getEventReadReceiptsLive(eventId).asObservable()
     }
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 0fe2b01576..5d8b019284 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -38,7 +38,6 @@ import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.session.widgets.model.Widget
@@ -124,22 +123,12 @@ class RxSession(private val session: Session) {
                 .startWithCallable { session.getPendingThreePids() }
     }
 
-    fun createRoom(roomParams: CreateRoomParams): Single<String> = rxSingle {
-        session.createRoom(roomParams)
-    }
-
     fun searchUsersDirectory(search: String,
                              limit: Int,
                              excludedUserIds: Set<String>): Single<List<User>> = rxSingle {
         session.searchUsersDirectory(search, limit, excludedUserIds)
     }
 
-    fun joinRoom(roomIdOrAlias: String,
-                 reason: String? = null,
-                 viaServers: List<String> = emptyList()): Single<Unit> = rxSingle {
-        session.joinRoom(roomIdOrAlias, reason, viaServers)
-    }
-
     fun getRoomIdByAlias(roomAlias: String,
                          searchOnServer: Boolean): Single<Optional<RoomAliasDescription>> = rxSingle {
         session.getRoomIdByAlias(roomAlias, searchOnServer)
diff --git a/vector/src/main/java/im/vector/app/core/mvrx/ResultExtension.kt b/vector/src/main/java/im/vector/app/core/mvrx/ResultExtension.kt
new file mode 100644
index 0000000000..1dbf658deb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/mvrx/ResultExtension.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.mvrx
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Success
+
+fun <A> Result<A>.foldToAsync(): Async<A> = fold(
+        { Success(it) },
+        { Fail(it) }
+)
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
index cbe363aa0e..0cc128f749 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
@@ -26,6 +26,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.mvrx.foldToAsync
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.raw.wellknown.getElementWellknown
 import im.vector.app.features.raw.wellknown.isE2EByDefault
@@ -35,7 +36,6 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
-import org.matrix.android.sdk.rx.rx
 
 class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
                                                             initialState: CreateDirectRoomViewState,
@@ -99,11 +99,15 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
                         enableEncryptionIfInvitedUsersSupportIt = adminE2EByDefault
                     }
 
-            session.rx()
-                    .createRoom(roomParams)
-                    .execute {
-                        copy(createAndInviteState = it)
-                    }
+            val result = runCatching {
+                session.createRoom(roomParams)
+            }.foldToAsync()
+
+            setState {
+                copy(
+                        createAndInviteState = result
+                )
+            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index f0732d8f07..725cce70ab 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -35,6 +35,7 @@ import dagger.assisted.AssistedInject
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.mvrx.foldToAsync
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.call.dialpad.DialPadLookup
@@ -649,12 +650,15 @@ class RoomDetailViewModel @AssistedInject constructor(
             val viaServers = MatrixPatterns.extractServerNameFromId(action.event.senderId)
                     ?.let { listOf(it) }
                     .orEmpty()
-            session.rx()
-                    .joinRoom(roomId, viaServers = viaServers)
-                    .map { roomId }
-                    .execute {
-                        copy(tombstoneEventHandling = it)
-                    }
+            viewModelScope.launch {
+                val result = runCatching {
+                    session.joinRoom(roomId, viaServers = viaServers)
+                    roomId
+                }.foldToAsync()
+                setState {
+                    copy(tombstoneEventHandling = result)
+                }
+            }
         }
     }
 

From f086f0e083a412532ed4eac6ef99bc9f18bcf73e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 17:13:48 +0200
Subject: [PATCH 070/350] Reduce usage of rxSingle when it's easy to do it -
 case 2

---
 .../RoomMemberProfileViewModel.kt             | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index 64081a1683..0fa681a799 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -29,6 +29,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import im.vector.app.R
+import im.vector.app.core.mvrx.foldToAsync
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
@@ -139,7 +140,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
 
     override fun handle(action: RoomMemberProfileAction) {
         when (action) {
-            is RoomMemberProfileAction.RetryFetchingInfo      -> fetchProfileInfo()
+            is RoomMemberProfileAction.RetryFetchingInfo      -> handleRetryFetchProfileInfo()
             is RoomMemberProfileAction.IgnoreUser             -> handleIgnoreAction()
             is RoomMemberProfileAction.VerifyUser             -> prepareVerification()
             is RoomMemberProfileAction.ShareRoomMemberProfile -> handleShareRoomMemberProfile()
@@ -259,18 +260,27 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
                 }
     }
 
-    private fun fetchProfileInfo() {
-        session.rx().getProfileInfo(initialState.userId)
-                .map {
-                    MatrixItem.UserItem(
-                            id = initialState.userId,
-                            displayName = it[ProfileService.DISPLAY_NAME_KEY] as? String,
-                            avatarUrl = it[ProfileService.AVATAR_URL_KEY] as? String
-                    )
-                }
-                .execute {
-                    copy(userMatrixItem = it)
-                }
+    private fun handleRetryFetchProfileInfo() {
+        viewModelScope.launch {
+            fetchProfileInfo()
+        }
+    }
+
+    private suspend fun fetchProfileInfo() {
+        val result = runCatching {
+            session.getProfile(initialState.userId)
+                    .let {
+                        MatrixItem.UserItem(
+                                id = initialState.userId,
+                                displayName = it[ProfileService.DISPLAY_NAME_KEY] as? String,
+                                avatarUrl = it[ProfileService.AVATAR_URL_KEY] as? String
+                        )
+                    }
+        }.foldToAsync()
+
+        setState {
+            copy(userMatrixItem = result)
+        }
     }
 
     private fun observeRoomSummaryAndPowerLevels(room: Room) {

From 820531120a0e45c448002044c0e75570a6e1aa2c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 17:33:57 +0200
Subject: [PATCH 071/350] Some formatting and cleanup

---
 .../features/permalink/PermalinkHandler.kt    |  5 ++++-
 .../userdirectory/UserListViewModel.kt        | 22 +++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index a7d69c783c..ae6d630c75 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -112,7 +112,10 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
     private fun PermalinkData.RoomLink.getRoomId(): Single<Optional<String>> {
         val session = activeSessionHolder.getSafeActiveSession()
         return if (isRoomAlias && session != null) {
-            session.rx().getRoomIdByAlias(roomIdOrAlias, true).map { it.getOrNull()?.roomId.toOptional() }.subscribeOn(Schedulers.io())
+            session.rx()
+                    .getRoomIdByAlias(roomIdOrAlias, true)
+                    .map { it.getOrNull()?.roomId.toOptional() }
+                    .subscribeOn(Schedulers.io())
         } else {
             Single.just(Optional.from(roomIdOrAlias))
         }
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index 0e042c8bc1..a85b2cd95f 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -144,15 +144,19 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
                                     }
                                     .onErrorReturn { Optional.empty() }
 
-                            Single.zip(searchObservable, profileObservable, { searchResults, optionalProfile ->
-                                val profile = optionalProfile.getOrNull() ?: return@zip searchResults
-                                val searchContainsProfile = searchResults.indexOfFirst { it.userId == profile.userId } != -1
-                                if (searchContainsProfile) {
-                                    searchResults
-                                } else {
-                                    listOf(profile) + searchResults
-                                }
-                            })
+                            Single.zip(
+                                    searchObservable,
+                                    profileObservable,
+                                    { searchResults, optionalProfile ->
+                                        val profile = optionalProfile.getOrNull() ?: return@zip searchResults
+                                        val searchContainsProfile = searchResults.any { it.userId == profile.userId }
+                                        if (searchContainsProfile) {
+                                            searchResults
+                                        } else {
+                                            listOf(profile) + searchResults
+                                        }
+                                    }
+                            )
                         }
                     }
                     stream.toAsync {

From 2a3694d8b72c80a1bec0720f27bd18ea9943bea3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 18:12:11 +0200
Subject: [PATCH 072/350] Cleanup

---
 .../vector/app/features/userdirectory/UserListViewModel.kt   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index a85b2cd95f..77f6c3f4eb 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -29,7 +29,6 @@ import im.vector.app.core.extensions.toggle
 import im.vector.app.core.platform.VectorViewModel
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.profile.ProfileService
@@ -50,8 +49,6 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
     private val knownUsersSearch = BehaviorRelay.create<KnownUsersSearch>()
     private val directoryUsersSearch = BehaviorRelay.create<DirectoryUsersSearch>()
 
-    private var currentUserSearchDisposable: Disposable? = null
-
     @AssistedFactory
     interface Factory {
         fun create(initialState: UserListViewState): UserListViewModel
@@ -115,8 +112,6 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
                     copy(knownUsers = async)
                 }
 
-        currentUserSearchDisposable?.dispose()
-
         directoryUsersSearch
                 .debounce(300, TimeUnit.MILLISECONDS)
                 .switchMapSingle { search ->

From 5848ec21f709e6bea460f65e62371cddd858c607 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 18:16:03 +0200
Subject: [PATCH 073/350] use orEmpty()

---
 .../im/vector/app/features/invite/InviteUsersToRoomViewModel.kt | 2 +-
 .../vector/app/features/roomdirectory/RoomDirectoryViewModel.kt | 2 +-
 .../im/vector/app/features/userdirectory/UserListViewModel.kt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
index 55730ff4ec..2f20fef3c9 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
@@ -92,6 +92,6 @@ class InviteUsersToRoomViewModel @AssistedInject constructor(@Assisted
     }
 
     fun getUserIdsOfRoomMembers(): Set<String> {
-        return room.roomSummary()?.otherMemberIds?.toSet() ?: emptySet()
+        return room.roomSummary()?.otherMemberIds?.toSet().orEmpty()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index 7b55e38764..cfc8d9f099 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -87,7 +87,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(
                     val joinedRoomIds = list
                             ?.map { it.roomId }
                             ?.toSet()
-                            ?: emptySet()
+                            .orEmpty()
 
                     setState {
                         copy(joinedRoomsIds = joinedRoomIds)
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index 77f6c3f4eb..3e1e06d47e 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -119,7 +119,7 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
                         Single.just(emptyList<User>())
                     } else {
                         val searchObservable = session.rx()
-                                .searchUsersDirectory(search, 50, state.excludedUserIds ?: emptySet())
+                                .searchUsersDirectory(search, 50, state.excludedUserIds.orEmpty())
                                 .map { users ->
                                     users.sortedBy { it.toMatrixItem().firstLetterOfDisplayName() }
                                 }

From b553d390e112b830d69747e46238ca3e6fda33d5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 18:30:37 +0200
Subject: [PATCH 074/350] Remove unused code

---
 .../android/sdk/rx/RxCallbackBuilders.kt      | 56 -------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
deleted file mode 100644
index ec30a31f6d..0000000000
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.rx
-
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
-import io.reactivex.Completable
-import io.reactivex.Single
-
-fun <T> singleBuilder(builder: (MatrixCallback<T>) -> Cancelable): Single<T> = Single.create { emitter ->
-    val callback = object : MatrixCallback<T> {
-        override fun onSuccess(data: T) {
-            // Add `!!` to fix the warning:
-            // "Type mismatch: type parameter with nullable bounds is used T is used where T was expected. This warning will become an error soon"
-            emitter.onSuccess(data!!)
-        }
-
-        override fun onFailure(failure: Throwable) {
-            emitter.tryOnError(failure)
-        }
-    }
-    val cancelable = builder(callback)
-    emitter.setCancellable {
-        cancelable.cancel()
-    }
-}
-
-fun <T> completableBuilder(builder: (MatrixCallback<T>) -> Cancelable): Completable = Completable.create { emitter ->
-    val callback = object : MatrixCallback<T> {
-        override fun onSuccess(data: T) {
-            emitter.onComplete()
-        }
-
-        override fun onFailure(failure: Throwable) {
-            emitter.tryOnError(failure)
-        }
-    }
-    val cancelable = builder(callback)
-    emitter.setCancellable {
-        cancelable.cancel()
-    }
-}

From f4c1de3c30bb91fff1cc655cc70f3862f1191f77 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 18:49:16 +0200
Subject: [PATCH 075/350] Fix exception in rxSingle (#3180) Do not wrap
 CancellationException to Failure.Cancelled, else RxCancellable will throw.

---
 CHANGES.md                                                    | 1 +
 .../main/java/org/matrix/android/sdk/api/failure/Failure.kt   | 1 -
 .../java/org/matrix/android/sdk/internal/network/Request.kt   | 4 ++--
 .../android/sdk/internal/session/sync/job/SyncThread.kt       | 3 ++-
 .../app/features/home/room/detail/search/SearchViewModel.kt   | 4 ++--
 .../im/vector/app/features/login/AbstractLoginFragment.kt     | 3 ++-
 .../app/features/roomdirectory/RoomDirectoryViewModel.kt      | 4 ++--
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index c9b155f7ad..f2c5fb5d11 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
+ - Fix exception in rxSingle (#3180)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
index b241903364..8f1bbb6941 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
@@ -32,7 +32,6 @@ import java.io.IOException
  */
 sealed class Failure(cause: Throwable? = null) : Throwable(cause = cause) {
     data class Unknown(val throwable: Throwable? = null) : Failure(throwable)
-    data class Cancelled(val throwable: Throwable? = null) : Failure(throwable)
     data class UnrecognizedCertificateFailure(val url: String, val fingerprint: Fingerprint) : Failure()
     data class NetworkConnection(val ioException: IOException? = null) : Failure(ioException)
     data class ServerError(val error: MatrixError, val httpCode: Int) : Failure(RuntimeException(error.toString()))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index 0246bae024..e045cebd3e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -88,8 +88,8 @@ internal suspend inline fun <DATA> executeRequest(globalErrorReceiver: GlobalErr
                 throw when (exception) {
                     is IOException              -> Failure.NetworkConnection(exception)
                     is Failure.ServerError,
-                    is Failure.OtherServerError -> exception
-                    is CancellationException    -> Failure.Cancelled(exception)
+                    is Failure.OtherServerError,
+                    is CancellationException    -> exception
                     else                        -> Failure.Unknown(exception)
                 }
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
index 424c24663c..de8d009892 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
@@ -20,6 +20,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import com.squareup.moshi.JsonEncodingException
+import kotlinx.coroutines.CancellationException
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.isTokenError
 import org.matrix.android.sdk.api.session.sync.SyncState
@@ -199,7 +200,7 @@ internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
             if (failure is Failure.NetworkConnection && failure.cause is SocketTimeoutException) {
                 // Timeout are not critical
                 Timber.v("Timeout")
-            } else if (failure is Failure.Cancelled) {
+            } else if (failure is CancellationException) {
                 Timber.v("Cancelled")
             } else if (failure.isTokenError()) {
                 // No token or invalid token, stop the thread
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index fb3abf002e..26111e4f2b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -28,9 +28,9 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.search.SearchResult
 
@@ -120,7 +120,7 @@ class SearchViewModel @AssistedInject constructor(
                 )
                 onSearchResultSuccess(result)
             } catch (failure: Throwable) {
-                if (failure is Failure.Cancelled) return@launch
+                if (failure is CancellationException) return@launch
 
                 _viewEvents.post(SearchViewEvents.Failure(failure))
                 setState {
diff --git a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
index e537f31e78..c16c7c6645 100644
--- a/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
+import kotlinx.coroutines.CancellationException
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
 import javax.net.ssl.HttpsURLConnection
@@ -76,7 +77,7 @@ abstract class AbstractLoginFragment<VB: ViewBinding> : VectorBaseFragment<VB>()
         }
 
         when (throwable) {
-            is Failure.Cancelled                      ->
+            is CancellationException                  ->
                 /* Ignore this error, user has cancelled the action */
                 Unit
             is Failure.ServerError                    ->
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
index cfc8d9f099..f64105b759 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -29,10 +29,10 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.settings.VectorPreferences
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsFilter
@@ -183,7 +183,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(
                         )
                 )
             } catch (failure: Throwable) {
-                if (failure is Failure.Cancelled) {
+                if (failure is CancellationException) {
                     // Ignore, another request should be already started
                     return@launch
                 }

From ff3a916cabc991d8191525ebeb25b1a13371cc0f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 18:59:49 +0200
Subject: [PATCH 076/350] Do not invite the current user when creating a room
 (#3123)

---
 CHANGES.md                                                   | 1 +
 .../internal/session/room/create/CreateRoomBodyBuilder.kt    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index f2c5fb5d11..94ceb85fbd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
  - Fix exception in rxSingle (#3180)
+ - Do not invite the current user when creating a room (#3123)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 5e823fc87f..80be49de61 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -27,6 +27,7 @@ import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.internal.crypto.DeviceListManager
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.di.AuthenticatedIdentity
+import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.token.AccessTokenProvider
 import org.matrix.android.sdk.internal.session.content.FileUploader
 import org.matrix.android.sdk.internal.session.identity.EnsureIdentityTokenTask
@@ -43,6 +44,8 @@ internal class CreateRoomBodyBuilder @Inject constructor(
         private val deviceListManager: DeviceListManager,
         private val identityStore: IdentityStore,
         private val fileUploader: FileUploader,
+        @UserId
+        private val userId: String,
         @AuthenticatedIdentity
         private val accessTokenProvider: AccessTokenProvider
 ) {
@@ -80,7 +83,7 @@ internal class CreateRoomBodyBuilder @Inject constructor(
                 roomAliasName = params.roomAliasName,
                 name = params.name,
                 topic = params.topic,
-                invitedUserIds = params.invitedUserIds,
+                invitedUserIds = params.invitedUserIds.filter { it != userId },
                 invite3pids = invite3pids,
                 creationContent = params.creationContent.takeIf { it.isNotEmpty() },
                 initialStates = initialStates,

From 19e07f6cac833167c4dae3d54ba4eccdac0ae028 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 19:06:32 +0200
Subject: [PATCH 077/350] typo

---
 .../im/vector/app/features/userdirectory/UserListFragment.kt    | 2 +-
 .../im/vector/app/features/userdirectory/UserListViewEvents.kt  | 2 +-
 .../im/vector/app/features/userdirectory/UserListViewModel.kt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
index 4a87d13021..6e6df7a7aa 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
@@ -89,7 +89,7 @@ class UserListFragment @Inject constructor(
 
         viewModel.observeViewEvents {
             when (it) {
-                is UserListViewEvents.OpenShareMatrixToLing -> {
+                is UserListViewEvents.OpenShareMatrixToLink -> {
                     val text = getString(R.string.invite_friends_text, it.link)
                     startSharePlainTextIntent(
                             fragment = this,
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewEvents.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewEvents.kt
index 95c6729fad..f5ec044597 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewEvents.kt
@@ -22,5 +22,5 @@ import im.vector.app.core.platform.VectorViewEvents
  * Transient events for invite users to room screen
  */
 sealed class UserListViewEvents : VectorViewEvents {
-    data class OpenShareMatrixToLing(val link: String) : UserListViewEvents()
+    data class OpenShareMatrixToLink(val link: String) : UserListViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index 3e1e06d47e..a68717ea57 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -89,7 +89,7 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
 
     private fun handleShareMyMatrixToLink() {
         session.permalinkService().createPermalink(session.myUserId)?.let {
-            _viewEvents.post(UserListViewEvents.OpenShareMatrixToLing(it))
+            _viewEvents.post(UserListViewEvents.OpenShareMatrixToLink(it))
         }
     }
 

From cf69d5c882fd3e5d95eb3dc8ddfff0ef4e19e87c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 19:11:37 +0200
Subject: [PATCH 078/350] Fix small bug about suggestion

---
 .../userdirectory/UserListController.kt       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
index a7ec9cd8c3..798f8b9345 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
@@ -135,7 +135,9 @@ class UserListController @Inject constructor(private val session: Session,
     }
 
     private fun buildDirectoryUsers(directoryUsers: List<User>, selectedUsers: List<String>, searchTerms: String, ignoreIds: List<String>) {
-        val toDisplay = directoryUsers.filter { !ignoreIds.contains(it.userId) }
+        val toDisplay = directoryUsers
+                .filter { !ignoreIds.contains(it.userId) && it.userId != session.myUserId }
+
         if (toDisplay.isEmpty() && searchTerms.isBlank()) {
             return
         }
@@ -147,16 +149,14 @@ class UserListController @Inject constructor(private val session: Session,
             renderEmptyState()
         } else {
             toDisplay.forEach { user ->
-                if (user.userId != session.myUserId) {
-                    val isSelected = selectedUsers.contains(user.userId)
-                    userDirectoryUserItem {
-                        id(user.userId)
-                        selected(isSelected)
-                        matrixItem(user.toMatrixItem())
-                        avatarRenderer(avatarRenderer)
-                        clickListener { _ ->
-                            callback?.onItemClick(user)
-                        }
+                val isSelected = selectedUsers.contains(user.userId)
+                userDirectoryUserItem {
+                    id(user.userId)
+                    selected(isSelected)
+                    matrixItem(user.toMatrixItem())
+                    avatarRenderer(avatarRenderer)
+                    clickListener { _ ->
+                        callback?.onItemClick(user)
                     }
                 }
             }

From 7309fa547b46469fb1f7ccdb86152ad425d11668 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 19:13:42 +0200
Subject: [PATCH 079/350] Exclude current user from the list of user to invite
 (#3123)

---
 .../userdirectory/UserListController.kt       | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
index 798f8b9345..90fb828663 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListController.kt
@@ -109,29 +109,31 @@ class UserListController @Inject constructor(private val session: Session,
     }
 
     private fun buildKnownUsers(currentState: UserListViewState, selectedUsers: List<String>) {
-        currentState.knownUsers()?.let { userList ->
-            userListHeaderItem {
-                id("known_header")
-                header(stringProvider.getString(R.string.direct_room_user_list_known_title))
-            }
+        currentState.knownUsers()
+                ?.filter { it.userId != session.myUserId }
+                ?.let { userList ->
+                    userListHeaderItem {
+                        id("known_header")
+                        header(stringProvider.getString(R.string.direct_room_user_list_known_title))
+                    }
 
-            if (userList.isEmpty()) {
-                renderEmptyState()
-                return
-            }
-            userList.forEach { item ->
-                val isSelected = selectedUsers.contains(item.userId)
-                userDirectoryUserItem {
-                    id(item.userId)
-                    selected(isSelected)
-                    matrixItem(item.toMatrixItem())
-                    avatarRenderer(avatarRenderer)
-                    clickListener { _ ->
-                        callback?.onItemClick(item)
+                    if (userList.isEmpty()) {
+                        renderEmptyState()
+                        return
+                    }
+                    userList.forEach { item ->
+                        val isSelected = selectedUsers.contains(item.userId)
+                        userDirectoryUserItem {
+                            id(item.userId)
+                            selected(isSelected)
+                            matrixItem(item.toMatrixItem())
+                            avatarRenderer(avatarRenderer)
+                            clickListener { _ ->
+                                callback?.onItemClick(item)
+                            }
+                        }
                     }
                 }
-            }
-        }
     }
 
     private fun buildDirectoryUsers(directoryUsers: List<User>, selectedUsers: List<String>, searchTerms: String, ignoreIds: List<String>) {

From bb48fea11631256301735d4f53591ddd7cdce110 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 17:59:41 +0000
Subject: [PATCH 080/350] Bump epoxy_version from 4.4.4 to 4.5.0

Bumps `epoxy_version` from 4.4.4 to 4.5.0.

Updates `epoxy` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Updates `epoxy-glide-preloading` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Updates `epoxy-processor` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Updates `epoxy-paging` from 4.4.4 to 4.5.0
- [Release notes](https://github.com/airbnb/epoxy/releases)
- [Changelog](https://github.com/airbnb/epoxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airbnb/epoxy/compare/4.4.4...4.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 3d30a2a2f6..b9f37f8767 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -290,7 +290,7 @@ android {
 
 dependencies {
 
-    def epoxy_version = '4.4.4'
+    def epoxy_version = '4.5.0'
     def fragment_version = '1.3.2'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'

From 7575959c4a3bbc95141423cda1bd1efcf6ca9db9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 07:05:44 +0000
Subject: [PATCH 081/350] Bump daggerVersion from 2.34.1 to 2.35

Bumps `daggerVersion` from 2.34.1 to 2.35.

Updates `dagger` from 2.34.1 to 2.35
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35)

Updates `dagger-compiler` from 2.34.1 to 2.35
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 6b261d855d..2807a2f824 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -115,7 +115,7 @@ dependencies {
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
-    def daggerVersion = '2.34.1'
+    def daggerVersion = '2.35'
     def work_version = '2.5.0'
     def retrofit_version = '2.9.0'
 
diff --git a/vector/build.gradle b/vector/build.gradle
index c9941d3cb0..37fb7c20ce 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -297,7 +297,7 @@ dependencies {
     def big_image_viewer_version = '1.8.0'
     def glide_version = '4.12.0'
     def moshi_version = '1.12.0'
-    def daggerVersion = '2.34.1'
+    def daggerVersion = '2.35'
     def autofill_version = "1.1.0"
     def work_version = '2.5.0'
     def arch_version = '2.1.0'

From ba7015c8f2b3249c33cbb6434e6352f5b7994818 Mon Sep 17 00:00:00 2001
From: Philip Munksgaard <philip@munksgaard.me>
Date: Thu, 22 Apr 2021 09:14:39 +0000
Subject: [PATCH 082/350] Translated using Weblate (Danish)

Currently translated at 20.8% (493 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/da/
---
 vector/src/main/res/values-da/strings.xml | 151 +++++++++-------------
 1 file changed, 61 insertions(+), 90 deletions(-)

diff --git a/vector/src/main/res/values-da/strings.xml b/vector/src/main/res/values-da/strings.xml
index d74de284f4..c6c854a128 100644
--- a/vector/src/main/res/values-da/strings.xml
+++ b/vector/src/main/res/values-da/strings.xml
@@ -1,12 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s sendte et billede.</string>
-
     <string name="notice_room_invite_no_invitee">%ss invitation</string>
     <string name="notice_room_invite">%1$s inviterede %2$s</string>
     <string name="notice_room_invite_you">%1$s inviterede dig</string>
-    <string name="notice_room_join">%1$s forbandt</string>
+    <string name="notice_room_join">%1$s kom ind i rummet</string>
     <string name="notice_room_leave">%1$s forlod rummet</string>
     <string name="notice_room_reject">%1$s afviste invitationen</string>
     <string name="notice_room_kick">%1$s kickede %2$s</string>
@@ -30,59 +29,44 @@
     <string name="notice_room_visibility_world_readable">alle.</string>
     <string name="notice_room_visibility_unknown">ukendt (%s).</string>
     <string name="notice_end_to_end">%1$s slog ende-til-ende kryptering til (%2$s)</string>
-
-    <string name="notice_requested_voip_conference">%1$s forespurgte en VoIP konference</string>
-    <string name="notice_voip_started">VoIP konference startet</string>
-    <string name="notice_voip_finished">VoIP konference afsluttet</string>
-
+    <string name="notice_requested_voip_conference">%1$s anmodede om en VoIP konference</string>
+    <string name="notice_voip_started">VoIP-konference startet</string>
+    <string name="notice_voip_finished">VoIP-konference afsluttet</string>
     <string name="notice_avatar_changed_too">(avatar blev også ændret)</string>
     <string name="notice_room_name_removed">%1$s fjernede navnet på rummet</string>
     <string name="notice_room_topic_removed">%1$s fjernede emnet for rummet</string>
     <string name="notice_profile_change_redacted">%1$s opdaterede sin profil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s inviterede %2$s til rummet</string>
     <string name="notice_room_third_party_registered_invite">%1$s accepterede invitationen til %2$s</string>
-
     <string name="notice_crypto_unable_to_decrypt">** Kunne ikke dekryptere: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Afsenderens enhed har ikke sendt os nøglerne til denne besked.</string>
-
     <string name="could_not_redact">Kunne ikke hemmeligholde</string>
     <string name="unable_to_send_message">Kunne ikke sende besked</string>
-
     <string name="message_failed_to_upload">Kunne ikke uploade billede</string>
-
     <string name="network_error">Netværks fejl</string>
     <string name="matrix_error">Matrix fejl</string>
-
     <string name="room_error_join_failed_empty_room">Det er i øjeblikket ikke muligt at genforbinde til et tomt rum.</string>
-
     <string name="encrypted_message">Krypteret besked</string>
-
     <string name="medium_email">mailadresse</string>
     <string name="medium_phone_number">Telefonnummer</string>
-
     <string name="room_displayname_invite_from">Invitation fra %s</string>
     <string name="room_displayname_room_invite">Invitation til rum</string>
     <string name="room_displayname_two_members">%1$s og %2$s</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s og 1 anden</item>
         <item quantity="other">%1$s og %2$d andre</item>
     </plurals>
-
     <string name="room_displayname_empty_room">Tomt rum</string>
     <string name="light_theme">Lyst Tema</string>
     <string name="dark_theme">Mørkt Tema</string>
     <string name="black_theme">Sort Tema</string>
-
     <string name="notification_sync_in_progress">Synkroniserer</string>
     <string name="notification_listening_for_events">Lyt efter begivenheder</string>
-
     <string name="title_activity_home">Beskeder</string>
     <string name="title_activity_room">Rum</string>
     <string name="title_activity_settings">Indstillinger</string>
     <string name="title_activity_member_details">Medlemsdetaljer</string>
     <string name="title_activity_historical">Historisk</string>
-
     <string name="ok">OK</string>
     <string name="cancel">Afbryd</string>
     <string name="save">Gem</string>
@@ -114,7 +98,6 @@
     <string name="or">eller</string>
     <string name="invite">Invitér</string>
     <string name="offline">Offline</string>
-
     <string name="action_sign_out">Log ud</string>
     <string name="action_voice_call">Stemmeopkald</string>
     <string name="action_video_call">Videoopkald</string>
@@ -126,23 +109,18 @@
     <string name="action_close">Luk</string>
     <string name="copied_to_clipboard">Kopieret til udklipsholder</string>
     <string name="disable">Slå fra</string>
-
     <string name="dialog_title_confirmation">Bekræftigelse</string>
     <string name="dialog_title_warning">Advarsel</string>
-
     <string name="bottom_action_home">Hjem</string>
     <string name="bottom_action_favourites">Favoritter</string>
     <string name="bottom_action_people">Folk</string>
     <string name="bottom_action_rooms">Rum</string>
-
     <string name="home_filter_placeholder_home">Søg efter rum</string>
     <string name="home_filter_placeholder_favorites">Søg efter favoritter</string>
     <string name="home_filter_placeholder_people">Søg efter folk</string>
     <string name="home_filter_placeholder_rooms">Søg efter rum</string>
-
     <string name="invitations_header">Invitationer</string>
     <string name="low_priority_header">Lav prioritet</string>
-
     <string name="direct_chats_header">Samtaler</string>
     <string name="local_address_book_header">Lokal adressebog</string>
     <string name="user_directory_header">Bruger katalog</string>
@@ -150,7 +128,6 @@
     <string name="no_conversation_placeholder">Ingen samtaler</string>
     <string name="template_no_contact_access_placeholder">Du gav ikke ${app_name} tilladelse til at se dine lokale kontakter</string>
     <string name="no_result_placeholder">Ingen resultater</string>
-
     <string name="rooms_header">Rum</string>
     <string name="rooms_directory_header">Rum katalog</string>
     <string name="no_room_placeholder">Ingen rum</string>
@@ -159,7 +136,6 @@
         <item quantity="one">1 bruger</item>
         <item quantity="other">%d brugere</item>
     </plurals>
-
     <string name="send_bug_report_include_logs">Send logfiler</string>
     <string name="send_bug_report_include_crash_logs">Send crashlogfiler</string>
     <string name="send_bug_report_include_screenshot">Send screenshot</string>
@@ -169,14 +145,11 @@
     <string name="send_bug_report_logs_description">For at diagnosticere problemer vil logs fra denne klient blive sendt sammen med fejlrapporten. Hvis du vil foretrække kun at sende teksten foroven, bedes du fjerne fluebenet:</string>
     <string name="send_bug_report_alert_message">Du lader til at ryste din telefon i frustration. Vil du sende en fejlmeddelelse?</string>
     <string name="send_bug_report_app_crashed">Programmet crashede sidst. Vil du sende en crash rapport?</string>
-
     <string name="send_bug_report_sent">Fejlrapporten lykkedes med at blive sendt</string>
     <string name="send_bug_report_failed">Fejlmeddelelsen kunne ikke sendes (%s)</string>
     <string name="send_bug_report_progress">Fremskridt (%s%%)</string>
-
     <string name="send_files_in">Send ind i</string>
     <string name="read_receipt">Læs</string>
-
     <string name="join_room">Forbind til Rum</string>
     <string name="username">Brugernavn</string>
     <string name="create_account">Registrér</string>
@@ -185,14 +158,11 @@
     <string name="hs_url">Home Server URL</string>
     <string name="identity_url">Identity Server URL</string>
     <string name="search">Søg</string>
-
     <string name="start_new_chat">Start Ny Chat</string>
     <string name="start_voice_call">Start Stemmeopkald</string>
     <string name="start_video_call">Start Videoopkald</string>
-
     <string name="option_send_files">Send filer</string>
     <string name="option_take_photo_video">Tag billede eller video</string>
-
     <string name="auth_login">Log ind</string>
     <string name="auth_register">Registrer</string>
     <string name="auth_submit">Send</string>
@@ -240,7 +210,6 @@ Du kan tilføje din emailadresse til din profil i indstillinger.</string>
     <string name="auth_reset_password_success_message">Dit password er blevet gendannet.
 
 Du er blevet logget ud af alle enheder og vil ikke længere modtage pushnotifikationer. For at slå notifikationer til igen skal du logge ind på hver enhed igen.</string>
-
     <string name="login_error_must_start_http">URLen skal starte med http[s]://</string>
     <string name="login_error_network_error">Kunne ikke logge ind: Netværksfejl</string>
     <string name="login_error_unable_login">Kunne ikke logge ind</string>
@@ -248,7 +217,6 @@ Du er blevet logget ud af alle enheder og vil ikke længere modtage pushnotifika
     <string name="login_error_unable_register">Kunne ikke registrere</string>
     <string name="login_error_unable_register_mail_ownership">Kunne ikke registrere : email ejerskabsfejl</string>
     <string name="login_error_invalid_home_server">Skriv gyldig URL</string>
-
     <string name="login_error_forbidden">Ugyldigt brugernavn/password</string>
     <string name="login_error_unknown_token">Adgangstokenen du skrev blev ikke godkendt</string>
     <string name="login_error_bad_json">Fejlformet JSON</string>
@@ -256,30 +224,23 @@ Du er blevet logget ud af alle enheder og vil ikke længere modtage pushnotifika
     <string name="login_error_limit_exceeded">For mange forespørgsler blev sendt</string>
     <string name="login_error_user_in_use">Brugernavnet er allerede i brug</string>
     <string name="login_error_login_email_not_yet">Emaillinket som ikke er blevet trykket på endnu</string>
-
     <string name="notification_noisy_notifications">Larmende notifikationer</string>
     <string name="notification_silent_notifications">Stille notifikationer</string>
-
     <string name="option_take_photo">Tag billede</string>
     <string name="option_take_video">Optag video</string>
-
     <string name="compression_options">"Send som "</string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Stor</string>
     <string name="compression_opt_list_medium">Middel</string>
     <string name="compression_opt_list_small">Lille</string>
-
     <string name="attachment_cancel_download">Afbryd hentningen?</string>
     <string name="attachment_cancel_upload">Afbryd uploadningen?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm:%2$ds</string>
-
     <string name="yesterday">I går</string>
     <string name="today">I dag</string>
-
     <string name="room_info_room_name">Rum navn</string>
     <string name="room_info_room_topic">Rum emne</string>
-
     <string name="call">Opkald</string>
     <string name="call_connected">Opkald forbundet</string>
     <string name="call_connecting">Opkald forbinder…</string>
@@ -289,15 +250,12 @@ Du er blevet logget ud af alle enheder og vil ikke længere modtage pushnotifika
     <string name="incoming_video_call">Indgående Videoopkald</string>
     <string name="incoming_voice_call">Indgående Stemmeopkald</string>
     <string name="call_in_progress">Opkald I Gang</string>
-
     <string name="call_error_user_not_responding">Den anden side tog den ikke.</string>
     <string name="call_error_ice_failed">Medie Forbindelse Mislykkedes</string>
     <string name="call_error_camera_init_failed">Kan ikke starte kameraet</string>
     <string name="call_error_answered_elsewhere">opkald besvaret et andet sted</string>
-
     <string name="media_picker_both_capture_title">Tag et billede eller optag en video</string>
     <string name="media_picker_cannot_record_video">Kan ikke optage video</string>
-
     <string name="permissions_rationale_popup_title">Information</string>
     <string name="template_permissions_rationale_msg_storage">${app_name} skal bruge tilladelse til at tilgå dit billed- og videoarkiv for at sende og gemme vedhæftninger.
 Giv venligst tilladelse ved næste pop-up for at kunne sende filer fra din telefon.</string>
@@ -318,47 +276,37 @@ Giv venligst tilladelse ved næste pop-up for at finde kontakter der er på ${ap
     <string name="template_permissions_msg_contacts_warning_other_androids">${app_name} skal bruge adgang til dine kontakter for at finde andre Matrix brugere ud fra deres email og telefonnumre.
 
 Vil du give ${app_name} adgang til dine kontakter?</string>
-
     <string name="permissions_action_not_performed_missing_permissions">Beklager… Handlingen blev ikke udført fordi der mangler tilladelser</string>
-
     <string name="media_slider_saved">Gemt</string>
     <string name="media_slider_saved_message">Gem til downloads</string>
     <string name="yes">JA</string>
     <string name="no">NEJ</string>
     <string name="_continue">Fortsæt</string>
-
     <string name="remove">Fjern</string>
     <string name="join">Forbind</string>
     <string name="preview">Forhåndsvisning</string>
     <string name="reject">Afvis</string>
-
     <string name="room_jump_to_first_unread">Spring til første ulæste besked.</string>
-
     <string name="room_preview_invitation_format">Du er blevet inviteret til at forbinde til dette rum af %s</string>
     <string name="room_preview_unlinked_email_warning">Denne invitation blev sendt til %s som ikke er tilknyttet denne konto.
 Det kan være du vil logge ind med en anden konto eller tilføje denne email til din konto.</string>
     <string name="room_preview_try_join_an_unknown_room">Du forsøger at tilgå %s. Vil du forbinde for at deltage i diskussionen?</string>
     <string name="room_preview_try_join_an_unknown_room_default">et rum</string>
     <string name="room_preview_room_interactions_disabled">Dette er en forhåndsvisning af dette rum. Interaktion med rummet er slået fra.</string>
-
     <string name="room_creation_title">Ny chat</string>
     <string name="room_creation_add_member">Tilføj medlem</string>
     <string name="room_title_one_member">1 medlem</string>
-
     <string name="room_participants_leave_prompt_title">Forlad rum</string>
     <string name="room_participants_leave_prompt_msg">Er du sikker på at du vil forlade rummet?</string>
     <string name="room_participants_remove_prompt_msg">Er du sikker på du vil fjerne %s fra denne chat?</string>
     <string name="room_participants_create">Skab</string>
-
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
     <string name="room_participants_idle">Passiv</string>
-
     <string name="room_participants_header_admin_tools">ADMINSTRATIONSVÆRKTØJER</string>
     <string name="room_participants_header_call">OPKALD</string>
     <string name="room_participants_header_direct_chats">DIREKTE CHATS</string>
     <string name="room_participants_header_devices">ENHEDER</string>
-
     <string name="room_participants_action_invite">Invitér</string>
     <string name="room_participants_action_leave">Forlad dette rum</string>
     <string name="room_participants_action_remove">Fjern fra dette rum</string>
@@ -374,18 +322,14 @@ Det kan være du vil logge ind med en anden konto eller tilføje denne email til
     <string name="room_participants_action_devices_list">Hvis Enhedsliste</string>
     <string name="room_participants_power_level_prompt">Du vil ikke kunne omgøre denne ændring da du forfremmer brugeren til at have samme magt niveau som dig selv.
 Er du sikker?</string>
-
     <string name="room_participants_invite_prompt_msg">Er du sikker på du vil invitere %s til denne chat?</string>
-
     <string name="people_search_invite_by_id"><u>Invitér med ID</u></string>
     <string name="people_search_local_contacts">LOKALE KONTAKTER (%d)</string>
     <string name="people_search_user_directory">BRUGERKATALOG (%s)</string>
     <string name="people_search_filter_text">Kun Matrix brugere</string>
-
     <string name="people_search_invite_by_id_dialog_title">Invitér bruger med ID</string>
     <string name="people_search_invite_by_id_dialog_description">Indtast venligst en eller flere emails eller Matrix ID</string>
     <string name="people_search_invite_by_id_dialog_hint">Email eller Matrix ID</string>
-
     <string name="room_menu_search">Søg</string>
     <string name="room_one_user_is_typing">%s skriver…</string>
     <string name="room_two_users_are_typing">"%1$s &amp; %2$s  skriver…"</string>
@@ -401,7 +345,6 @@ Er du sikker?</string>
     <string name="room_delete_unsent_messages">Slet usendte beskeder</string>
     <string name="room_message_file_not_found">Fil ikke fundet</string>
     <string name="room_do_not_have_permission_to_post">Du har ikke tilladelse til at skrive i dette rum</string>
-
     <string name="ssl_trust">Stol på</string>
     <string name="ssl_do_not_trust">Stol ikke på</string>
     <string name="ssl_logout_account">Log ud</string>
@@ -412,12 +355,9 @@ Er du sikker?</string>
     <string name="ssl_cert_new_account_expl">Hvis serveradministratoren har sagt det er forventeligt skal du sikre dig at fingeraftrykket forneden passer med det fingeraftryk de har oplyst.</string>
     <string name="ssl_unexpected_existing_expl">Certifikatet har ændret sig fra det din telefon stolede på. Dette er HØJST USÆDVANLIGT. Det anbefales at du IKKE ACCEPTERE dette nye certifikat.</string>
     <string name="title_activity_bug_report">Nug rapport</string>
-
     <string name="read_receipts_list">Kvitteringer for læsning</string>
-
     <string name="ssl_expected_existing_expl">Certifikatet er ændret fra et tidligere betroet, til et der ikke er betroet. Serveren kan have fornyet sit certifikat. Kontakt server administratoren for det forventede fingeraftryk.</string>
     <string name="ssl_only_accept">Accepter kun certifikatet hvis server administratoren har publiceret et fingeraftryk der matcher det ovenstående.</string>
-
     <string name="room_details_title">Detaljer for rummet</string>
     <string name="room_details_people">Personer</string>
     <string name="room_details_files">Filer</string>
@@ -425,30 +365,22 @@ Er du sikker?</string>
     <string name="malformed_id">Ugyldigt ID. Det skal være en e-mail adresse eller et Matrix ID som \'@lokaldel:domæne\'</string>
     <string name="room_details_people_invited_group_name">INVITERET</string>
     <string name="title_activity_group_details">Detaljer om community</string>
-
     <string name="loading">Loader…</string>
-
     <string name="action_exit">Afslut</string>
     <string name="actions">Handlinger</string>
     <string name="bottom_action_groups">Communities</string>
-
     <string name="home_filter_placeholder_groups">Søg efter communities</string>
-
     <string name="groups_header">Communities</string>
     <string name="no_group_placeholder">Ingen grupper</string>
-
     <string name="start_new_chat_prompt_msg">Er du sikker på, at du ønsker at starte en ny chat med %s?</string>
     <string name="start_voice_call_prompt_msg">Er du sikker på, at du ønsker at starte et opkald?</string>
     <string name="start_video_call_prompt_msg">Er du sikker på, at du ønsker at starte et videoopkald\?</string>
-
     <string name="groups_invite_header">Inviter</string>
     <string name="groups_list">Liste over grupper</string>
-
     <plurals name="membership_changes">
         <item quantity="one">1 medlemsændring</item>
         <item quantity="other">%d medlemsændringer</item>
     </plurals>
-
     <string name="list_members">Medlemsoversigt</string>
     <string name="room_sync_in_progress">Synkroniserer…</string>
     <plurals name="room_header_active_members_count">
@@ -460,18 +392,14 @@ Er du sikker?</string>
         <item quantity="other">%d medlemmer</item>
     </plurals>
     <string name="room_participants_ban_prompt_msg">Er du sikker på, at du ønsker at blokere denne bruger fra denne chat?</string>
-
     <plurals name="room_new_messages_notification">
         <item quantity="one">1 ny meddelelse</item>
         <item quantity="other">%d nye meddelelser</item>
     </plurals>
-
     <string name="room_event_action_report_prompt_reason">Årsag til rapportering</string>
     <string name="room_event_action_report_prompt_ignore_user">Ønsker du at skjule alle meddelelser fra denne bruger?</string>
     <string name="room_event_action_cancel_upload">Annuller upload</string>
     <string name="room_event_action_cancel_download">Annuller download</string>
-
-
     <string name="search_hint">Søg</string>
     <string name="search_members_hint">Filtrer medlemmer i rum</string>
     <string name="search_no_results">Ingen resultater</string>
@@ -479,7 +407,6 @@ Er du sikker?</string>
     <string name="tab_title_search_messages">MEDDELELSER</string>
     <string name="tab_title_search_people">FOLK</string>
     <string name="tab_title_search_files">FILER</string>
-
     <string name="room_recents_directory">OVERSIGT</string>
     <string name="room_recents_favourites">FAVORITTER</string>
     <string name="room_recents_conversations">RUM</string>
@@ -488,7 +415,6 @@ Er du sikker?</string>
     <string name="room_recents_start_chat">Start chat</string>
     <string name="room_recents_create_room">Opret rum</string>
     <string name="room_recents_join_room_prompt">Indtast ID eller alias på et rum</string>
-
     <string name="directory_search_results_title">Gennemse oversigt</string>
     <plurals name="directory_search_rooms">
         <item quantity="one">1 rum</item>
@@ -499,7 +425,6 @@ Er du sikker?</string>
         <item quantity="other">%1$s rum fundet for %2$s</item>
     </plurals>
     <string name="directory_searching_title">Søger i liste…</string>
-
     <string name="room_settings_all_messages_noisy">Alle meddelelser (højlydt)</string>
     <string name="room_settings_all_messages">Alle meddelelser</string>
     <string name="room_settings_favourite">Favorit</string>
@@ -508,7 +433,6 @@ Er du sikker?</string>
     <string name="room_settings_leave_conversation">Forlad samtale</string>
     <string name="room_settings_forget">Glem</string>
     <string name="room_settings_add_homescreen_shortcut">Opret genvej på startskærm</string>
-
     <string name="room_sliding_menu_messages">Meddelelser</string>
     <string name="room_sliding_menu_settings">Indstillinger</string>
     <string name="room_sliding_menu_version">"Version "</string>
@@ -516,7 +440,6 @@ Er du sikker?</string>
     <string name="room_sliding_menu_third_party_notices">Beskeder fra tredjepart</string>
     <string name="room_sliding_menu_copyright">Copyright</string>
     <string name="room_sliding_menu_privacy_policy">Privacy-politik</string>
-
     <string name="settings_profile_picture">Profilbillede</string>
     <string name="settings_display_name">Navn til visning</string>
     <string name="settings_email_address">Email</string>
@@ -524,7 +447,6 @@ Er du sikker?</string>
     <string name="settings_phone_number">Telefon</string>
     <string name="settings_add_phone_number">Tilføj telefonnummer</string>
     <string name="settings_turn_screen_on">Tænd skærmen 3 sekunder</string>
-
     <string name="settings_containing_my_display_name">Meddelelser med mit navn</string>
     <string name="settings_containing_my_user_name">Meddelelser med mit brugernavn</string>
     <string name="settings_messages_in_one_to_one">Meddelelser i direkte chats</string>
@@ -532,13 +454,11 @@ Er du sikker?</string>
     <string name="settings_invited_to_room">Når jeg bliver inviteret til et rum</string>
     <string name="settings_call_invitations">Invitation til opkald</string>
     <string name="settings_messages_sent_by_bot">Meddelelser sendt af bot</string>
-
     <string name="settings_start_on_boot">Start ved opstart</string>
     <string name="settings_background_sync">Synkronisering i baggrunden</string>
     <string name="settings_enable_background_sync">Aktiver baggrundssynkronisering</string>
     <string name="settings_set_sync_timeout">Timeout for synkroniseringskald</string>
     <string name="settings_set_sync_delay">Pause mellem to synkroniseringskald</string>
-
     <string name="settings_version">Version</string>
     <string name="settings_app_term_conditions">Anvendelsesbetingelser</string>
     <string name="settings_third_party_notices">Meddelelser fra tredjepart</string>
@@ -547,7 +467,6 @@ Er du sikker?</string>
     <string name="settings_clear_cache">Ryd cache</string>
     <string name="settings_clear_media_cache">Ryd mediecache</string>
     <string name="settings_keep_media">Beholde mediefiler</string>
-
     <string name="settings_user_settings">Brugerindstillinger</string>
     <string name="settings_ignored_users">Ignorerede brugere</string>
     <string name="settings_other">Andet</string>
@@ -559,7 +478,6 @@ Er du sikker?</string>
     <string name="title_activity_keys_backup_setup">Nøgle-backup</string>
     <string name="title_activity_keys_backup_restore">Brug Nøgle-backup</string>
     <string name="title_activity_verify_device">Bekræft session</string>
-
     <string name="keys_backup_is_not_finished_please_wait">Nøgle-backup er ikke færdig, vent venligst…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Du vil miste dine krypterede beskeder, hvis du logger ud nu</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Jeg ønsker ikke mine krypterede beskeder</string>
@@ -567,7 +485,60 @@ Er du sikker?</string>
     <string name="are_you_sure">Er du sikker\?</string>
     <string name="backup">Back up</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Du vil miste adgang til dine krypterede beskeder, medmindre du tager backup af dine nøgler, før du logger ud.</string>
-
     <string name="dialog_title_third_party_licences">Tredjeparts licenser</string>
-
-</resources>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Du trak invitationen til %1$s tilbage</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s trak invitationen til %2$s tilbage</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Du trak invitationen til %1$s tilbage</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s trak invitationen til %2$s tilbage</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Du inviterede %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s inviterede %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Du inviterede %1$s til rummet</string>
+    <string name="notice_room_name_removed_by_you">Du fjernede navnet på rummet</string>
+    <string name="notice_requested_voip_conference_by_you">Du anmodede om en VoIP-konference</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Alle servere er bannet fra at deltage! Dette rum kan ikke længere bruges.</string>
+    <string name="notice_room_server_acl_updated_no_change">Ingen ændring.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Du satte serverens ACLer for dette rum.</string>
+    <string name="notice_room_server_acl_set_title">%s satte serverens ACLer for dette rum.</string>
+    <string name="notice_direct_room_update_by_you">Du opgraderede her.</string>
+    <string name="notice_direct_room_update">%s opgraderede her.</string>
+    <string name="notice_room_update_by_you">Du opgraderede dette rum.</string>
+    <string name="notice_room_update">%s opgraderede dette rum.</string>
+    <string name="notice_end_to_end_by_you">Du slog ende-til-ende kryptering til (%1$s)</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Du gjorde fremtidige beskeder synlige for %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s gjorde fremtidige beskeder synlige for %2$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Du gjorde den fremtidige historik for rummet synlig for %1$s</string>
+    <string name="notice_ended_call_by_you">Du afsluttede opkaldet.</string>
+    <string name="notice_answered_call_by_you">Du besvarede opkaldet.</string>
+    <string name="notice_call_candidates_by_you">Du sendte data til at forberede opkaldet.</string>
+    <string name="notice_call_candidates">%s sendte data til at forberede opkaldet.</string>
+    <string name="notice_placed_voice_call_by_you">Du foretog et opkald.</string>
+    <string name="notice_placed_video_call_by_you">Du foretog et video-opkald.</string>
+    <string name="notice_room_name_changed_by_you">Du skiftede rummets navn til: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Du skiftede rummets logo</string>
+    <string name="notice_room_avatar_changed">%1$s skiftede rummets logo</string>
+    <string name="notice_room_topic_changed_by_you">Du skiftede emnet til: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Du fjernede dit viste navn (det var %1$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Du skiftede dit viste navn fra %1$s til %2$s</string>
+    <string name="notice_display_name_set_by_you">Du satte dit viste navn til %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Du skiftede din avatar</string>
+    <string name="notice_room_withdraw_by_you">Du trak %1$ss invitation tilbage</string>
+    <string name="notice_room_ban_by_you">Du bannede %1$s</string>
+    <string name="notice_room_unban_by_you">Du unbannede %1$s</string>
+    <string name="notice_room_kick_by_you">Du smed %1$s ud</string>
+    <string name="notice_room_reject_by_you">Du afslog invitationen</string>
+    <string name="notice_direct_room_leave_by_you">Du gik ud af rummet</string>
+    <string name="notice_direct_room_leave">%1$s gik ud af rummet</string>
+    <string name="notice_room_leave_by_you">Du gik ud af rummet</string>
+    <string name="notice_direct_room_join_by_you">Du kom ind</string>
+    <string name="notice_direct_room_join">%1$s kom ind</string>
+    <string name="notice_room_join_by_you">Du kom ind i rummet</string>
+    <string name="notice_room_invite_by_you">Du inviterede %1$s</string>
+    <string name="notice_direct_room_created_by_you">Du oprettede diskussionen</string>
+    <string name="notice_direct_room_created">%1$s oprettede diskussionen</string>
+    <string name="notice_room_created_by_you">Du oprettede rummet</string>
+    <string name="notice_room_created">%1$s oprettede rummet</string>
+    <string name="notice_room_invite_no_invitee_by_you">Din invitation</string>
+    <string name="summary_you_sent_sticker">Du har sendt et klistermærke.</string>
+    <string name="summary_user_sent_sticker">%1$s har sendt et klistermærke.</string>
+    <string name="summary_you_sent_image">Du har sendt et billede.</string>
+</resources>
\ No newline at end of file

From a35b63dbeb2c9e6356c75843652fe99784a98b73 Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Wed, 21 Apr 2021 13:56:31 +0000
Subject: [PATCH 083/350] Translated using Weblate (Finnish)

Currently translated at 79.2% (1873 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
---
 vector/src/main/res/values-fi/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 33f19760af..e8786bdaf6 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -763,7 +763,7 @@
     <string name="encryption_export_saved_as">Huoneen osapuolten välisen salauksen avaimet tallennettiin tiedostoon \'%s\'
 \n
 \nVaroitus: tämä tiedosto saatetaan poistaa, mikäli Element poistetaan.</string>
-    <string name="encryption_import_e2e_room_keys">Tuo päästä päähän -salatun huoneen avaimet</string>
+    <string name="encryption_import_e2e_room_keys">Tuo salatun huoneen avaimet</string>
     <string name="encryption_import_room_keys">Tuo huoneen avaimet</string>
     <string name="encryption_import_room_keys_summary">Tuo avaimet paikallisesta tiedostosta</string>
     <string name="encryption_import_import">Tuo</string>

From 6d4b7eba5b46fdd589d10c07396305339c528617 Mon Sep 17 00:00:00 2001
From: Andrejs <tlpbu@droplar.com>
Date: Tue, 20 Apr 2021 11:08:28 +0000
Subject: [PATCH 084/350] Translated using Weblate (Latvian)

Currently translated at 81.5% (1928 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
---
 vector/src/main/res/values-lv/strings.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 032c3d4d39..00274660c0 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -245,7 +245,7 @@
     <string name="title_activity_settings">Iestatījumi</string>
     <string name="title_activity_member_details">Dalībnieka informācija</string>
     <string name="title_activity_historical">Bijušie</string>
-    <string name="ok">Lai notiek</string>
+    <string name="ok">Labi</string>
     <string name="cancel">Atcelt</string>
     <string name="save">Saglabāt</string>
     <string name="leave">Pamest</string>
@@ -267,9 +267,9 @@
 \nPievienojies ar %1$s vai %2$s iespēju</string>
     <string name="ongoing_conference_call_voice">Balss</string>
     <string name="ongoing_conference_call_video">Video</string>
-    <string name="cannot_start_call">Nevarēja sākt zvanu. Lūdzu, pamēģini vēlāk</string>
-    <string name="missing_permissions_warning">Dēļ nepietiekamām atļaujām, dažas iespējas var nebūt pieejamas…</string>
-    <string name="missing_permissions_to_start_conf_call">Tev ir nepieciešams iegūt atļauju, lai varētu sākt konferenci šajā istabā</string>
+    <string name="cannot_start_call">Nevarēja sākt zvanu. Lūdzu, mēģiniet vēlāk</string>
+    <string name="missing_permissions_warning">Dēļ nepietiekamām atļaujām dažas iespējas var nebūt pieejamas…</string>
+    <string name="missing_permissions_to_start_conf_call">Jums nepieciešams iegūt atļauju, lai spētu uzaicināt sākt konferenci šajā istabā</string>
     <string name="missing_permissions_title_to_start_conf_call">Nav iespējams sākt zvanu</string>
     <string name="device_information">Ierīces informācija</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Konferences zvani netiek atbalstīti šifrētās istabās</string>
@@ -1228,7 +1228,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="done">Gatavs</string>
     <string name="skip">Izlaist</string>
     <string name="accept">Pieņemt</string>
-    <string name="no_permissions_to_start_conf_call">Šajā istabā nav atļaujas sākt konferences zvanu</string>
+    <string name="no_permissions_to_start_conf_call">Jums nav atļaujas sākt konferences zvanu šajā istabā</string>
     <string name="reset">Atiestatīt</string>
     <string name="dismiss">Aizvērt</string>
     <string name="pause_video">Pauzēt</string>
@@ -1922,7 +1922,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="system_alerts_header">Sistēmas Brīdinājumi</string>
     <string name="action_unpublish">Nepublicēt</string>
     <string name="call_notification_hangup">Nolikt</string>
-    <string name="call_anyway">Zvanīt Tāpat</string>
+    <string name="call_anyway">Zvanīt vienalga</string>
     <string name="failed_to_remove_widget">Neizdevās noņemt logrīku</string>
     <string name="failed_to_add_widget">Neizdevās ielādēt logrīku</string>
     <string name="notification_sync_init">Startē pakalpojumu</string>
@@ -2137,8 +2137,8 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="no_permissions_to_start_webrtc_call_in_direct_room">Jums nav atļaujas sākt zvanu</string>
     <string name="no_permissions_to_start_webrtc_call">Jums nav atļaujas sākt zvanu šajā istabā</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Jums nav atļaujas sākt konferences zvanu</string>
-    <string name="missing_permissions_error">Trūkstošo atļauju dēļ, šī darbība nav iespējama.</string>
-    <string name="start_chatting">Sākt Sarunu</string>
+    <string name="missing_permissions_error">Trūkstošo atļauju dēļ šī darbība nav iespējama.</string>
+    <string name="start_chatting">Sākt sarunu</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Ja jūs nedublēsiet atslēgas pirms izrakstīšanās, zaudēsiet piekļuvi jūsu šifrētām ziņām.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Drošs Atslēgu Dublējums jābūt ieslēgts visās jūsu sesijās, lai izvairītos no piekļuves zaudēšanas jūsu šifrētām ziņām.</string>
     <string name="backup">Dublēt</string>

From 52d8088d751e1474e76b9ba32bb8475b647de1fa Mon Sep 17 00:00:00 2001
From: Martin Hansen <hdsumo@protonmail.ch>
Date: Tue, 20 Apr 2021 19:49:35 +0000
Subject: [PATCH 085/350] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 66.4% (1571 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
---
 vector/src/main/res/values-nb-rNO/strings.xml | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 1b4628c913..827c7ceaae 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -1615,4 +1615,89 @@
     <string name="settings_troubleshoot_test_play_services_title">Play Tjenester Sjekk</string>
     <string name="directory_searching_title">Søker i katalogen…</string>
     <string name="room_recents_invites">INVITASJONER</string>
+    <string name="dev_tools_error_no_content">Ikke noe innhold</string>
+    <string name="event_status_a11y_sending">Sender</string>
+    <string name="event_status_a11y_failed">Mislyktes</string>
+    <string name="event_status_a11y_sent">Sendt</string>
+    <string name="event_status_cancel_sending_dialog_message">Vil du avbryte sending av melding\?</string>
+    <string name="event_status_a11y_delete_all">Slett alle mislykkede meldinger</string>
+    <string name="event_status_delete_all_failed_dialog_title">Slett usendte meldinger</string>
+    <string name="event_status_failed_messages_warning">Meldingene kunne ikke sendes</string>
+    <string name="event_status_delete_all_failed_dialog_message">Er du sikker på at du vil slette alle usendte meldinger i dette rommet\?</string>
+    <string name="room_displayname_two_members">%1$s og %2$s</string>
+    <string name="medium_phone_number">Telefonnummer</string>
+    <string name="matrix_error">Matrix feil</string>
+    <string name="network_error">Nettverksfeil</string>
+    <string name="message_failed_to_upload">Kunne ikke laste opp bildet</string>
+    <string name="unable_to_send_message">Kan ikke sende melding</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Avsenderens enhet har ikke sendt oss nøklene til denne meldingen.</string>
+    <string name="notice_crypto_unable_to_decrypt">** Kan ikke dekryptere: %s **</string>
+    <string name="power_level_custom_no_value">Tilpasset</string>
+    <string name="power_level_custom">Tilpasset (%1$d)</string>
+    <string name="power_level_default">Standard</string>
+    <string name="power_level_admin">Administrator</string>
+    <string name="notice_widget_jitsi_modified_by_you">Du endret videokonferansen</string>
+    <string name="notice_widget_jitsi_modified">Videokonferanse endret av %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">Du avsluttet videokonferansen</string>
+    <string name="notice_widget_jitsi_removed">Videokonferanse avsluttet av %1$s</string>
+    <string name="notice_widget_jitsi_added">Videokonferanse startet av %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">Du startet videokonferanse</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Du godtok invitasjonen til %1$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Du inviterte %1$s</string>
+    <string name="notice_profile_change_redacted_by_you">Du oppdaterte profilen din %1$s</string>
+    <string name="notice_profile_change_redacted">%1$s oppdaterte profilen sin %2$s</string>
+    <string name="notice_event_redacted_with_reason">Melding fjernet [årsak: %1$s]</string>
+    <string name="notice_event_redacted_by">Melding fjernet av %1$s</string>
+    <string name="notice_event_redacted">Meldingen er fjernet</string>
+    <string name="notice_avatar_changed_too">(avatar ble også endret)</string>
+    <string name="notice_voip_finished">VoIP-konferansen avsluttet</string>
+    <string name="notice_voip_started">VoIP-konferansen startet</string>
+    <string name="notice_requested_voip_conference_by_you">Du ba om en VoIP-konferanse</string>
+    <string name="notice_requested_voip_conference">%1$s ba om en VoIP-konferanse</string>
+    <string name="notice_room_update_by_you">Du oppgraderte dette rommet.</string>
+    <string name="notice_room_update">%s oppgradert dette rommet.</string>
+    <string name="notice_end_to_end_by_you">Du har slått på end-to-end-kryptering (%1$s)</string>
+    <string name="notice_end_to_end">%1$s slo på ende-til-ende-kryptering (%2$s)</string>
+    <string name="notice_made_future_room_visibility_by_you">Du gjorde fremtidig romhistorie synlig for %1$s</string>
+    <string name="notice_made_future_room_visibility">%1$s synliggjort fremtidig romhistorie for %2$s</string>
+    <string name="notice_ended_call_by_you">Du avsluttet anropet.</string>
+    <string name="notice_ended_call">%s avsluttet anropet.</string>
+    <string name="notice_call_candidates">%s sendte data for å konfigurere anropet.</string>
+    <string name="notice_call_candidates_by_you">Du sendte data for å konfigurere anropet.</string>
+    <string name="notice_answered_call">%s svarte på anropet.</string>
+    <string name="notice_answered_call_by_you">Du svarte på anropet.</string>
+    <string name="notice_placed_video_call_by_you">Du plasserte en videosamtale.</string>
+    <string name="notice_placed_video_call">%s plasserte et videosamtale.</string>
+    <string name="notice_room_name_changed">%1$s endret romnavnet til: %2$s</string>
+    <string name="notice_room_avatar_changed_by_you">Du byttet romavatar</string>
+    <string name="notice_room_avatar_changed">%1$s endret romavataren</string>
+    <string name="notice_room_topic_changed_by_you">Du endret emnet til: %1$s</string>
+    <string name="notice_room_topic_changed">%1$s endret emnet til: %2$s</string>
+    <string name="notice_display_name_removed_by_you">Du fjernet visningsnavnet ditt (det var %1$s)</string>
+    <string name="notice_avatar_url_changed_by_you">Du byttet avatar</string>
+    <string name="notice_avatar_url_changed">%1$s endret avatar</string>
+    <string name="notice_room_ban_by_you">Du utestengte %1$s</string>
+    <string name="notice_room_kick_by_you">Du sparket %1$s</string>
+    <string name="notice_room_reject_by_you">Du avviste invitasjonen</string>
+    <string name="notice_room_reject">%1$s avviste invitasjonen</string>
+    <string name="notice_direct_room_leave_by_you">Du forlot rommet</string>
+    <string name="notice_direct_room_leave">%1$s forlot rommet</string>
+    <string name="notice_room_leave_by_you">Du forlot rommet</string>
+    <string name="notice_room_leave">%1$s forlot rommet</string>
+    <string name="notice_direct_room_join_by_you">Du ble med</string>
+    <string name="notice_direct_room_join">%1$s ble med</string>
+    <string name="notice_room_join_by_you">Du ble med på rommet</string>
+    <string name="notice_room_join">%1$s ble med på rommet</string>
+    <string name="notice_room_invite_you">%1$s inviterte deg</string>
+    <string name="notice_room_invite_by_you">Du inviterte %1$s</string>
+    <string name="notice_room_invite">%1$s inviterte %2$s</string>
+    <string name="notice_direct_room_created_by_you">Du opprettet diskusjonen</string>
+    <string name="notice_direct_room_created">%1$s opprettet diskusjonen</string>
+    <string name="notice_room_created_by_you">Du opprettet rommet</string>
+    <string name="notice_room_created">%1$s skapte rommet</string>
+    <string name="summary_you_sent_sticker">Du sendte et klistremerke.</string>
+    <string name="summary_user_sent_sticker">%1$s sendte et klistremerke.</string>
+    <string name="summary_you_sent_image">Du sendte et bilde.</string>
+    <string name="summary_user_sent_image">%1$s sendte et bilde.</string>
+    <string name="summary_message">%1$s: %2$s</string>
 </resources>
\ No newline at end of file

From 149e9f6674a70d3d40c0dc8e116fa67be93b8160 Mon Sep 17 00:00:00 2001
From: Quang Trung <quangtrung02hn16@gmail.com>
Date: Wed, 21 Apr 2021 01:01:43 +0000
Subject: [PATCH 086/350] Translated using Weblate (Vietnamese)

Currently translated at 18.7% (442 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
---
 vector/src/main/res/values-vi/strings.xml | 188 +++++++++++++++++++++-
 1 file changed, 185 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index 407fd31e8c..9b4459b255 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -151,9 +151,9 @@
     <string name="notification_listening_for_events">Theo dõi sự kiện</string>
     <string name="notification_sync_in_progress">Đang đồng bộ hóa…</string>
     <string name="notification_sync_init">Đang khởi tạo dịch vụ</string>
-    <string name="black_theme">Nền đen</string>
-    <string name="dark_theme">Nền tối</string>
-    <string name="light_theme">Nền sáng</string>
+    <string name="black_theme">Chủ đề đen</string>
+    <string name="dark_theme">Chủ đề tối</string>
+    <string name="light_theme">Chủ đề sáng</string>
     <string name="auth_email_validation_message">Vui lòng kiểm tra email của bạn để tiếp tục quá trình đăng ký</string>
     <string name="auth_forgot_password">Quên mật khẩu\?</string>
     <string name="auth_password_dont_match">Mật khẩu không trùng khớp</string>
@@ -273,4 +273,186 @@
     <string name="send_bug_report_include_crash_logs">Gửi bản tường thuật sự cố</string>
     <string name="send_bug_report_include_logs">Gửi bản tường thuật</string>
     <string name="auth_submit">Gửi</string>
+    <string name="startup_notification_fdroid_battery_optim_title">Kết nối trong nền</string>
+    <string name="startup_notification_privacy_button_other">Chọn tuỳ chọn khác</string>
+    <string name="startup_notification_privacy_button_grant">Cấp quyền</string>
+    <string name="settings_discovery_manage">Quản lý cài đặt khám phá của bạn.</string>
+    <string name="settings_discovery_category">Khám phá</string>
+    <string name="settings_deactivate_my_account">Vô hiệu hoá tài khoản của tôi</string>
+    <string name="settings_deactivate_account_section">Vô hiệu hoá tài khoản</string>
+    <string name="notice_room_server_acl_updated_was_allowed">• Máy chủ khớp với %s đã bị xoá khỏi danh sách được cho phép.</string>
+    <string name="notice_room_server_acl_updated_allowed">• Máy chủ khớp với %s bây giờ sẽ được cho phép.</string>
+    <string name="notice_room_server_acl_updated_was_banned">• Máy chủ khớp với %s đã được xoá khỏi danh sách cấm.</string>
+    <string name="notice_room_server_acl_updated_banned">• Máy chủ khớp với %s bây giờ sẽ bị cấm.</string>
+    <string name="template_re_authentication_default_confirm_text">${app_name} yêu cầu bạn nhập thông tin của bạn để thực hiện hành động này.</string>
+    <string name="re_authentication_activity_title">Cần xác thực lại</string>
+    <string name="call_transfer_users_tab_title">Người dùng</string>
+    <string name="call_transfer_failure">Đã xảy ra lỗi khi đang chuyển cuộc gọi</string>
+    <string name="call_transfer_title">Chuyển</string>
+    <string name="call_transfer_connect_action">Kết nối</string>
+    <string name="a11y_error_some_message_not_sent">Một số tin nhắn chưa được gửi</string>
+    <string name="a11y_unsent_draft">Phòng này có bản nháp chưa được gửi</string>
+    <string name="a11y_delete_avatar">Xoá ảnh đại diện</string>
+    <string name="a11y_change_avatar">Thay đổi ảnh đại diện</string>
+    <string name="a11y_image">Hình ảnh</string>
+    <string name="authentication_error">Xác thực thất bại</string>
+    <string name="a11y_video">Video</string>
+    <string name="a11y_error_message_not_sent">Tin nhắn không được gửi vì có lỗi</string>
+    <string name="a11y_close_emoji_picker">Đóng trình chọn Emoji</string>
+    <string name="a11y_open_emoji_picker">Mở trình chọn Emoji</string>
+    <string name="a11y_trust_level_trusted">Cấp độ tin tưởng đã tin tưởng</string>
+    <string name="a11y_trust_level_warning">Cấp độ tin tưởng cảnh báo</string>
+    <string name="a11y_trust_level_default">Cấp độ tin tưởng mặc định</string>
+    <string name="a11y_selected">Đã chọn</string>
+    <string name="dev_tools_send_custom_event">Gửi sự kiện tuỳ chỉnh</string>
+    <string name="dev_tools_explore_room_state">Khám phá trạng thái phòng</string>
+    <string name="dev_tools_menu_name">Công cụ phát triển</string>
+    <string name="a11y_view_read_receipts">Xem xác nhận đã đọc</string>
+    <string name="a11y_rule_notify_off">Không thông báo</string>
+    <string name="a11y_rule_notify_silent">Thông báo không có âm thanh</string>
+    <string name="a11y_rule_notify_noisy">Thông báo có âm thanh</string>
+    <string name="dev_tools_error_no_content">Không có nội dung</string>
+    <string name="event_status_cancel_sending_dialog_message">Bạn có muốn huỷ việc gửi tin nhắn không\?</string>
+    <string name="event_status_a11y_delete_all">Xoá tất cả tin nhắn bị thất bại</string>
+    <string name="event_status_a11y_failed">Thất bại</string>
+    <string name="event_status_a11y_sent">Đã gửi</string>
+    <string name="event_status_a11y_sending">Đang gửi</string>
+    <string name="medium_phone_number">Số điện thoại</string>
+    <string name="medium_email">Địa chỉ email</string>
+    <string name="room_error_join_failed_empty_room">Hiện tại chưa thể tham gia lại phòng trống.</string>
+    <string name="matrix_error">Lỗi Matrix</string>
+    <string name="notice_power_level_changed">%1$s đã thay đổi cấp độ quyền lực của %2$s.</string>
+    <string name="notice_power_level_changed_by_you">Bạn đã thay đổi cấp độ quyền lực của %1$s.</string>
+    <string name="network_error">Lỗi mạng</string>
+    <string name="message_failed_to_upload">Tải hình ảnh lên thất bại</string>
+    <string name="unable_to_send_message">Không thể gửi tin nhắn</string>
+    <string name="could_not_redact">Không thể rút lại</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Thiết bị của người gửi chưa gửi cho chúng tôi mã khoá cho tin nhắn này.</string>
+    <string name="notice_crypto_unable_to_decrypt">** Không thể giải mã: %s **</string>
+    <string name="notice_power_level_diff">%1$s từ %2$s thành %3$s</string>
+    <string name="power_level_custom_no_value">Tuỳ chỉnh</string>
+    <string name="power_level_custom">Tuỳ chỉnh (%1$d)</string>
+    <string name="power_level_default">Mặc định</string>
+    <string name="power_level_moderator">Người điều hành</string>
+    <string name="power_level_admin">Quản trị viên</string>
+    <string name="notice_widget_jitsi_modified_by_you">Bạn đã sửa đổi buổi hội thảo video</string>
+    <string name="notice_widget_jitsi_modified">Buổi hội thảo video đã được %1$s sửa đổi</string>
+    <string name="notice_widget_jitsi_removed_by_you">Bạn đã kết thúc buổi hội thảo video</string>
+    <string name="notice_widget_jitsi_removed">Buổi hội thảo video đã được %1$s kết thúc</string>
+    <string name="notice_widget_jitsi_added_by_you">Bạn đã bắt đầu buổi hội thảo video</string>
+    <string name="notice_widget_jitsi_added">Buổi hội thảo video đã được %1$s bắt đầu</string>
+    <string name="notice_widget_modified_by_you">Bạn đã sửa đổi %1$s tiện ích</string>
+    <string name="notice_widget_modified">%1$s đã sửa đổi %2$s tiện ích</string>
+    <string name="notice_widget_removed_by_you">Bạn đã xoá %1$s tiện ích</string>
+    <string name="notice_widget_removed">%1$s đã xoá %2$s tiện ích</string>
+    <string name="notice_widget_added_by_you">Bạn đã thêm %1$s tiện ích</string>
+    <string name="notice_widget_added">%1$s đã thêm %2$s tiện ích</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Bạn đã chấp nhận lời mời đến %1$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s đã chấp nhận lời mời đến %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Bạn đã thu hồi lời mời đến %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s đã thu hồi lời mời đến %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Bạn đã thu hồi lời mời đến %1$s để tham gia phòng</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s đã thu hồi lời mời đến %2$s để tham gia phòng</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Bạn đã mời %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s đã mời %2$s</string>
+    <string name="notice_room_third_party_invite_by_you">Bạn đã gửi lời mời đến %1$s để tham gia phòng</string>
+    <string name="notice_room_third_party_invite">%1$s đã gửi lời mời đến %2$s để tham gia phòng</string>
+    <string name="notice_event_redacted_by_with_reason">Tin nhắn đã bị %1$s xoá [lý do: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">Tin nhắn đã bị xoá [lý do: %1$s]</string>
+    <string name="notice_event_redacted_by">Tin nhắn đã bị %1$s xoá</string>
+    <string name="notice_event_redacted">Tin nhắn đã bị xoá</string>
+    <string name="notice_room_avatar_removed_by_you">Bạn đã xoá ảnh đại diện của phòng</string>
+    <string name="notice_room_avatar_removed">%1$s đã xoá ảnh đại diện của phòng</string>
+    <string name="notice_room_topic_removed_by_you">Bạn đã xoá chủ đề của phòng</string>
+    <string name="notice_room_topic_removed">%1$s đã xoá chủ đề của phòng</string>
+    <string name="notice_room_name_removed_by_you">Bạn đã xoá tên phòng</string>
+    <string name="notice_room_name_removed">%1$s đã xoá tên phòng</string>
+    <string name="notice_avatar_changed_too">(ảnh đại diện cũng được thay đổi)</string>
+    <string name="notice_voip_finished">Buổi hội thảo VoIP đã hoàn thành</string>
+    <string name="notice_voip_started">Buổi hội thảo VoIP đã bắt đầu</string>
+    <string name="notice_requested_voip_conference_by_you">Bạn đã yêu cầu một buổi hội thảo VoIP</string>
+    <string name="notice_requested_voip_conference">%1$s đã yêu cầu một buổi hội thảo VoIP</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Tất cả máy chủ bị cấm không được tham gia! Phòng này không thể được sử dụng nữa.</string>
+    <string name="notice_room_server_acl_updated_no_change">Không có thay đổi.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Bạn đã thay đổi ACL máy chủ cho phòng này.</string>
+    <string name="notice_room_server_acl_updated_title">%s đã thay đổi ACL máy chủ cho phòng này.</string>
+    <string name="notice_room_server_acl_set_allowed">• Máy chủ khớp với %s được cho phép.</string>
+    <string name="notice_room_server_acl_set_banned">• Máy chủ khớp với %s bị cấm.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Bạn đã đặt ACL máy chủ cho phòng này.</string>
+    <string name="notice_room_server_acl_set_title">%s đã đặt ACL máy chủ cho phòng này.</string>
+    <string name="notice_direct_room_update_by_you">Bạn đã nâng cấp ở đây.</string>
+    <string name="notice_direct_room_update">%s đã nâng cấp ở đây.</string>
+    <string name="notice_room_update_by_you">Bạn đã nâng cấp phòng này.</string>
+    <string name="notice_room_update">%s đã nâng cấp phòng này.</string>
+    <string name="notice_end_to_end_by_you">Bạn đã bật mã hoá đầu cuối (%1$s)</string>
+    <string name="notice_end_to_end">%1$s đã bật mã hoá đầu cuối (%2$s)</string>
+    <string name="notice_room_visibility_unknown">không xác định (%s).</string>
+    <string name="notice_room_visibility_world_readable">bất kỳ ai.</string>
+    <string name="notice_room_visibility_shared">tất cả thành viên phòng.</string>
+    <string name="notice_room_visibility_joined">tất cả thành viên phòng, từ lúc họ tham gia.</string>
+    <string name="notice_room_visibility_invited">tất cả thành viên phòng, từ lúc họ được mời.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Bạn đã làm các tin nhắn trong tương lai có thể được %1$s nhìn thấy</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s đã làm các tin nhắn trong tương lai có thể được %2$s nhìn thấy</string>
+    <string name="notice_made_future_room_visibility_by_you">Bạn đã làm lịch sử phòng trong tương lai có thể được %1$s nhìn thấy</string>
+    <string name="notice_made_future_room_visibility">%1$s đã làm lịch sử phòng trong tương lai có thể được %2$s nhìn thấy</string>
+    <string name="notice_room_ban_by_you">Bạn đã cấm %1$s</string>
+    <string name="notice_room_ban">%1$s đã cấm %2$s</string>
+    <string name="notice_room_unban_by_you">Bạn đã bỏ cấm %1$s</string>
+    <string name="notice_room_unban">%1$s đã bỏ cấm %2$s</string>
+    <string name="notice_display_name_removed_by_you">Bạn đã xoá tên hiển thị (nó đã là %1$s)</string>
+    <string name="notice_display_name_removed">%1$s đã xoá tên hiển thị (nó đã là %2$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Bạn đã đổi tên hiển thị từ %1$s thành %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s đã đổi tên hiển thị từ %2$s thành %3$s</string>
+    <string name="notice_display_name_set_by_you">Bạn đã đặt tên hiển thị thành %1$s</string>
+    <string name="notice_display_name_set">%1$s đã đặt tên hiển thị thành %2$s</string>
+    <string name="notice_avatar_url_changed_by_you">Bạn đã thay đổi ảnh đại diện</string>
+    <string name="notice_avatar_url_changed">%1$s đã thay đổi ảnh đại diện</string>
+    <string name="notice_room_withdraw_by_you">Bạn đã rút lại lời mời của %1$s</string>
+    <string name="notice_room_withdraw">%1$s đã rút lại lời mời của %2$s</string>
+    <string name="room_widget_permission_theme">Chủ đề của bạn</string>
+    <string name="settings_theme">Chủ đề</string>
+    <string name="notice_ended_call_by_you">Bạn đã kết thúc cuộc gọi.</string>
+    <string name="notice_ended_call">%s đã kết thúc cuộc gọi.</string>
+    <string name="notice_answered_call_by_you">Bạn đã trả lời cuộc gọi.</string>
+    <string name="notice_answered_call">%s đã trả lời cuộc gọi.</string>
+    <string name="notice_call_candidates_by_you">Bạn đã gửi dữ liệu để thiết lập cuộc gọi.</string>
+    <string name="notice_call_candidates">%s đã gửi dữ liệu để thiết lập cuộc gọi.</string>
+    <string name="notice_placed_voice_call_by_you">Bạn đã đặt một cuộc gọi thoại.</string>
+    <string name="notice_placed_voice_call">%s đã đặt một cuộc gọi thoại.</string>
+    <string name="notice_placed_video_call_by_you">Bạn đã đặt một cuộc gọi video.</string>
+    <string name="notice_placed_video_call">%s đã đặt một cuộc gọi video.</string>
+    <string name="notice_room_name_changed_by_you">Bạn đã đổi tên phòng thành: %1$s</string>
+    <string name="notice_room_name_changed">%1$s đã đổi tên phòng thành: %2$s</string>
+    <string name="notice_room_avatar_changed_by_you">Bạn đã thay đổi ảnh đại diện của phòng</string>
+    <string name="notice_room_avatar_changed">%1$s đã thay đổi ảnh đại diện của phòng</string>
+    <string name="notice_room_topic_changed">%1$s đã thay đổi chủ đề thành: %2$s</string>
+    <string name="notice_room_topic_changed_by_you">Bạn đã thay đổi chủ đề thành: %1$s</string>
+    <string name="event_status_delete_all_failed_dialog_title">Xoá các tin nhắn chưa được gửi</string>
+    <string name="event_status_delete_all_failed_dialog_message">Bạn có chắc bạn muốn xoá tất cả tin nhắn chưa được gửi trong phòng này không\?</string>
+    <string name="notice_room_kick_by_you">Bạn đã kick %1$s</string>
+    <string name="notice_room_kick">%1$s đã kick %2$s</string>
+    <string name="notice_room_reject_by_you">Bạn đã từ chối lời mời</string>
+    <string name="notice_room_reject">%1$s đã từ chối lời mời</string>
+    <string name="notice_direct_room_leave_by_you">Bạn đã rời phòng</string>
+    <string name="notice_direct_room_leave">%1$s đã rời phòng</string>
+    <string name="notice_room_leave_by_you">Bạn đã rời phòng</string>
+    <string name="notice_room_leave">%1$s đã rời phòng</string>
+    <string name="notice_direct_room_join_by_you">Bạn đã tham gia</string>
+    <string name="notice_direct_room_join">%1$s đã tham gia</string>
+    <string name="notice_room_join_by_you">Bạn đã tham gia phòng</string>
+    <string name="notice_room_join">%1$s đã tham gia phòng</string>
+    <string name="notice_room_invite_you">%1$s đã mời bạn</string>
+    <string name="notice_room_invite_by_you">Bạn đã mời %1$s</string>
+    <string name="notice_room_invite">%1$s đã mời %2$s</string>
+    <string name="notice_direct_room_created_by_you">Bạn đã tạo cuộc thảo luận</string>
+    <string name="notice_direct_room_created">%1$s đã tạo cuộc thảo luận</string>
+    <string name="notice_room_created_by_you">Bạn đã tạo phòng</string>
+    <string name="notice_room_created">%1$s đã tạo phòng</string>
+    <string name="notice_room_invite_no_invitee_by_you">Lời mời của bạn</string>
+    <string name="notice_room_invite_no_invitee">Lời mời của %s</string>
+    <string name="summary_you_sent_sticker">Bạn đã gửi một sticker.</string>
+    <string name="summary_user_sent_sticker">%1$s đã gửi một sticker.</string>
+    <string name="summary_you_sent_image">Bạn đã gửi một hình ảnh.</string>
+    <string name="summary_user_sent_image">%1$s đã gửi một hình ảnh.</string>
+    <string name="summary_message">%1$s: %2$s</string>
 </resources>
\ No newline at end of file

From 63f1efd32081d254953f3c163a12483615c8e0c7 Mon Sep 17 00:00:00 2001
From: Deleted User <noreply+1494@weblate.org>
Date: Fri, 23 Apr 2021 19:28:46 +0000
Subject: [PATCH 087/350] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/nb_NO/
---
 .../android/nb-NO/changelogs/40100120.txt     |  2 ++
 .../android/nb-NO/changelogs/40100130.txt     |  2 ++
 .../android/nb-NO/changelogs/40100140.txt     |  2 ++
 .../android/nb-NO/changelogs/40100150.txt     |  2 ++
 .../android/nb-NO/changelogs/40100160.txt     |  2 ++
 .../android/nb-NO/changelogs/40100170.txt     |  2 ++
 .../android/nb-NO/changelogs/40101000.txt     |  2 ++
 .../android/nb-NO/changelogs/40101010.txt     |  2 ++
 .../android/nb-NO/changelogs/40101020.txt     |  2 ++
 .../android/nb-NO/changelogs/40101030.txt     |  2 ++
 .../android/nb-NO/full_description.txt        | 30 +++++++++++++++++++
 11 files changed, 50 insertions(+)
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40100120.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40100130.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40100140.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40100150.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40100160.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40100170.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40101010.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/nb-NO/changelogs/40101030.txt
 create mode 100644 fastlane/metadata/android/nb-NO/full_description.txt

diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100120.txt b/fastlane/metadata/android/nb-NO/changelogs/40100120.txt
new file mode 100644
index 0000000000..163cd64cdc
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40100120.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: URL-forhåndsvisning, nytt Emoji-tastatur, nye rominnstillingsmuligheter og snø til jul!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100130.txt b/fastlane/metadata/android/nb-NO/changelogs/40100130.txt
new file mode 100644
index 0000000000..23ab42ef2c
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40100130.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: URL-forhåndsvisning, nytt Emoji-tastatur, nye rominnstillingsmuligheter og snø til jul!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100140.txt b/fastlane/metadata/android/nb-NO/changelogs/40100140.txt
new file mode 100644
index 0000000000..10a3d9b925
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: Rediger romtillatelser, automatisk lys/mørkt tema og en haug med feilrettinger.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100150.txt b/fastlane/metadata/android/nb-NO/changelogs/40100150.txt
new file mode 100644
index 0000000000..3237da115d
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: Sosial innloggingsstøtte.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100160.txt b/fastlane/metadata/android/nb-NO/changelogs/40100160.txt
new file mode 100644
index 0000000000..5502fd3ab1
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: Sosial innloggingsstøtte.
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.15 og https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40100170.txt b/fastlane/metadata/android/nb-NO/changelogs/40100170.txt
new file mode 100644
index 0000000000..f9174a2ee4
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: Feilrettinger!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40101000.txt b/fastlane/metadata/android/nb-NO/changelogs/40101000.txt
new file mode 100644
index 0000000000..370dbb36ce
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: forbedring av VoIP (lyd og videosamtaler i DM) og feilrettinger!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40101010.txt b/fastlane/metadata/android/nb-NO/changelogs/40101010.txt
new file mode 100644
index 0000000000..c6109b8d9b
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: forbedring av ytelsen og feilrettinger!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40101020.txt b/fastlane/metadata/android/nb-NO/changelogs/40101020.txt
new file mode 100644
index 0000000000..9464c6fb0f
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: forbedring av ytelsen og feilrettinger!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/nb-NO/changelogs/40101030.txt b/fastlane/metadata/android/nb-NO/changelogs/40101030.txt
new file mode 100644
index 0000000000..1e12246e9a
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Hovedendringene i denne versjonen: forbedring av ytelsen og feilrettinger!
+Full endringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/nb-NO/full_description.txt b/fastlane/metadata/android/nb-NO/full_description.txt
new file mode 100644
index 0000000000..92a3c4c5c3
--- /dev/null
+++ b/fastlane/metadata/android/nb-NO/full_description.txt
@@ -0,0 +1,30 @@
+Element er en ny type messenger og samarbeidsapp som:
+
+1. Gir deg kontrollen for å bevare personvernet ditt
+2. Lar deg kommunisere med hvem som helst i Matrix-nettverket, og til og med ved å integrere med apper som Slack
+3. Beskytter deg mot reklame, datamining og inngjerdede hager
+4. Sikrer deg gjennom end-to-end-kryptering, med kryssignering for å bekrefte andre
+
+Element er helt forskjellig fra andre meldings- og samarbeidsapper fordi det er desentralisert og åpen kildekode.
+
+Element lar deg selv være vert - eller velge en vert - slik at du har personvern, eierskap og kontroll over dataene og samtalene dine. Det gir deg tilgang til et åpent nettverk; slik at du ikke bare holder på å snakke med bare andre Element-brukere. Og det er veldig sikkert.
+
+Element er i stand til å gjøre alt dette fordi det opererer på Matrix - standarden for åpen, desentralisert kommunikasjon.
+
+Element setter deg i kontroll ved å la deg velge hvem som er vert for samtalene dine. Fra Element-appen kan du velge å være vert på forskjellige måter:
+
+1. Få en gratis konto på matrix.org-serveren som er vert for Matrix-utviklerne, eller velg blant tusenvis av offentlige servere som er vert for frivillige
+2. Vær vert for kontoen din ved å kjøre en server på din egen maskinvare
+3. Registrer deg for en konto på en tilpasset server ved å bare abonnere på Hosting Matrix Services-vertsplattformen
+
+<b> Hvorfor velge Element? </b>
+
+<b> EGNE DATA DINE </b>: Du bestemmer hvor du vil oppbevare dataene og meldingene dine. Du eier den og kontrollerer den, ikke noe MEGACORP som utvinner dataene dine eller gir tilgang til tredjeparter.
+
+<b> ÅPEN MELDING OG SAMARBEID </b>: Du kan chatte med alle andre i Matrix-nettverket, enten de bruker Element eller en annen Matrix-app, og selv om de bruker et annet meldingssystem som Slack, IRC eller XMPP.
+
+<b> SUPER-SECURE </b>: Ekte end-to-end-kryptering (bare de i samtalen kan dekryptere meldinger), og kryssignering for å verifisere enhetene til samtaledeltakerne.
+
+<b> KOMPLETT KOMMUNIKASJON </b>: Meldinger, tale- og videosamtaler, fildeling, skjermdeling og en hel haug med integrasjoner, bots og widgets. Bygg rom, lokalsamfunn, hold kontakten og få ting gjort.
+
+<b> ALT DER DU ER </b>: Hold kontakten uansett hvor du er med fullt synkronisert meldingslogg på alle enhetene dine og på nettet på https://app.element.io.

From 4608888b833c53af3c3a678bdc608eaaa3920e39 Mon Sep 17 00:00:00 2001
From: Quang Trung <quangtrung02hn16@gmail.com>
Date: Sun, 25 Apr 2021 01:24:42 +0000
Subject: [PATCH 088/350] Translated using Weblate (Vietnamese)

Currently translated at 19.0% (449 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
---
 vector/src/main/res/values-vi/strings.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index 9b4459b255..a1566a81d2 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="send_bug_report_rage_shake">Lắc điện thoại để báo cáo lỗi</string>
-    <string name="send_bug_report_alert_message">Có vẻ bạn đang lắc điện thoại một cách tức giận. Bạn có muốn báo cáo lỗi không\?</string>
+    <string name="send_bug_report_alert_message">Có vẻ bạn đang lắc điện thoại một cách tức giận. Bạn có muốn mở màn hình báo cáo lỗi không\?</string>
     <string name="send_bug_report_placeholder">Miêu tả vấn đề của bạn ở đây</string>
     <string name="send_bug_report_description_in_english">Nếu có thể, vui lòng viết miêu tả bằng tiếng Anh.</string>
     <string name="send_bug_report_description">Vui lòng miêu tả lỗi. Bạn đã làm gì\? Bạn mong điều gì xảy ra\? Điều gì đã xảy ra\?</string>
@@ -27,7 +27,7 @@
     <string name="matrix_only_filter">Chỉ những liên hệ Matrix</string>
     <string name="user_directory_header">Thư mục người dùng</string>
     <string name="local_address_book_header">Sổ địa chỉ địa phương</string>
-    <string name="direct_chats_header">Các cuộc trò chuyện</string>
+    <string name="direct_chats_header">Cuộc trò chuyện</string>
     <string name="system_alerts_header">Cảnh báo hệ thống</string>
     <string name="low_priority_header">Ưu tiên thấp</string>
     <string name="invitations_header">Lời mời</string>
@@ -53,7 +53,7 @@
     <string name="action_mark_room_read">Đánh dấu đã đọc</string>
     <string name="action_quick_reply">Trả lời nhanh</string>
     <string name="action_mark_all_as_read">Đánh dấu tất cả đã đọc</string>
-    <string name="action_global_search">Tìm toàn bộ</string>
+    <string name="action_global_search">Tìm kiếm trong toàn bộ</string>
     <string name="action_video_call">Cuộc gọi bằng video</string>
     <string name="action_voice_call">Cuộc gọi bằng giọng nói</string>
     <string name="action_sign_out_confirmation_simple">Bạn có chắc mình muốn đăng xuất không\?</string>
@@ -209,9 +209,9 @@
     <string name="template_call_failed_no_connection">Cuộc gọi ${app_name} thất bại</string>
     <string name="call_failed_dont_ask_again">Đừng hỏi lại tôi</string>
     <string name="call_failed_no_ice_use_alt">Hãy thử dùng %s</string>
-    <string name="call_failed_no_ice_description">Vui lòng yêu cầu quản trị viên của máy chủ nhà của bạn (%1$s) thiết lập một máy chủ TURN để các cuộc gọi có thể hoạt động […].
+    <string name="call_failed_no_ice_description">Vui lòng yêu cầu quản trị viên của máy chủ nhà của bạn (%1$s) thiết lập một máy chủ TURN để các cuộc gọi có thể hoạt động một cách đáng tin cậy.
 \n
-\nBạn cũng có thể thử dùng máy chủ công cộng ở %2$s, nhưng cách này sẽ không […] bằng, và địa chỉ IP của bạn cũng sẽ được chia sẻ đến server đó. Bạn có thể quản lý việc này trong mục Cài đặt.</string>
+\nBạn cũng có thể thử dùng máy chủ công cộng ở %2$s, nhưng cách này sẽ không đáng tin cậy bằng, và địa chỉ IP của bạn sẽ được chia sẻ đến máy chủ đó. Bạn cũng có thể quản lý việc này trong Cài đặt.</string>
     <string name="call_failed_no_ice_title">Cuộc gọi thất bại do thiết lập máy chủ sai</string>
     <string name="start_video_call_prompt_msg">Bạn có chắc bạn muốn bắt đầu một cuộc gọi video\?</string>
     <string name="start_voice_call_prompt_msg">Bạn có chắc bạn muốn bắt đầu một cuộc gọi bằng giọng nói\?</string>
@@ -455,4 +455,6 @@
     <string name="summary_you_sent_image">Bạn đã gửi một hình ảnh.</string>
     <string name="summary_user_sent_image">%1$s đã gửi một hình ảnh.</string>
     <string name="summary_message">%1$s: %2$s</string>
+    <string name="notice_profile_change_redacted_by_you">Bạn đã cập nhật hồ sơ của bạn %1$s</string>
+    <string name="notice_profile_change_redacted">%1$s đã cập nhật hồ sơ của họ %2$s</string>
 </resources>
\ No newline at end of file

From ae4ae4111dc22bcabb0e7d036291c898e1b3c4eb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 26 Apr 2021 10:55:25 +0200
Subject: [PATCH 089/350] Restore rx methods, may be used by forks...

---
 .../src/main/java/org/matrix/android/sdk/rx/RxRoom.kt | 11 +++++++++++
 .../main/java/org/matrix/android/sdk/rx/RxSession.kt  | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
index 3f61ca0103..21db4e1893 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
@@ -19,7 +19,9 @@ package org.matrix.android.sdk.rx
 import android.net.Uri
 import io.reactivex.Completable
 import io.reactivex.Observable
+import io.reactivex.Single
 import kotlinx.coroutines.rx2.rxCompletable
+import kotlinx.coroutines.rx2.rxSingle
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.identity.ThreePid
@@ -89,6 +91,15 @@ class RxRoom(private val room: Room) {
         return room.getMyReadReceiptLive().asObservable()
     }
 
+    fun loadRoomMembersIfNeeded(): Single<Unit> = rxSingle {
+        room.loadRoomMembersIfNeeded()
+    }
+
+    fun joinRoom(reason: String? = null,
+                 viaServers: List<String> = emptyList()): Single<Unit> = rxSingle {
+        room.join(reason, viaServers)
+    }
+
     fun liveEventReadReceipts(eventId: String): Observable<List<ReadReceipt>> {
         return room.getEventReadReceiptsLive(eventId).asObservable()
     }
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 5d8b019284..0fe2b01576 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -38,6 +38,7 @@ import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.session.widgets.model.Widget
@@ -123,12 +124,22 @@ class RxSession(private val session: Session) {
                 .startWithCallable { session.getPendingThreePids() }
     }
 
+    fun createRoom(roomParams: CreateRoomParams): Single<String> = rxSingle {
+        session.createRoom(roomParams)
+    }
+
     fun searchUsersDirectory(search: String,
                              limit: Int,
                              excludedUserIds: Set<String>): Single<List<User>> = rxSingle {
         session.searchUsersDirectory(search, limit, excludedUserIds)
     }
 
+    fun joinRoom(roomIdOrAlias: String,
+                 reason: String? = null,
+                 viaServers: List<String> = emptyList()): Single<Unit> = rxSingle {
+        session.joinRoom(roomIdOrAlias, reason, viaServers)
+    }
+
     fun getRoomIdByAlias(roomAlias: String,
                          searchOnServer: Boolean): Single<Optional<RoomAliasDescription>> = rxSingle {
         session.getRoomIdByAlias(roomAlias, searchOnServer)

From bcbc6c0f7c1fc9c190abd64c954bf0c4132e86ba Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 26 Apr 2021 11:00:57 +0200
Subject: [PATCH 090/350] Add missing loading state

---
 .../app/features/createdirect/CreateDirectRoomViewModel.kt     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
index 0cc128f749..9d6f6da54b 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.createdirect
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
@@ -82,6 +83,8 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun createRoomAndInviteSelectedUsers(selections: Set<PendingSelection>) {
+        setState { copy(createAndInviteState = Loading()) }
+
         viewModelScope.launch(Dispatchers.IO) {
             val adminE2EByDefault = rawService.getElementWellknown(session.myUserId)
                     ?.isE2EByDefault()

From 08cdac3e0df7756c95290015df881532fe40421d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 26 Apr 2021 11:05:18 +0200
Subject: [PATCH 091/350] Handle PR review remarks

---
 .../im/vector/app/core/mvrx/ResultExtension.kt    | 15 +++++++++++----
 .../createdirect/CreateDirectRoomViewModel.kt     |  6 +++---
 .../home/room/detail/RoomDetailViewModel.kt       |  6 +++---
 .../RoomMemberProfileViewModel.kt                 |  6 +++---
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/mvrx/ResultExtension.kt b/vector/src/main/java/im/vector/app/core/mvrx/ResultExtension.kt
index 1dbf658deb..dfd04ea6f6 100644
--- a/vector/src/main/java/im/vector/app/core/mvrx/ResultExtension.kt
+++ b/vector/src/main/java/im/vector/app/core/mvrx/ResultExtension.kt
@@ -20,7 +20,14 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Success
 
-fun <A> Result<A>.foldToAsync(): Async<A> = fold(
-        { Success(it) },
-        { Fail(it) }
-)
+/**
+ * Note: this will be removed when upgrading to mvrx2
+ */
+suspend fun <A> runCatchingToAsync(block: suspend () -> A): Async<A> {
+    return runCatching {
+        block.invoke()
+    }.fold(
+            { Success(it) },
+            { Fail(it) }
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
index 9d6f6da54b..2f0b6e5ec9 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
@@ -27,7 +27,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.mvrx.foldToAsync
+import im.vector.app.core.mvrx.runCatchingToAsync
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.raw.wellknown.getElementWellknown
 import im.vector.app.features.raw.wellknown.isE2EByDefault
@@ -102,9 +102,9 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
                         enableEncryptionIfInvitedUsersSupportIt = adminE2EByDefault
                     }
 
-            val result = runCatching {
+            val result = runCatchingToAsync {
                 session.createRoom(roomParams)
-            }.foldToAsync()
+            }
 
             setState {
                 copy(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 725cce70ab..006a2c9b5f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -35,7 +35,7 @@ import dagger.assisted.AssistedInject
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.mvrx.foldToAsync
+import im.vector.app.core.mvrx.runCatchingToAsync
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.call.dialpad.DialPadLookup
@@ -651,10 +651,10 @@ class RoomDetailViewModel @AssistedInject constructor(
                     ?.let { listOf(it) }
                     .orEmpty()
             viewModelScope.launch {
-                val result = runCatching {
+                val result = runCatchingToAsync {
                     session.joinRoom(roomId, viaServers = viaServers)
                     roomId
-                }.foldToAsync()
+                }
                 setState {
                     copy(tombstoneEventHandling = result)
                 }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index 0fa681a799..7b05c6c7f5 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -29,7 +29,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
 import im.vector.app.R
-import im.vector.app.core.mvrx.foldToAsync
+import im.vector.app.core.mvrx.runCatchingToAsync
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
@@ -267,7 +267,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
     }
 
     private suspend fun fetchProfileInfo() {
-        val result = runCatching {
+        val result = runCatchingToAsync {
             session.getProfile(initialState.userId)
                     .let {
                         MatrixItem.UserItem(
@@ -276,7 +276,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
                                 avatarUrl = it[ProfileService.AVATAR_URL_KEY] as? String
                         )
                     }
-        }.foldToAsync()
+        }
 
         setState {
             copy(userMatrixItem = result)

From ed9db95aa063c38f48fefd96b76d8f917fc864a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 14:27:59 +0000
Subject: [PATCH 092/350] Bump fragment-ktx from 1.3.2 to 1.3.3

Bumps fragment-ktx from 1.3.2 to 1.3.3.

Signed-off-by: dependabot[bot] <support@github.com>
---
 multipicker/build.gradle | 2 +-
 vector/build.gradle      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index 26afd5fb77..5eff2ec3ec 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -43,7 +43,7 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "androidx.fragment:fragment-ktx:1.3.2"
+    implementation "androidx.fragment:fragment-ktx:1.3.3"
     implementation 'androidx.exifinterface:exifinterface:1.3.2'
 
     // Log
diff --git a/vector/build.gradle b/vector/build.gradle
index cb4f26b71f..69d2037255 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -291,7 +291,7 @@ android {
 dependencies {
 
     def epoxy_version = '4.5.0'
-    def fragment_version = '1.3.2'
+    def fragment_version = '1.3.3'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.8.0'

From 49d1b3e583b846d86e3330445b0e8c5077b83c91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 14:31:37 +0000
Subject: [PATCH 093/350] Bump zxcvbn from 1.4.1 to 1.5.0

Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.4.1...1.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index d13742d28b..32565f01ca 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -388,7 +388,7 @@ dependencies {
     implementation 'androidx.browser:browser:1.3.0'
 
     // Passphrase strength helper
-    implementation 'com.nulab-inc:zxcvbn:1.4.1'
+    implementation 'com.nulab-inc:zxcvbn:1.5.0'
 
     //Alerter
     implementation 'com.tapadoo.android:alerter:7.0.1'

From c5fa0a413f5ae3eec898e7c4fdb8bac0454868df Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 29 Dec 2020 17:34:25 +0100
Subject: [PATCH 094/350] Space first commit

---
 .../org/matrix/android/sdk/rx/RxSession.kt    |   9 +
 .../matrix/android/sdk/api/session/Session.kt |   6 +
 .../sdk/api/session/events/model/EventType.kt |   1 +
 .../session/room/RoomSummaryQueryParams.kt    |   4 +
 .../api/session/room/model/IRoomSummary.kt    |  31 ++++
 .../sdk/api/session/room/model/RoomSummary.kt |  27 +--
 .../sdk/api/session/room/model/RoomType.kt    |  23 +++
 .../room/model/create/CreateRoomParams.kt     |  15 +-
 .../room/model/create/RoomCreateContent.kt    |   4 +-
 .../api/session/space/CreateSpaceParams.kt    |  27 +++
 .../android/sdk/api/session/space/Space.kt    |  26 +++
 .../sdk/api/session/space/SpaceService.kt     |  45 +++++
 .../sdk/api/session/space/SpaceSummary.kt     |  26 +++
 .../session/space/model/SpaceChildContent.kt  |  52 ++++++
 .../matrix/android/sdk/api/util/MatrixItem.kt |   9 +-
 .../database/RealmSessionStoreMigration.kt    |  20 +-
 .../database/mapper/RoomSummaryMapper.kt      |   3 +-
 .../database/mapper/SpaceSummaryMapper.kt     |  34 ++++
 .../database/model/SessionRealmModule.kt      |   3 +-
 .../database/model/SpaceSummaryEntity.kt      |  41 +++++
 .../query/SpaceSummaryEntityQueries.kt        |  55 ++++++
 .../sdk/internal/session/DefaultSession.kt    |   6 +-
 .../sdk/internal/session/room/RoomModule.kt   |   5 +
 .../relationship/RoomRelationshipHelper.kt    |  50 +++++
 .../room/summary/RoomSummaryDataSource.kt     |   4 +
 .../room/summary/RoomSummaryUpdater.kt        |  18 ++
 .../internal/session/space/DefaultSpace.kt    |  38 ++++
 .../session/space/DefaultSpaceService.kt      |  70 +++++++
 .../session/space/SpaceSummaryDataSource.kt   |  93 ++++++++++
 .../im/vector/app/core/di/FragmentModule.kt   |   6 +
 .../im/vector/app/core/di/VectorComponent.kt  |   3 +
 .../im/vector/app/features/command/Command.kt |   3 +-
 .../app/features/command/CommandParser.kt     |  12 ++
 .../app/features/command/ParsedCommand.kt     |   1 +
 .../features/grouplist/GroupListViewModel.kt  |   7 +-
 .../grouplist/HomeSpaceSummaryItem.kt         |  62 +++++++
 .../grouplist/SelectedSpaceDataSource.kt      |  26 +++
 .../features/grouplist/SpaceListFragment.kt   |  84 +++++++++
 .../grouplist/SpaceSummaryController.kt       |  76 ++++++++
 .../features/grouplist/SpaceSummaryItem.kt    |  57 ++++++
 .../app/features/home/AvatarRenderer.kt       |  31 +++-
 .../app/features/home/HomeDetailFragment.kt   |  28 +++
 .../app/features/home/HomeDetailViewModel.kt  |  13 ++
 .../app/features/home/HomeDetailViewState.kt  |   2 +
 .../app/features/home/HomeDrawerFragment.kt   |   7 +-
 .../home/room/detail/RoomDetailViewModel.kt   |  18 ++
 .../createroom/CreateRoomController.kt        |   8 +-
 .../createroom/CreateRoomViewModel.kt         |  18 +-
 .../createroom/CreateRoomViewState.kt         |  10 +-
 .../features/settings/VectorPreferences.kt    |   6 +
 .../features/spaces/SpacesListViewModel.kt    | 172 ++++++++++++++++++
 .../src/main/res/drawable/bg_group_item.xml   |   2 +-
 .../src/main/res/drawable/bg_space_item.xml   |  27 +++
 .../res/drawable/ic_selected_community.xml    |   9 +
 .../src/main/res/drawable/ic_space_home.xml   |  12 ++
 .../res/drawable/space_home_background.xml    |  13 ++
 .../main/res/layout/fragment_home_detail.xml  |  51 ++++--
 vector/src/main/res/layout/item_space.xml     |  63 +++++++
 vector/src/main/res/values/strings.xml        |   4 +
 .../src/main/res/xml/vector_settings_labs.xml |   6 +
 60 files changed, 1523 insertions(+), 59 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/IRoomSummary.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/SpaceSummaryEntityQueries.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryDataSource.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
 create mode 100644 vector/src/main/res/drawable/bg_space_item.xml
 create mode 100644 vector/src/main/res/drawable/ic_selected_community.xml
 create mode 100644 vector/src/main/res/drawable/ic_space_home.xml
 create mode 100644 vector/src/main/res/drawable/space_home_background.xml
 create mode 100644 vector/src/main/res/layout/item_space.xml

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 0fe2b01576..7cc0d69bb9 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -39,6 +39,8 @@ import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.session.widgets.model.Widget
@@ -66,6 +68,13 @@ class RxSession(private val session: Session) {
                 }
     }
 
+    fun liveSpaceSummaries(queryParams: SpaceSummaryQueryParams): Observable<List<SpaceSummary>> {
+        return session.spaceService().getSpaceSummariesLive(queryParams).asObservable()
+                .startWithCallable {
+                    session.spaceService().getSpaceSummaries(queryParams)
+                }
+    }
+
     fun liveBreadcrumbs(queryParams: RoomSummaryQueryParams): Observable<List<RoomSummary>> {
         return session.getBreadcrumbsLive(queryParams).asObservable()
                 .startWithCallable {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index a15799d862..5f442c33f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -48,6 +48,7 @@ import org.matrix.android.sdk.api.session.search.SearchService
 import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.session.signout.SignOutService
+import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.sync.FilterService
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.session.terms.TermsService
@@ -227,6 +228,11 @@ interface Session :
      */
     fun thirdPartyService(): ThirdPartyService
 
+    /**
+     * Returns the space service associated with the session
+     */
+    fun spaceService(): SpaceService
+
     /**
      * Add a listener to the session.
      * @param listener the listener to add.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index 905e18b8e8..9d8f18e912 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -51,6 +51,7 @@ 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"
 
     /**
      * Note that this Event has been deprecated, see
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index 7e04ebb5f2..c8d52302e9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -20,6 +20,7 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomType
 
 fun roomSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {}): RoomSummaryQueryParams {
     return RoomSummaryQueryParams.Builder().apply(init).build()
@@ -36,6 +37,7 @@ data class RoomSummaryQueryParams(
         val memberships: List<Membership>,
         val roomCategoryFilter: RoomCategoryFilter?,
         val roomTagQueryFilter: RoomTagQueryFilter?
+        val excludeType: List<String?>
 ) {
 
     class Builder {
@@ -46,6 +48,7 @@ data class RoomSummaryQueryParams(
         var memberships: List<Membership> = Membership.all()
         var roomCategoryFilter: RoomCategoryFilter? = RoomCategoryFilter.ALL
         var roomTagQueryFilter: RoomTagQueryFilter? = null
+        var excludeType: List<String?> = listOf(RoomType.SPACE)
 
         fun build() = RoomSummaryQueryParams(
                 roomId = roomId,
@@ -54,6 +57,7 @@ data class RoomSummaryQueryParams(
                 memberships = memberships,
                 roomCategoryFilter = roomCategoryFilter,
                 roomTagQueryFilter = roomTagQueryFilter
+                excludeType = excludeType
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/IRoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/IRoomSummary.kt
new file mode 100644
index 0000000000..1724f00c99
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/IRoomSummary.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.model
+
+interface IRoomSummary {
+    val roomId: String
+    val displayName: String
+    val name: String
+    val topic: String
+    val avatarUrl: String
+    val canonicalAlias: String?
+    val aliases: List<String>
+    val joinedMembersCount: Int?
+    val invitedMembersCount: Int?
+    val otherMemberIds: List<String>
+    val roomType: String?
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index 9455a83aff..ac87a16911 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -27,19 +27,19 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
  * It can be retrieved by [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
  */
 data class RoomSummary constructor(
-        val roomId: String,
+        override val roomId: String,
         // Computed display name
-        val displayName: String = "",
-        val name: String = "",
-        val topic: String = "",
-        val avatarUrl: String = "",
-        val canonicalAlias: String? = null,
-        val aliases: List<String> = emptyList(),
-        val isDirect: Boolean = false,
-        val joinedMembersCount: Int? = 0,
-        val invitedMembersCount: Int? = 0,
+        override val displayName: String = "",
+        override val name: String = "",
+        override val topic: String = "",
+        override val avatarUrl: String = "",
+        override val canonicalAlias: String? = null,
+        override val aliases: List<String> = emptyList(),
+        override val joinedMembersCount: Int? = 0,
+        override val invitedMembersCount: Int? = 0,
         val latestPreviewableEvent: TimelineEvent? = null,
-        val otherMemberIds: List<String> = emptyList(),
+        override val otherMemberIds: List<String> = emptyList(),
+        val isDirect: Boolean = false,
         val notificationCount: Int = 0,
         val highlightCount: Int = 0,
         val hasUnreadMessages: Boolean = false,
@@ -54,8 +54,9 @@ data class RoomSummary constructor(
         val inviterId: String? = null,
         val breadcrumbsIndex: Int = NOT_IN_BREADCRUMBS,
         val roomEncryptionTrustLevel: RoomEncryptionTrustLevel? = null,
-        val hasFailedSending: Boolean = false
-) {
+        val hasFailedSending: Boolean = false,
+        override val roomType: String? = null
+) : IRoomSummary {
 
     val isVersioned: Boolean
         get() = versioningState != VersioningState.NONE
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
new file mode 100644
index 0000000000..3958d45d0b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.model
+
+object RoomType {
+
+    const val SPACE = "m.space"
+    const val MESSAGING = "m.messaging"
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index 80e3741a0c..6009649314 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -21,10 +21,11 @@ import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 
 // TODO Give a way to include other initial states
-class CreateRoomParams {
+open class CreateRoomParams {
     /**
      * A public visibility indicates that the room will be shown in the published room list.
      * A private visibility will hide the room from the published room list.
@@ -111,6 +112,17 @@ class CreateRoomParams {
             }
         }
 
+    var roomType: String? = RoomType.MESSAGING
+        set(value) {
+            field = value
+            if (value != null) {
+                creationContent[CREATION_CONTENT_KEY_ROOM_TYPE] = value
+            } else {
+                // This is the default value, we remove the field
+                creationContent.remove(CREATION_CONTENT_KEY_ROOM_TYPE)
+            }
+        }
+
     /**
      * The power level content to override in the default power level event
      */
@@ -138,5 +150,6 @@ class CreateRoomParams {
 
     companion object {
         private const val CREATION_CONTENT_KEY_M_FEDERATE = "m.federate"
+        private const val CREATION_CONTENT_KEY_ROOM_TYPE = "type"
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
index 0b595b1b2b..52e5c0e9c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
@@ -26,5 +26,7 @@ import com.squareup.moshi.JsonClass
 data class RoomCreateContent(
         @Json(name = "creator") val creator: String? = null,
         @Json(name = "room_version") val roomVersion: String? = null,
-        @Json(name = "predecessor") val predecessor: Predecessor? = null
+        @Json(name = "predecessor") val predecessor: Predecessor? = null,
+        // Defines the room type, see #RoomType (user extensible)
+        @Json(name = "type") val type: String? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt
new file mode 100644
index 0000000000..0caa7af14c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.space
+
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+
+class CreateSpaceParams : CreateRoomParams() {
+
+    init {
+        roomType = RoomType.SPACE
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
new file mode 100644
index 0000000000..75480282fa
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.space
+
+import org.matrix.android.sdk.api.session.room.Room
+
+interface Space {
+
+    fun asRoom() : Room
+
+    suspend fun addRoom(roomId: String)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
new file mode 100644
index 0000000000..0c3461f1ca
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.space
+
+import androidx.lifecycle.LiveData
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+
+typealias SpaceSummaryQueryParams = RoomSummaryQueryParams
+
+interface SpaceService {
+
+    /**
+     * Create a room asynchronously
+     */
+    suspend fun createSpace(params: CreateSpaceParams): String
+
+    /**
+     * Get a space from a roomId
+     * @param roomId the roomId to look for.
+     * @return a room with roomId or null if room type is not space
+     */
+    fun getSpace(spaceId: String): Space?
+
+    /**
+     * Get a live list of space summaries. This list is refreshed as soon as the data changes.
+     * @return the [LiveData] of List[SpaceSummary]
+     */
+    fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams): LiveData<List<SpaceSummary>>
+
+    fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<SpaceSummary>
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt
new file mode 100644
index 0000000000..d2be2f18f1
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.space
+
+import org.matrix.android.sdk.api.session.room.model.IRoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+data class SpaceSummary(
+        val spaceId: String,
+        val roomSummary: RoomSummary,
+        val children: List<IRoomSummary>
+) : IRoomSummary by roomSummary
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
new file mode 100644
index 0000000000..f65318b543
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.space.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ *  "content": {
+ *      "via": ["example.com"],
+ *      "present": true,
+ *      "order": "abcd",
+ *      "default": true
+ *  }
+ */
+@JsonClass(generateAdapter = true)
+data class SpaceChildContent(
+        /**
+         * Key which gives a list of candidate servers that can be used to join the room
+         */
+        @Json(name = "via") val via: List<String>? = null,
+        /**
+         * present: true key is included to distinguish from a deleted state event
+         */
+        @Json(name = "present") val present: Boolean? = false,
+        /**
+         * The order key is a string which is used to provide a default ordering of siblings in the room list.
+         * (Rooms are sorted based on a lexicographic ordering of order values; rooms with no order come last.
+         * orders which are not strings, or do not consist solely of ascii characters in the range \x20 (space) to \x7F (~),
+         * or consist of more than 50 characters, are forbidden and should be ignored if received.)
+         */
+        @Json(name = "order") val order: String? = null,
+        /**
+         * The default flag on a child listing allows a space admin to list the "default" sub-spaces and rooms in that space.
+         * This means that when a user joins the parent space, they will automatically be joined to those default children.
+         */
+        @Json(name = "default") val default: Boolean? = true
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
index db229a6453..a792248764 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
+import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.user.model.User
 import java.util.Locale
 
@@ -86,9 +87,9 @@ sealed class MatrixItem(
     }
 
     protected fun checkId() {
-        if (!id.startsWith(getIdPrefix())) {
-            error("Wrong usage of MatrixItem: check the id $id should start with ${getIdPrefix()}")
-        }
+//        if (!id.startsWith(getIdPrefix())) {
+//            error("Wrong usage of MatrixItem: check the id $id should start with ${getIdPrefix()}")
+//        }
     }
 
     /**
@@ -151,6 +152,8 @@ fun RoomSummary.toMatrixItem() = MatrixItem.RoomItem(roomId, displayName, avatar
 
 fun RoomSummary.toRoomAliasMatrixItem() = MatrixItem.RoomAliasItem(canonicalAlias ?: roomId, displayName, avatarUrl)
 
+fun SpaceSummary.toMatrixItem() = MatrixItem.RoomItem(spaceId, displayName, avatarUrl)
+
 // If no name is available, use room alias as Riot-Web does
 fun PublicRoom.toMatrixItem() = MatrixItem.RoomItem(roomId, name ?: getPrimaryAlias() ?: "", avatarUrl)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 1daae906f2..2c06a4e8f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -29,15 +29,17 @@ import org.matrix.android.sdk.internal.database.model.PreviewUrlCacheEntityField
 import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+
 import org.matrix.android.sdk.internal.database.model.RoomTagEntityFields
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
 import timber.log.Timber
 import javax.inject.Inject
 
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 9L
+        const val SESSION_STORE_SCHEMA_VERSION = 10L
     }
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@@ -52,6 +54,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         if (oldVersion <= 6) migrateTo7(realm)
         if (oldVersion <= 7) migrateTo8(realm)
         if (oldVersion <= 8) migrateTo9(realm)
+        if (oldVersion <= 9) migrateTo10(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -194,4 +197,19 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                             }
                 }
     }
+
+    fun migrateTo10(realm: DynamicRealm) {
+        Timber.d("Step 9 -> 10")
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.ROOM_TYPE, String::class.java)
+                ?.transform { obj ->
+                    // Should I put messaging type here?
+                    obj.setString(RoomSummaryEntityFields.ROOM_TYPE, null)
+                }
+
+        realm.schema.create("SpaceSummaryEntity")
+                ?.addField(SpaceSummaryEntityFields.SPACE_ID, String::class.java, FieldAttribute.PRIMARY_KEY)
+                ?.addRealmObjectField(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
+                ?.addRealmListField(SpaceSummaryEntityFields.CHILDREN.`$`, realm.schema.get("RoomSummaryEntity")!!)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 6dc70b60fc..c74eb4460d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -63,7 +63,8 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                 breadcrumbsIndex = roomSummaryEntity.breadcrumbsIndex,
                 roomEncryptionTrustLevel = roomSummaryEntity.roomEncryptionTrustLevel,
                 inviterId = roomSummaryEntity.inviterId,
-                hasFailedSending = roomSummaryEntity.hasFailedSending
+                hasFailedSending = roomSummaryEntity.hasFailedSending,
+                roomType = roomSummaryEntity.roomType
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
new file mode 100644
index 0000000000..9dee99d7fe
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.mapper
+
+import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
+import javax.inject.Inject
+
+internal class SpaceSummaryMapper @Inject constructor(private val roomSummaryMapper: RoomSummaryMapper) {
+
+    fun map(spaceSummaryEntity: SpaceSummaryEntity): SpaceSummary {
+        return SpaceSummary(
+                spaceId = spaceSummaryEntity.spaceId,
+                roomSummary = roomSummaryMapper.map(spaceSummaryEntity.roomSummaryEntity!!),
+                children = spaceSummaryEntity.children.map {
+                    roomSummaryMapper.map(it)
+                }
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index 6e6096cf8a..8c5bb8e990 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -61,6 +61,7 @@ import io.realm.annotations.RealmModule
             CurrentStateEventEntity::class,
             UserAccountDataEntity::class,
             ScalarTokenEntity::class,
-            WellknownIntegrationManagerConfigEntity::class
+            WellknownIntegrationManagerConfigEntity::class,
+            SpaceSummaryEntity::class
         ])
 internal class SessionRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt
new file mode 100644
index 0000000000..ca54655022
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+import io.realm.RealmList
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+internal open class SpaceSummaryEntity(@PrimaryKey var spaceId: String = "",
+                                       var roomSummaryEntity: RoomSummaryEntity? = null,
+                                       var children: RealmList<RoomSummaryEntity> = RealmList()
+                                        // TODO public / private .. and more
+) : RealmObject() {
+
+    // Do we want to denormalize that ?
+
+//    private var membershipStr: String = Membership.NONE.name
+//    var membership: Membership
+//        get() {
+//            return Membership.valueOf(membershipStr)
+//        }
+//        set(value) {
+//            membershipStr = value.name
+//        }
+
+    companion object
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/SpaceSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/SpaceSummaryEntityQueries.kt
new file mode 100644
index 0000000000..b6403c596f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/SpaceSummaryEntityQueries.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.query
+
+import io.realm.Realm
+import io.realm.RealmQuery
+import io.realm.kotlin.createObject
+import io.realm.kotlin.where
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
+
+internal fun SpaceSummaryEntity.Companion.where(realm: Realm, roomId: String? = null): RealmQuery<SpaceSummaryEntity> {
+    val query = realm.where<SpaceSummaryEntity>()
+    query.isNotNull(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`)
+    if (roomId != null) {
+        query.equalTo(SpaceSummaryEntityFields.SPACE_ID, roomId)
+    }
+    query.sort(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.DISPLAY_NAME)
+    return query
+}
+
+internal fun SpaceSummaryEntity.Companion.findByAlias(realm: Realm, roomAlias: String): SpaceSummaryEntity? {
+    val spaceSummary = realm.where<SpaceSummaryEntity>()
+            .isNotNull(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`)
+            .equalTo(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.CANONICAL_ALIAS, roomAlias)
+            .findFirst()
+    if (spaceSummary != null) {
+        return spaceSummary
+    }
+    return realm.where<SpaceSummaryEntity>()
+            .isNotNull(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`)
+            .contains(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.FLAT_ALIASES, "|$roomAlias")
+            .findFirst()
+}
+
+internal fun SpaceSummaryEntity.Companion.getOrCreate(realm: Realm, roomId: String): SpaceSummaryEntity {
+    return where(realm, roomId).findFirst() ?: realm.createObject<SpaceSummaryEntity>(roomId).also {
+        it.roomSummaryEntity = RoomSummaryEntity.getOrCreate(realm, roomId)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 821a9cba8c..ecb680c691 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -49,6 +49,7 @@ import org.matrix.android.sdk.api.session.search.SearchService
 import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.session.signout.SignOutService
+import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.sync.FilterService
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.api.session.thirdparty.ThirdPartyService
@@ -121,7 +122,8 @@ internal class DefaultSession @Inject constructor(
         private val thirdPartyService: Lazy<ThirdPartyService>,
         private val callSignalingService: Lazy<CallSignalingService>,
         @UnauthenticatedWithCertificate
-        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>
+        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>,
+        private val spaceService: Lazy<SpaceService>
 ) : Session,
         RoomService by roomService.get(),
         RoomDirectoryService by roomDirectoryService.get(),
@@ -265,6 +267,8 @@ internal class DefaultSession @Inject constructor(
 
     override fun thirdPartyService(): ThirdPartyService = thirdPartyService.get()
 
+    override fun spaceService(): SpaceService = spaceService.get()
+
     override fun getOkHttpClient(): OkHttpClient {
         return unauthenticatedWithCertificateOkHttpClient.get()
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index 5133f72932..8f3445bec3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -24,6 +24,7 @@ import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.internal.session.DefaultFileService
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.directory.DirectoryAPI
@@ -89,6 +90,7 @@ import org.matrix.android.sdk.internal.session.room.typing.DefaultSendTypingTask
 import org.matrix.android.sdk.internal.session.room.typing.SendTypingTask
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultGetUploadsTask
 import org.matrix.android.sdk.internal.session.room.uploads.GetUploadsTask
+import org.matrix.android.sdk.internal.session.space.DefaultSpaceService
 import retrofit2.Retrofit
 
 @Module
@@ -135,6 +137,9 @@ internal abstract class RoomModule {
     @Binds
     abstract fun bindRoomService(service: DefaultRoomService): RoomService
 
+    @Binds
+    abstract fun bindSpaceService(service: DefaultSpaceService): SpaceService
+
     @Binds
     abstract fun bindRoomDirectoryService(service: DefaultRoomDirectoryService): RoomDirectoryService
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
new file mode 100644
index 0000000000..4025861caa
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.relationship
+
+import io.realm.Realm
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import org.matrix.android.sdk.internal.database.mapper.ContentMapper
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
+import org.matrix.android.sdk.internal.database.query.whereType
+
+/**
+ * Relationship between rooms and spaces
+ * The intention is that rooms and spaces form a hierarchy, which clients can use to structure the user's room list into a tree view.
+ * The parent/child relationship can be expressed in one of two ways:
+ *  - The admins of a space can advertise rooms and subspaces for their space by setting m.space.child state events.
+ *  The state_key is the ID of a child room or space, and the content should contain a via key which gives
+ *  a list of candidate servers that can be used to join the room. present: true key is included to distinguish from a deleted state event.
+ *
+ *  - Separately, rooms can claim parents via the m.room.parent state event:
+ */
+internal class RoomRelationshipHelper(private val realm: Realm,
+                                      private val roomId: String
+) {
+
+    fun getDirectChildrenDescriptions(): List<String> {
+        return CurrentStateEventEntity.whereType(realm, roomId, EventType.STATE_SPACE_CHILD)
+                .findAll()
+                .filter { ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.present == true }
+                .mapNotNull {
+                    // ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()
+                    it.roomId
+                }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index dd3fbe04b2..576e7f4eba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -189,6 +189,10 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                 query.equalTo(RoomSummaryEntityFields.IS_SERVER_NOTICE, sn)
             }
         }
+
+        queryParams.excludeType.forEach {
+            query.notEqualTo(RoomSummaryEntityFields.ROOM_TYPE, it)
+        }
         return query
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 7913bf71a2..f8a3495aa2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -25,6 +25,8 @@ import org.matrix.android.sdk.api.session.room.model.RoomAliasesContent
 import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
 import org.matrix.android.sdk.api.session.room.model.RoomNameContent
 import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.internal.crypto.EventDecryptor
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
@@ -36,6 +38,7 @@ import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.EventEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendStates
 import org.matrix.android.sdk.internal.database.query.getOrCreate
@@ -46,6 +49,7 @@ import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.room.RoomAvatarResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomDisplayNameResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
+import org.matrix.android.sdk.internal.session.room.relationship.RoomRelationshipHelper
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncSummary
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncUnreadNotifications
 import timber.log.Timber
@@ -89,6 +93,10 @@ internal class RoomSummaryUpdater @Inject constructor(
         val lastTopicEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_TOPIC, stateKey = "")?.root
         val lastCanonicalAliasEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_CANONICAL_ALIAS, stateKey = "")?.root
         val lastAliasesEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_ALIASES, stateKey = "")?.root
+        val roomCreateEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_CREATE, stateKey = "")?.root
+
+        val roomType = ContentMapper.map(roomCreateEvent?.content).toModel<RoomCreateContent>()?.type
+        roomSummaryEntity.roomType = roomType
 
         // Don't use current state for this one as we are only interested in having MXCRYPTO_ALGORITHM_MEGOLM event in the room
         val encryptionEvent = EventEntity.whereType(realm, roomId = roomId, type = EventType.STATE_ROOM_ENCRYPTION)
@@ -152,6 +160,16 @@ internal class RoomSummaryUpdater @Inject constructor(
                 crossSigningService.onUsersDeviceUpdate(otherRoomMembers)
             }
         }
+
+        if (roomType == RoomType.SPACE) {
+            val spaceSummaryEntity = SpaceSummaryEntity.getOrCreate(realm, roomId)
+            spaceSummaryEntity.roomSummaryEntity = roomSummaryEntity
+            spaceSummaryEntity.children.clear()
+            spaceSummaryEntity.children.addAll(
+                    RoomRelationshipHelper(realm, roomId).getDirectChildrenDescriptions()
+                            .map { RoomSummaryEntity.getOrCreate(realm, roomId) }
+            )
+        }
     }
 
     private fun RoomSummaryEntity.updateHasFailedSending() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
new file mode 100644
index 0000000000..ae71ee5cf2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.space.Space
+import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+
+class DefaultSpace(private val room: Room) : Space {
+
+    override fun asRoom(): Room {
+        return room
+    }
+
+    override suspend fun addRoom(roomId: String) {
+        asRoom().sendStateEvent(
+                eventType = EventType.STATE_SPACE_CHILD,
+                stateKey = roomId,
+                body = SpaceChildContent(present = true).toContent()
+        )
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
new file mode 100644
index 0000000000..3d9e7d7764
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import androidx.lifecycle.LiveData
+import com.zhuinden.monarchy.Monarchy
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.space.CreateSpaceParams
+import org.matrix.android.sdk.api.session.space.Space
+import org.matrix.android.sdk.api.session.space.SpaceService
+import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.room.RoomGetter
+import org.matrix.android.sdk.internal.session.room.alias.DeleteRoomAliasTask
+import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
+import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
+import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
+import org.matrix.android.sdk.internal.session.user.accountdata.UpdateBreadcrumbsTask
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import javax.inject.Inject
+
+internal class DefaultSpaceService @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val createRoomTask: CreateRoomTask,
+        private val joinRoomTask: JoinRoomTask,
+        private val markAllRoomsReadTask: MarkAllRoomsReadTask,
+        private val updateBreadcrumbsTask: UpdateBreadcrumbsTask,
+        private val roomIdByAliasTask: GetRoomIdByAliasTask,
+        private val deleteRoomAliasTask: DeleteRoomAliasTask,
+        private val roomGetter: RoomGetter,
+        private val spaceSummaryDataSource: SpaceSummaryDataSource,
+        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
+        private val taskExecutor: TaskExecutor
+) : SpaceService {
+
+    override suspend fun createSpace(params: CreateSpaceParams): String {
+        return createRoomTask.execute(params)
+    }
+
+    override fun getSpace(spaceId: String): Space? {
+        return roomGetter.getRoom(spaceId)
+                ?.takeIf { it.roomSummary()?.roomType == RoomType.SPACE }
+                ?.let { DefaultSpace(it) }
+    }
+
+    override fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams): LiveData<List<SpaceSummary>> {
+        return spaceSummaryDataSource.getRoomSummariesLive(queryParams)
+    }
+
+    override fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<SpaceSummary> {
+        return spaceSummaryDataSource.getSpaceSummaries(spaceSummaryQueryParams)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryDataSource.kt
new file mode 100644
index 0000000000..c15e81c287
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryDataSource.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Transformations
+import com.zhuinden.monarchy.Monarchy
+import io.realm.Realm
+import io.realm.RealmQuery
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.model.VersioningState
+import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.SpaceSummaryMapper
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
+import org.matrix.android.sdk.internal.database.query.findByAlias
+import org.matrix.android.sdk.internal.database.query.where
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.query.process
+import org.matrix.android.sdk.internal.util.fetchCopyMap
+import javax.inject.Inject
+
+internal class SpaceSummaryDataSource @Inject constructor(
+        @SessionDatabase private val monarchy: Monarchy,
+        private val spaceSummaryMapper: SpaceSummaryMapper
+) {
+
+    fun getSpaceSummary(roomIdOrAlias: String): SpaceSummary? {
+        return monarchy
+                .fetchCopyMap({
+                    if (roomIdOrAlias.startsWith("!")) {
+                        // It's a roomId
+                        SpaceSummaryEntity.where(it, roomId = roomIdOrAlias).findFirst()
+                    } else {
+                        // Assume it's a room alias
+                        SpaceSummaryEntity.findByAlias(it, roomIdOrAlias)
+                    }
+                }, { entity, _ ->
+                    spaceSummaryMapper.map(entity)
+                })
+    }
+
+    fun getSpaceSummaryLive(roomId: String): LiveData<Optional<SpaceSummary>> {
+        val liveData = monarchy.findAllMappedWithChanges(
+                { realm -> SpaceSummaryEntity.where(realm, roomId).isNotEmpty(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.DISPLAY_NAME) },
+                { spaceSummaryMapper.map(it) }
+        )
+        return Transformations.map(liveData) { results ->
+            results.firstOrNull().toOptional()
+        }
+    }
+
+    fun getSpaceSummaries(queryParams: SpaceSummaryQueryParams): List<SpaceSummary> {
+        return monarchy.fetchAllMappedSync(
+                { spaceSummariesQuery(it, queryParams) },
+                { spaceSummaryMapper.map(it) }
+        )
+    }
+
+    fun getRoomSummariesLive(queryParams: RoomSummaryQueryParams): LiveData<List<SpaceSummary>> {
+        return monarchy.findAllMappedWithChanges(
+                { spaceSummariesQuery(it, queryParams) },
+                { spaceSummaryMapper.map(it) }
+        )
+    }
+
+    private fun spaceSummariesQuery(realm: Realm, queryParams: SpaceSummaryQueryParams): RealmQuery<SpaceSummaryEntity> {
+        val query = SpaceSummaryEntity.where(realm)
+        query.process(SpaceSummaryEntityFields.SPACE_ID, queryParams.roomId)
+        query.process(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.DISPLAY_NAME, queryParams.displayName)
+        query.process(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.CANONICAL_ALIAS, queryParams.canonicalAlias)
+        query.process(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.MEMBERSHIP_STR, queryParams.memberships)
+        query.notEqualTo(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.VERSIONING_STATE_STR, VersioningState.UPGRADED_ROOM_JOINED.name)
+        return query
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 430aee5468..1a3719e03f 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -52,6 +52,7 @@ import im.vector.app.features.devtools.RoomDevToolStateEventListFragment
 import im.vector.app.features.discovery.DiscoverySettingsFragment
 import im.vector.app.features.discovery.change.SetIdentityServerFragment
 import im.vector.app.features.grouplist.GroupListFragment
+import im.vector.app.features.grouplist.SpaceListFragment
 import im.vector.app.features.home.HomeDetailFragment
 import im.vector.app.features.home.HomeDrawerFragment
 import im.vector.app.features.home.LoadingFragment
@@ -145,6 +146,11 @@ interface FragmentModule {
     @FragmentKey(GroupListFragment::class)
     fun bindGroupListFragment(fragment: GroupListFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(SpaceListFragment::class)
+    fun bindSpaceListFragment(fragment: SpaceListFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(RoomDetailFragment::class)
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
index 4b88ff6767..3a197d3f83 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
@@ -35,6 +35,7 @@ import im.vector.app.features.configuration.VectorConfiguration
 import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
 import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
 import im.vector.app.features.grouplist.SelectedGroupDataSource
+import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
@@ -115,6 +116,8 @@ interface VectorComponent {
 
     fun selectedGroupStore(): SelectedGroupDataSource
 
+    fun selectedSpaceStore(): SelectedSpaceDataSource
+
     fun roomDetailPendingActionStore(): RoomDetailPendingActionStore
 
     fun activeSessionObservableStore(): ActiveSessionDataSource
diff --git a/vector/src/main/java/im/vector/app/features/command/Command.kt b/vector/src/main/java/im/vector/app/features/command/Command.kt
index 66d88f149a..b29d061dfb 100644
--- a/vector/src/main/java/im/vector/app/features/command/Command.kt
+++ b/vector/src/main/java/im/vector/app/features/command/Command.kt
@@ -46,7 +46,8 @@ enum class Command(val command: String, val parameters: String, @StringRes val d
     PLAIN("/plain", "<message>", R.string.command_description_plain),
     DISCARD_SESSION("/discardsession", "", R.string.command_description_discard_session),
     CONFETTI("/confetti", "<message>", R.string.command_confetti),
-    SNOW("/snow", "<message>", R.string.command_snow);
+    SNOW("/snow", "<message>", R.string.command_snow),
+    CREATE_SPACE("/createspace", "<name> <invitee>*", R.string.command_description_create_space);
 
     val length
         get() = command.length + 1
diff --git a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
index d458751364..57466ddf98 100644
--- a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
+++ b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
@@ -300,6 +300,18 @@ object CommandParser {
                     val message = textMessage.substring(Command.SNOW.command.length).trim()
                     ParsedCommand.SendChatEffect(ChatEffect.SNOW, message)
                 }
+                Command.CREATE_SPACE.command           -> {
+                    val rawCommand = textMessage.substring(Command.CREATE_SPACE.command.length).trim()
+                    val split = rawCommand.split(" ").map { it.trim() }
+                    if (split.isEmpty()) {
+                        ParsedCommand.ErrorSyntax(Command.CREATE_SPACE)
+                    } else {
+                        ParsedCommand.CreateSpace(
+                                split[0],
+                                split.subList(1, split.size)
+                        )
+                    }
+                }
                 else                                   -> {
                     // Unknown command
                     ParsedCommand.ErrorUnknownSlashCommand(slashCommand)
diff --git a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
index d17faeafb8..1017b29234 100644
--- a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
+++ b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
@@ -57,4 +57,5 @@ sealed class ParsedCommand {
     class SendPoll(val question: String, val options: List<String>) : ParsedCommand()
     object DiscardSession : ParsedCommand()
     class SendChatEffect(val chatEffect: ChatEffect, val message: String) : ParsedCommand()
+    class CreateSpace(val name: String, val invitees: List<String>) : ParsedCommand()
 }
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
index 4b187f83ca..0f6f77783d 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
@@ -30,6 +30,7 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import io.reactivex.Observable
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.group.groupSummaryQueryParams
@@ -96,8 +97,10 @@ class GroupListViewModel @AssistedInject constructor(@Assisted initialState: Gro
     private fun handleSelectGroup(action: GroupListAction.SelectGroup) = withState { state ->
         if (state.selectedGroup?.groupId != action.groupSummary.groupId) {
             // We take care of refreshing group data when selecting to be sure we get all the rooms and users
-            viewModelScope.launch {
-                session.getGroup(action.groupSummary.groupId)?.fetchGroupData()
+            tryOrNull {
+                viewModelScope.launch {
+                    session.getGroup(action.groupSummary.groupId)?.fetchGroupData()
+                }
             }
             setState { copy(selectedGroup = action.groupSummary) }
         }
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
new file mode 100644
index 0000000000..ade86a9d89
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.app.features.grouplist
+
+import android.content.res.Resources
+import android.util.TypedValue
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.CheckableConstraintLayout
+
+@EpoxyModelClass(layout = R.layout.item_space)
+abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Holder>() {
+
+    @EpoxyAttribute var selected: Boolean = false
+    @EpoxyAttribute var listener: (() -> Unit)? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.rootView.setOnClickListener { listener?.invoke() }
+        holder.groupNameView.text = holder.view.context.getString(R.string.group_details_home)
+        holder.rootView.isChecked = selected
+        holder.rootView.context.resources
+        holder.avatarImageView.background = ContextCompat.getDrawable(holder.view.context, R.drawable.space_home_background)
+        holder.avatarImageView.setImageResource(R.drawable.ic_space_home)
+        holder.avatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.groupAvatarImageView)
+        val groupNameView by bind<TextView>(R.id.groupNameView)
+        val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
+    }
+
+    fun dpToPx(resources: Resources, dp: Int): Int {
+        return TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP,
+                dp.toFloat(),
+                resources.displayMetrics
+        ).toInt()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt b/vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt
new file mode 100644
index 0000000000..d95251c271
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.grouplist
+
+import arrow.core.Option
+import im.vector.app.core.utils.BehaviorDataSource
+import org.matrix.android.sdk.api.session.space.SpaceSummary
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SelectedSpaceDataSource @Inject constructor() : BehaviorDataSource<Option<SpaceSummary>>(Option.empty())
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt
new file mode 100644
index 0000000000..4c783cb2d4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.app.features.grouplist
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.Incomplete
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.StateView
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentGroupListBinding
+import im.vector.app.features.home.HomeActivitySharedAction
+import im.vector.app.features.home.HomeSharedActionViewModel
+import im.vector.app.features.spaces.SpaceListAction
+import im.vector.app.features.spaces.SpaceListViewEvents
+import im.vector.app.features.spaces.SpacesListViewModel
+import org.matrix.android.sdk.api.session.space.SpaceSummary
+import javax.inject.Inject
+
+class SpaceListFragment @Inject constructor(
+        val spaceListViewModelFactory: SpacesListViewModel.Factory,
+        private val spaceController: SpaceSummaryController
+) : VectorBaseFragment<FragmentGroupListBinding>(), SpaceSummaryController.Callback {
+
+    private lateinit var sharedActionViewModel: HomeSharedActionViewModel
+    private val viewModel: SpacesListViewModel by fragmentViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGroupListBinding {
+        return FragmentGroupListBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        sharedActionViewModel = activityViewModelProvider.get(HomeSharedActionViewModel::class.java)
+        spaceController.callback = this
+        views.stateView.contentView = views.groupListView
+        views.groupListView.configureWith(spaceController)
+        viewModel.observeViewEvents {
+            when (it) {
+                is SpaceListViewEvents.OpenSpaceSummary -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup)
+            }.exhaustive
+        }
+    }
+
+    override fun onDestroyView() {
+        spaceController.callback = null
+        views.groupListView.cleanup()
+        super.onDestroyView()
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        when (state.asyncSpaces) {
+            is Incomplete -> views.stateView.state = StateView.State.Loading
+            is Success -> views.stateView.state = StateView.State.Content
+        }
+        spaceController.update(state)
+    }
+
+    override fun onSpaceSelected(spaceSummary: SpaceSummary) {
+        viewModel.handle(SpaceListAction.SelectSpace(spaceSummary))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt
new file mode 100644
index 0000000000..c7a27266fd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.app.features.grouplist
+
+import com.airbnb.epoxy.EpoxyController
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.spaces.SpaceListViewState
+import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class SpaceSummaryController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val stringProvider: StringProvider) : EpoxyController() {
+
+    var callback: Callback? = null
+    private var viewState: SpaceListViewState? = null
+
+    init {
+        requestModelBuild()
+    }
+
+    fun update(viewState: SpaceListViewState) {
+        this.viewState = viewState
+        requestModelBuild()
+    }
+
+    override fun buildModels() {
+        val nonNullViewState = viewState ?: return
+        buildGroupModels(nonNullViewState.asyncSpaces(), nonNullViewState.selectedSpace)
+    }
+
+    private fun buildGroupModels(summaries: List<SpaceSummary>?, selected: SpaceSummary?) {
+        if (summaries.isNullOrEmpty()) {
+            return
+        }
+        summaries.forEach { groupSummary ->
+            val isSelected = groupSummary.spaceId == selected?.spaceId
+            if (groupSummary.spaceId == ALL_COMMUNITIES_GROUP_ID) {
+                homeSpaceSummaryItem {
+                    id(groupSummary.spaceId)
+                    selected(isSelected)
+                    listener { callback?.onSpaceSelected(groupSummary) }
+                }
+            } else {
+                spaceSummaryItem {
+                    avatarRenderer(avatarRenderer)
+                    id(groupSummary.spaceId)
+                    matrixItem(groupSummary.toMatrixItem())
+                    selected(isSelected)
+                    listener { callback?.onSpaceSelected(groupSummary) }
+                }
+            }
+        }
+    }
+
+    interface Callback {
+        fun onSpaceSelected(spaceSummary: SpaceSummary)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryItem.kt
new file mode 100644
index 0000000000..1a710b764c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryItem.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.app.features.grouplist
+
+import android.widget.ImageView
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_space)
+abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
+
+    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute var selected: Boolean = false
+    @EpoxyAttribute var listener: (() -> Unit)? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.rootView.setOnClickListener { listener?.invoke() }
+        holder.groupNameView.text = matrixItem.displayName
+        holder.rootView.isChecked = selected
+        avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
+    }
+
+    override fun unbind(holder: Holder) {
+        avatarRenderer.clear(holder.avatarImageView)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.groupAvatarImageView)
+        val groupNameView by bind<TextView>(R.id.groupNameView)
+        val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
index 1d673a2a07..1765372548 100644
--- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
@@ -35,6 +35,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.glide.GlideRequest
 import im.vector.app.core.glide.GlideRequests
+import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
 import jp.wasabeef.glide.transformations.BlurTransformation
 import jp.wasabeef.glide.transformations.ColorFilterTransformation
@@ -48,7 +49,8 @@ import javax.inject.Inject
  */
 
 class AvatarRenderer @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
-                                         private val matrixItemColorProvider: MatrixItemColorProvider) {
+                                         private val matrixItemColorProvider: MatrixItemColorProvider,
+                                         private val dimensionConverter: DimensionConverter) {
 
     companion object {
         private const val THUMBNAIL_SIZE = 250
@@ -61,6 +63,23 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
                 DrawableImageViewTarget(imageView))
     }
 
+    @UiThread
+    fun renderSpace(matrixItem: MatrixItem, imageView: ImageView, glideRequests: GlideRequests) {
+        val placeholder = getSpacePlaceholderDrawable(matrixItem)
+        val resolvedUrl = resolvedUrl(matrixItem.avatarUrl)
+        glideRequests
+                .load(resolvedUrl)
+                .transform(MultiTransformation(CenterCrop(), RoundedCorners(dimensionConverter.dpToPx(8))))
+                .placeholder(placeholder)
+                .into(DrawableImageViewTarget(imageView))
+    }
+
+    fun renderSpace(matrixItem: MatrixItem, imageView: ImageView) {
+        renderSpace(
+                matrixItem,
+                imageView, GlideApp.with(imageView))
+    }
+
     fun clear(imageView: ImageView) {
         // It can be called after recycler view is destroyed, just silently catch
         tryOrNull { GlideApp.with(imageView).clear(imageView) }
@@ -159,6 +178,16 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
                 .buildRound(matrixItem.firstLetterOfDisplayName(), avatarColor)
     }
 
+    @AnyThread
+    fun getSpacePlaceholderDrawable(matrixItem: MatrixItem): Drawable {
+        val avatarColor = matrixItemColorProvider.getColor(matrixItem)
+        return TextDrawable.builder()
+                .beginConfig()
+                .bold()
+                .endConfig()
+                .buildRoundRect(matrixItem.firstLetterOfDisplayName(), avatarColor, dimensionConverter.dpToPx(8))
+    }
+
     // PRIVATE API *********************************************************************************
 
     private fun buildGlideRequest(glideRequests: GlideRequests, avatarUrl: String?): GlideRequest<Drawable> {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 5def43b60b..de24be1a7d 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -22,7 +22,10 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import androidx.lifecycle.Observer
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -47,11 +50,13 @@ import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity.Companion.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS
+import im.vector.app.features.spaces.ALL_COMMUNITIES_GROUP_ID
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.BannerState
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import timber.log.Timber
@@ -130,6 +135,11 @@ class HomeDetailFragment @Inject constructor(
         viewModel.selectSubscribe(this, HomeDetailViewState::groupSummary) { groupSummary ->
             onGroupChange(groupSummary.orNull())
         }
+
+        viewModel.selectSubscribe(this, HomeDetailViewState::spaceSummary) { spaceSummary ->
+            onSpaceChange(spaceSummary.orNull())
+        }
+
         viewModel.selectSubscribe(this, HomeDetailViewState::displayMode) { displayMode ->
             switchDisplayMode(displayMode)
         }
@@ -243,6 +253,24 @@ class HomeDetailFragment @Inject constructor(
         }
     }
 
+    private fun onSpaceChange(spaceSummary: SpaceSummary?) {
+        spaceSummary?.let {
+            // Use GlideApp with activity context to avoid the glideRequests to be paused
+            if (spaceSummary.spaceId == ALL_COMMUNITIES_GROUP_ID) {
+                // Special case
+                views.groupToolbarAvatarImageView.background = ContextCompat.getDrawable(requireContext(), R.drawable.space_home_background)
+                views.groupToolbarAvatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
+                views.groupToolbarAvatarImageView.setImageResource(R.drawable.ic_space_home)
+                views.groupToolbarSpaceTitleView.isVisible = false
+            } else {
+                views.groupToolbarAvatarImageView.background = null
+                avatarRenderer.renderSpace(it.toMatrixItem(), views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
+                views.groupToolbarSpaceTitleView.isVisible = true
+                views.groupToolbarSpaceTitleView.text = spaceSummary.displayName
+            }
+        }
+    }
+
     private fun setupKeysBackupBanner() {
         serverBackupStatusViewModel
                 .subscribe(this) {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index d6a8b075f4..a07a329a57 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -28,6 +28,7 @@ import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.grouplist.SelectedGroupDataSource
+import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.features.ui.UiStateRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -75,6 +76,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     init {
         observeSyncState()
         observeSelectedGroupStore()
+        observeSelectedSpaceStore()
         observeRoomSummaries()
     }
 
@@ -137,6 +139,17 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                 .disposeOnClear()
     }
 
+    private fun observeSelectedSpaceStore() {
+        selectedSpaceStore
+                .observe()
+                .subscribe {
+                    setState {
+                        copy(spaceSummary = it)
+                    }
+                }
+                .disposeOnClear()
+    }
+
     private fun observeRoomSummaries() {
         session.getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
index 533c9166f9..dd316dcece 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
@@ -22,10 +22,12 @@ import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.sync.SyncState
 
 data class HomeDetailViewState(
         val groupSummary: Option<GroupSummary> = Option.empty(),
+        val spaceSummary: Option<SpaceSummary> = Option.empty(),
         val asyncRooms: Async<List<RoomSummary>> = Uninitialized,
         val displayMode: RoomListDisplayMode = RoomListDisplayMode.PEOPLE,
         val notificationCountCatchup: Int = 0,
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index 59eb45607e..92be20367a 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -31,6 +31,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.FragmentHomeDrawerBinding
 import im.vector.app.features.grouplist.GroupListFragment
+import im.vector.app.features.grouplist.SpaceListFragment
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.usercode.UserCodeActivity
@@ -58,7 +59,11 @@ class HomeDrawerFragment @Inject constructor(
         sharedActionViewModel = activityViewModelProvider.get(HomeSharedActionViewModel::class.java)
 
         if (savedInstanceState == null) {
-            replaceChildFragment(R.id.homeDrawerGroupListContainer, GroupListFragment::class.java)
+            if (vectorPreferences.labSpaces()) {
+                replaceChildFragment(R.id.homeDrawerGroupListContainer, SpaceListFragment::class.java)
+            } else {
+                replaceChildFragment(R.id.homeDrawerGroupListContainer, GroupListFragment::class.java)
+            }
         }
         session.getUserLive(session.myUserId).observeK(viewLifecycleOwner) { optionalUser ->
             val user = optionalUser?.getOrNull()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 006a2c9b5f..bdf38719e2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -97,6 +97,8 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.getRelationContent
 import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
+import org.matrix.android.sdk.api.session.space.CreateSpaceParams
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.api.util.appendParamToUrl
 import org.matrix.android.sdk.api.util.toOptional
@@ -821,6 +823,22 @@ class RoomDetailViewModel @AssistedInject constructor(
                                 )
                             }
                         }
+                        is ParsedCommand.CreateSpace              -> {
+                            viewModelScope.launch(Dispatchers.IO) {
+                                try {
+                                    val params = CreateSpaceParams().apply {
+                                        name = slashCommandResult.name
+                                        invitedUserIds.addAll(slashCommandResult.invitees)
+                                    }
+                                    val spaceId = session.spaceService().createSpace(params)
+                                    session.spaceService().getSpace(spaceId)?.addRoom(state.roomId)
+                                } catch (failure: Throwable) {
+                                    _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
+                                }
+                            }
+                            _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
+                            popDraft()
+                        }
                     }.exhaustive
                 }
                 is SendMode.EDIT -> {
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
index 94b419797d..e08f383512 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
@@ -89,19 +89,19 @@ class CreateRoomController @Inject constructor(
             enabled(enableFormElement)
             title(stringProvider.getString(R.string.create_room_public_title))
             summary(stringProvider.getString(R.string.create_room_public_description))
-            switchChecked(viewState.roomType is CreateRoomViewState.RoomType.Public)
-            showDivider(viewState.roomType !is CreateRoomViewState.RoomType.Public)
+            switchChecked(viewState.roomVisibilityType is CreateRoomViewState.RoomVisibilityType.Public)
+            showDivider(viewState.roomVisibilityType !is CreateRoomViewState.RoomVisibilityType.Public)
 
             listener { value ->
                 listener?.setIsPublic(value)
             }
         }
-        if (viewState.roomType is CreateRoomViewState.RoomType.Public) {
+        if (viewState.roomVisibilityType is CreateRoomViewState.RoomVisibilityType.Public) {
             // Room alias for public room
             roomAliasEditItem {
                 id("alias")
                 enabled(enableFormElement)
-                value(viewState.roomType.aliasLocalPart)
+                value(viewState.roomVisibilityType.aliasLocalPart)
                 homeServer(":" + viewState.homeServerName)
                 errorMessage(
                         roomAliasErrorFormatter.format(
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index af63f23a8c..33dc6bc054 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -76,7 +76,7 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr
 
             setState {
                 copy(
-                        isEncrypted = roomType is CreateRoomViewState.RoomType.Private && adminE2EByDefault,
+                        isEncrypted = roomVisibilityType is CreateRoomViewState.RoomVisibilityType.Private && adminE2EByDefault,
                         hsAdminHasDisabledE2E = !adminE2EByDefault
                 )
             }
@@ -147,14 +147,14 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr
     private fun setIsPublic(action: CreateRoomAction.SetIsPublic) = setState {
         if (action.isPublic) {
             copy(
-                    roomType = CreateRoomViewState.RoomType.Public(""),
+                    roomVisibilityType = CreateRoomViewState.RoomVisibilityType.Public(""),
                     // Reset any error in the form about alias
                     asyncCreateRoomRequest = Uninitialized,
                     isEncrypted = false
             )
         } else {
             copy(
-                    roomType = CreateRoomViewState.RoomType.Private,
+                    roomVisibilityType = CreateRoomViewState.RoomVisibilityType.Private,
                     isEncrypted = adminE2EByDefault
             )
         }
@@ -162,10 +162,10 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr
 
     private fun setRoomAliasLocalPart(action: CreateRoomAction.SetRoomAliasLocalPart) {
         withState { state ->
-            if (state.roomType is CreateRoomViewState.RoomType.Public) {
+            if (state.roomVisibilityType is CreateRoomViewState.RoomVisibilityType.Public) {
                 setState {
                     copy(
-                            roomType = CreateRoomViewState.RoomType.Public(action.aliasLocalPart),
+                            roomVisibilityType = CreateRoomViewState.RoomVisibilityType.Public(action.aliasLocalPart),
                             // Reset any error in the form about alias
                             asyncCreateRoomRequest = Uninitialized
                     )
@@ -191,15 +191,15 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr
                     name = state.roomName.takeIf { it.isNotBlank() }
                     topic = state.roomTopic.takeIf { it.isNotBlank() }
                     avatarUri = state.avatarUri
-                    when (state.roomType) {
-                        is CreateRoomViewState.RoomType.Public  -> {
+                    when (state.roomVisibilityType) {
+                        is CreateRoomViewState.RoomVisibilityType.Public  -> {
                             // Directory visibility
                             visibility = RoomDirectoryVisibility.PUBLIC
                             // Preset
                             preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
-                            roomAliasName = state.roomType.aliasLocalPart
+                            roomAliasName = state.roomVisibilityType.aliasLocalPart
                         }
-                        is CreateRoomViewState.RoomType.Private -> {
+                        is CreateRoomViewState.RoomVisibilityType.Private -> {
                             // Directory visibility
                             visibility = RoomDirectoryVisibility.PRIVATE
                             // Preset
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
index 4609693c8f..6bc19dfa20 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
@@ -26,7 +26,7 @@ data class CreateRoomViewState(
         val avatarUri: Uri? = null,
         val roomName: String = "",
         val roomTopic: String = "",
-        val roomType: RoomType = RoomType.Private,
+        val roomVisibilityType: RoomVisibilityType = RoomVisibilityType.Private,
         val isEncrypted: Boolean = false,
         val showAdvanced: Boolean = false,
         val disableFederation: Boolean = false,
@@ -45,10 +45,10 @@ data class CreateRoomViewState(
     fun isEmpty() = avatarUri == null
             && roomName.isEmpty()
             && roomTopic.isEmpty()
-            && (roomType as? RoomType.Public)?.aliasLocalPart?.isEmpty().orTrue()
+            && (roomVisibilityType as? RoomVisibilityType.Public)?.aliasLocalPart?.isEmpty().orTrue()
 
-    sealed class RoomType {
-        object Private : RoomType()
-        data class Public(val aliasLocalPart: String) : RoomType()
+    sealed class RoomVisibilityType {
+        object Private : RoomVisibilityType()
+        data class Public(val aliasLocalPart: String) : RoomVisibilityType()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 9b043cfc7c..222c8da6b7 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -156,6 +156,8 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         private const val SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY = "SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
         private const val SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY"
 
+        const val SETTINGS_LABS_USE_SPACES = "SETTINGS_LABS_USE_SPACES"
+
         // SETTINGS_LABS_HIDE_TECHNICAL_E2E_ERRORS
         private const val SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM = "SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM"
         const val SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB = "SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
@@ -306,6 +308,10 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB, false)
     }
 
+    fun labSpaces(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_USE_SPACES, false)
+    }
+
     fun failFast(): Boolean {
         return BuildConfig.DEBUG || (developerMode() && defaultPrefs.getBoolean(SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY, false))
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
new file mode 100644
index 0000000000..5daedcc984
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import arrow.core.Option
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.ViewModelContext
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.R
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.grouplist.SelectedSpaceDataSource
+import im.vector.app.features.grouplist.SpaceListFragment
+import io.reactivex.Observable
+import io.reactivex.functions.BiFunction
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.rx.rx
+
+const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
+
+sealed class SpaceListAction : VectorViewModelAction {
+    data class SelectSpace(val spaceSummary: SpaceSummary) : SpaceListAction()
+}
+
+/**
+ * Transient events for group list screen
+ */
+sealed class SpaceListViewEvents : VectorViewEvents {
+    object OpenSpaceSummary : SpaceListViewEvents()
+}
+
+data class SpaceListViewState(
+        val asyncSpaces: Async<List<SpaceSummary>> = Uninitialized,
+        val selectedSpace: SpaceSummary? = null
+) : MvRxState
+
+class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
+                                                      private val selectedSpaceDataSource: SelectedSpaceDataSource,
+                                                      private val session: Session,
+                                                      private val stringProvider: StringProvider
+) : VectorViewModel<SpaceListViewState, SpaceListAction, SpaceListViewEvents>(initialState) {
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(initialState: SpaceListViewState): SpacesListViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SpacesListViewModel, SpaceListViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: SpaceListViewState): SpacesListViewModel {
+            val groupListFragment: SpaceListFragment = (viewModelContext as FragmentViewModelContext).fragment()
+            return groupListFragment.spaceListViewModelFactory.create(state)
+        }
+    }
+
+    private var currentGroupId = ""
+
+    init {
+        observeGroupSummaries()
+        observeSelectionState()
+    }
+
+    private fun observeSelectionState() {
+        selectSubscribe(SpaceListViewState::selectedSpace) { spaceSummary ->
+            if (spaceSummary != null) {
+                // We only want to open group if the updated selectedGroup is a different one.
+                if (currentGroupId != spaceSummary.spaceId) {
+                    currentGroupId = spaceSummary.spaceId
+                    _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary)
+                }
+                val optionGroup = Option.just(spaceSummary)
+                selectedSpaceDataSource.post(optionGroup)
+            } else {
+                // If selected group is null we force to default. It can happens when leaving the selected group.
+                setState {
+                    copy(selectedSpace = this.asyncSpaces()?.find { it.spaceId == ALL_COMMUNITIES_GROUP_ID })
+                }
+            }
+        }
+    }
+
+    override fun handle(action: SpaceListAction) {
+        when (action) {
+            is SpaceListAction.SelectSpace -> handleSelectSpace(action)
+        }
+    }
+
+    // PRIVATE METHODS *****************************************************************************
+
+    private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
+        if (state.selectedSpace?.spaceId != action.spaceSummary.spaceId) {
+            // We take care of refreshing group data when selecting to be sure we get all the rooms and users
+//            tryOrNull {
+//                viewModelScope.launch {
+//                    session.getGroup(action.spaceSummary.groupId)?.fetchGroupData()
+//                }
+//            }
+            setState { copy(selectedSpace = action.spaceSummary) }
+        }
+    }
+
+    private fun observeGroupSummaries() {
+        val roomSummaryQueryParams = roomSummaryQueryParams() {
+            memberships = listOf(Membership.JOIN)
+            displayName = QueryStringValue.IsNotEmpty
+            excludeType = listOf(RoomType.MESSAGING, null)
+        }
+        Observable.combineLatest<SpaceSummary, List<SpaceSummary>, List<SpaceSummary>>(
+                session
+                        .rx()
+                        .liveUser(session.myUserId)
+                        .map { optionalUser ->
+                            SpaceSummary(
+                                    spaceId = ALL_COMMUNITIES_GROUP_ID,
+                                    roomSummary = RoomSummary(
+                                            roomId = ALL_COMMUNITIES_GROUP_ID,
+                                            membership = Membership.JOIN,
+                                            displayName = stringProvider.getString(R.string.group_all_communities),
+                                            avatarUrl = optionalUser.getOrNull()?.avatarUrl ?: "",
+                                            encryptionEventTs = 0,
+                                            isEncrypted = false,
+                                            typingUsers = emptyList()
+                                    ),
+                                    children = emptyList()
+                            )
+                        },
+                session
+                        .rx()
+                        .liveSpaceSummaries(roomSummaryQueryParams),
+                BiFunction { allCommunityGroup, communityGroups ->
+                    listOf(allCommunityGroup) + communityGroups
+                }
+        )
+                .execute { async ->
+                    val currentSelectedGroupId = selectedSpace?.spaceId
+                    val newSelectedGroup = if (currentSelectedGroupId != null) {
+                        async()?.find { it.spaceId == currentSelectedGroupId }
+                    } else {
+                        async()?.firstOrNull()
+                    }
+                    copy(asyncSpaces = async, selectedSpace = newSelectedGroup)
+                }
+    }
+}
diff --git a/vector/src/main/res/drawable/bg_group_item.xml b/vector/src/main/res/drawable/bg_group_item.xml
index 9e48ebc725..ea39f5a9d0 100644
--- a/vector/src/main/res/drawable/bg_group_item.xml
+++ b/vector/src/main/res/drawable/bg_group_item.xml
@@ -3,7 +3,7 @@
 
     <item android:state_checked="true">
         <shape>
-            <solid android:color="@android:color/transparent" />
+            <solid android:color="?colorAccent" />
             <corners android:radius="4dp" />
         </shape>
     </item>
diff --git a/vector/src/main/res/drawable/bg_space_item.xml b/vector/src/main/res/drawable/bg_space_item.xml
new file mode 100644
index 0000000000..1cb879a0ca
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_space_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="true">
+        <layer-list>
+            <item>
+                <shape>
+                    <solid android:color="@android:color/transparent" />
+                </shape>
+            </item>
+            <item android:gravity="center_vertical|start" >
+                <shape>
+                    <size android:width="4dp" android:height="40dp" />
+                    <solid android:color="?colorAccent" />
+                    <corners android:bottomRightRadius="8dp" android:topRightRadius="8dp" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+
+    <item>
+        <shape>
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+
+</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_selected_community.xml b/vector/src/main/res/drawable/ic_selected_community.xml
new file mode 100644
index 0000000000..e95b54aab3
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_selected_community.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="4dp"
+    android:height="32dp"
+    android:viewportWidth="4"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M0,0C2.2091,0 4,1.7909 4,4V28C4,30.2091 2.2091,32 0,32V0Z"
+      android:fillColor="#0DBD8B"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_space_home.xml b/vector/src/main/res/drawable/ic_space_home.xml
new file mode 100644
index 0000000000..e5935156f4
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_space_home.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="22dp"
+    android:viewportWidth="18"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M12.75,21.62L12.75,15C12.75,14.4477 12.3023,14 11.75,14L6.25,14C5.6977,14 5.25,14.4477 5.25,15L5.25,21.6047C4.1731,21.6088 3.1268,21.6166 2.1586,21.6292C1.0345,21.6438 0.111,20.7402 0.111,19.616L0.111,8.5055C0.111,8.1143 0.2828,7.7429 0.5808,7.4896L8.0284,1.1591C8.5886,0.683 9.4112,0.683 9.9714,1.1591L17.419,7.4896C17.717,7.7429 17.8888,8.1119 17.8888,8.5031L17.8888,19.6452C17.8888,20.7595 16.981,21.6557 15.8667,21.6451C15.0172,21.637 13.9473,21.6278 12.75,21.62Z"
+      android:strokeWidth="1"
+      android:fillColor="#3F3D3D"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/vector/src/main/res/drawable/space_home_background.xml b/vector/src/main/res/drawable/space_home_background.xml
new file mode 100644
index 0000000000..ec51c30a20
--- /dev/null
+++ b/vector/src/main/res/drawable/space_home_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:width="40dp" android:height="40dp"/>
+
+    <solid android:color="?riotx_background" />
+
+    <stroke android:width="1dp" android:color="@color/riotx_disabled_accent"/>
+
+    <corners android:radius="8dp" />
+
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index d25375f3b9..ba2b630efe 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -22,24 +22,49 @@
             android:orientation="horizontal">
 
             <ImageView
+                android:layout_gravity="center_vertical"
                 android:id="@+id/groupToolbarAvatarImageView"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:contentDescription="@string/a11y_open_drawer"
                 tools:src="@tools:sample/avatars" />
 
-            <TextView
-                android:id="@+id/groupToolbarTitleView"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="32dp"
-                android:layout_marginEnd="32dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:textColor="?riotx_text_primary"
-                android:textSize="20sp"
-                android:textStyle="bold"
-                tools:text="@tools:sample/lorem/random" />
+                android:layout_weight="1"
+                android:gravity="start"
+                android:orientation="vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp">
+
+                <TextView
+                    android:id="@+id/groupToolbarTitleView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:gravity="start"
+                    android:maxLines="1"
+                    android:textColor="?riotx_text_primary"
+                    android:textSize="20sp"
+                    android:textStyle="bold"
+                    tools:text="@tools:sample/lorem/random" />
+
+                <TextView
+                    android:id="@+id/groupToolbarSpaceTitleView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:visibility="visible"
+                    android:visibility="gone"
+                    android:ellipsize="end"
+                    android:gravity="start"
+                    android:maxLines="1"
+                    android:textColor="?riotx_text_primary"
+                    android:textSize="14sp"
+                    tools:text="@tools:sample/lorem/random" />
+
+            </LinearLayout>
+
 
         </LinearLayout>
 
@@ -60,10 +85,10 @@
         android:background="?riotx_keys_backup_banner_accent_color"
         android:minHeight="67dp"
         android:visibility="gone"
-        tools:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/syncStateView" />
+        app:layout_constraintTop_toBottomOf="@id/syncStateView"
+        tools:visibility="visible" />
 
     <im.vector.app.core.ui.views.CurrentCallsView
         android:id="@+id/activeCallView"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
new file mode 100644
index 0000000000..be23a5e546
--- /dev/null
+++ b/vector/src/main/res/layout/item_space.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemGroupLayout"
+    android:layout_width="match_parent"
+    android:layout_height="65dp"
+    android:background="@drawable/bg_space_item"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground">
+
+    <ImageView
+        android:id="@+id/groupAvatarImageView"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:duplicateParentState="true"
+        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/groupNameView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintEnd_toStartOf="@+id/groupAvatarChevron"
+        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem/random" />
+
+    <ImageView
+        android:id="@+id/groupAvatarChevron"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="21dp"
+        android:src="@drawable/ic_arrow_right"
+        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
+
+    <View
+        android:id="@+id/groupBottomSeparator"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?riotx_header_panel_border_mobile"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 634b91bf90..c9cb4729f7 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2183,6 +2183,8 @@
     <string name="labs_swipe_to_reply_in_timeline">Enable swipe to reply in timeline</string>
     <string name="labs_show_unread_notifications_as_tab">Add a dedicated tab for unread notifications on main screen.</string>
 
+    <string name="labs_experimental_spaces">Enable Spaces (formerly known as ‘groups as rooms’) to allow users to organise rooms into more useful groups.</string>
+
     <string name="link_copied_to_clipboard">Link copied to clipboard</string>
 
     <string name="add_by_matrix_id">Add by matrix ID</string>
@@ -3242,6 +3244,8 @@
     <string name="dev_tools_success_state_event">State event sent!</string>
     <string name="dev_tools_event_content_hint">Event content</string>
 
+    <string name="command_description_create_space">Create a community</string>
+
     <string name="event_status_a11y_sending">Sending</string>
     <string name="event_status_a11y_sent">Sent</string>
     <string name="event_status_a11y_failed">Failed</string>
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index fef5a2fe9d..ed1ea222a2 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -45,4 +45,10 @@
         android:title="@string/labs_show_unread_notifications_as_tab" />
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
+
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:key="SETTINGS_LABS_USE_SPACES"
+        android:title="@string/labs_experimental_spaces" />
+
 </androidx.preference.PreferenceScreen>
\ No newline at end of file

From df341d8ea38a1d8a9cab1432e92db999163fd608 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 7 Jan 2021 10:43:00 +0100
Subject: [PATCH 095/350] Basic peeking preview and join and filter

---
 .../sdk/api/session/events/model/EventType.kt |   1 +
 .../api/session/room/peeking/PeekResult.kt    |   2 +
 .../android/sdk/api/session/space/Space.kt    |   2 +
 .../sdk/api/session/space/SpaceService.kt     |  27 +++
 .../session/space/model/SpaceChildContent.kt  |   1 +
 .../sdk/internal/session/room/RoomModule.kt   |   5 +
 .../relationship/RoomRelationshipHelper.kt    |   2 +-
 .../room/summary/RoomSummaryUpdater.kt        |   2 +-
 .../internal/session/space/DefaultSpace.kt    |   8 +
 .../session/space/DefaultSpaceService.kt      |  30 ++++
 .../session/space/peeking/PeekSpaceTask.kt    | 141 +++++++++++++++
 .../session/space/peeking/SpacePeekResult.kt  |  55 ++++++
 vector/src/main/AndroidManifest.xml           |   3 +-
 .../im/vector/app/core/di/FragmentModule.kt   |   6 +
 .../im/vector/app/core/di/ViewModelModule.kt  |   6 +
 .../im/vector/app/features/command/Command.kt |   3 +-
 .../app/features/command/CommandParser.kt     |   8 +-
 .../app/features/command/ParsedCommand.kt     |   1 +
 .../features/grouplist/SpaceListFragment.kt   |   3 +-
 .../grouplist/SpaceSummaryController.kt       |  69 ++++++--
 .../vector/app/features/home/HomeActivity.kt  |   4 +
 .../features/home/HomeActivitySharedAction.kt |   1 +
 .../home/room/detail/RoomDetailViewModel.kt   |  11 ++
 .../features/spaces/SpacePreviewActivity.kt   |  72 ++++++++
 .../SpacePreviewSharedActionViewModel.kt      |  30 ++++
 .../features/spaces/SpacesListViewModel.kt    |  26 ++-
 .../features/spaces/preview/RoomChildItem.kt  |  79 +++++++++
 .../spaces/preview/SpacePreviewController.kt  | 117 +++++++++++++
 .../spaces/preview/SpacePreviewFragment.kt    | 165 ++++++++++++++++++
 .../spaces/preview/SpacePreviewState.kt       |  31 ++++
 .../spaces/preview/SpacePreviewViewAction.kt  |  25 +++
 .../spaces/preview/SpacePreviewViewEvents.kt  |  26 +++
 .../spaces/preview/SpacePreviewViewModel.kt   | 135 ++++++++++++++
 .../features/spaces/preview/SpaceTabView.kt   |  51 ++++++
 .../spaces/preview/SpaceTopSummaryItem.kt     |  46 +++++
 .../features/spaces/preview/SubSpaceItem.kt   |  68 ++++++++
 .../res/layout/fragment_space_preview.xml     | 127 ++++++++++++++
 .../main/res/layout/item_space_roomchild.xml  | 115 ++++++++++++
 .../main/res/layout/item_space_subspace.xml   |  71 ++++++++
 vector/src/main/res/layout/item_space_tab.xml |  11 ++
 .../res/layout/item_space_top_summary.xml     |  46 +++++
 vector/src/main/res/values/strings.xml        |   3 +
 42 files changed, 1604 insertions(+), 31 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedActionViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/RoomChildItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewEvents.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTopSummaryItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/preview/SubSpaceItem.kt
 create mode 100644 vector/src/main/res/layout/fragment_space_preview.xml
 create mode 100644 vector/src/main/res/layout/item_space_roomchild.xml
 create mode 100644 vector/src/main/res/layout/item_space_subspace.xml
 create mode 100644 vector/src/main/res/layout/item_space_tab.xml
 create mode 100644 vector/src/main/res/layout/item_space_top_summary.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index 9d8f18e912..4be8eea856 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -52,6 +52,7 @@ 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"
 
     /**
      * Note that this Event has been deprecated, see
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt
index db70dadef3..a27e88aced 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt
@@ -34,4 +34,6 @@ sealed class PeekResult {
     ) : PeekResult()
 
     object UnknownAlias : PeekResult()
+
+    fun isSuccess() = this is Success
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 75480282fa..88ac00cc55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -23,4 +23,6 @@ interface Space {
     fun asRoom() : Room
 
     suspend fun addRoom(roomId: String)
+
+//    fun getChildren() : List<IRoomSummary>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index 0c3461f1ca..4043a3f7b4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.api.session.space
 
 import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
 
 typealias SpaceSummaryQueryParams = RoomSummaryQueryParams
 
@@ -35,6 +36,13 @@ interface SpaceService {
      */
     fun getSpace(spaceId: String): Space?
 
+    /**
+     * Try to resolve (peek) rooms and subspace in this space.
+     * Use this call get preview of children of this space, particularly useful to get a
+     * preview of rooms that you did not join yet.
+     */
+    suspend fun peekSpace(spaceId: String) : SpacePeekResult
+
     /**
      * Get a live list of space summaries. This list is refreshed as soon as the data changes.
      * @return the [LiveData] of List[SpaceSummary]
@@ -42,4 +50,23 @@ interface SpaceService {
     fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams): LiveData<List<SpaceSummary>>
 
     fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<SpaceSummary>
+
+    data class ChildAutoJoinInfo(
+            val roomIdOrAlias: String,
+            val viaServers: List<String> = emptyList()
+    )
+
+    sealed class JoinSpaceResult {
+        object Success: JoinSpaceResult()
+        data class Fail(val error: Throwable?): JoinSpaceResult()
+        /** Success fully joined the space, but failed to join all or some of it's rooms */
+        data class PartialSuccess(val failedRooms: Map<String, Throwable>) : JoinSpaceResult()
+
+        fun isSuccess() = this is Success || this is PartialSuccess
+    }
+
+    suspend fun joinSpace(spaceIdOrAlias: String,
+                          reason: String? = null,
+                          viaServers: List<String> = emptyList(),
+                          autoJoinChild: List<ChildAutoJoinInfo>) : JoinSpaceResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
index f65318b543..f7bd067c55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
@@ -35,6 +35,7 @@ data class SpaceChildContent(
         @Json(name = "via") val via: List<String>? = null,
         /**
          * present: true key is included to distinguish from a deleted state event
+         * Children where present is not present or is not set to true are ignored.
          */
         @Json(name = "present") val present: Boolean? = false,
         /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index 8f3445bec3..b7c4246eca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -91,6 +91,8 @@ import org.matrix.android.sdk.internal.session.room.typing.SendTypingTask
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultGetUploadsTask
 import org.matrix.android.sdk.internal.session.room.uploads.GetUploadsTask
 import org.matrix.android.sdk.internal.session.space.DefaultSpaceService
+import org.matrix.android.sdk.internal.session.space.peeking.DefaultPeekSpaceTask
+import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
 import retrofit2.Retrofit
 
 @Module
@@ -236,6 +238,9 @@ internal abstract class RoomModule {
     @Binds
     abstract fun bindPeekRoomTask(task: DefaultPeekRoomTask): PeekRoomTask
 
+    @Binds
+    abstract fun bindPeekSpaceTask(task: DefaultPeekSpaceTask): PeekSpaceTask
+
     @Binds
     abstract fun bindGetEventTask(task: DefaultGetEventTask): GetEventTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
index 4025861caa..b1bcfc7077 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
@@ -44,7 +44,7 @@ internal class RoomRelationshipHelper(private val realm: Realm,
                 .filter { ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.present == true }
                 .mapNotNull {
                     // ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()
-                    it.roomId
+                    it.stateKey
                 }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index f8a3495aa2..7b637cc9e9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -167,7 +167,7 @@ internal class RoomSummaryUpdater @Inject constructor(
             spaceSummaryEntity.children.clear()
             spaceSummaryEntity.children.addAll(
                     RoomRelationshipHelper(realm, roomId).getDirectChildrenDescriptions()
-                            .map { RoomSummaryEntity.getOrCreate(realm, roomId) }
+                            .map { RoomSummaryEntity.getOrCreate(realm, it) }
             )
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index ae71ee5cf2..ebe845572d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -35,4 +35,12 @@ class DefaultSpace(private val room: Room) : Space {
                 body = SpaceChildContent(present = true).toContent()
         )
     }
+
+//    override fun getChildren(): List<IRoomSummary> {
+// //        asRoom().getStateEvents(setOf(EventType.STATE_SPACE_CHILD)).mapNotNull {
+// //            // statekeys are the roomIds
+// //
+// //        }
+//        return emptyList<IRoomSummary>()
+//    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 3d9e7d7764..4118d74604 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -32,6 +32,8 @@ import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
 import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
+import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
+import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
 import org.matrix.android.sdk.internal.session.user.accountdata.UpdateBreadcrumbsTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
@@ -46,6 +48,7 @@ internal class DefaultSpaceService @Inject constructor(
         private val deleteRoomAliasTask: DeleteRoomAliasTask,
         private val roomGetter: RoomGetter,
         private val spaceSummaryDataSource: SpaceSummaryDataSource,
+        private val peekSpaceTask: PeekSpaceTask,
         private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
         private val taskExecutor: TaskExecutor
 ) : SpaceService {
@@ -67,4 +70,31 @@ internal class DefaultSpaceService @Inject constructor(
     override fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<SpaceSummary> {
         return spaceSummaryDataSource.getSpaceSummaries(spaceSummaryQueryParams)
     }
+
+    override suspend fun peekSpace(spaceId: String): SpacePeekResult {
+        return peekSpaceTask.execute(PeekSpaceTask.Params(spaceId))
+    }
+
+    override suspend fun joinSpace(spaceIdOrAlias: String, reason: String?, viaServers: List<String>, autoJoinChild: List<SpaceService.ChildAutoJoinInfo>): SpaceService.JoinSpaceResult {
+        try {
+            joinRoomTask.execute(JoinRoomTask.Params(spaceIdOrAlias, reason, viaServers))
+            val childJoinFailures = mutableMapOf<String, Throwable>()
+            autoJoinChild.forEach { info ->
+                // TODO what if the child is it self a subspace with some default children?
+                try {
+                    joinRoomTask.execute(JoinRoomTask.Params(info.roomIdOrAlias, null, info.viaServers))
+                } catch (failure: Throwable) {
+                    // TODO, i could already be a member of this room, handle that as it should not be an error in this context
+                    childJoinFailures[info.roomIdOrAlias] = failure
+                }
+            }
+            return if (childJoinFailures.isEmpty()) {
+                SpaceService.JoinSpaceResult.Success
+            } else {
+                SpaceService.JoinSpaceResult.PartialSuccess(childJoinFailures)
+            }
+        } catch (throwable: Throwable) {
+            return SpaceService.JoinSpaceResult.Fail(throwable)
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
new file mode 100644
index 0000000000..826be0b3aa
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space.peeking
+
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
+import org.matrix.android.sdk.api.session.room.peeking.PeekResult
+import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import org.matrix.android.sdk.internal.session.room.peeking.PeekRoomTask
+import org.matrix.android.sdk.internal.session.room.peeking.ResolveRoomStateTask
+import org.matrix.android.sdk.internal.task.Task
+import timber.log.Timber
+import javax.inject.Inject
+
+internal interface PeekSpaceTask : Task<PeekSpaceTask.Params, SpacePeekResult> {
+    data class Params(
+            val roomIdOrAlias: String,
+            // A depth limit as a simple protection against cycles
+            val maxDepth: Int = 4
+    )
+}
+
+internal class DefaultPeekSpaceTask @Inject constructor(
+        private val peekRoomTask: PeekRoomTask,
+        private val resolveRoomStateTask: ResolveRoomStateTask
+) : PeekSpaceTask {
+
+    override suspend fun execute(params: PeekSpaceTask.Params): SpacePeekResult {
+        val peekResult = peekRoomTask.execute(PeekRoomTask.Params(params.roomIdOrAlias))
+        val roomResult = peekResult as? PeekResult.Success ?: return SpacePeekResult.FailedToResolve(params.roomIdOrAlias, peekResult)
+
+        // check the room type
+        // kind of duplicate cause we already did it in Peek? could we pass on the result??
+        val stateEvents = try {
+            resolveRoomStateTask.execute(ResolveRoomStateTask.Params(roomResult.roomId))
+        } catch (failure: Throwable) {
+            return SpacePeekResult.FailedToResolve(params.roomIdOrAlias, peekResult)
+        }
+        val isSpace = stateEvents
+                .lastOrNull { it.type == EventType.STATE_ROOM_CREATE && it.stateKey == "" }
+                ?.let { it.content?.toModel<RoomCreateContent>()?.type } == RoomType.SPACE
+
+        if (!isSpace) return SpacePeekResult.NotSpaceType(params.roomIdOrAlias)
+
+        val children = peekChildren(stateEvents, 0, params.maxDepth)
+
+        return SpacePeekResult.Success(
+                SpacePeekSummary(
+                        params.roomIdOrAlias,
+                        peekResult,
+                        children
+                )
+        )
+    }
+
+    private suspend fun peekChildren(stateEvents: List<Event>, depth: Int, maxDepth: Int): List<ISpaceChild> {
+        if (depth >= maxDepth) return emptyList()
+        val childRoomsIds = stateEvents
+                .filter {
+                    it.type == EventType.STATE_SPACE_CHILD && !it.stateKey.isNullOrEmpty()
+                            // Children where present is not present or is not set to true are ignored.
+                            && it.content?.toModel<SpaceChildContent>()?.present == true
+                }
+                .map { it.stateKey to it.content?.toModel<SpaceChildContent>() }
+
+        Timber.v("## SPACE_PEEK: found ${childRoomsIds.size} present children")
+
+        val spaceChildResults = mutableListOf<ISpaceChild>()
+        childRoomsIds.forEach { entry ->
+
+            Timber.v("## SPACE_PEEK: peeking child $entry")
+            // peek each child
+            val childId = entry.first ?: return@forEach
+            try {
+                val childPeek = peekRoomTask.execute(PeekRoomTask.Params(childId))
+
+                val childStateEvents = resolveRoomStateTask.execute(ResolveRoomStateTask.Params(childId))
+                val createContent = childStateEvents
+                        .lastOrNull { it.type == EventType.STATE_ROOM_CREATE && it.stateKey == "" }
+                        ?.let { it.content?.toModel<RoomCreateContent>() }
+
+                if (!childPeek.isSuccess() || createContent == null) {
+                    Timber.v("## SPACE_PEEK: cannot peek child $entry")
+                    // can't peek :/
+                    spaceChildResults.add(
+                            SpaceChildPeekResult(
+                                    childId, childPeek, entry.second?.default, entry.second?.order
+                            )
+                    )
+                    // continue to next child
+                    return@forEach
+                }
+                val type = createContent.type
+                if (type == RoomType.SPACE) {
+                    Timber.v("## SPACE_PEEK: subspace child $entry")
+                    spaceChildResults.add(
+                            SpaceSubChildPeekResult(
+                                    childId,
+                                    childPeek,
+                                    entry.second?.default,
+                                    entry.second?.order,
+                                    peekChildren(childStateEvents, depth + 1, maxDepth)
+                            )
+                    )
+                } 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
+            } catch (failure: Throwable) {
+                // can this happen?
+                Timber.e(failure, "## Failed to resolve space child")
+            }
+        }
+        return spaceChildResults
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
new file mode 100644
index 0000000000..63eed2a6c2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space.peeking
+
+import org.matrix.android.sdk.api.session.room.peeking.PeekResult
+
+data class SpacePeekSummary(
+        val idOrAlias: String,
+        val roomPeekResult: PeekResult.Success,
+        val children: List<ISpaceChild>
+)
+
+interface ISpaceChild {
+    val id: String
+    val roomPeekResult: PeekResult
+    val default: Boolean?
+    val order: String?
+}
+
+data class SpaceChildPeekResult(
+        override val id: String,
+        override val roomPeekResult: PeekResult,
+        override val default: Boolean? = null,
+        override val order: String? = null
+) : ISpaceChild
+
+data class SpaceSubChildPeekResult(
+        override val id: String,
+        override val roomPeekResult: PeekResult,
+        override val default: Boolean?,
+        override val order: String?,
+        val children: List<ISpaceChild>
+) : ISpaceChild
+
+sealed class SpacePeekResult {
+    abstract class SpacePeekError : SpacePeekResult()
+    data class FailedToResolve(val spaceId: String, val roomPeekResult: PeekResult) : SpacePeekError()
+    data class NotSpaceType(val spaceId: String) : SpacePeekError()
+
+    data class Success(val summary: SpacePeekSummary): SpacePeekResult()
+}
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 07606d315c..9a1f2e6dfd 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -271,7 +271,8 @@
             <!--            </intent-filter>-->
         </activity>
 
-        <activity android:name=".features.devtools.RoomDevToolActivity" />
+        <activity android:name=".features.devtools.RoomDevToolActivity"/>
+        <activity android:name=".features.spaces.SpacePreviewActivity"/>
         <!-- Services -->
 
         <service
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 1a3719e03f..00216fb034 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -118,6 +118,7 @@ import im.vector.app.features.settings.push.PushRulesFragment
 import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
 import im.vector.app.features.share.IncomingShareFragment
 import im.vector.app.features.signout.soft.SoftLogoutFragment
+import im.vector.app.features.spaces.preview.SpacePreviewFragment
 import im.vector.app.features.terms.ReviewTermsFragment
 import im.vector.app.features.usercode.ShowUserCodeFragment
 import im.vector.app.features.userdirectory.UserListFragment
@@ -630,4 +631,9 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(RoomDevToolSendFormFragment::class)
     fun bindRoomDevToolSendFormFragment(fragment: RoomDevToolSendFormFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SpacePreviewFragment::class)
+    fun bindSpacePreviewFragment(fragment: SpacePreviewFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
index 8409021845..2639e87e6e 100644
--- a/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
@@ -38,6 +38,7 @@ import im.vector.app.features.roomprofile.RoomProfileSharedActionViewModel
 import im.vector.app.features.roomprofile.alias.detail.RoomAliasBottomSheetSharedActionViewModel
 import im.vector.app.features.roomprofile.settings.historyvisibility.RoomHistoryVisibilitySharedActionViewModel
 import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleSharedActionViewModel
+import im.vector.app.features.spaces.SpacePreviewSharedActionViewModel
 import im.vector.app.features.userdirectory.UserListSharedActionViewModel
 
 @Module
@@ -142,4 +143,9 @@ interface ViewModelModule {
     @IntoMap
     @ViewModelKey(DiscoverySharedViewModel::class)
     fun bindDiscoverySharedViewModel(viewModel: DiscoverySharedViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(SpacePreviewSharedActionViewModel::class)
+    fun bindSpacePreviewSharedActionViewModel(viewModel: SpacePreviewSharedActionViewModel): ViewModel
 }
diff --git a/vector/src/main/java/im/vector/app/features/command/Command.kt b/vector/src/main/java/im/vector/app/features/command/Command.kt
index b29d061dfb..4722e824f6 100644
--- a/vector/src/main/java/im/vector/app/features/command/Command.kt
+++ b/vector/src/main/java/im/vector/app/features/command/Command.kt
@@ -47,7 +47,8 @@ enum class Command(val command: String, val parameters: String, @StringRes val d
     DISCARD_SESSION("/discardsession", "", R.string.command_description_discard_session),
     CONFETTI("/confetti", "<message>", R.string.command_confetti),
     SNOW("/snow", "<message>", R.string.command_snow),
-    CREATE_SPACE("/createspace", "<name> <invitee>*", R.string.command_description_create_space);
+    CREATE_SPACE("/createspace", "<name> <invitee>*", R.string.command_description_create_space),
+    ADD_TO_SPACE("/addToSpace", "spaceId", R.string.command_description_create_space);
 
     val length
         get() = command.length + 1
diff --git a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
index 57466ddf98..fe5707ec45 100644
--- a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
+++ b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
@@ -296,7 +296,7 @@ object CommandParser {
                     val message = textMessage.substring(Command.CONFETTI.command.length).trim()
                     ParsedCommand.SendChatEffect(ChatEffect.CONFETTI, message)
                 }
-                Command.SNOW.command               -> {
+                Command.SNOW.command                   -> {
                     val message = textMessage.substring(Command.SNOW.command.length).trim()
                     ParsedCommand.SendChatEffect(ChatEffect.SNOW, message)
                 }
@@ -312,6 +312,12 @@ object CommandParser {
                         )
                     }
                 }
+                Command.ADD_TO_SPACE.command        -> {
+                    val rawCommand = textMessage.substring(Command.ADD_TO_SPACE.command.length).trim()
+                    ParsedCommand.AddToSpace(
+                            rawCommand
+                    )
+                }
                 else                                   -> {
                     // Unknown command
                     ParsedCommand.ErrorUnknownSlashCommand(slashCommand)
diff --git a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
index 1017b29234..99b0ae7889 100644
--- a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
+++ b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
@@ -58,4 +58,5 @@ sealed class ParsedCommand {
     object DiscardSession : ParsedCommand()
     class SendChatEffect(val chatEffect: ChatEffect, val message: String) : ParsedCommand()
     class CreateSpace(val name: String, val invitees: List<String>) : ParsedCommand()
+    class AddToSpace(val spaceId: String) : ParsedCommand()
 }
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt
index 4c783cb2d4..7091c0b86c 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt
@@ -59,7 +59,8 @@ class SpaceListFragment @Inject constructor(
         views.groupListView.configureWith(spaceController)
         viewModel.observeViewEvents {
             when (it) {
-                is SpaceListViewEvents.OpenSpaceSummary -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup)
+                is SpaceListViewEvents.OpenSpaceSummary -> sharedActionViewModel.post(HomeActivitySharedAction.OpenSpacePreview(it.id))
+                is SpaceListViewEvents.OpenSpace -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup)
             }.exhaustive
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt
index c7a27266fd..dab2cbceae 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt
@@ -18,9 +18,13 @@
 package im.vector.app.features.grouplist
 
 import com.airbnb.epoxy.EpoxyController
+import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItemHeader
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.spaces.SpaceListViewState
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
@@ -50,24 +54,57 @@ class SpaceSummaryController @Inject constructor(
         if (summaries.isNullOrEmpty()) {
             return
         }
-        summaries.forEach { groupSummary ->
-            val isSelected = groupSummary.spaceId == selected?.spaceId
-            if (groupSummary.spaceId == ALL_COMMUNITIES_GROUP_ID) {
-                homeSpaceSummaryItem {
-                    id(groupSummary.spaceId)
-                    selected(isSelected)
-                    listener { callback?.onSpaceSelected(groupSummary) }
+        // show invites on top
+
+        summaries.filter { it.roomSummary.membership == Membership.INVITE }
+                .let { invites ->
+                    if (invites.isNotEmpty()) {
+                        genericItemHeader {
+                            id("invites")
+                            text(stringProvider.getString(R.string.spaces_invited_header))
+                        }
+                        invites.forEach {
+                            spaceSummaryItem {
+                                avatarRenderer(avatarRenderer)
+                                id(it.spaceId)
+                                matrixItem(it.toMatrixItem())
+                                selected(false)
+                                listener { callback?.onSpaceSelected(it) }
+                            }
+                        }
+                        genericFooterItem {
+                            id("invite_space")
+                            text("")
+                        }
+                    }
                 }
-            } else {
-                spaceSummaryItem {
-                    avatarRenderer(avatarRenderer)
-                    id(groupSummary.spaceId)
-                    matrixItem(groupSummary.toMatrixItem())
-                    selected(isSelected)
-                    listener { callback?.onSpaceSelected(groupSummary) }
-                }
-            }
+
+        genericItemHeader {
+            id("spaces")
+            text(stringProvider.getString(R.string.spaces_header))
         }
+
+        summaries
+                .filter { it.roomSummary.membership == Membership.JOIN }
+                .forEach { groupSummary ->
+
+                    val isSelected = groupSummary.spaceId == selected?.spaceId
+                    if (groupSummary.spaceId == ALL_COMMUNITIES_GROUP_ID) {
+                        homeSpaceSummaryItem {
+                            id(groupSummary.spaceId)
+                            selected(isSelected)
+                            listener { callback?.onSpaceSelected(groupSummary) }
+                        }
+                    } else {
+                        spaceSummaryItem {
+                            avatarRenderer(avatarRenderer)
+                            id(groupSummary.spaceId)
+                            matrixItem(groupSummary.toMatrixItem())
+                            selected(isSelected)
+                            listener { callback?.onSpaceSelected(groupSummary) }
+                        }
+                    }
+                }
     }
 
     interface Callback {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 60a8836be5..138ffc26f4 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -54,6 +54,7 @@ import im.vector.app.features.popup.VerificationVectorAlert
 import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
@@ -141,6 +142,9 @@ class HomeActivity :
                             views.drawerLayout.closeDrawer(GravityCompat.START)
                             replaceFragment(R.id.homeDetailFragmentContainer, HomeDetailFragment::class.java, allowStateLoss = true)
                         }
+                        is HomeActivitySharedAction.OpenSpacePreview -> {
+                            startActivity(SpacePreviewActivity.newIntent(this, sharedAction.spaceId))
+                        }
                     }.exhaustive
                 }
                 .disposeOnDestroy()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
index 52b3c58785..f72354465b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
@@ -25,4 +25,5 @@ sealed class HomeActivitySharedAction : VectorSharedAction {
     object OpenDrawer : HomeActivitySharedAction()
     object CloseDrawer : HomeActivitySharedAction()
     object OpenGroup : HomeActivitySharedAction()
+    data class OpenSpacePreview(val spaceId: String) : HomeActivitySharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index bdf38719e2..785449236c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -839,6 +839,17 @@ class RoomDetailViewModel @AssistedInject constructor(
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
                             popDraft()
                         }
+                        is ParsedCommand.AddToSpace            -> {
+                            viewModelScope.launch(Dispatchers.IO) {
+                                try {
+                                    session.spaceService().getSpace(slashCommandResult.spaceId)?.addRoom(room.roomId)
+                                } catch (failure: Throwable) {
+                                    _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
+                                }
+                            }
+                            _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
+                            popDraft()
+                        }
                     }.exhaustive
                 }
                 is SendMode.EDIT -> {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt
new file mode 100644
index 0000000000..dacde8846c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.airbnb.mvrx.MvRx
+import im.vector.app.R
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.app.features.spaces.preview.SpacePreviewArgs
+import im.vector.app.features.spaces.preview.SpacePreviewFragment
+
+class SpacePreviewActivity : VectorBaseActivity<ActivitySimpleBinding>() {
+
+    lateinit var sharedActionViewModel: SpacePreviewSharedActionViewModel
+
+    override fun getBinding(): ActivitySimpleBinding = ActivitySimpleBinding.inflate(layoutInflater)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        sharedActionViewModel = viewModelProvider.get(SpacePreviewSharedActionViewModel::class.java)
+        sharedActionViewModel
+                .observe()
+                .subscribe { action ->
+                    when (action) {
+                        SpacePreviewSharedAction.DismissAction -> finish()
+                        SpacePreviewSharedAction.ShowModalLoading -> showWaitingView()
+                        SpacePreviewSharedAction.HideModalLoading -> hideWaitingView()
+                        is SpacePreviewSharedAction.ShowErrorMessage -> action.error?.let { showSnackbar(it) }
+                    }
+                }.disposeOnDestroy()
+
+        if (isFirstCreation()) {
+            val simpleName = SpacePreviewFragment::class.java.simpleName
+            val args = intent?.getParcelableExtra<SpacePreviewArgs>(MvRx.KEY_ARG)
+            if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
+                supportFragmentManager.commitTransaction {
+                    replace(R.id.simpleFragmentContainer,
+                            SpacePreviewFragment::class.java,
+                            Bundle().apply { this.putParcelable(MvRx.KEY_ARG, args) },
+                            simpleName
+                    )
+                }
+            }
+        }
+    }
+
+    companion object {
+        fun newIntent(context: Context, spaceIdOrAlias: String): Intent {
+            return Intent(context, SpacePreviewActivity::class.java).apply {
+                putExtra(MvRx.KEY_ARG, SpacePreviewArgs(spaceIdOrAlias))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedActionViewModel.kt
new file mode 100644
index 0000000000..058b1a275b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedActionViewModel.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import im.vector.app.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedActionViewModel
+import javax.inject.Inject
+
+sealed class SpacePreviewSharedAction : VectorSharedAction {
+    object DismissAction : SpacePreviewSharedAction()
+    object ShowModalLoading : SpacePreviewSharedAction()
+    object HideModalLoading : SpacePreviewSharedAction()
+    data class ShowErrorMessage(val error: String? = null) : SpacePreviewSharedAction()
+}
+
+class SpacePreviewSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<SpacePreviewSharedAction>()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 5daedcc984..f0d8ae30f7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -53,7 +53,8 @@ sealed class SpaceListAction : VectorViewModelAction {
  * Transient events for group list screen
  */
 sealed class SpaceListViewEvents : VectorViewEvents {
-    object OpenSpaceSummary : SpaceListViewEvents()
+    object OpenSpace : SpaceListViewEvents()
+    data class OpenSpaceSummary(val id: String) : SpaceListViewEvents()
 }
 
 data class SpaceListViewState(
@@ -94,7 +95,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                 // We only want to open group if the updated selectedGroup is a different one.
                 if (currentGroupId != spaceSummary.spaceId) {
                     currentGroupId = spaceSummary.spaceId
-                    _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary)
+                    _viewEvents.post(SpaceListViewEvents.OpenSpace)
                 }
                 val optionGroup = Option.just(spaceSummary)
                 selectedSpaceDataSource.post(optionGroup)
@@ -116,20 +117,27 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     // PRIVATE METHODS *****************************************************************************
 
     private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
-        if (state.selectedSpace?.spaceId != action.spaceSummary.spaceId) {
-            // We take care of refreshing group data when selecting to be sure we get all the rooms and users
-//            tryOrNull {
-//                viewModelScope.launch {
-//                    session.getGroup(action.spaceSummary.groupId)?.fetchGroupData()
+
+        if (state.selectedSpace?.roomSummary?.membership == Membership.INVITE) {
+            _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary(state.selectedSpace.roomSummary.roomId))
+//            viewModelScope.launch(Dispatchers.IO) {
+//                tryOrNull { session.spaceService().peekSpace(action.spaceSummary.spaceId) }.let {
+//                    Timber.d("PEEK RESULT/ $it")
 //                }
 //            }
-            setState { copy(selectedSpace = action.spaceSummary) }
+        } else {
+            if (state.selectedSpace?.spaceId != action.spaceSummary.spaceId) {
+//                state.selectedSpace?.let {
+//                    selectedSpaceDataSource.post(Option.just(state.selectedSpace))
+//                }
+                setState { copy(selectedSpace = action.spaceSummary) }
+            }
         }
     }
 
     private fun observeGroupSummaries() {
         val roomSummaryQueryParams = roomSummaryQueryParams() {
-            memberships = listOf(Membership.JOIN)
+            memberships = listOf(Membership.JOIN, Membership.INVITE)
             displayName = QueryStringValue.IsNotEmpty
             excludeType = listOf(RoomType.MESSAGING, null)
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/RoomChildItem.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/RoomChildItem.kt
new file mode 100644
index 0000000000..bf28618c6c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/RoomChildItem.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import android.widget.ImageView
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_space_roomchild)
+abstract class RoomChildItem : VectorEpoxyModel<RoomChildItem.Holder>() {
+
+    @EpoxyAttribute
+    lateinit var roomId: String
+
+    @EpoxyAttribute
+    lateinit var title: String
+
+    @EpoxyAttribute
+    var topic: String? = null
+
+    @EpoxyAttribute
+    lateinit var memberCount: String
+
+    @EpoxyAttribute
+    var avatarUrl: String? = null
+
+    @EpoxyAttribute
+    lateinit var avatarRenderer: AvatarRenderer
+
+    @EpoxyAttribute
+    var depth: Int = 0
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.roomNameText.text = title
+        holder.roomTopicText.setTextOrHide(topic)
+        holder.memberCountText.text = memberCount
+
+        avatarRenderer.render(
+                MatrixItem.RoomItem(roomId, title, avatarUrl),
+                holder.avatarImageView
+        )
+        holder.tabView.tabDepth = depth
+    }
+
+    override fun unbind(holder: Holder) {
+        avatarRenderer.clear(holder.avatarImageView)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.childRoomAvatar)
+        val roomNameText by bind<TextView>(R.id.childRoomName)
+        val roomTopicText by bind<TextView>(R.id.childRoomTopic)
+        val memberCountText by bind<TextView>(R.id.spaceChildMemberCountText)
+        val tabView by bind<SpaceTabView>(R.id.spaceChildTabView)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
new file mode 100644
index 0000000000..651411b2fe
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericItemHeader
+import im.vector.app.core.utils.TextUtils
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.peeking.PeekResult
+import org.matrix.android.sdk.internal.session.space.peeking.ISpaceChild
+import org.matrix.android.sdk.internal.session.space.peeking.SpaceChildPeekResult
+import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
+import org.matrix.android.sdk.internal.session.space.peeking.SpaceSubChildPeekResult
+import javax.inject.Inject
+
+class SpacePreviewController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val stringProvider: StringProvider
+) : TypedEpoxyController<SpacePreviewState>() {
+
+    interface InteractionListener
+
+    var interactionListener: InteractionListener? = null
+
+    override fun buildModels(data: SpacePreviewState?) {
+        val result: SpacePeekResult = data?.peekResult?.invoke() ?: return
+
+        when (result) {
+            is SpacePeekResult.SpacePeekError -> {
+                genericFooterItem {
+                    id("failed")
+                    // TODO
+                    text("Failed to resolve")
+                }
+            }
+            is SpacePeekResult.Success -> {
+                // add summary info
+                val memberCount = result.summary.roomPeekResult.numJoinedMembers ?: 0
+
+                spaceTopSummaryItem {
+                    id("info")
+                    formattedMemberCount(stringProvider.getQuantityString(R.plurals.room_title_members, memberCount, memberCount))
+                    topic(result.summary.roomPeekResult.topic ?: "")
+                }
+
+                genericItemHeader {
+                    id("header_rooms")
+                    text(stringProvider.getString(R.string.rooms))
+                }
+
+                buildChildren(result.summary.children, 0)
+            }
+        }
+    }
+
+    private fun buildChildren(children: List<ISpaceChild>, depth: Int) {
+        children.forEach { child ->
+            when (child) {
+                is SpaceSubChildPeekResult -> {
+                    when (val roomPeekResult = child.roomPeekResult) {
+                        is PeekResult.Success -> {
+                            subSpaceItem {
+                                id(roomPeekResult.roomId)
+                                roomId(roomPeekResult.roomId)
+                                title(roomPeekResult.name)
+                                depth(depth)
+                                avatarUrl(roomPeekResult.avatarUrl)
+                                avatarRenderer(avatarRenderer)
+                            }
+                            buildChildren(child.children, depth + 1)
+                        }
+                        else -> {
+                            // ?? TODO
+                        }
+                    }
+                }
+                is SpaceChildPeekResult    -> {
+                    // We have to check if the peek result was success
+                    when (val roomPeekResult = child.roomPeekResult) {
+                        is PeekResult.Success -> {
+                            roomChildItem {
+                                id(child.id)
+                                depth(depth)
+                                roomId(roomPeekResult.roomId)
+                                title(roomPeekResult.name ?: "")
+                                topic(roomPeekResult.topic ?: "")
+                                avatarUrl(roomPeekResult.avatarUrl)
+                                memberCount(TextUtils.formatCountToShortDecimal(roomPeekResult.numJoinedMembers ?: 0))
+                                avatarRenderer(avatarRenderer)
+                            }
+                        }
+                        else                  -> {
+                            // What to do here?
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
new file mode 100644
index 0000000000..fcf961f23a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import com.jakewharton.rxbinding3.appcompat.navigationClicks
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentSpacePreviewBinding
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.spaces.SpacePreviewSharedAction
+import im.vector.app.features.spaces.SpacePreviewSharedActionViewModel
+import io.reactivex.android.schedulers.AndroidSchedulers
+import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+@Parcelize
+data class SpacePreviewArgs(
+        val idOrAlias: String
+) : Parcelable
+
+class SpacePreviewFragment @Inject constructor(
+        private val viewModelFactory: SpacePreviewViewModel.Factory,
+        private val avatarRenderer: AvatarRenderer,
+        private val epoxyController: SpacePreviewController
+) : VectorBaseFragment<FragmentSpacePreviewBinding>(), SpacePreviewViewModel.Factory {
+
+    private val viewModel by fragmentViewModel(SpacePreviewViewModel::class)
+    lateinit var sharedActionViewModel: SpacePreviewSharedActionViewModel
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSpacePreviewBinding {
+        return FragmentSpacePreviewBinding.inflate(inflater, container, false)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        sharedActionViewModel = activityViewModelProvider.get(SpacePreviewSharedActionViewModel::class.java)
+    }
+
+    override fun create(initialState: SpacePreviewState) = viewModelFactory.create(initialState)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        viewModel.observeViewEvents {
+            handleViewEvents(it)
+        }
+
+        views.roomPreviewNoPreviewToolbar.navigationClicks()
+                .throttleFirst(300, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { sharedActionViewModel.post(SpacePreviewSharedAction.DismissAction) }
+                .disposeOnDestroyView()
+
+        views.spacePreviewRecyclerView.configureWith(epoxyController)
+
+        views.spacePreviewAcceptInviteButton.debouncedClicks {
+            viewModel.handle(SpacePreviewViewAction.AcceptInvite)
+        }
+
+        views.spacePreviewDeclineInviteButton.debouncedClicks {
+            viewModel.handle(SpacePreviewViewAction.DismissInvite)
+        }
+    }
+
+    override fun onDestroyView() {
+        views.spacePreviewRecyclerView.cleanup()
+        super.onDestroyView()
+    }
+
+    override fun invalidate() = withState(viewModel) {
+        when (it.peekResult) {
+            is Uninitialized,
+            is Loading -> {
+                views.spacePreviewPeekingProgress.isVisible = true
+                views.spacePreviewButtonBar.isVisible = true
+                views.spacePreviewAcceptInviteButton.isEnabled = false
+                views.spacePreviewDeclineInviteButton.isEnabled = false
+            }
+            is Fail -> {
+                views.spacePreviewPeekingProgress.isVisible = false
+                views.spacePreviewButtonBar.isVisible = false
+            }
+            is Success -> {
+                views.spacePreviewPeekingProgress.isVisible = false
+                views.spacePreviewButtonBar.isVisible = true
+                views.spacePreviewAcceptInviteButton.isEnabled = true
+                views.spacePreviewDeclineInviteButton.isEnabled = true
+                epoxyController.setData(it)
+            }
+        }
+        updateToolbar(it)
+    }
+
+    private fun handleViewEvents(viewEvents: SpacePreviewViewEvents) {
+        when (viewEvents) {
+            SpacePreviewViewEvents.Dismiss -> {
+            }
+            SpacePreviewViewEvents.StartJoining -> {
+                sharedActionViewModel.post(SpacePreviewSharedAction.ShowModalLoading)
+            }
+            SpacePreviewViewEvents.JoinSuccess -> {
+                sharedActionViewModel.post(SpacePreviewSharedAction.HideModalLoading)
+                sharedActionViewModel.post(SpacePreviewSharedAction.DismissAction)
+            }
+            is SpacePreviewViewEvents.JoinFailure -> {
+                sharedActionViewModel.post(SpacePreviewSharedAction.HideModalLoading)
+                sharedActionViewModel.post(SpacePreviewSharedAction.ShowErrorMessage(viewEvents.message ?: getString(R.string.matrix_error)))
+            }
+        }
+    }
+
+    private fun updateToolbar(spacePreviewState: SpacePreviewState) {
+        when (val preview = spacePreviewState.peekResult.invoke()) {
+            is SpacePeekResult.Success -> {
+                val roomPeekResult = preview.summary.roomPeekResult
+                val mxItem = MatrixItem.RoomItem(roomPeekResult.roomId, roomPeekResult.name, roomPeekResult.avatarUrl)
+                avatarRenderer.renderSpace(mxItem, views.spacePreviewToolbarAvatar)
+                views.roomPreviewNoPreviewToolbarTitle.text = roomPeekResult.name
+            }
+            is SpacePeekResult.SpacePeekError,
+            null -> {
+                // what to do here?
+                val mxItem = MatrixItem.RoomItem(spacePreviewState.idOrAlias, spacePreviewState.name, spacePreviewState.avatarUrl)
+                avatarRenderer.renderSpace(mxItem, views.spacePreviewToolbarAvatar)
+                views.roomPreviewNoPreviewToolbarTitle.text = spacePreviewState.name
+            }
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        viewModel.handle(SpacePreviewViewAction.ViewReady)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
new file mode 100644
index 0000000000..41d94e8c9d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
+
+data class SpacePreviewState(
+        val idOrAlias: String,
+        val name: String?  = null,
+        val avatarUrl: String? = null,
+        val peekResult: Async<SpacePeekResult> = Uninitialized
+) : MvRxState {
+    constructor(args: SpacePreviewArgs) : this(idOrAlias = args.idOrAlias)
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewAction.kt
new file mode 100644
index 0000000000..6426b89d55
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewAction.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class SpacePreviewViewAction : VectorViewModelAction {
+    object ViewReady : SpacePreviewViewAction()
+    object AcceptInvite : SpacePreviewViewAction()
+    object DismissInvite : SpacePreviewViewAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewEvents.kt
new file mode 100644
index 0000000000..04645e59ad
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewEvents.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SpacePreviewViewEvents : VectorViewEvents {
+    object Dismiss: SpacePreviewViewEvents()
+    object StartJoining: SpacePreviewViewEvents()
+    object JoinSuccess: SpacePreviewViewEvents()
+    data class JoinFailure(val message: String?): SpacePreviewViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
new file mode 100644
index 0000000000..6986db18aa
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.ViewModelContext
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.peeking.PeekResult
+import org.matrix.android.sdk.api.session.space.SpaceService
+import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
+
+class SpacePreviewViewModel @AssistedInject constructor(
+        @Assisted private val initialState: SpacePreviewState,
+        private val session: Session
+) : VectorViewModel<SpacePreviewState, SpacePreviewViewAction, SpacePreviewViewEvents>(initialState) {
+
+    private var initialized = false
+
+    init {
+        // do we have some things in cache?
+        session.getRoomSummary(initialState.idOrAlias)?.let {
+            setState {
+                copy(name = it.name, avatarUrl = it.avatarUrl)
+            }
+        }
+    }
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(initialState: SpacePreviewState): SpacePreviewViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SpacePreviewViewModel, SpacePreviewState> {
+        override fun create(viewModelContext: ViewModelContext, state: SpacePreviewState): SpacePreviewViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    override fun handle(action: SpacePreviewViewAction) {
+        when (action) {
+            SpacePreviewViewAction.ViewReady -> handleReady()
+            SpacePreviewViewAction.AcceptInvite -> handleAcceptInvite()
+            SpacePreviewViewAction.DismissInvite -> handleDismissInvite()
+        }
+    }
+
+    private fun handleDismissInvite() {
+        TODO("Not yet implemented")
+    }
+
+    private fun handleAcceptInvite() = withState { state ->
+        // Here we need to join the space himself as well as the default rooms in that space
+        val spaceInfo = state.peekResult.invoke() as? SpacePeekResult.Success
+
+        // TODO if we have no summary, we cannot find auto join rooms...
+        // So maybe we should trigger a retry on summary after the join?
+        val spaceVia = (spaceInfo?.summary?.roomPeekResult as? PeekResult.Success)?.viaServers ?: emptyList()
+        val autoJoinChildren = spaceInfo?.summary?.children
+                ?.filter { it.default == true }
+                ?.map {
+                    SpaceService.ChildAutoJoinInfo(
+                            it.id,
+                            // via servers
+                            (it.roomPeekResult as? PeekResult.Success)?.viaServers ?: emptyList()
+                    )
+                } ?: emptyList()
+
+        // trigger modal loading
+        _viewEvents.post(SpacePreviewViewEvents.StartJoining)
+        viewModelScope.launch(Dispatchers.IO) {
+            val joinResult = session.spaceService().joinSpace(spaceInfo?.summary?.idOrAlias ?: initialState.idOrAlias, null, spaceVia, autoJoinChildren)
+            when (joinResult) {
+                SpaceService.JoinSpaceResult.Success,
+                is SpaceService.JoinSpaceResult.PartialSuccess -> {
+                    // For now we don't handle partial success, it's just success
+                    _viewEvents.post(SpacePreviewViewEvents.JoinSuccess)
+                }
+                is SpaceService.JoinSpaceResult.Fail -> {
+                    _viewEvents.post(SpacePreviewViewEvents.JoinFailure(joinResult.error?.toString()))
+                }
+            }
+        }
+    }
+
+    private fun handleReady() {
+        if (!initialized) {
+            initialized = true
+            // peek for the room
+            setState {
+                copy(peekResult = Loading())
+            }
+            viewModelScope.launch(Dispatchers.IO) {
+                try {
+                    val result = session.spaceService().peekSpace(initialState.idOrAlias)
+                    setState {
+                        copy(peekResult = Success(result))
+                    }
+                } catch (failure: Throwable) {
+                    setState {
+                        copy(peekResult = Fail(failure))
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt
new file mode 100644
index 0000000000..675e7070e7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTabView.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.LinearLayout
+import im.vector.app.R
+
+class SpaceTabView constructor(context: Context,
+                               attrs: AttributeSet? = null,
+                               defStyleAttr: Int = 0)
+    : LinearLayout(context, attrs, defStyleAttr) {
+
+    constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0) {}
+    constructor(context: Context) : this(context, null, 0) {}
+
+    var tabDepth = 0
+        set(value) {
+            if (field != value) {
+                field = value
+                setUpView()
+            }
+        }
+
+    init {
+        setUpView()
+    }
+
+    private fun setUpView() {
+        // remove children
+        removeAllViews()
+        for (i in 0 until tabDepth) {
+            inflate(context, R.layout.item_space_tab, this)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTopSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTopSummaryItem.kt
new file mode 100644
index 0000000000..c357fb14b3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpaceTopSummaryItem.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+
+@EpoxyModelClass(layout = R.layout.item_space_top_summary)
+abstract class SpaceTopSummaryItem : VectorEpoxyModel<SpaceTopSummaryItem.Holder>() {
+
+    @EpoxyAttribute
+    var topic: String? = null
+
+    @EpoxyAttribute
+    lateinit var formattedMemberCount: String
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.spaceTopicText.setTextOrHide(topic)
+        holder.memberCountText.text = formattedMemberCount
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val memberCountText by bind<TextView>(R.id.spaceSummaryMemberCountText)
+        val spaceTopicText by bind<TextView>(R.id.spaceSummaryTopic)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SubSpaceItem.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SubSpaceItem.kt
new file mode 100644
index 0000000000..367a81fe5a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SubSpaceItem.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.preview
+
+import android.widget.ImageView
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_space_subspace)
+abstract class SubSpaceItem : VectorEpoxyModel<SubSpaceItem.Holder>() {
+
+    @EpoxyAttribute
+    lateinit var roomId: String
+
+    @EpoxyAttribute
+    lateinit var title: String
+
+    @EpoxyAttribute
+    var avatarUrl: String? = null
+
+    @EpoxyAttribute
+    lateinit var avatarRenderer: AvatarRenderer
+
+    @EpoxyAttribute
+    var depth: Int = 0
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.nameText.text = title
+
+        avatarRenderer.renderSpace(
+                MatrixItem.RoomItem(roomId, title, avatarUrl),
+                holder.avatarImageView
+        )
+        holder.tabView.tabDepth = depth
+    }
+
+    override fun unbind(holder: Holder) {
+        avatarRenderer.clear(holder.avatarImageView)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.childSpaceAvatar)
+        val nameText by bind<TextView>(R.id.childSpaceName)
+        val tabView by bind<SpaceTabView>(R.id.childSpaceTab)
+    }
+}
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
new file mode 100644
index 0000000000..257797548e
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/roomPreviewNoPreviewToolbar"
+            style="@style/VectorToolbarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="?actionBarSize"
+            app:navigationIcon="@drawable/ic_x_18dp"
+            android:elevation="4dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+<!--                <ImageView-->
+<!--                    android:id="@+id/spacePreviewClose"-->
+<!--                    android:layout_width="@dimen/layout_touch_size"-->
+<!--                    android:layout_height="@dimen/layout_touch_size"-->
+<!--                    android:clickable="true"-->
+<!--                    android:focusable="true"-->
+<!--                    android:foreground="?attr/selectableItemBackground"-->
+<!--                    android:scaleType="center"-->
+<!--                    android:src="@drawable/ic_x_18dp"-->
+<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+<!--                    app:layout_constraintStart_toStartOf="parent"-->
+<!--                    app:layout_constraintTop_toTopOf="parent" />-->
+
+                <ImageView
+                    android:id="@+id/spacePreviewToolbarAvatar"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:src="@tools:sample/avatars" />
+
+                <TextView
+                    android:id="@+id/roomPreviewNoPreviewToolbarTitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textColor="?vctr_toolbar_primary_text_color"
+                    android:textSize="18sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toEndOf="@+id/spacePreviewToolbarAvatar"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="@sample/matrix.json/data/displayName" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.appcompat.widget.Toolbar>
+
+        <ProgressBar
+            android:id="@+id/spacePreviewPeekingProgress"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="14dp"
+            android:layout_gravity="center"
+            android:background="?riotx_header_panel_background"
+            android:indeterminate="true" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/spacePreviewRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:fastScrollEnabled="true"
+            android:overScrollMode="always"
+            android:scrollbars="vertical"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/spacePreviewPeekingProgress"
+            tools:listitem="@layout/item_space_subspace" />
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?list_divider_color"/>
+
+        <LinearLayout
+            android:id="@+id/spacePreviewButtonBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:elevation="2dp"
+            android:orientation="horizontal"
+            android:layout_margin="8dp">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/spacePreviewDeclineInviteButton"
+                style="@style/VectorButtonStyleDestructive"
+                android:layout_width="0dp"
+                android:layout_marginEnd="16dp"
+                android:layout_weight="1"
+                android:text="@string/decline" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/spacePreviewAcceptInviteButton"
+                style="@style/VectorButtonStylePositive"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:text="@string/accept" />
+        </LinearLayout>
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
new file mode 100644
index 0000000000..0fdbd833f4
--- /dev/null
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <im.vector.app.features.spaces.preview.SpaceTabView
+        android:id="@+id/spaceChildTabView"
+        android:layout_width="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_height="match_parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="6dp"
+        android:background="@drawable/space_home_background"
+        android:clipToPadding="false"
+        android:foreground="?attr/selectableItemBackground"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/childRoomAvatar"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="12dp"
+            android:scaleType="centerInside"
+            android:visibility="visible"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="MissingPrefix"
+            tools:src="@tools:sample/avatars" />
+
+        <TextView
+            android:id="@+id/childRoomName"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="4dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?riotx_text_primary"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@+id/childRoomTopic"
+            app:layout_constraintEnd_toStartOf="@id/spaceChildMemberCountIcon"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/childRoomAvatar"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@tools:sample/full_names" />
+
+        <TextView
+            android:id="@+id/childRoomTopic"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="15sp"
+            app:layout_constraintBottom_toBottomOf="@id/spaceChildBarrier"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="@+id/childRoomName"
+            app:layout_constraintTop_toBottomOf="@+id/childRoomName"
+            tools:text="@sample/matrix.json/data/roomTopic" />
+
+        <ImageView
+            android:id="@+id/spaceChildMemberCountIcon"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_marginEnd="4dp"
+            android:src="@drawable/ic_room_profile_member_list"
+            app:layout_constraintBottom_toBottomOf="@+id/spaceChildMemberCountText"
+            app:layout_constraintEnd_toStartOf="@+id/spaceChildMemberCountText"
+            app:layout_constraintTop_toTopOf="@+id/spaceChildMemberCountText"
+            app:tint="?riotx_text_secondary" />
+
+        <TextView
+            android:id="@+id/spaceChildMemberCountText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:maxLength="5"
+            android:textColor="?riotx_text_secondary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="123" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/spaceChildBarrier"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="childRoomAvatar,childRoomTopic"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/spaceChildBarrier" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
new file mode 100644
index 0000000000..ac654dc2b3
--- /dev/null
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="16dp"
+    android:background="?riotx_background"
+    android:clipToPadding="false"
+    android:foreground="?attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <im.vector.app.features.spaces.preview.SpaceTabView
+        android:id="@+id/childSpaceTab"
+        android:layout_width="3dp"
+        android:layout_height="2dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/childSpaceAvatar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/childSpaceAvatar"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:scaleType="centerInside"
+        android:visibility="visible"
+        android:layout_marginStart="8dp"
+        app:layout_constraintBottom_toBottomOf="@id/childSpaceName"
+        app:layout_constraintStart_toEndOf="@id/childSpaceTab"
+        app:layout_constraintTop_toTopOf="@id/childSpaceName"
+        tools:ignore="MissingPrefix"
+        tools:src="@tools:sample/avatars" />
+
+    <View
+        android:layout_width="2dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="2dp"
+        android:background="?riotx_list_bottom_sheet_divider_color"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginStart="15dp"
+        app:layout_constraintTop_toBottomOf="@id/childSpaceAvatar">
+
+    </View>
+
+    <TextView
+        android:id="@+id/childSpaceName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginBottom="16dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/childSpaceAvatar"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/full_names" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_tab.xml b/vector/src/main/res/layout/item_space_tab.xml
new file mode 100644
index 0000000000..ea08fabea3
--- /dev/null
+++ b/vector/src/main/res/layout/item_space_tab.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="16dp"
+    android:layout_height="match_parent">
+
+    <View
+        android:layout_width="2dp"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"
+        android:background="?riotx_list_bottom_sheet_divider_color" />
+</RelativeLayout>
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
new file mode 100644
index 0000000000..e4e2bbdd76
--- /dev/null
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+
+    <ImageView
+        android:id="@+id/spaceSummaryMemberCountIcon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:src="@drawable/ic_room_profile_member_list"
+        app:layout_constraintBottom_toBottomOf="@+id/spaceSummaryMemberCountText"
+        app:layout_constraintStart_toEndOf="@+id/spaceSummaryMemberCountText"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_secondary" />
+
+    <TextView
+        android:id="@+id/spaceSummaryMemberCountText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textColor="?riotx_text_secondary"
+        app:layout_constraintBottom_toBottomOf="@+id/spaceSummaryMemberCountIcon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/spaceSummaryMemberCountIcon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="123 members" />
+
+    <TextView
+        android:id="@+id/spaceSummaryTopic"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textColor="?riotx_text_primary"
+        android:autoLink="all"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/spaceSummaryMemberCountIcon"
+        tools:text="@sample/matrix.json/data/roomTopic" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index c9cb4729f7..b296c4e5ea 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -508,6 +508,9 @@
     <string name="groups_header">Communities</string>
     <string name="no_group_placeholder">No groups</string>
 
+    <string name="spaces_invited_header">Invites</string>
+    <string name="spaces_header">Spaces</string>
+
     <string name="send_bug_report_include_logs">Send logs</string>
     <string name="send_bug_report_include_crash_logs">Send crash logs</string>
     <string name="send_bug_report_include_key_share_history">Send key share requests history</string>

From ab4f2429c47a1d239582262f7a401b2cbde07021 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 8 Jan 2021 09:07:27 +0100
Subject: [PATCH 096/350] Use unstable prefixes

---
 .../android/sdk/api/session/events/model/EventType.kt       | 4 ++--
 .../matrix/android/sdk/api/session/room/model/RoomType.kt   | 4 ++--
 .../sdk/api/session/room/model/create/RoomCreateContent.kt  | 2 +-
 .../sdk/internal/session/space/peeking/PeekSpaceTask.kt     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index 4be8eea856..99934d3d95 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -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
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
index 3958d45d0b..b4932494f2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
@@ -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"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
index 52e5c0e9c7..f9d40d5652 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
@@ -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
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
index 826be0b3aa..a2be75a232 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
@@ -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

From e2578a29ed905ffe9095e663d51c325d96f14e9e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 12 Jan 2021 11:40:09 +0100
Subject: [PATCH 097/350] Basic space join / use tmp msc id / db model update

---
 .../api/session/room/model/SpaceChildInfo.kt  |  25 ++++
 .../room/model/create/CreateRoomParams.kt     |   3 +-
 .../sdk/api/session/space/SpaceSummary.kt     |   3 +-
 .../session/space/model/SpaceChildContent.kt  |   2 +-
 .../sdk/internal/database/RealmQueryLatch.kt  |   2 +
 .../database/RealmSessionStoreMigration.kt    |  11 +-
 .../database/mapper/SpaceSummaryMapper.kt     |   9 +-
 .../database/model/SessionRealmModule.kt      |   3 +-
 .../database/model/SpaceChildInfoEntity.kt    |  38 ++++++
 .../database/model/SpaceSummaryEntity.kt      |   2 +-
 .../sdk/internal/session/room/RoomModule.kt   |   5 +
 .../relationship/RoomRelationshipHelper.kt    |  24 +++-
 .../room/summary/RoomSummaryUpdater.kt        |  19 ++-
 .../session/space/DefaultSpaceService.kt      |  35 +++---
 .../internal/session/space/JoinSpaceTask.kt   | 116 ++++++++++++++++++
 .../session/space/peeking/SpacePeekResult.kt  |   2 +-
 .../internal/session/sync/RoomSyncHandler.kt  |   1 +
 vector/src/main/AndroidManifest.xml           |   1 +
 .../im/vector/app/core/di/FragmentModule.kt   |   2 +-
 .../app/features/home/HomeDrawerFragment.kt   |   2 +-
 .../features/spaces/SpaceExploreActivity.kt   |  73 +++++++++++
 .../SpaceListFragment.kt                      |  10 +-
 .../SpaceSummaryController.kt                 |  10 +-
 .../{grouplist => spaces}/SpaceSummaryItem.kt |   2 +-
 .../features/spaces/SpacesListViewModel.kt    |  13 +-
 .../explore/SpaceDirectoryController.kt       |  53 ++++++++
 .../spaces/explore/SpaceDirectoryFragment.kt  |  35 ++++++
 .../spaces/explore/SpaceDirectoryViewModel.kt | 101 +++++++++++++++
 28 files changed, 549 insertions(+), 53 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
 rename vector/src/main/java/im/vector/app/features/{grouplist => spaces}/SpaceListFragment.kt (91%)
 rename vector/src/main/java/im/vector/app/features/{grouplist => spaces}/SpaceSummaryController.kt (95%)
 rename vector/src/main/java/im/vector/app/features/{grouplist => spaces}/SpaceSummaryItem.kt (98%)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
new file mode 100644
index 0000000000..04f3310a77
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.model
+
+data class SpaceChildInfo(
+        val roomSummary: IRoomSummary?,
+        val present: Boolean,
+        val order: String?,
+        val autoJoin: Boolean,
+        val viaServers: List<String>
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index 6009649314..880854da58 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -21,7 +21,6 @@ import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
-import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 
 // TODO Give a way to include other initial states
@@ -112,7 +111,7 @@ open class CreateRoomParams {
             }
         }
 
-    var roomType: String? = RoomType.MESSAGING
+    var roomType: String? = null // RoomType.MESSAGING
         set(value) {
             field = value
             if (value != null) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt
index d2be2f18f1..1473ed7a96 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt
@@ -18,9 +18,10 @@ package org.matrix.android.sdk.api.session.space
 
 import org.matrix.android.sdk.api.session.room.model.IRoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 
 data class SpaceSummary(
         val spaceId: String,
         val roomSummary: RoomSummary,
-        val children: List<IRoomSummary>
+        val children: List<SpaceChildInfo>
 ) : IRoomSummary by roomSummary
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
index f7bd067c55..e31ff5af5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
@@ -49,5 +49,5 @@ data class SpaceChildContent(
          * The default flag on a child listing allows a space admin to list the "default" sub-spaces and rooms in that space.
          * This means that when a user joins the parent space, they will automatically be joined to those default children.
          */
-        @Json(name = "default") val default: Boolean? = true
+        @Json(name = "default") val default: Boolean? = false
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
index c9c797304a..04f47bfccd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
@@ -26,6 +26,7 @@ import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
+import timber.log.Timber
 
 internal suspend fun <T> awaitNotEmptyResult(realmConfiguration: RealmConfiguration,
                                              timeoutMillis: Long,
@@ -40,6 +41,7 @@ internal suspend fun <T> awaitNotEmptyResult(realmConfiguration: RealmConfigurat
 
                 val listener = object : RealmChangeListener<RealmResults<T>> {
                     override fun onChange(it: RealmResults<T>) {
+                        Timber.v("## Space: $it")
                         if (it.isNotEmpty()) {
                             result.removeChangeListener(this)
                             latch.complete(Unit)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 2c06a4e8f7..27b2b031e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -29,9 +29,9 @@ import org.matrix.android.sdk.internal.database.model.PreviewUrlCacheEntityField
 import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
-
 import org.matrix.android.sdk.internal.database.model.RoomTagEntityFields
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
+import org.matrix.android.sdk.internal.database.model.SpaceChildInfoEntityFields
 import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
 import timber.log.Timber
 import javax.inject.Inject
@@ -207,9 +207,16 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                     obj.setString(RoomSummaryEntityFields.ROOM_TYPE, null)
                 }
 
+        val spaceChildInfoSchema = realm.schema.create("SpaceChildInfoEntity")
+                ?.addField(SpaceChildInfoEntityFields.ORDER,  String::class.java)
+                ?.addField(SpaceChildInfoEntityFields.PRESENT, Boolean::class.java)
+                ?.setNullable(SpaceChildInfoEntityFields.PRESENT, true)
+                ?.addRealmListField(SpaceChildInfoEntityFields.VIA_SERVERS.`$`, String::class.java)
+                ?.addRealmObjectField(SpaceChildInfoEntityFields.ROOM_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
+
         realm.schema.create("SpaceSummaryEntity")
                 ?.addField(SpaceSummaryEntityFields.SPACE_ID, String::class.java, FieldAttribute.PRIMARY_KEY)
                 ?.addRealmObjectField(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
-                ?.addRealmListField(SpaceSummaryEntityFields.CHILDREN.`$`, realm.schema.get("RoomSummaryEntity")!!)
+                ?.addRealmListField(SpaceSummaryEntityFields.CHILDREN.`$`, spaceChildInfoSchema!!)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
index 9dee99d7fe..7128501a65 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.database.mapper
 
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
 import javax.inject.Inject
@@ -27,7 +28,13 @@ internal class SpaceSummaryMapper @Inject constructor(private val roomSummaryMap
                 spaceId = spaceSummaryEntity.spaceId,
                 roomSummary = roomSummaryMapper.map(spaceSummaryEntity.roomSummaryEntity!!),
                 children = spaceSummaryEntity.children.map {
-                    roomSummaryMapper.map(it)
+                    SpaceChildInfo(
+                            roomSummary = it.roomSummaryEntity?.let { rs -> roomSummaryMapper.map(rs) },
+                            autoJoin = it.autoJoin ?: false,
+                            present = it.present ?: false,
+                            viaServers = it.viaServers.map { it },
+                            order = it.order
+                    )
                 }
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index 8c5bb8e990..76116be1a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -62,6 +62,7 @@ import io.realm.annotations.RealmModule
             UserAccountDataEntity::class,
             ScalarTokenEntity::class,
             WellknownIntegrationManagerConfigEntity::class,
-            SpaceSummaryEntity::class
+            SpaceSummaryEntity::class,
+            SpaceChildInfoEntity::class
         ])
 internal class SessionRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt
new file mode 100644
index 0000000000..68667c55fc
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+import io.realm.RealmList
+import io.realm.RealmObject
+
+/**
+ * Decorates room summary with space related information.
+ */
+internal open class SpaceChildInfoEntity(
+        var viaServers: RealmList<String> = RealmList(),
+        // it's an active child of the space if and only if present is not null and true
+        var present: Boolean? = null,
+        // Use for alphabetic ordering of this child
+        var order: String? = null,
+        // If true, this child should be join when parent is joined
+        var autoJoin: Boolean? = null,
+        // link to the actual room (check type to see if it's a subspace)
+        var roomSummaryEntity: RoomSummaryEntity? = null
+) : RealmObject() {
+
+    companion object
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt
index ca54655022..e63b5b9d55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt
@@ -22,7 +22,7 @@ import io.realm.annotations.PrimaryKey
 
 internal open class SpaceSummaryEntity(@PrimaryKey var spaceId: String = "",
                                        var roomSummaryEntity: RoomSummaryEntity? = null,
-                                       var children: RealmList<RoomSummaryEntity> = RealmList()
+                                       var children: RealmList<SpaceChildInfoEntity> = RealmList()
                                         // TODO public / private .. and more
 ) : RealmObject() {
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index b7c4246eca..8cc7f41d5b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -90,7 +90,9 @@ import org.matrix.android.sdk.internal.session.room.typing.DefaultSendTypingTask
 import org.matrix.android.sdk.internal.session.room.typing.SendTypingTask
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultGetUploadsTask
 import org.matrix.android.sdk.internal.session.room.uploads.GetUploadsTask
+import org.matrix.android.sdk.internal.session.space.DefaultJoinSpaceTask
 import org.matrix.android.sdk.internal.session.space.DefaultSpaceService
+import org.matrix.android.sdk.internal.session.space.JoinSpaceTask
 import org.matrix.android.sdk.internal.session.space.peeking.DefaultPeekSpaceTask
 import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
 import retrofit2.Retrofit
@@ -241,6 +243,9 @@ internal abstract class RoomModule {
     @Binds
     abstract fun bindPeekSpaceTask(task: DefaultPeekSpaceTask): PeekSpaceTask
 
+    @Binds
+    abstract fun bindJoinSpaceTask(task: DefaultJoinSpaceTask): JoinSpaceTask
+
     @Binds
     abstract fun bindGetEventTask(task: DefaultGetEventTask): GetEventTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
index b1bcfc7077..54b9a17c3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
 import org.matrix.android.sdk.internal.database.query.whereType
+import timber.log.Timber
 
 /**
  * Relationship between rooms and spaces
@@ -38,13 +39,30 @@ internal class RoomRelationshipHelper(private val realm: Realm,
                                       private val roomId: String
 ) {
 
-    fun getDirectChildrenDescriptions(): List<String> {
+    data class SpaceChildInfo(
+            val roomId: String,
+            val present: Boolean,
+            val order: String?,
+            val autoJoin: Boolean,
+            val viaServers: List<String>
+    )
+
+    fun getDirectChildrenDescriptions(): List<SpaceChildInfo> {
         return CurrentStateEventEntity.whereType(realm, roomId, EventType.STATE_SPACE_CHILD)
                 .findAll()
-                .filter { ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.present == true }
+//                .filter { ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.present == true }
                 .mapNotNull {
                     // ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()
-                    it.stateKey
+                    ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.let { scc ->
+                        Timber.d("## Space child desc state event $scc")
+                        SpaceChildInfo(
+                                roomId = it.stateKey,
+                                present = scc.present ?: false,
+                                order = scc.order,
+                                autoJoin = scc.default ?: false,
+                                viaServers = scc.via ?: emptyList()
+                        )
+                    }
                 }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 7b637cc9e9..11d0ffffde 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.internal.session.room.summary
 
 import io.realm.Realm
+import io.realm.kotlin.createObject
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -38,6 +39,7 @@ import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.EventEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SpaceChildInfoEntity
 import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendStates
@@ -162,13 +164,26 @@ internal class RoomSummaryUpdater @Inject constructor(
         }
 
         if (roomType == RoomType.SPACE) {
-            val spaceSummaryEntity = SpaceSummaryEntity.getOrCreate(realm, roomId)
+            Timber.v("## Space: Updating summary for Space $roomId membership: ${roomSummaryEntity.membership}")
+            val spaceSummaryEntity = SpaceSummaryEntity()
+            spaceSummaryEntity.spaceId = roomId
             spaceSummaryEntity.roomSummaryEntity = roomSummaryEntity
             spaceSummaryEntity.children.clear()
             spaceSummaryEntity.children.addAll(
                     RoomRelationshipHelper(realm, roomId).getDirectChildrenDescriptions()
-                            .map { RoomSummaryEntity.getOrCreate(realm, it) }
+                            .map {
+                                Timber.v("## Space: Updating summary for room $roomId with info $it")
+                                realm.createObject<SpaceChildInfoEntity>().apply {
+                                    this.roomSummaryEntity = RoomSummaryEntity.getOrCreate(realm, it.roomId)
+                                    this.order = it.order
+                                    this.present = it.present
+                                    this.autoJoin = it.autoJoin
+                                }.also {
+                                    Timber.v("## Space: Updating summary for room $roomId with children $it")
+                                }
+                            }
             )
+            realm.insertOrUpdate(spaceSummaryEntity)
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 4118d74604..973904cbd5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -42,6 +42,7 @@ internal class DefaultSpaceService @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         private val createRoomTask: CreateRoomTask,
         private val joinRoomTask: JoinRoomTask,
+        private val joinSpaceTask: JoinSpaceTask,
         private val markAllRoomsReadTask: MarkAllRoomsReadTask,
         private val updateBreadcrumbsTask: UpdateBreadcrumbsTask,
         private val roomIdByAliasTask: GetRoomIdByAliasTask,
@@ -77,22 +78,24 @@ internal class DefaultSpaceService @Inject constructor(
 
     override suspend fun joinSpace(spaceIdOrAlias: String, reason: String?, viaServers: List<String>, autoJoinChild: List<SpaceService.ChildAutoJoinInfo>): SpaceService.JoinSpaceResult {
         try {
-            joinRoomTask.execute(JoinRoomTask.Params(spaceIdOrAlias, reason, viaServers))
-            val childJoinFailures = mutableMapOf<String, Throwable>()
-            autoJoinChild.forEach { info ->
-                // TODO what if the child is it self a subspace with some default children?
-                try {
-                    joinRoomTask.execute(JoinRoomTask.Params(info.roomIdOrAlias, null, info.viaServers))
-                } catch (failure: Throwable) {
-                    // TODO, i could already be a member of this room, handle that as it should not be an error in this context
-                    childJoinFailures[info.roomIdOrAlias] = failure
-                }
-            }
-            return if (childJoinFailures.isEmpty()) {
-                SpaceService.JoinSpaceResult.Success
-            } else {
-                SpaceService.JoinSpaceResult.PartialSuccess(childJoinFailures)
-            }
+            joinSpaceTask.execute(JoinSpaceTask.Params(spaceIdOrAlias, reason, viaServers))
+            // TODO partial success
+            return SpaceService.JoinSpaceResult.Success
+//            val childJoinFailures = mutableMapOf<String, Throwable>()
+//            autoJoinChild.forEach { info ->
+//                // TODO what if the child is it self a subspace with some default children?
+//                try {
+//                    joinRoomTask.execute(JoinRoomTask.Params(info.roomIdOrAlias, null, info.viaServers))
+//                } catch (failure: Throwable) {
+//                    // TODO, i could already be a member of this room, handle that as it should not be an error in this context
+//                    childJoinFailures[info.roomIdOrAlias] = failure
+//                }
+//            }
+//            return if (childJoinFailures.isEmpty()) {
+//                SpaceService.JoinSpaceResult.Success
+//            } else {
+//                SpaceService.JoinSpaceResult.PartialSuccess(childJoinFailures)
+//            }
         } catch (throwable: Throwable) {
             return SpaceService.JoinSpaceResult.Fail(throwable)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
new file mode 100644
index 0000000000..66a695fc18
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import io.realm.RealmConfiguration
+import kotlinx.coroutines.TimeoutCancellationException
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
+import org.matrix.android.sdk.internal.task.Task
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+internal interface JoinSpaceTask : Task<JoinSpaceTask.Params, Unit> {
+    data class Params(
+            val roomIdOrAlias: String,
+            val reason: String?,
+            val viaServers: List<String> = emptyList()
+    )
+}
+
+internal class DefaultJoinSpaceTask @Inject constructor(
+        private val roomAPI: RoomAPI,
+        private val joinRoomTask: JoinRoomTask,
+        @SessionDatabase
+        private val realmConfiguration: RealmConfiguration,
+        private val spaceSummaryDataSource: SpaceSummaryDataSource,
+        private val eventBus: EventBus
+) : JoinSpaceTask {
+
+    override suspend fun execute(params: JoinSpaceTask.Params) {
+        Timber.v("## Space: > Joining root space ${params.roomIdOrAlias} ...")
+        joinRoomTask.execute(JoinRoomTask.Params(
+                params.roomIdOrAlias,
+                params.reason,
+                params.viaServers
+        ))
+        Timber.v("## Space: < Joining root space done for ${params.roomIdOrAlias}")
+        // we want to wait for sync result to check for auto join rooms
+
+        Timber.v("## Space: > Wait for post joined sync ${params.roomIdOrAlias} ...")
+        try {
+            awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(2L)) { realm ->
+                realm.where(SpaceSummaryEntity::class.java)
+                        .apply {
+                            if (params.roomIdOrAlias.startsWith("!")) {
+                                equalTo(SpaceSummaryEntityFields.SPACE_ID, params.roomIdOrAlias)
+                            } else {
+                                equalTo(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.CANONICAL_ALIAS, params.roomIdOrAlias)
+                            }
+                        }
+                        .equalTo(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.MEMBERSHIP_STR, Membership.JOIN.name)
+            }
+        } catch (exception: TimeoutCancellationException) {
+            Timber.w("## Space: > Error created with timeout")
+            throw CreateRoomFailure.CreatedWithTimeout
+        }
+
+        Timber.v("## Space: > Sync done ...")
+        // after that i should have the children (? do i nead to paginate to get state)
+        val summary = spaceSummaryDataSource.getSpaceSummary(params.roomIdOrAlias)
+        Timber.v("## Space: Found space summary Name:[${summary?.roomSummary?.name}] children: ${summary?.children?.size}")
+        summary?.children?.forEach {
+            val childRoomSummary = it.roomSummary ?: return@forEach
+            Timber.v("## Space: Processing child :[${childRoomSummary.roomId}] present: ${it.present} autoJoin:${it.autoJoin}")
+            if (it.present && it.autoJoin) {
+                // I should try to join as well
+                if (childRoomSummary.roomType == RoomType.SPACE) {
+                } else {
+                    try {
+                        Timber.v("## Space: Joining room child ${childRoomSummary.roomId}")
+                        joinRoomTask.execute(JoinRoomTask.Params(
+                                roomIdOrAlias = childRoomSummary.roomId,
+                                reason = "Auto-join parent space",
+                                viaServers = it.viaServers
+                        ))
+                    } catch (failure: Throwable) {
+                        // todo keep track for partial success
+                        Timber.e("## Space: Failed to join room child ${childRoomSummary.roomId}")
+                    }
+                }
+            }
+        }
+    }
+}
+
+// try {
+//    awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(1L)) { realm ->
+//        realm.where(RoomEntity::class.java)
+//                .equalTo(RoomEntityFields.ROOM_ID, roomId)
+//    }
+// } catch (exception: TimeoutCancellationException) {
+//    throw CreateRoomFailure.CreatedWithTimeout
+// }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
index 63eed2a6c2..a854dd25d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 2bb606e921..6859df1d37 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -212,6 +212,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                 val ageLocalTs = event.unsignedData?.age?.let { syncLocalTimestampMillis - it }
                 val eventEntity = event.toEntity(roomId, SendState.SYNCED, ageLocalTs).copyToRealmOrIgnore(realm, insertType)
                 CurrentStateEventEntity.getOrCreate(realm, roomId, event.stateKey, event.type).apply {
+                    Timber.v("## Space state event: $eventEntity")
                     eventId = event.eventId
                     root = eventEntity
                 }
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 9a1f2e6dfd..e66a123773 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -273,6 +273,7 @@
 
         <activity android:name=".features.devtools.RoomDevToolActivity"/>
         <activity android:name=".features.spaces.SpacePreviewActivity"/>
+        <activity android:name=".features.spaces.SpaceExploreActivity"/>
         <!-- Services -->
 
         <service
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 00216fb034..e79443a4e7 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -52,7 +52,6 @@ import im.vector.app.features.devtools.RoomDevToolStateEventListFragment
 import im.vector.app.features.discovery.DiscoverySettingsFragment
 import im.vector.app.features.discovery.change.SetIdentityServerFragment
 import im.vector.app.features.grouplist.GroupListFragment
-import im.vector.app.features.grouplist.SpaceListFragment
 import im.vector.app.features.home.HomeDetailFragment
 import im.vector.app.features.home.HomeDrawerFragment
 import im.vector.app.features.home.LoadingFragment
@@ -118,6 +117,7 @@ import im.vector.app.features.settings.push.PushRulesFragment
 import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
 import im.vector.app.features.share.IncomingShareFragment
 import im.vector.app.features.signout.soft.SoftLogoutFragment
+import im.vector.app.features.spaces.SpaceListFragment
 import im.vector.app.features.spaces.preview.SpacePreviewFragment
 import im.vector.app.features.terms.ReviewTermsFragment
 import im.vector.app.features.usercode.ShowUserCodeFragment
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index 92be20367a..91811ffb13 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -31,9 +31,9 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.FragmentHomeDrawerBinding
 import im.vector.app.features.grouplist.GroupListFragment
-import im.vector.app.features.grouplist.SpaceListFragment
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.spaces.SpaceListFragment
 import im.vector.app.features.usercode.UserCodeActivity
 import im.vector.app.features.workers.signout.SignOutUiWorker
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
new file mode 100644
index 0000000000..298f51922b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.airbnb.mvrx.MvRx
+import im.vector.app.R
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.app.features.spaces.explore.SpaceDirectoryArgs
+import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
+import im.vector.app.features.spaces.preview.SpacePreviewArgs
+import im.vector.app.features.spaces.preview.SpacePreviewFragment
+
+class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>() {
+
+    override fun getBinding(): ActivitySimpleBinding = ActivitySimpleBinding.inflate(layoutInflater)
+    // lateinit var sharedActionViewModel: SpacePreviewSharedActionViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+//        sharedActionViewModel = viewModelProvider.get(SpacePreviewSharedActionViewModel::class.java)
+//        sharedActionViewModel
+//                .observe()
+//                .subscribe { action ->
+//                    when (action) {
+//                        SpacePreviewSharedAction.DismissAction -> finish()
+//                        SpacePreviewSharedAction.ShowModalLoading -> showWaitingView()
+//                        SpacePreviewSharedAction.HideModalLoading -> hideWaitingView()
+//                        is SpacePreviewSharedAction.ShowErrorMessage -> action.error?.let { showSnackbar(it) }
+//                    }
+//                }.disposeOnDestroy()
+
+        if (isFirstCreation()) {
+            val simpleName = SpaceDirectoryFragment::class.java.simpleName
+            val args = intent?.getParcelableExtra<SpacePreviewArgs>(MvRx.KEY_ARG)
+            if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
+                supportFragmentManager.commitTransaction {
+                    replace(R.id.simpleFragmentContainer,
+                            SpacePreviewFragment::class.java,
+                            Bundle().apply { this.putParcelable(MvRx.KEY_ARG, args) },
+                            simpleName
+                    )
+                }
+            }
+        }
+    }
+
+    companion object {
+        fun newIntent(context: Context, spaceId: String): Intent {
+            return Intent(context, SpaceExploreActivity::class.java).apply {
+                putExtra(MvRx.KEY_ARG, SpaceDirectoryArgs(spaceId))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
similarity index 91%
rename from vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt
rename to vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index 7091c0b86c..e14b920b2c 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -1,21 +1,20 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-package im.vector.app.features.grouplist
+package im.vector.app.features.spaces
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -33,9 +32,6 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGroupListBinding
 import im.vector.app.features.home.HomeActivitySharedAction
 import im.vector.app.features.home.HomeSharedActionViewModel
-import im.vector.app.features.spaces.SpaceListAction
-import im.vector.app.features.spaces.SpaceListViewEvents
-import im.vector.app.features.spaces.SpacesListViewModel
 import org.matrix.android.sdk.api.session.space.SpaceSummary
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
similarity index 95%
rename from vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt
rename to vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index dab2cbceae..29d48b4cd1 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -1,29 +1,28 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
-package im.vector.app.features.grouplist
+package im.vector.app.features.spaces
 
 import com.airbnb.epoxy.EpoxyController
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItemHeader
+import im.vector.app.features.grouplist.homeSpaceSummaryItem
 import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.spaces.SpaceListViewState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
@@ -87,7 +86,6 @@ class SpaceSummaryController @Inject constructor(
         summaries
                 .filter { it.roomSummary.membership == Membership.JOIN }
                 .forEach { groupSummary ->
-
                     val isSelected = groupSummary.spaceId == selected?.spaceId
                     if (groupSummary.spaceId == ALL_COMMUNITIES_GROUP_ID) {
                         homeSpaceSummaryItem {
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
similarity index 98%
rename from vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryItem.kt
rename to vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 1a710b764c..525936deab 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package im.vector.app.features.grouplist
+package im.vector.app.features.spaces
 
 import android.widget.ImageView
 import android.widget.TextView
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index f0d8ae30f7..bdc5c997f6 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -31,14 +31,12 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.grouplist.SelectedSpaceDataSource
-import im.vector.app.features.grouplist.SpaceListFragment
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.rx.rx
@@ -117,9 +115,11 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     // PRIVATE METHODS *****************************************************************************
 
     private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
-
-        if (state.selectedSpace?.roomSummary?.membership == Membership.INVITE) {
-            _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary(state.selectedSpace.roomSummary.roomId))
+        // get uptodate version of the space
+        val summary = session.spaceService().getSpaceSummaries(roomSummaryQueryParams { roomId = QueryStringValue.Equals(action.spaceSummary.spaceId) })
+                .firstOrNull()
+        if (summary?.roomSummary?.membership == Membership.INVITE) {
+            _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary(summary.roomSummary.roomId))
 //            viewModelScope.launch(Dispatchers.IO) {
 //                tryOrNull { session.spaceService().peekSpace(action.spaceSummary.spaceId) }.let {
 //                    Timber.d("PEEK RESULT/ $it")
@@ -139,7 +139,8 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         val roomSummaryQueryParams = roomSummaryQueryParams() {
             memberships = listOf(Membership.JOIN, Membership.INVITE)
             displayName = QueryStringValue.IsNotEmpty
-            excludeType = listOf(RoomType.MESSAGING, null)
+            excludeType = listOf(/**RoomType.MESSAGING,$*/
+                    null)
         }
         Observable.combineLatest<SpaceSummary, List<SpaceSummary>, List<SpaceSummary>>(
                 session
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
new file mode 100644
index 0000000000..2c46607987
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.explore
+
+import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Incomplete
+import com.airbnb.mvrx.Success
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+
+class SpaceDirectoryController : TypedEpoxyController<SpaceDirectoryState>() {
+
+    override fun buildModels(data: SpaceDirectoryState?) {
+        when (data?.summary) {
+            is Success -> {
+//                val directories = roomDirectoryListCreator.computeDirectories(asyncThirdPartyProtocol())
+//
+//                directories.forEach {
+//                    buildDirectory(it)
+//                }
+            }
+            is Incomplete -> {
+                loadingItem {
+                    id("loading")
+                }
+            }
+            is Fail -> {
+                errorWithRetryItem {
+                    id("error")
+//                    text(errorFormatter.toHumanReadable(asyncThirdPartyProtocol.error))
+//                    listener { callback?.retry() }
+                }
+            }
+            else          -> {
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
new file mode 100644
index 0000000000..6b67e20405
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.explore
+
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class SpaceDirectoryArgs(
+        val spaceId: String
+) : Parcelable
+
+class SpaceDirectoryFragment : VectorBaseFragment<FragmentRoomDirectoryPickerBinding>() {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
+            FragmentRoomDirectoryPickerBinding.inflate(layoutInflater, container, false)
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
new file mode 100644
index 0000000000..86baae0875
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.explore
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.ViewModelContext
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.rx.rx
+import org.matrix.android.sdk.rx.unwrap
+
+data class SpaceDirectoryState(
+        // The current filter
+        val spaceId: String,
+        val currentFilter: String = "",
+        val summary: Async<SpaceSummary> = Uninitialized,
+        // True if more result are available server side
+        val hasMore: Boolean = false,
+        // Set of joined roomId / spaces,
+        val joinedRoomsIds: Set<String> = emptySet()
+) : MvRxState {
+    constructor(args: SpaceDirectoryArgs) : this(spaceId = args.spaceId)
+}
+
+sealed class SpaceDirectoryViewAction : VectorViewModelAction
+
+sealed class SpaceDirectoryViewEvents : VectorViewEvents
+
+class SpaceDirectoryViewModel @AssistedInject constructor(
+        @Assisted initialState: SpaceDirectoryState,
+        private val session: Session
+) : VectorViewModel<SpaceDirectoryState, VectorViewModelAction, SpaceDirectoryViewEvents>(initialState) {
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(initialState: SpaceDirectoryState): SpaceDirectoryViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SpaceDirectoryViewModel, SpaceDirectoryState> {
+        override fun create(viewModelContext: ViewModelContext, state: SpaceDirectoryState): SpaceDirectoryViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    init {
+        val queryParams = roomSummaryQueryParams {
+            roomId = QueryStringValue.Equals(initialState.spaceId)
+        }
+
+        viewModelScope.launch(Dispatchers.IO) {
+            session
+                    .rx()
+                    .liveSpaceSummaries(queryParams)
+                    .observeOn(Schedulers.computation())
+                    .map { sum -> Optional.from(sum.firstOrNull()) }
+                    .unwrap()
+                    .execute { async ->
+                        copy(summary = async)
+                    }
+        }
+    }
+
+    override fun handle(action: VectorViewModelAction) {
+        TODO("Not yet implemented")
+    }
+}

From 7521a0d3ae48b7faa861694ecd5d9dc62ab5c8b7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 12 Jan 2021 15:37:39 +0100
Subject: [PATCH 098/350] Fix / post rebase issues

---
 .../android/sdk/internal/session/space/JoinSpaceTask.kt      | 4 +---
 .../java/im/vector/app/features/spaces/SpaceSummaryItem.kt   | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index 66a695fc18..82dfb55dcc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.session.space
 
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.TimeoutCancellationException
-import org.greenrobot.eventbus.EventBus
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
@@ -46,8 +45,7 @@ internal class DefaultJoinSpaceTask @Inject constructor(
         private val joinRoomTask: JoinRoomTask,
         @SessionDatabase
         private val realmConfiguration: RealmConfiguration,
-        private val spaceSummaryDataSource: SpaceSummaryDataSource,
-        private val eventBus: EventBus
+        private val spaceSummaryDataSource: SpaceSummaryDataSource
 ) : JoinSpaceTask {
 
     override suspend fun execute(params: JoinSpaceTask.Params) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 525936deab..bf3a47461f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -1,18 +1,17 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package im.vector.app.features.spaces

From b7a89f40552d75f4daaf690cd871b31ecc15b710 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 12 Jan 2021 15:37:48 +0100
Subject: [PATCH 099/350] Fix / Syncs breaking on dendrite

---
 .../matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt | 2 +-
 .../sdk/internal/session/sync/model/RoomSyncAccountData.kt      | 2 +-
 .../sdk/internal/session/sync/model/RoomSyncEphemeral.kt        | 2 +-
 .../android/sdk/internal/session/sync/model/RoomSyncState.kt    | 2 +-
 .../android/sdk/internal/session/sync/model/RoomSyncTimeline.kt | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 6859df1d37..95fbb2f1b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -456,7 +456,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
     }
 
     private fun handleRoomAccountDataEvents(realm: Realm, roomId: String, accountData: RoomSyncAccountData) {
-        for (event in accountData.events) {
+        accountData.events?.forEach { event ->
             val eventType = event.getClearType()
             if (eventType == EventType.TAG) {
                 val content = event.getClearContent().toModel<RoomTagContent>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
index 1c35d812ee..9e0ccde16b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
@@ -25,5 +25,5 @@ internal data class RoomSyncAccountData(
         /**
          * List of account data events (array of Event).
          */
-        @Json(name = "events") val events: List<Event> = emptyList()
+        @Json(name = "events") val events: List<Event>? = emptyList()
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
index d59dddb3ea..a2e044d947 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
@@ -26,5 +26,5 @@ internal data class RoomSyncEphemeral(
         /**
          * List of ephemeral events (array of Event).
          */
-        @Json(name = "events") val events: List<Event> = emptyList()
+        @Json(name = "events") val events: List<Event>? = emptyList()
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
index 5355b7eef1..c825cbf31c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
@@ -27,5 +27,5 @@ internal data class RoomSyncState(
         /**
          * List of state events (array of Event). The resulting state corresponds to the *start* of the timeline.
          */
-        @Json(name = "events") val events: List<Event> = emptyList()
+        @Json(name = "events") val events: List<Event>? = emptyList()
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
index ddf430099a..ce51958f73 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
@@ -27,7 +27,7 @@ internal data class RoomSyncTimeline(
         /**
          * List of events (array of Event).
          */
-        @Json(name = "events") val events: List<Event> = emptyList(),
+        @Json(name = "events") val events: List<Event>? = emptyList(),
 
         /**
          * Boolean which tells whether there are more events on the server

From 57f17620b554a01ba5a347728a49106d39443b99 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 13 Jan 2021 14:23:02 +0100
Subject: [PATCH 100/350] Fix Dendrite sync response support

---
 .../session/room/timeline/TokenChunkEventPersistor.kt       | 6 +++---
 .../sdk/internal/session/room/uploads/GetUploadsTask.kt     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index c38dcd00a7..903aef16df 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -124,7 +124,7 @@ internal class TokenChunkEventPersistor @Inject constructor(@SessionDatabase pri
                            direction: PaginationDirection): Result {
         monarchy
                 .awaitTransaction { realm ->
-                    Timber.v("Start persisting ${receivedChunk.events.size} events in $roomId towards $direction")
+                    Timber.v("Start persisting ${receivedChunk.events?.size} events in $roomId towards $direction")
 
                     val nextToken: String?
                     val prevToken: String?
@@ -149,7 +149,7 @@ internal class TokenChunkEventPersistor @Inject constructor(@SessionDatabase pri
                     }
                             ?: ChunkEntity.create(realm, prevToken, nextToken)
 
-                    if (receivedChunk.events.isEmpty() && !receivedChunk.hasMore()) {
+                    if (receivedChunk.events.isNullOrEmpty() && !receivedChunk.hasMore()) {
                         handleReachEnd(realm, roomId, direction, currentChunk)
                     } else {
                         handlePagination(realm, roomId, direction, receivedChunk, currentChunk)
@@ -189,7 +189,7 @@ internal class TokenChunkEventPersistor @Inject constructor(@SessionDatabase pri
             receivedChunk: TokenChunkEvent,
             currentChunk: ChunkEntity
     ) {
-        Timber.v("Add ${receivedChunk.events.size} events in chunk(${currentChunk.nextToken} | ${currentChunk.prevToken}")
+        Timber.v("Add ${receivedChunk.events?.size} events in chunk(${currentChunk.nextToken} | ${currentChunk.prevToken}")
         val roomMemberContentsByUser = HashMap<String, RoomMemberContent?>()
         val eventList = receivedChunk.events
         val stateEvents = receivedChunk.stateEvents
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
index 028c3e9193..74b8372b77 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
@@ -94,7 +94,7 @@ internal class DefaultGetUploadsTask @Inject constructor(
                     nextToken = chunk.end ?: "",
                     hasMore = chunk.hasMore()
             )
-            events = chunk.events
+            events = chunk.events ?: emptyList()
         }
 
         var uploadEvents = listOf<UploadEvent>()

From 186024b2717b0c388d88e55eb3fc63b0f76999d9 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 15 Jan 2021 09:57:29 +0100
Subject: [PATCH 101/350] MSC 2946 WIP

---
 .../sdk/api/session/space/SpaceService.kt     |   9 ++
 .../sdk/internal/session/SessionComponent.kt  |   4 +-
 .../sdk/internal/session/room/RoomModule.kt   |   4 -
 .../session/space/DefaultSpaceService.kt      |  62 ++++++-
 .../internal/session/space/JoinSpaceTask.kt   |   2 +-
 .../session/space/ResolveSpaceInfoTask.kt     |  45 ++++++
 .../sdk/internal/session/space/SpaceApi.kt    |  42 +++++
 .../space/SpaceChildSummaryResponse.kt        |  96 +++++++++++
 .../sdk/internal/session/space/SpaceModule.kt |  48 ++++++
 .../session/space/SpaceSummaryParams.kt       |  30 ++++
 .../internal/session/space/SpacesResponse.kt  |  31 ++++
 .../session/space/peeking/PeekSpaceTask.kt    |   2 +-
 .../spaces/preview/SpacePreviewController.kt  | 153 ++++++++++--------
 .../spaces/preview/SpacePreviewFragment.kt    |  35 ++--
 .../spaces/preview/SpacePreviewState.kt       |  16 +-
 .../spaces/preview/SpacePreviewViewModel.kt   | 138 +++++++++++++---
 16 files changed, 600 insertions(+), 117 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpacesResponse.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index 4043a3f7b4..304fb4d98b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -18,6 +18,8 @@ package org.matrix.android.sdk.api.session.space
 
 import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
 
 typealias SpaceSummaryQueryParams = RoomSummaryQueryParams
@@ -43,6 +45,11 @@ interface SpaceService {
      */
     suspend fun peekSpace(spaceId: String) : SpacePeekResult
 
+    /**
+     * Get's information of a space by querying the server
+     */
+    suspend fun querySpaceChildren(spaceId: String) : Pair<RoomSummary, List<SpaceChildInfo>>
+
     /**
      * Get a live list of space summaries. This list is refreshed as soon as the data changes.
      * @return the [LiveData] of List[SpaceSummary]
@@ -69,4 +76,6 @@ interface SpaceService {
                           reason: String? = null,
                           viaServers: List<String> = emptyList(),
                           autoJoinChild: List<ChildAutoJoinInfo>) : JoinSpaceResult
+
+    suspend fun rejectInvite(spaceId: String, reason: String?)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
index 7e1e3d0f70..541c877b1d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -52,6 +52,7 @@ import org.matrix.android.sdk.internal.session.room.send.RedactEventWorker
 import org.matrix.android.sdk.internal.session.room.send.SendEventWorker
 import org.matrix.android.sdk.internal.session.search.SearchModule
 import org.matrix.android.sdk.internal.session.signout.SignOutModule
+import org.matrix.android.sdk.internal.session.space.SpaceModule
 import org.matrix.android.sdk.internal.session.sync.SyncModule
 import org.matrix.android.sdk.internal.session.sync.SyncTask
 import org.matrix.android.sdk.internal.session.sync.SyncTokenStore
@@ -91,7 +92,8 @@ import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
             FederationModule::class,
             CallModule::class,
             SearchModule::class,
-            ThirdPartyModule::class
+            ThirdPartyModule::class,
+            SpaceModule::class
         ]
 )
 @SessionScope
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index 8cc7f41d5b..c19c59e6db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -90,11 +90,7 @@ import org.matrix.android.sdk.internal.session.room.typing.DefaultSendTypingTask
 import org.matrix.android.sdk.internal.session.room.typing.SendTypingTask
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultGetUploadsTask
 import org.matrix.android.sdk.internal.session.room.uploads.GetUploadsTask
-import org.matrix.android.sdk.internal.session.space.DefaultJoinSpaceTask
 import org.matrix.android.sdk.internal.session.space.DefaultSpaceService
-import org.matrix.android.sdk.internal.session.space.JoinSpaceTask
-import org.matrix.android.sdk.internal.session.space.peeking.DefaultPeekSpaceTask
-import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
 import retrofit2.Retrofit
 
 @Module
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 973904cbd5..42f4ed4742 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -18,12 +18,17 @@ package org.matrix.android.sdk.internal.session.space
 
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.space.CreateSpaceParams
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
+import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.room.RoomGetter
 import org.matrix.android.sdk.internal.session.room.alias.DeleteRoomAliasTask
@@ -31,6 +36,7 @@ import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
 import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
 import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
 import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
+import org.matrix.android.sdk.internal.session.room.membership.leaving.LeaveRoomTask
 import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
 import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
 import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
@@ -50,6 +56,8 @@ internal class DefaultSpaceService @Inject constructor(
         private val roomGetter: RoomGetter,
         private val spaceSummaryDataSource: SpaceSummaryDataSource,
         private val peekSpaceTask: PeekSpaceTask,
+        private val resolveSpaceInfoTask: ResolveSpaceInfoTask,
+        private val leaveRoomTask: LeaveRoomTask,
         private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
         private val taskExecutor: TaskExecutor
 ) : SpaceService {
@@ -76,7 +84,55 @@ internal class DefaultSpaceService @Inject constructor(
         return peekSpaceTask.execute(PeekSpaceTask.Params(spaceId))
     }
 
-    override suspend fun joinSpace(spaceIdOrAlias: String, reason: String?, viaServers: List<String>, autoJoinChild: List<SpaceService.ChildAutoJoinInfo>): SpaceService.JoinSpaceResult {
+    override suspend fun querySpaceChildren(spaceId: String): Pair<RoomSummary, List<SpaceChildInfo>> {
+        return resolveSpaceInfoTask.execute(ResolveSpaceInfoTask.Params.withId(spaceId)).let { response ->
+            val spaceDesc = response.rooms?.firstOrNull { it.roomId == spaceId }
+            Pair(
+                    first = RoomSummary(
+                            roomId = spaceDesc?.roomId ?: spaceId,
+                            roomType = spaceDesc?.roomType,
+                            name = spaceDesc?.name ?: "",
+                            displayName = spaceDesc?.name ?: "",
+                            topic = spaceDesc?.topic ?: "",
+                            joinedMembersCount = spaceDesc?.numJoinedMembers,
+                            avatarUrl = spaceDesc?.avatarUrl ?: "",
+                            encryptionEventTs = null,
+                            typingUsers = emptyList(),
+                            isEncrypted = false
+                    ),
+                    second = response.rooms
+                            ?.filter { it.roomId != spaceId }
+                            ?.map { childSummary ->
+                                val childStateEv = response.events
+                                        ?.firstOrNull { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
+                                        ?.content.toModel<SpaceChildContent>()
+                                SpaceChildInfo(
+                                        roomSummary = RoomSummary(
+                                                roomId = childSummary.roomId,
+                                                roomType = childSummary.roomType,
+                                                name = childSummary.name ?: "",
+                                                displayName = childSummary.name ?: "",
+                                                topic = childSummary.topic ?: "",
+                                                joinedMembersCount = childSummary.numJoinedMembers,
+                                                avatarUrl = childSummary.avatarUrl ?: "",
+                                                encryptionEventTs = null,
+                                                typingUsers = emptyList(),
+                                                isEncrypted = false
+                                        ),
+                                        order = childStateEv?.order,
+                                        present = childStateEv?.present ?: false,
+                                        autoJoin = childStateEv?.default ?: false,
+                                        viaServers = childStateEv?.via ?: emptyList()
+                                )
+                            } ?: emptyList()
+            )
+        }
+    }
+
+    override suspend fun joinSpace(spaceIdOrAlias: String,
+                                   reason: String?,
+                                   viaServers: List<String>,
+                                   autoJoinChild: List<SpaceService.ChildAutoJoinInfo>): SpaceService.JoinSpaceResult {
         try {
             joinSpaceTask.execute(JoinSpaceTask.Params(spaceIdOrAlias, reason, viaServers))
             // TODO partial success
@@ -100,4 +156,8 @@ internal class DefaultSpaceService @Inject constructor(
             return SpaceService.JoinSpaceResult.Fail(throwable)
         }
     }
+
+    override suspend fun rejectInvite(spaceId: String, reason: String?) {
+        leaveRoomTask.execute(LeaveRoomTask.Params(spaceId, reason))
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index 82dfb55dcc..1878d2c0f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
new file mode 100644
index 0000000000..1eacdce8df
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface ResolveSpaceInfoTask : Task<ResolveSpaceInfoTask.Params, SpacesResponse> {
+    data class Params(
+            val spaceId: String,
+            val maxRoomPerSpace: Int,
+            val limit: Int,
+            val batchToken: String?
+    ) {
+        companion object {
+            fun withId(spaceId: String) = Params(spaceId, 10, 20, null)
+        }
+    }
+}
+
+internal class DefaultResolveSpaceInfoTask @Inject constructor(
+        private val spaceApi: SpaceApi
+) : ResolveSpaceInfoTask {
+    override suspend fun execute(params: ResolveSpaceInfoTask.Params): SpacesResponse {
+        val body = SpaceSummaryParams(maxRoomPerSpace = params.maxRoomPerSpace, limit = params.limit, batch = params.batchToken ?: "")
+        return executeRequest<SpacesResponse>(null) {
+            apiCall = spaceApi.getSpaces(params.spaceId, body)
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
new file mode 100644
index 0000000000..5919a90b99
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.POST
+import retrofit2.http.Path
+
+internal interface SpaceApi {
+
+    /**
+     *
+     * POST /_matrix/client/r0/rooms/{roomID}/spaces
+     *  {
+     *  "max_rooms_per_space": 5,      // The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1.
+     *  "limit": 100,                  // The maximum number of rooms/subspaces to return, server can override this, default: 100.
+     *  "batch": "opaque_string"       // A token to use if this is a subsequent HTTP hit, default: "".
+     *  }
+     *
+     *  MSC 2946 https://github.com/matrix-org/matrix-doc/blob/kegan/spaces-summary/proposals/2946-spaces-summary.md
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "rooms/{roomId}/spaces")
+    fun getSpaces(@Path("roomId") spaceId: String,
+                  @Body params: SpaceSummaryParams
+    ): Call<SpacesResponse>
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt
new file mode 100644
index 0000000000..5021ff638f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceChildSummaryResponse.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class SpaceChildSummaryResponse(
+        /**
+         * The total number of state events which point to or from this room (inbound/outbound edges).
+         * This includes all m.space.child events in the room, in addition to m.room.parent events which point to this room as a parent.
+         */
+        @Json(name = "num_refs") val numRefs: Int? = null,
+
+        /**
+         * The room type, which is m.space for subspaces.
+         * It can be omitted if there is no room type in which case it should be interpreted as a normal room.
+         */
+        @Json(name = "room_type") val roomType: String? = null,
+
+        /**
+         * Aliases of the room. May be empty.
+         */
+        @Json(name = "aliases")
+        val aliases: List<String>? = null,
+
+        /**
+         * The canonical alias of the room, if any.
+         */
+        @Json(name = "canonical_alias")
+        val canonicalAlias: String? = null,
+
+        /**
+         * The name of the room, if any.
+         */
+        @Json(name = "name")
+        val name: String? = null,
+
+        /**
+         * Required. The number of members joined to the room.
+         */
+        @Json(name = "num_joined_members")
+        val numJoinedMembers: Int = 0,
+
+        /**
+         * Required. The ID of the room.
+         */
+        @Json(name = "room_id")
+        val roomId: String,
+
+        /**
+         * The topic of the room, if any.
+         */
+        @Json(name = "topic")
+        val topic: String? = null,
+
+        /**
+         * Required. Whether the room may be viewed by guest users without joining.
+         */
+        @Json(name = "world_readable")
+        val worldReadable: Boolean = false,
+
+        /**
+         * Required. Whether guest users may join the room and participate in it. If they can,
+         * they will be subject to ordinary power level rules like any other user.
+         */
+        @Json(name = "guest_can_join")
+        val guestCanJoin: Boolean = false,
+
+        /**
+         * The URL for the room's avatar, if one is set.
+         */
+        @Json(name = "avatar_url")
+        val avatarUrl: String? = null,
+
+        /**
+         * Undocumented item
+         */
+        @Json(name = "m.federate")
+        val isFederated: Boolean = false
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
new file mode 100644
index 0000000000..ba15f2e981
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.space.peeking.DefaultPeekSpaceTask
+import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
+import retrofit2.Retrofit
+
+@Module
+internal abstract class SpaceModule {
+
+    @Module
+    companion object {
+        @Provides
+        @JvmStatic
+        @SessionScope
+        fun providesSpacesAPI(retrofit: Retrofit): SpaceApi {
+            return retrofit.create(SpaceApi::class.java)
+        }
+    }
+
+    @Binds
+    abstract fun bindResolveSpaceTask(task: DefaultResolveSpaceInfoTask): ResolveSpaceInfoTask
+
+    @Binds
+    abstract fun bindPeekSpaceTask(task: DefaultPeekSpaceTask): PeekSpaceTask
+
+    @Binds
+    abstract fun bindJoinSpaceTask(task: DefaultJoinSpaceTask): JoinSpaceTask
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
new file mode 100644
index 0000000000..a3c6b3cc84
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class SpaceSummaryParams(
+        /**  The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1*/
+        @Json(name = "max_rooms_per_space") val maxRoomPerSpace: Int = 100,
+        /** The maximum number of rooms/subspaces to return, server can override this, default: 100 */
+        @Json(name = "limit") val limit: Int = 100,
+        /** A token to use if this is a subsequent HTTP hit, default: "".*/
+        @Json(name = "batch") val batch: String = ""
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpacesResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpacesResponse.kt
new file mode 100644
index 0000000000..20d63c8814
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpacesResponse.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.events.model.Event
+
+@JsonClass(generateAdapter = true)
+internal data class SpacesResponse(
+        /** Its presence indicates that there are more results to return. */
+        @Json(name = "next_batch") val nextBatch: String? = null,
+        /** Rooms information like name/avatar/type ... */
+        @Json(name = "rooms") val rooms: List<SpaceChildSummaryResponse>? = null,
+        /** These are the edges of the graph. The objects in the array are complete (or stripped?) m.room.parent or m.space.child events. */
+        @Json(name = "events") val events: List<Event>? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
index a2be75a232..1214befebd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
index 651411b2fe..eee8d1241f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
@@ -17,17 +17,14 @@
 package im.vector.app.features.spaces.preview
 
 import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
 import im.vector.app.R
+import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItemHeader
 import im.vector.app.core.utils.TextUtils
 import im.vector.app.features.home.AvatarRenderer
-import org.matrix.android.sdk.api.session.room.peeking.PeekResult
-import org.matrix.android.sdk.internal.session.space.peeking.ISpaceChild
-import org.matrix.android.sdk.internal.session.space.peeking.SpaceChildPeekResult
-import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
-import org.matrix.android.sdk.internal.session.space.peeking.SpaceSubChildPeekResult
 import javax.inject.Inject
 
 class SpacePreviewController @Inject constructor(
@@ -40,78 +37,100 @@ class SpacePreviewController @Inject constructor(
     var interactionListener: InteractionListener? = null
 
     override fun buildModels(data: SpacePreviewState?) {
-        val result: SpacePeekResult = data?.peekResult?.invoke() ?: return
+        val result = data?.childInfoList?.invoke() ?: return
 
-        when (result) {
-            is SpacePeekResult.SpacePeekError -> {
-                genericFooterItem {
-                    id("failed")
-                    // TODO
-                    text("Failed to resolve")
-                }
+        val memberCount = data.spaceInfo.invoke()?.memberCount ?: 0
+
+        spaceTopSummaryItem {
+            id("info")
+            formattedMemberCount(stringProvider.getQuantityString(R.plurals.room_title_members, memberCount, memberCount))
+            topic(data.spaceInfo.invoke()?.topic ?: data.topic ?: "")
+        }
+
+        if (result.isNotEmpty()) {
+            genericItemHeader {
+                id("header_rooms")
+                text(stringProvider.getString(R.string.rooms))
             }
-            is SpacePeekResult.Success -> {
-                // add summary info
-                val memberCount = result.summary.roomPeekResult.numJoinedMembers ?: 0
 
-                spaceTopSummaryItem {
-                    id("info")
-                    formattedMemberCount(stringProvider.getQuantityString(R.plurals.room_title_members, memberCount, memberCount))
-                    topic(result.summary.roomPeekResult.topic ?: "")
-                }
-
-                genericItemHeader {
-                    id("header_rooms")
-                    text(stringProvider.getString(R.string.rooms))
-                }
-
-                buildChildren(result.summary.children, 0)
-            }
+            buildChildren(result, 0)
         }
     }
 
-    private fun buildChildren(children: List<ISpaceChild>, depth: Int) {
+    private fun buildChildren(children: List<ChildInfo>, depth: Int) {
         children.forEach { child ->
-            when (child) {
-                is SpaceSubChildPeekResult -> {
-                    when (val roomPeekResult = child.roomPeekResult) {
-                        is PeekResult.Success -> {
-                            subSpaceItem {
-                                id(roomPeekResult.roomId)
-                                roomId(roomPeekResult.roomId)
-                                title(roomPeekResult.name)
-                                depth(depth)
-                                avatarUrl(roomPeekResult.avatarUrl)
-                                avatarRenderer(avatarRenderer)
-                            }
-                            buildChildren(child.children, depth + 1)
-                        }
-                        else -> {
-                            // ?? TODO
-                        }
+
+            if (child.isSubSpace == true) {
+                subSpaceItem {
+                    id(child.roomId)
+                    roomId(child.roomId)
+                    title(child.name)
+                    depth(depth)
+                    avatarUrl(child.avatarUrl)
+                    avatarRenderer(avatarRenderer)
+                }
+                when (child.children) {
+                    is Loading -> {
+                        loadingItem { id("loading_children_${child.roomId}") }
+                    }
+                    is Success -> {
+                        buildChildren(child.children.invoke(), depth + 1)
+                    }
+                    else       -> {
                     }
                 }
-                is SpaceChildPeekResult    -> {
-                    // We have to check if the peek result was success
-                    when (val roomPeekResult = child.roomPeekResult) {
-                        is PeekResult.Success -> {
-                            roomChildItem {
-                                id(child.id)
-                                depth(depth)
-                                roomId(roomPeekResult.roomId)
-                                title(roomPeekResult.name ?: "")
-                                topic(roomPeekResult.topic ?: "")
-                                avatarUrl(roomPeekResult.avatarUrl)
-                                memberCount(TextUtils.formatCountToShortDecimal(roomPeekResult.numJoinedMembers ?: 0))
-                                avatarRenderer(avatarRenderer)
-                            }
-                        }
-                        else                  -> {
-                            // What to do here?
-                        }
-                    }
+            } else {
+                roomChildItem {
+                    id(child.roomId)
+                    depth(depth)
+                    roomId(child.roomId)
+                    title(child.name ?: "")
+                    topic(child.topic ?: "")
+                    avatarUrl(child.avatarUrl)
+                    memberCount(TextUtils.formatCountToShortDecimal(child.memberCount ?: 0))
+                    avatarRenderer(avatarRenderer)
                 }
             }
+//            when (child) {
+//                is SpaceSubChildPeekResult -> {
+//                    when (val roomPeekResult = child.roomPeekResult) {
+//                        is PeekResult.Success -> {
+//                            subSpaceItem {
+//                                id(roomPeekResult.roomId)
+//                                roomId(roomPeekResult.roomId)
+//                                title(roomPeekResult.name)
+//                                depth(depth)
+//                                avatarUrl(roomPeekResult.avatarUrl)
+//                                avatarRenderer(avatarRenderer)
+//                            }
+//                            buildChildren(child.children, depth + 1)
+//                        }
+//                        else                  -> {
+//                            // ?? TODO
+//                        }
+//                    }
+//                }
+//                is SpaceChildPeekResult -> {
+//                    // We have to check if the peek result was success
+//                    when (val roomPeekResult = child.roomPeekResult) {
+//                        is PeekResult.Success -> {
+//                            roomChildItem {
+//                                id(child.id)
+//                                depth(depth)
+//                                roomId(roomPeekResult.roomId)
+//                                title(roomPeekResult.name ?: "")
+//                                topic(roomPeekResult.topic ?: "")
+//                                avatarUrl(roomPeekResult.avatarUrl)
+//                                memberCount(TextUtils.formatCountToShortDecimal(roomPeekResult.numJoinedMembers ?: 0))
+//                                avatarRenderer(avatarRenderer)
+//                            }
+//                        }
+//                        else                  -> {
+//                            // What to do here?
+//                        }
+//                    }
+//                }
+//            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
index fcf961f23a..563b4f39e0 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
@@ -40,7 +40,6 @@ import im.vector.app.features.spaces.SpacePreviewSharedActionViewModel
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.util.MatrixItem
-import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -99,7 +98,7 @@ class SpacePreviewFragment @Inject constructor(
     }
 
     override fun invalidate() = withState(viewModel) {
-        when (it.peekResult) {
+        when (it.spaceInfo) {
             is Uninitialized,
             is Loading -> {
                 views.spacePreviewPeekingProgress.isVisible = true
@@ -141,21 +140,23 @@ class SpacePreviewFragment @Inject constructor(
     }
 
     private fun updateToolbar(spacePreviewState: SpacePreviewState) {
-        when (val preview = spacePreviewState.peekResult.invoke()) {
-            is SpacePeekResult.Success -> {
-                val roomPeekResult = preview.summary.roomPeekResult
-                val mxItem = MatrixItem.RoomItem(roomPeekResult.roomId, roomPeekResult.name, roomPeekResult.avatarUrl)
-                avatarRenderer.renderSpace(mxItem, views.spacePreviewToolbarAvatar)
-                views.roomPreviewNoPreviewToolbarTitle.text = roomPeekResult.name
-            }
-            is SpacePeekResult.SpacePeekError,
-            null -> {
-                // what to do here?
-                val mxItem = MatrixItem.RoomItem(spacePreviewState.idOrAlias, spacePreviewState.name, spacePreviewState.avatarUrl)
-                avatarRenderer.renderSpace(mxItem, views.spacePreviewToolbarAvatar)
-                views.roomPreviewNoPreviewToolbarTitle.text = spacePreviewState.name
-            }
-        }
+//        when (val preview = spacePreviewState.peekResult.invoke()) {
+//            is SpacePeekResult.Success -> {
+//                val roomPeekResult = preview.summary.roomPeekResult
+        val spaceName = spacePreviewState.spaceInfo.invoke()?.name ?: spacePreviewState.name ?: ""
+        val spaceAvatarUrl = spacePreviewState.spaceInfo.invoke()?.avatarUrl ?: spacePreviewState.avatarUrl
+        val mxItem = MatrixItem.RoomItem(spacePreviewState.idOrAlias, spaceName, spaceAvatarUrl)
+        avatarRenderer.renderSpace(mxItem, views.spacePreviewToolbarAvatar)
+        views.roomPreviewNoPreviewToolbarTitle.text = spaceName
+//            }
+//            is SpacePeekResult.SpacePeekError,
+//            null -> {
+//                // what to do here?
+//                val mxItem = MatrixItem.RoomItem(spacePreviewState.idOrAlias, spacePreviewState.name, spacePreviewState.avatarUrl)
+//                avatarRenderer.renderSpace(mxItem, views.spacePreviewToolbarAvatar)
+//                views.roomPreviewNoPreviewToolbarTitle.text = spacePreviewState.name
+//            }
+//        }
     }
 
     override fun onStart() {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
index 41d94e8c9d..cf64672046 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
@@ -19,13 +19,25 @@ package im.vector.app.features.spaces.preview
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
 
 data class SpacePreviewState(
         val idOrAlias: String,
         val name: String?  = null,
+        val topic: String?  = null,
         val avatarUrl: String? = null,
-        val peekResult: Async<SpacePeekResult> = Uninitialized
+        val spaceInfo: Async<ChildInfo> = Uninitialized,
+        val childInfoList: Async<List<ChildInfo>> = Uninitialized
 ) : MvRxState {
     constructor(args: SpacePreviewArgs) : this(idOrAlias = args.idOrAlias)
 }
+
+data class ChildInfo(
+        val roomId: String,
+        val avatarUrl: String?,
+        val name: String?,
+        val topic: String?,
+        val memberCount: Int?,
+        val isSubSpace: Boolean?,
+        val viaServers: List<String>?,
+        val children: Async<List<ChildInfo>>
+)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index 6986db18aa..d11fe1502b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -23,6 +23,7 @@ import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
@@ -30,9 +31,12 @@ import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
+import org.matrix.android.sdk.internal.session.space.peeking.SpaceSubChildPeekResult
+import timber.log.Timber
 
 class SpacePreviewViewModel @AssistedInject constructor(
         @Assisted private val initialState: SpacePreviewState,
@@ -73,31 +77,29 @@ class SpacePreviewViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleDismissInvite() {
-        TODO("Not yet implemented")
+    private fun handleDismissInvite() = withState { state ->
+        // Here we need to join the space himself as well as the default rooms in that space
+        // TODO modal loading
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                session.spaceService().rejectInvite(initialState.idOrAlias, null)
+            } catch (failure: Throwable) {
+                Timber.e(failure, "## Space: Failed to reject invite")
+            }
+        }
     }
 
     private fun handleAcceptInvite() = withState { state ->
         // Here we need to join the space himself as well as the default rooms in that space
-        val spaceInfo = state.peekResult.invoke() as? SpacePeekResult.Success
-
         // TODO if we have no summary, we cannot find auto join rooms...
         // So maybe we should trigger a retry on summary after the join?
-        val spaceVia = (spaceInfo?.summary?.roomPeekResult as? PeekResult.Success)?.viaServers ?: emptyList()
-        val autoJoinChildren = spaceInfo?.summary?.children
-                ?.filter { it.default == true }
-                ?.map {
-                    SpaceService.ChildAutoJoinInfo(
-                            it.id,
-                            // via servers
-                            (it.roomPeekResult as? PeekResult.Success)?.viaServers ?: emptyList()
-                    )
-                } ?: emptyList()
+        val spaceInfo = state.spaceInfo.invoke()
+        val spaceVia = spaceInfo?.viaServers ?: emptyList()
 
         // trigger modal loading
         _viewEvents.post(SpacePreviewViewEvents.StartJoining)
         viewModelScope.launch(Dispatchers.IO) {
-            val joinResult = session.spaceService().joinSpace(spaceInfo?.summary?.idOrAlias ?: initialState.idOrAlias, null, spaceVia, autoJoinChildren)
+            val joinResult = session.spaceService().joinSpace(initialState.idOrAlias, null, spaceVia, emptyList())
             when (joinResult) {
                 SpaceService.JoinSpaceResult.Success,
                 is SpaceService.JoinSpaceResult.PartialSuccess -> {
@@ -116,20 +118,110 @@ class SpacePreviewViewModel @AssistedInject constructor(
             initialized = true
             // peek for the room
             setState {
-                copy(peekResult = Loading())
+                copy(
+                        spaceInfo = Loading(),
+                        childInfoList = Loading()
+                )
             }
             viewModelScope.launch(Dispatchers.IO) {
                 try {
-                    val result = session.spaceService().peekSpace(initialState.idOrAlias)
-                    setState {
-                        copy(peekResult = Success(result))
-                    }
+                    resolveSpaceInfo()
                 } catch (failure: Throwable) {
-                    setState {
-                        copy(peekResult = Fail(failure))
-                    }
+                    Timber.e(failure, "## Space: Failed to resolve space info. Fallback to picking")
+                    fallBackResolve()
                 }
             }
         }
     }
+
+    private suspend fun resolveSpaceInfo() {
+        val resolveResult = session.spaceService().querySpaceChildren(initialState.idOrAlias)
+        setState {
+            copy(
+                    spaceInfo = Success(
+                            resolveResult.first.let {
+                                ChildInfo(
+                                        roomId = it.roomId,
+                                        avatarUrl = it.avatarUrl,
+                                        name = it.name,
+                                        topic = it.topic,
+                                        memberCount = it.joinedMembersCount,
+                                        isSubSpace = it.roomType == RoomType.SPACE,
+                                        children = Uninitialized,
+                                        viaServers = null
+                                )
+                            }
+                    ),
+                    childInfoList = Success(
+                            resolveResult.second.map {
+                                ChildInfo(
+                                        roomId = it.roomSummary?.roomId ?: "",
+                                        avatarUrl = it.roomSummary?.avatarUrl,
+                                        name = it.roomSummary?.name,
+                                        topic = it.roomSummary?.topic,
+                                        memberCount = it.roomSummary?.joinedMembersCount,
+                                        isSubSpace = it.roomSummary?.roomType == RoomType.SPACE,
+                                        children = Uninitialized,
+                                        viaServers = null
+                                )
+                            }
+                    )
+            )
+        }
+    }
+
+    private suspend fun fallBackResolve() {
+        try {
+            val resolveResult: SpacePeekResult = session.spaceService().peekSpace(initialState.idOrAlias)
+            val spaceInfo = (resolveResult as? SpacePeekResult.Success)?.summary?.roomPeekResult
+            setState {
+                copy(
+                        spaceInfo = Success(
+                                ChildInfo(
+                                        roomId = spaceInfo?.roomId ?: initialState.idOrAlias,
+                                        avatarUrl = spaceInfo?.avatarUrl,
+                                        name = spaceInfo?.name,
+                                        topic = spaceInfo?.topic,
+                                        memberCount = spaceInfo?.numJoinedMembers,
+                                        isSubSpace = true,
+                                        children = Uninitialized,
+                                        viaServers = spaceInfo?.viaServers
+
+                                )
+                        ),
+                        childInfoList = resolveResult.let {
+                            when (it) {
+                                is SpacePeekResult.Success -> {
+                                    (resolveResult as SpacePeekResult.Success).summary.children.mapNotNull { spaceChild ->
+                                        val roomPeekResult = spaceChild.roomPeekResult
+                                        if (roomPeekResult is PeekResult.Success) {
+                                            ChildInfo(
+                                                    roomId = spaceChild.id,
+                                                    avatarUrl = roomPeekResult.avatarUrl,
+                                                    name = roomPeekResult.name,
+                                                    topic = roomPeekResult.topic,
+                                                    memberCount = roomPeekResult.numJoinedMembers,
+                                                    isSubSpace = spaceChild is SpaceSubChildPeekResult,
+                                                    children = Uninitialized,
+                                                    viaServers = roomPeekResult.viaServers
+
+                                            )
+                                        } else {
+                                            null
+                                        }
+                                    }
+                                    Success(emptyList())
+                                }
+                                else                       -> {
+                                    Fail(Exception("Failed to get info"))
+                                }
+                            }
+                        })
+            }
+        } catch (failure: Throwable) {
+            setState {
+                copy(spaceInfo = Fail(failure), childInfoList = Fail(failure))
+            }
+        }
+    }
 }

From a8d7c25244f688965147bfe7f455d9b20e2da2ae Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 10 Feb 2021 16:36:05 +0100
Subject: [PATCH 102/350] rebase fix

---
 .../java/im/vector/app/features/home/AvatarRenderer.kt     | 2 ++
 .../java/im/vector/app/features/home/HomeDetailFragment.kt | 1 -
 .../im/vector/app/features/spaces/SpacesListViewModel.kt   | 7 ++++---
 .../app/features/spaces/explore/SpaceDirectoryViewModel.kt | 7 ++++---
 .../app/features/spaces/preview/SpacePreviewViewModel.kt   | 7 ++++---
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
index 1765372548..f9a68ba465 100644
--- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
@@ -26,7 +26,9 @@ import androidx.core.graphics.drawable.toBitmap
 import com.amulyakhare.textdrawable.TextDrawable
 import com.bumptech.glide.load.MultiTransformation
 import com.bumptech.glide.load.Transformation
+import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.DrawableImageViewTarget
 import com.bumptech.glide.request.target.Target
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index de24be1a7d..6bc3f27fd4 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -25,7 +25,6 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
-import androidx.lifecycle.Observer
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index bdc5c997f6..cbfa760f56 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -23,8 +23,9 @@ import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.R
 import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.core.platform.VectorViewModel
@@ -66,7 +67,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                                                       private val stringProvider: StringProvider
 ) : VectorViewModel<SpaceListViewState, SpaceListAction, SpaceListViewEvents>(initialState) {
 
-    @AssistedInject.Factory
+    @AssistedFactory
     interface Factory {
         fun create(initialState: SpaceListViewState): SpacesListViewModel
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index 86baae0875..a5d1e16101 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -24,8 +24,9 @@ import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
@@ -62,7 +63,7 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
         private val session: Session
 ) : VectorViewModel<SpaceDirectoryState, VectorViewModelAction, SpaceDirectoryViewEvents>(initialState) {
 
-    @AssistedInject.Factory
+    @AssistedFactory
     interface Factory {
         fun create(initialState: SpaceDirectoryState): SpaceDirectoryViewModel
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index d11fe1502b..f5dd8b76ec 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -25,8 +25,9 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -54,7 +55,7 @@ class SpacePreviewViewModel @AssistedInject constructor(
         }
     }
 
-    @AssistedInject.Factory
+    @AssistedFactory
     interface Factory {
         fun create(initialState: SpacePreviewState): SpacePreviewViewModel
     }

From c8916ee83c8b2bdeaafe6dfc94fb85199581c94d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 11 Feb 2021 13:12:02 +0100
Subject: [PATCH 103/350] Udpate since msc 1772

---
 .../sdk/session/space/SpaceCreationTest.kt    | 188 ++++++++++++++++++
 .../sdk/api/session/events/model/EventType.kt |   7 +-
 .../api/session/room/alias/RoomAliasError.kt  |   2 +-
 .../room/model/PowerLevelsContentOverride.kt  |  67 +++++++
 .../api/session/room/model/SpaceChildInfo.kt  |   1 -
 .../room/model/create/CreateRoomParams.kt     |   6 +-
 .../room/powerlevels/PowerLevelsHelper.kt     |   5 +-
 .../api/session/space/CreateSpaceParams.kt    |   8 +
 .../android/sdk/api/session/space/Space.kt    |   4 +-
 .../sdk/api/session/space/SpaceService.kt     |  18 +-
 .../session/space/model/SpaceChildContent.kt  |  31 ++-
 .../session/space/model/SpaceParentContent.kt |  54 +++++
 .../database/RealmSessionStoreMigration.kt    |   2 -
 .../database/mapper/SpaceSummaryMapper.kt     |   1 -
 .../database/model/SpaceChildInfoEntity.kt    |   4 +-
 .../alias/RoomAliasAvailabilityChecker.kt     |   6 +-
 .../session/room/create/CreateRoomBody.kt     |   4 +-
 .../relationship/RoomRelationshipHelper.kt    |  23 ++-
 .../room/state/SafePowerLevelContent.kt       |   2 +-
 .../room/summary/RoomSummaryUpdater.kt        |   2 +-
 .../internal/session/space/DefaultSpace.kt    |  29 ++-
 .../session/space/DefaultSpaceService.kt      |  40 ++--
 .../internal/session/space/JoinSpaceTask.kt   |  49 +++--
 .../sdk/internal/session/space/SpaceModule.kt |   2 +-
 .../session/space/peeking/PeekSpaceTask.kt    |  10 +-
 .../im/vector/app/features/command/Command.kt |   4 +-
 .../app/features/command/CommandParser.kt     |  12 ++
 .../app/features/command/ParsedCommand.kt     |   2 +
 .../home/room/detail/RoomDetailViewModel.kt   |  40 +++-
 .../createroom/CreateRoomViewModel.kt         |  13 +-
 .../createroom/RoomAliasErrorFormatter.kt     |   2 +-
 .../spaces/preview/SpacePreviewViewModel.kt   |   2 +-
 vector/src/main/res/values/strings.xml        |   3 +
 33 files changed, 544 insertions(+), 99 deletions(-)
 create mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContentOverride.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceParentContent.kt

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
new file mode 100644
index 0000000000..90470233a1
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.session.space
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomType
+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.RoomCreateContent
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.space.SpaceService
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import org.matrix.android.sdk.internal.util.awaitCallback
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class SpaceCreationTest : InstrumentedTest {
+
+    private val commonTestHelper = CommonTestHelper(context())
+
+    @Test
+    fun createSimplePublicSpace() {
+        val session = commonTestHelper.createAccount("Hubble", SessionTestParams(true))
+        val roomName = "My Space"
+        val topic = "A public space for test"
+        val spaceId: String
+        runBlocking {
+            spaceId = session.spaceService().createSpace(roomName, topic, null, true)
+            // wait a bit to let the summry update it self :/
+            delay(400)
+        }
+
+        val syncedSpace = session.spaceService().getSpace(spaceId)
+        assertEquals(roomName, syncedSpace?.asRoom()?.roomSummary()?.name, "Room name should be set")
+        assertEquals(topic, syncedSpace?.asRoom()?.roomSummary()?.topic, "Room topic should be set")
+        // assertEquals(topic, syncedSpace.asRoom().roomSummary()?., "Room topic should be set")
+
+        assertNotNull(syncedSpace, "Space should be found by Id")
+        val creationEvent = syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_CREATE)
+        val createContent = creationEvent?.content.toModel<RoomCreateContent>()
+        assertEquals(RoomType.SPACE, createContent?.type, "Room type should be space")
+
+        var powerLevelsContent: PowerLevelsContent? = null
+        commonTestHelper.waitWithLatch { latch ->
+            commonTestHelper.retryPeriodicallyWithLatch(latch) {
+                val toModel = syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_POWER_LEVELS)?.content.toModel<PowerLevelsContent>()
+                powerLevelsContent = toModel
+                toModel != null
+            }
+        }
+        assertEquals(100, powerLevelsContent?.eventsDefault, "Space-rooms should be created with a power level for events_default of 100")
+
+        commonTestHelper.signOutAndClose(session)
+    }
+
+    @Test
+    fun testJoinSimplePublicSpace() {
+        val aliceSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
+        val bobSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
+
+        val roomName = "My Space"
+        val topic = "A public space for test"
+        val spaceId: String
+        runBlocking {
+            spaceId = aliceSession.spaceService().createSpace(roomName, topic, null, true)
+            // wait a bit to let the summry update it self :/
+            delay(400)
+        }
+
+        // Try to join from bob, it's a public space no need to invite
+
+        val joinResult: SpaceService.JoinSpaceResult
+        runBlocking {
+            joinResult = bobSession.spaceService().joinSpace(spaceId)
+        }
+
+        assertEquals(SpaceService.JoinSpaceResult.Success, joinResult)
+
+        val spaceBobPov = bobSession.spaceService().getSpace(spaceId)
+        assertEquals(roomName, spaceBobPov?.asRoom()?.roomSummary()?.name, "Room name should be set")
+        assertEquals(topic, spaceBobPov?.asRoom()?.roomSummary()?.topic, "Room topic should be set")
+
+        commonTestHelper.signOutAndClose(aliceSession)
+        commonTestHelper.signOutAndClose(bobSession)
+    }
+
+    @Test
+    fun testSimplePublicSpaceWithChildren() {
+        val aliceSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
+        val bobSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
+
+        val roomName = "My Space"
+        val topic = "A public space for test"
+        val spaceId: String
+        val firstChild: String
+        val secondChild: String
+
+        spaceId = runBlocking { aliceSession.spaceService().createSpace(roomName, topic, null, true) }
+        val syncedSpace = aliceSession.spaceService().getSpace(spaceId)
+
+        // create a room
+        firstChild = runBlocking {
+            awaitCallback<String> {
+                aliceSession.createRoom(CreateRoomParams().apply {
+                    this.name = "FirstRoom"
+                    this.topic = "Description of first room"
+                    this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+                }, it)
+            }
+        }
+
+        runBlocking {
+            syncedSpace?.addChildren(firstChild, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "a", true)
+        }
+
+        secondChild = runBlocking {
+            awaitCallback {
+                aliceSession.createRoom(CreateRoomParams().apply {
+                    this.name = "SecondRoom"
+                    this.topic = "Description of second room"
+                    this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+                }, it)
+            }
+        }
+
+        runBlocking {
+            syncedSpace?.addChildren(secondChild, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "b", false)
+        }
+
+        // Try to join from bob, it's a public space no need to invite
+
+        val joinResult = runBlocking {
+            bobSession.spaceService().joinSpace(spaceId)
+        }
+
+        assertEquals(SpaceService.JoinSpaceResult.Success, joinResult)
+
+        val spaceBobPov = bobSession.spaceService().getSpace(spaceId)
+        assertEquals(roomName, spaceBobPov?.asRoom()?.roomSummary()?.name, "Room name should be set")
+        assertEquals(topic, spaceBobPov?.asRoom()?.roomSummary()?.topic, "Room topic should be set")
+
+        // check if bob has joined automatically the first room
+
+        val bobMembershipFirstRoom = bobSession.getRoom(firstChild)?.roomSummary()?.membership
+        assertEquals(Membership.JOIN, bobMembershipFirstRoom, "Bob should have joined this room")
+        RoomSummaryQueryParams.Builder()
+
+        val spaceSummaryBobPov = bobSession.spaceService().getSpaceSummaries(roomSummaryQueryParams {
+            this.roomId = QueryStringValue.Equals(spaceId)
+            this.memberships = listOf(Membership.JOIN)
+        }).firstOrNull()
+
+        assertEquals(2, spaceSummaryBobPov?.children?.size ?: -1, "Unexpected number of children")
+
+        commonTestHelper.signOutAndClose(aliceSession)
+        commonTestHelper.signOutAndClose(bobSession)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index 99934d3d95..b4a58e5ee6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -51,9 +51,13 @@ 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 = "m.space.child"
     const val STATE_SPACE_CHILD = "org.matrix.msc1772.space.child"
 
+    //    const val STATE_SPACE_PARENT = "m.space.parent"
+    const val STATE_SPACE_PARENT = "org.matrix.msc1772.space.parent"
+
     /**
      * Note that this Event has been deprecated, see
      * - https://matrix.org/docs/spec/client_server/r0.6.1#historical-events
@@ -76,6 +80,7 @@ object EventType {
     const val CALL_NEGOTIATE = "m.call.negotiate"
     const val CALL_REJECT = "m.call.reject"
     const val CALL_HANGUP = "m.call.hangup"
+
     // This type is not processed by the client, just sent to the server
     const val CALL_REPLACES = "m.call.replaces"
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/alias/RoomAliasError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/alias/RoomAliasError.kt
index d2cb7c58a9..1102eda11c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/alias/RoomAliasError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/alias/RoomAliasError.kt
@@ -17,7 +17,7 @@
 package org.matrix.android.sdk.api.session.room.alias
 
 sealed class RoomAliasError : Throwable() {
-    object AliasEmpty : RoomAliasError()
+    object AliasIsBlank : RoomAliasError()
     object AliasNotAvailable : RoomAliasError()
     object AliasInvalid : RoomAliasError()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContentOverride.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContentOverride.kt
new file mode 100644
index 0000000000..577228cf44
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContentOverride.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * Class representing the EventType.EVENT_TYPE_STATE_ROOM_POWER_LEVELS state event content.
+ */
+@JsonClass(generateAdapter = true)
+data class PowerLevelsContentOverride(
+        /**
+         * The level required to ban a user. Defaults to 50 if unspecified.
+         */
+        @Json(name = "ban") val ban: Int? = null,
+        /**
+         * The level required to kick a user. Defaults to 50 if unspecified.
+         */
+        @Json(name = "kick") val kick: Int? = null,
+        /**
+         * The level required to invite a user. Defaults to 50 if unspecified.
+         */
+        @Json(name = "invite") val invite: Int? = null,
+        /**
+         * The level required to redact an event. Defaults to 50 if unspecified.
+         */
+        @Json(name = "redact") val redact: Int? = null,
+        /**
+         * The default level required to send message events. Can be overridden by the events key. Defaults to 0 if unspecified.
+         */
+        @Json(name = "events_default") val eventsDefault: Int? = null,
+        /**
+         * The level required to send specific event types. This is a mapping from event type to power level required.
+         */
+        @Json(name = "events") val events: Map<String, Int>? = null,
+        /**
+         * The default power level for every user in the room, unless their user_id is mentioned in the users key. Defaults to 0 if unspecified.
+         */
+        @Json(name = "users_default") val usersDefault: Int? = null,
+        /**
+         * The power levels for specific users. This is a mapping from user_id to power level for that user.
+         */
+        @Json(name = "users") val users: Map<String, Int>? = null,
+        /**
+         * The default level required to send state events. Can be overridden by the events key. Defaults to 50 if unspecified.
+         */
+        @Json(name = "state_default") val stateDefault: Int? = null,
+        /**
+         * The power level requirements for specific notification types. This is a mapping from key to power level for that notifications key.
+         */
+        @Json(name = "notifications") val notifications: Map<String, Any>? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
index 04f3310a77..38d9f1e74e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.api.session.room.model
 
 data class SpaceChildInfo(
         val roomSummary: IRoomSummary?,
-        val present: Boolean,
         val order: String?,
         val autoJoin: Boolean,
         val viaServers: List<String>
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index 880854da58..d4b1a8647a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -18,7 +18,7 @@ package org.matrix.android.sdk.api.session.room.model.create
 
 import android.net.Uri
 import org.matrix.android.sdk.api.session.identity.ThreePid
-import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
@@ -125,7 +125,7 @@ open class CreateRoomParams {
     /**
      * The power level content to override in the default power level event
      */
-    var powerLevelContentOverride: PowerLevelsContent? = null
+    var powerLevelContentOverride: PowerLevelsContentOverride? = null
 
     /**
      * Mark as a direct message room.
@@ -149,6 +149,6 @@ open class CreateRoomParams {
 
     companion object {
         private const val CREATION_CONTENT_KEY_M_FEDERATE = "m.federate"
-        private const val CREATION_CONTENT_KEY_ROOM_TYPE = "type"
+        private const val CREATION_CONTENT_KEY_ROOM_TYPE = "org.matrix.msc1772.type"
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
index 4f1253c6df..7918376ca9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
@@ -31,9 +31,8 @@ class PowerLevelsHelper(private val powerLevelsContent: PowerLevelsContent) {
      * @return the power level
      */
     fun getUserPowerLevelValue(userId: String): Int {
-        return powerLevelsContent.users.getOrElse(userId) {
-            powerLevelsContent.usersDefault
-        }
+        return powerLevelsContent.users?.get(userId)
+                ?: powerLevelsContent.usersDefault
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt
index 0caa7af14c..9776baf567 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt
@@ -16,12 +16,20 @@
 
 package org.matrix.android.sdk.api.session.space
 
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 
 class CreateSpaceParams : CreateRoomParams() {
 
     init {
+        // Space-rooms are distinguished from regular messaging rooms by the m.room.type of m.space
         roomType = RoomType.SPACE
+
+        // Space-rooms should be created with a power level for events_default of 100,
+        // to prevent the rooms accidentally/maliciously clogging up with messages from random members of the space.
+        powerLevelContentOverride = PowerLevelsContentOverride(
+                eventsDefault = 100
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 88ac00cc55..616393d00b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -22,7 +22,9 @@ interface Space {
 
     fun asRoom() : Room
 
-    suspend fun addRoom(roomId: String)
+    suspend fun addChildren(roomId: String, viaServers: List<String>, order: String?, autoJoin: Boolean = false)
+
+    suspend fun removeRoom(roomId: String)
 
 //    fun getChildren() : List<IRoomSummary>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index 304fb4d98b..bef3267086 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.api.session.space
 
+import android.net.Uri
 import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -31,6 +32,11 @@ interface SpaceService {
      */
     suspend fun createSpace(params: CreateSpaceParams): String
 
+    /**
+     * Just a shortcut for space creation for ease of use
+     */
+    suspend fun createSpace(name: String, topic: String?, avatarUri: Uri?, isPublic: Boolean): String
+
     /**
      * Get a space from a roomId
      * @param roomId the roomId to look for.
@@ -43,12 +49,12 @@ interface SpaceService {
      * Use this call get preview of children of this space, particularly useful to get a
      * preview of rooms that you did not join yet.
      */
-    suspend fun peekSpace(spaceId: String) : SpacePeekResult
+    suspend fun peekSpace(spaceId: String): SpacePeekResult
 
     /**
      * Get's information of a space by querying the server
      */
-    suspend fun querySpaceChildren(spaceId: String) : Pair<RoomSummary, List<SpaceChildInfo>>
+    suspend fun querySpaceChildren(spaceId: String): Pair<RoomSummary, List<SpaceChildInfo>>
 
     /**
      * Get a live list of space summaries. This list is refreshed as soon as the data changes.
@@ -64,8 +70,9 @@ interface SpaceService {
     )
 
     sealed class JoinSpaceResult {
-        object Success: JoinSpaceResult()
-        data class Fail(val error: Throwable?): JoinSpaceResult()
+        object Success : JoinSpaceResult()
+        data class Fail(val error: Throwable) : JoinSpaceResult()
+
         /** Success fully joined the space, but failed to join all or some of it's rooms */
         data class PartialSuccess(val failedRooms: Map<String, Throwable>) : JoinSpaceResult()
 
@@ -74,8 +81,7 @@ interface SpaceService {
 
     suspend fun joinSpace(spaceIdOrAlias: String,
                           reason: String? = null,
-                          viaServers: List<String> = emptyList(),
-                          autoJoinChild: List<ChildAutoJoinInfo>) : JoinSpaceResult
+                          viaServers: List<String> = emptyList()): JoinSpaceResult
 
     suspend fun rejectInvite(spaceId: String, reason: String?)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
index e31ff5af5c..f7abf7e618 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
@@ -31,13 +31,9 @@ import com.squareup.moshi.JsonClass
 data class SpaceChildContent(
         /**
          * Key which gives a list of candidate servers that can be used to join the room
+         * Children where via is not present are ignored.
          */
         @Json(name = "via") val via: List<String>? = null,
-        /**
-         * present: true key is included to distinguish from a deleted state event
-         * Children where present is not present or is not set to true are ignored.
-         */
-        @Json(name = "present") val present: Boolean? = false,
         /**
          * The order key is a string which is used to provide a default ordering of siblings in the room list.
          * (Rooms are sorted based on a lexicographic ordering of order values; rooms with no order come last.
@@ -46,8 +42,25 @@ data class SpaceChildContent(
          */
         @Json(name = "order") val order: String? = null,
         /**
-         * The default flag on a child listing allows a space admin to list the "default" sub-spaces and rooms in that space.
-         * This means that when a user joins the parent space, they will automatically be joined to those default children.
+         * The auto_join flag on a child listing allows a space admin to list the sub-spaces and rooms in that space which should
+         * be automatically joined by members of that space.
+         * (This is not a force-join, which are descoped for a future MSC; the user can subsequently part these room if they desire.)
          */
-        @Json(name = "default") val default: Boolean? = false
-)
+        @Json(name = "auto_join") val autoJoin: Boolean? = false
+) {
+    /**
+     * Orders which are not strings, or do not consist solely of ascii characters in the range \x20 (space) to \x7F (~),
+     * or consist of more than 50 characters, are forbidden and should be ignored if received.)
+     */
+    fun validOrder(): String? {
+        order?.let {
+            if (order.length > 50) return null
+            if (!ORDER_VALID_CHAR_REGEX.matches(it)) return null
+        }
+        return order
+    }
+
+    companion object {
+        private val ORDER_VALID_CHAR_REGEX = "[ -~]+".toRegex()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceParentContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceParentContent.kt
new file mode 100644
index 0000000000..b3f7267580
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceParentContent.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.space.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ *  Rooms can claim parents via the m.space.parent state event.
+ * {
+ *  "type": "m.space.parent",
+ *  "state_key": "!space:example.com",
+ *  "content": {
+ *      "via": ["example.com"],
+ *      "present": true,
+ *      "canonical": true,
+ *  }
+ * }
+ */
+@JsonClass(generateAdapter = true)
+data class SpaceParentContent(
+        /**
+         * Key which gives a list of candidate servers that can be used to join the parent.
+         * Parents where via is not present are ignored.
+         */
+        @Json(name = "via") val via: List<String>? = null,
+        /**
+         * present: true key is included to distinguish from a deleted state event
+         * Parent where present is not present (sic) or is not set to true are ignored.
+         */
+        @Json(name = "present") val present: Boolean? = false,
+        /**
+         * Canonical determines whether this is the main parent for the space.
+         * When a user joins a room with a canonical parent, clients may switch to view the room
+         * in the context of that space, peeking into it in order to find other rooms and group them together.
+         * In practice, well behaved rooms should only have one canonical parent, but given this is not enforced:
+         * if multiple are present the client should select the one with the lowest room ID, as determined via a lexicographic utf-8 ordering.
+         */
+        @Json(name = "canonical") val canonical: Boolean? = false
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 27b2b031e4..b14ed9e9c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -209,8 +209,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
         val spaceChildInfoSchema = realm.schema.create("SpaceChildInfoEntity")
                 ?.addField(SpaceChildInfoEntityFields.ORDER,  String::class.java)
-                ?.addField(SpaceChildInfoEntityFields.PRESENT, Boolean::class.java)
-                ?.setNullable(SpaceChildInfoEntityFields.PRESENT, true)
                 ?.addRealmListField(SpaceChildInfoEntityFields.VIA_SERVERS.`$`, String::class.java)
                 ?.addRealmObjectField(SpaceChildInfoEntityFields.ROOM_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
index 7128501a65..d08528598d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
@@ -31,7 +31,6 @@ internal class SpaceSummaryMapper @Inject constructor(private val roomSummaryMap
                     SpaceChildInfo(
                             roomSummary = it.roomSummaryEntity?.let { rs -> roomSummaryMapper.map(rs) },
                             autoJoin = it.autoJoin ?: false,
-                            present = it.present ?: false,
                             viaServers = it.viaServers.map { it },
                             order = it.order
                     )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt
index 68667c55fc..7862207901 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@ import io.realm.RealmObject
  */
 internal open class SpaceChildInfoEntity(
         var viaServers: RealmList<String> = RealmList(),
-        // it's an active child of the space if and only if present is not null and true
-        var present: Boolean? = null,
         // Use for alphabetic ordering of this child
         var order: String? = null,
         // If true, this child should be join when parent is joined
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasAvailabilityChecker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasAvailabilityChecker.kt
index 9faf50dd8b..b39cbaa582 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasAvailabilityChecker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasAvailabilityChecker.kt
@@ -36,7 +36,11 @@ internal class RoomAliasAvailabilityChecker @Inject constructor(
     @Throws(RoomAliasError::class)
     suspend fun check(aliasLocalPart: String?) {
         if (aliasLocalPart.isNullOrEmpty()) {
-            throw RoomAliasError.AliasEmpty
+            // don't check empty or not provided alias
+            return
+        }
+        if (aliasLocalPart.isBlank()) {
+            throw RoomAliasError.AliasIsBlank
         }
         // Check alias availability
         val fullAlias = aliasLocalPart.toFullLocalAlias(userId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
index 13d403e2e4..a3f6cd53cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.internal.session.room.create
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
@@ -111,5 +111,5 @@ internal data class CreateRoomBody(
          * The power level content to override in the default power level event
          */
         @Json(name = "power_level_content_override")
-        val powerLevelContentOverride: PowerLevelsContent?
+        val powerLevelContentOverride: PowerLevelsContentOverride?
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
index 54b9a17c3c..c04f5d3948 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
@@ -41,28 +41,31 @@ internal class RoomRelationshipHelper(private val realm: Realm,
 
     data class SpaceChildInfo(
             val roomId: String,
-            val present: Boolean,
             val order: String?,
             val autoJoin: Boolean,
             val viaServers: List<String>
     )
 
+    /**
+     * Gets the ordered list of valid child description.
+     */
     fun getDirectChildrenDescriptions(): List<SpaceChildInfo> {
         return CurrentStateEventEntity.whereType(realm, roomId, EventType.STATE_SPACE_CHILD)
                 .findAll()
-//                .filter { ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.present == true }
                 .mapNotNull {
-                    // ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()
                     ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.let { scc ->
                         Timber.d("## Space child desc state event $scc")
-                        SpaceChildInfo(
-                                roomId = it.stateKey,
-                                present = scc.present ?: false,
-                                order = scc.order,
-                                autoJoin = scc.default ?: false,
-                                viaServers = scc.via ?: emptyList()
-                        )
+                        // Children where via is not present are ignored.
+                        scc.via?.let { via ->
+                            SpaceChildInfo(
+                                    roomId = it.stateKey,
+                                    order = scc.validOrder(),
+                                    autoJoin = scc.autoJoin ?: false,
+                                    viaServers = via
+                            )
+                        }
                     }
                 }
+                .sortedBy { it.order }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
index a97709e38b..e5ab87ccac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
@@ -50,7 +50,7 @@ internal fun JsonDict.toSafePowerLevelsContentDict(): JsonDict {
                         eventsDefault = content.eventsDefault,
                         events = content.events,
                         usersDefault = content.usersDefault,
-                        users = content.users,
+                        users = content.users ?: emptyMap(),
                         stateDefault = content.stateDefault,
                         notifications = content.notifications.mapValues { content.notificationLevel(it.key)  }
                 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 11d0ffffde..3d01021811 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -99,6 +99,7 @@ internal class RoomSummaryUpdater @Inject constructor(
 
         val roomType = ContentMapper.map(roomCreateEvent?.content).toModel<RoomCreateContent>()?.type
         roomSummaryEntity.roomType = roomType
+        Timber.v("## Space: Updating summary room [$roomId] roomType: [$roomType]")
 
         // Don't use current state for this one as we are only interested in having MXCRYPTO_ALGORITHM_MEGOLM event in the room
         val encryptionEvent = EventEntity.whereType(realm, roomId = roomId, type = EventType.STATE_ROOM_ENCRYPTION)
@@ -176,7 +177,6 @@ internal class RoomSummaryUpdater @Inject constructor(
                                 realm.createObject<SpaceChildInfoEntity>().apply {
                                     this.roomSummaryEntity = RoomSummaryEntity.getOrCreate(realm, it.roomId)
                                     this.order = it.order
-                                    this.present = it.present
                                     this.autoJoin = it.autoJoin
                                 }.also {
                                     Timber.v("## Space: Updating summary for room $roomId with children $it")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index ebe845572d..0728c31974 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -16,8 +16,10 @@
 
 package org.matrix.android.sdk.internal.session.space
 
+import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
@@ -28,11 +30,34 @@ class DefaultSpace(private val room: Room) : Space {
         return room
     }
 
-    override suspend fun addRoom(roomId: String) {
+    override suspend fun addChildren(roomId: String, viaServers: List<String>, order: String?, autoJoin: Boolean) {
         asRoom().sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
-                body = SpaceChildContent(present = true).toContent()
+                body = SpaceChildContent(
+                        via = viaServers,
+                        autoJoin = autoJoin,
+                        order = order
+                ).toContent()
+        )
+    }
+
+    override suspend fun removeRoom(roomId: String) {
+        val existing = asRoom().getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+                .firstOrNull()
+                ?.content.toModel<SpaceChildContent>()
+                ?: // should we throw here?
+                return
+
+        // edit state event and set via to null
+        asRoom().sendStateEvent(
+                eventType = EventType.STATE_SPACE_CHILD,
+                stateKey = roomId,
+                body = SpaceChildContent(
+                        order = existing.order,
+                        via = null,
+                        autoJoin = existing.autoJoin
+                ).toContent()
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 42f4ed4742..906886d5e8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.space
 
+import android.net.Uri
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -23,6 +24,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import org.matrix.android.sdk.api.session.space.CreateSpaceParams
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.SpaceService
@@ -66,6 +68,15 @@ internal class DefaultSpaceService @Inject constructor(
         return createRoomTask.execute(params)
     }
 
+    override suspend fun createSpace(name: String, topic: String?, avatarUri: Uri?, isPublic: Boolean): String {
+        return createSpace(CreateSpaceParams().apply {
+            this.name = name
+            this.topic = topic
+            this.preset = if (isPublic) CreateRoomPreset.PRESET_PUBLIC_CHAT else CreateRoomPreset.PRESET_PRIVATE_CHAT
+            this.avatarUri = avatarUri
+        })
+    }
+
     override fun getSpace(spaceId: String): Space? {
         return roomGetter.getRoom(spaceId)
                 ?.takeIf { it.roomSummary()?.roomType == RoomType.SPACE }
@@ -120,8 +131,7 @@ internal class DefaultSpaceService @Inject constructor(
                                                 isEncrypted = false
                                         ),
                                         order = childStateEv?.order,
-                                        present = childStateEv?.present ?: false,
-                                        autoJoin = childStateEv?.default ?: false,
+                                        autoJoin = childStateEv?.autoJoin ?: false,
                                         viaServers = childStateEv?.via ?: emptyList()
                                 )
                             } ?: emptyList()
@@ -131,30 +141,8 @@ internal class DefaultSpaceService @Inject constructor(
 
     override suspend fun joinSpace(spaceIdOrAlias: String,
                                    reason: String?,
-                                   viaServers: List<String>,
-                                   autoJoinChild: List<SpaceService.ChildAutoJoinInfo>): SpaceService.JoinSpaceResult {
-        try {
-            joinSpaceTask.execute(JoinSpaceTask.Params(spaceIdOrAlias, reason, viaServers))
-            // TODO partial success
-            return SpaceService.JoinSpaceResult.Success
-//            val childJoinFailures = mutableMapOf<String, Throwable>()
-//            autoJoinChild.forEach { info ->
-//                // TODO what if the child is it self a subspace with some default children?
-//                try {
-//                    joinRoomTask.execute(JoinRoomTask.Params(info.roomIdOrAlias, null, info.viaServers))
-//                } catch (failure: Throwable) {
-//                    // TODO, i could already be a member of this room, handle that as it should not be an error in this context
-//                    childJoinFailures[info.roomIdOrAlias] = failure
-//                }
-//            }
-//            return if (childJoinFailures.isEmpty()) {
-//                SpaceService.JoinSpaceResult.Success
-//            } else {
-//                SpaceService.JoinSpaceResult.PartialSuccess(childJoinFailures)
-//            }
-        } catch (throwable: Throwable) {
-            return SpaceService.JoinSpaceResult.Fail(throwable)
-        }
+                                   viaServers: List<String>): SpaceService.JoinSpaceResult {
+        return joinSpaceTask.execute(JoinSpaceTask.Params(spaceIdOrAlias, reason, viaServers))
     }
 
     override suspend fun rejectInvite(spaceId: String, reason: String?) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index 1878d2c0f9..6ee3652761 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -18,9 +18,9 @@ package org.matrix.android.sdk.internal.session.space
 
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.TimeoutCancellationException
-import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
 import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
 import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
@@ -32,7 +32,7 @@ import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-internal interface JoinSpaceTask : Task<JoinSpaceTask.Params, Unit> {
+internal interface JoinSpaceTask : Task<JoinSpaceTask.Params, SpaceService.JoinSpaceResult> {
     data class Params(
             val roomIdOrAlias: String,
             val reason: String?,
@@ -48,13 +48,17 @@ internal class DefaultJoinSpaceTask @Inject constructor(
         private val spaceSummaryDataSource: SpaceSummaryDataSource
 ) : JoinSpaceTask {
 
-    override suspend fun execute(params: JoinSpaceTask.Params) {
+    override suspend fun execute(params: JoinSpaceTask.Params): SpaceService.JoinSpaceResult {
         Timber.v("## Space: > Joining root space ${params.roomIdOrAlias} ...")
-        joinRoomTask.execute(JoinRoomTask.Params(
-                params.roomIdOrAlias,
-                params.reason,
-                params.viaServers
-        ))
+        try {
+            joinRoomTask.execute(JoinRoomTask.Params(
+                    params.roomIdOrAlias,
+                    params.reason,
+                    params.viaServers
+            ))
+        } catch (failure: Throwable) {
+            return SpaceService.JoinSpaceResult.Fail(failure)
+        }
         Timber.v("## Space: < Joining root space done for ${params.roomIdOrAlias}")
         // we want to wait for sync result to check for auto join rooms
 
@@ -73,19 +77,32 @@ internal class DefaultJoinSpaceTask @Inject constructor(
             }
         } catch (exception: TimeoutCancellationException) {
             Timber.w("## Space: > Error created with timeout")
-            throw CreateRoomFailure.CreatedWithTimeout
+            return SpaceService.JoinSpaceResult.PartialSuccess(emptyMap())
         }
 
+        val errors = HashMap<String, Throwable>()
         Timber.v("## Space: > Sync done ...")
-        // after that i should have the children (? do i nead to paginate to get state)
+        // after that i should have the children (? do I need to paginate to get state)
         val summary = spaceSummaryDataSource.getSpaceSummary(params.roomIdOrAlias)
         Timber.v("## Space: Found space summary Name:[${summary?.roomSummary?.name}] children: ${summary?.children?.size}")
         summary?.children?.forEach {
             val childRoomSummary = it.roomSummary ?: return@forEach
-            Timber.v("## Space: Processing child :[${childRoomSummary.roomId}] present: ${it.present} autoJoin:${it.autoJoin}")
-            if (it.present && it.autoJoin) {
+            Timber.v("## Space: Processing child :[${childRoomSummary.roomId}] autoJoin:${it.autoJoin}")
+            if (it.autoJoin) {
                 // I should try to join as well
                 if (childRoomSummary.roomType == RoomType.SPACE) {
+                    // recursively join auto-joined child of this space?
+                    when (val subspaceJoinResult = this.execute(JoinSpaceTask.Params(it.roomSummary.roomId, null, it.viaServers))) {
+                        SpaceService.JoinSpaceResult.Success -> {
+                            // nop
+                        }
+                        is SpaceService.JoinSpaceResult.Fail -> {
+                            errors[it.roomSummary.roomId] = subspaceJoinResult.error
+                        }
+                        is SpaceService.JoinSpaceResult.PartialSuccess -> {
+                            errors.putAll(subspaceJoinResult.failedRooms)
+                        }
+                    }
                 } else {
                     try {
                         Timber.v("## Space: Joining room child ${childRoomSummary.roomId}")
@@ -95,12 +112,18 @@ internal class DefaultJoinSpaceTask @Inject constructor(
                                 viaServers = it.viaServers
                         ))
                     } catch (failure: Throwable) {
-                        // todo keep track for partial success
+                        errors[it.roomSummary.roomId] = failure
                         Timber.e("## Space: Failed to join room child ${childRoomSummary.roomId}")
                     }
                 }
             }
         }
+
+        return if (errors.isEmpty()) {
+            SpaceService.JoinSpaceResult.Success
+        } else {
+            SpaceService.JoinSpaceResult.PartialSuccess(errors)
+        }
     }
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
index ba15f2e981..4612d9e142 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
index 1214befebd..8faed5f784 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
@@ -75,8 +75,8 @@ internal class DefaultPeekSpaceTask @Inject constructor(
         val childRoomsIds = stateEvents
                 .filter {
                     it.type == EventType.STATE_SPACE_CHILD && !it.stateKey.isNullOrEmpty()
-                            // Children where present is not present or is not set to true are ignored.
-                            && it.content?.toModel<SpaceChildContent>()?.present == true
+                            // Children where via is not present are ignored.
+                            && it.content?.toModel<SpaceChildContent>()?.via != null
                 }
                 .map { it.stateKey to it.content?.toModel<SpaceChildContent>() }
 
@@ -101,7 +101,7 @@ internal class DefaultPeekSpaceTask @Inject constructor(
                     // can't peek :/
                     spaceChildResults.add(
                             SpaceChildPeekResult(
-                                    childId, childPeek, entry.second?.default, entry.second?.order
+                                    childId, childPeek, entry.second?.autoJoin, entry.second?.order
                             )
                     )
                     // continue to next child
@@ -114,7 +114,7 @@ internal class DefaultPeekSpaceTask @Inject constructor(
                             SpaceSubChildPeekResult(
                                     childId,
                                     childPeek,
-                                    entry.second?.default,
+                                    entry.second?.autoJoin,
                                     entry.second?.order,
                                     peekChildren(childStateEvents, depth + 1, maxDepth)
                             )
@@ -125,7 +125,7 @@ internal class DefaultPeekSpaceTask @Inject constructor(
                     Timber.v("## SPACE_PEEK: room child $entry")
                     spaceChildResults.add(
                             SpaceChildPeekResult(
-                                    childId, childPeek, entry.second?.default, entry.second?.order
+                                    childId, childPeek, entry.second?.autoJoin, entry.second?.order
                             )
                     )
                 }
diff --git a/vector/src/main/java/im/vector/app/features/command/Command.kt b/vector/src/main/java/im/vector/app/features/command/Command.kt
index 4722e824f6..2b78627d88 100644
--- a/vector/src/main/java/im/vector/app/features/command/Command.kt
+++ b/vector/src/main/java/im/vector/app/features/command/Command.kt
@@ -48,7 +48,9 @@ enum class Command(val command: String, val parameters: String, @StringRes val d
     CONFETTI("/confetti", "<message>", R.string.command_confetti),
     SNOW("/snow", "<message>", R.string.command_snow),
     CREATE_SPACE("/createspace", "<name> <invitee>*", R.string.command_description_create_space),
-    ADD_TO_SPACE("/addToSpace", "spaceId", R.string.command_description_create_space);
+    ADD_TO_SPACE("/addToSpace", "spaceId", R.string.command_description_create_space),
+    JOIN_SPACE("/joinSpace", "spaceId", R.string.command_description_join_space),
+    LEAVE_ROOM("/leave", "<roomId?>", R.string.command_description_leave_room);
 
     val length
         get() = command.length + 1
diff --git a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
index fe5707ec45..9b190d64fe 100644
--- a/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
+++ b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt
@@ -318,6 +318,18 @@ object CommandParser {
                             rawCommand
                     )
                 }
+                Command.JOIN_SPACE.command        -> {
+                    val spaceIdOrAlias = textMessage.substring(Command.JOIN_SPACE.command.length).trim()
+                    ParsedCommand.JoinSpace(
+                            spaceIdOrAlias
+                    )
+                }
+                Command.LEAVE_ROOM.command        -> {
+                    val spaceIdOrAlias = textMessage.substring(Command.LEAVE_ROOM.command.length).trim()
+                    ParsedCommand.LeaveRoom(
+                            spaceIdOrAlias
+                    )
+                }
                 else                                   -> {
                     // Unknown command
                     ParsedCommand.ErrorUnknownSlashCommand(slashCommand)
diff --git a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
index 99b0ae7889..d67caac60a 100644
--- a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
+++ b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
@@ -59,4 +59,6 @@ sealed class ParsedCommand {
     class SendChatEffect(val chatEffect: ChatEffect, val message: String) : ParsedCommand()
     class CreateSpace(val name: String, val invitees: List<String>) : ParsedCommand()
     class AddToSpace(val spaceId: String) : ParsedCommand()
+    class JoinSpace(val spaceIdOrAlias: String) : ParsedCommand()
+    class LeaveRoom(val roomId: String) : ParsedCommand()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 785449236c..8bd0c60c40 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -831,7 +831,13 @@ class RoomDetailViewModel @AssistedInject constructor(
                                         invitedUserIds.addAll(slashCommandResult.invitees)
                                     }
                                     val spaceId = session.spaceService().createSpace(params)
-                                    session.spaceService().getSpace(spaceId)?.addRoom(state.roomId)
+                                    session.spaceService().getSpace(spaceId)
+                                            ?.addChildren(
+                                                    state.roomId,
+                                                    listOf(session.sessionParams.homeServerHost ?: ""),
+                                                    null,
+                                                    true
+                                            )
                                 } catch (failure: Throwable) {
                                     _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
                                 }
@@ -842,7 +848,37 @@ class RoomDetailViewModel @AssistedInject constructor(
                         is ParsedCommand.AddToSpace            -> {
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
-                                    session.spaceService().getSpace(slashCommandResult.spaceId)?.addRoom(room.roomId)
+                                    session.spaceService().getSpace(slashCommandResult.spaceId)
+                                            ?.addChildren(
+                                                    room.roomId,
+                                                    listOf(session.sessionParams.homeServerHost ?: ""),
+                                                    null,
+                                                    false
+                                            )
+                                } catch (failure: Throwable) {
+                                    _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
+                                }
+                            }
+                            _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
+                            popDraft()
+                        }
+                        is ParsedCommand.JoinSpace -> {
+                            viewModelScope.launch(Dispatchers.IO) {
+                                try {
+                                    session.spaceService().joinSpace(slashCommandResult.spaceIdOrAlias)
+                                } catch (failure: Throwable) {
+                                    _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
+                                }
+                            }
+                            _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
+                            popDraft()
+                        }
+                        is ParsedCommand.LeaveRoom -> {
+                            viewModelScope.launch(Dispatchers.IO) {
+                                try {
+                                    awaitCallback {
+                                        session.getRoom(slashCommandResult.roomId)?.leave(null, it)
+                                    }
                                 } catch (failure: Throwable) {
                                     _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
                                 }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 33dc6bc054..a86f06b142 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -26,8 +26,8 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.raw.wellknown.getElementWellknown
@@ -37,6 +37,8 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.alias.RoomAliasError
+import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
@@ -182,6 +184,15 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr
             return@withState
         }
 
+        if (state.roomVisibilityType is CreateRoomViewState.RoomVisibilityType.Public
+                && state.roomVisibilityType.aliasLocalPart.isBlank()) {
+            // we require an alias for public rooms
+            setState {
+                copy(asyncCreateRoomRequest = Fail(CreateRoomFailure.AliasError(RoomAliasError.AliasIsBlank)))
+            }
+            return@withState
+        }
+
         setState {
             copy(asyncCreateRoomRequest = Loading())
         }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasErrorFormatter.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasErrorFormatter.kt
index 7a23a79ab3..43cd460445 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasErrorFormatter.kt
@@ -26,7 +26,7 @@ class RoomAliasErrorFormatter @Inject constructor(
 ) {
     fun format(roomAliasError: RoomAliasError?): String? {
         return when (roomAliasError) {
-            is RoomAliasError.AliasEmpty        -> R.string.create_room_alias_empty
+            is RoomAliasError.AliasIsBlank      -> R.string.create_room_alias_empty
             is RoomAliasError.AliasNotAvailable -> R.string.create_room_alias_already_in_use
             is RoomAliasError.AliasInvalid      -> R.string.create_room_alias_invalid
             else                                -> null
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index f5dd8b76ec..37dde7d287 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -100,7 +100,7 @@ class SpacePreviewViewModel @AssistedInject constructor(
         // trigger modal loading
         _viewEvents.post(SpacePreviewViewEvents.StartJoining)
         viewModelScope.launch(Dispatchers.IO) {
-            val joinResult = session.spaceService().joinSpace(initialState.idOrAlias, null, spaceVia, emptyList())
+            val joinResult = session.spaceService().joinSpace(initialState.idOrAlias, null, spaceVia)
             when (joinResult) {
                 SpaceService.JoinSpaceResult.Success,
                 is SpaceService.JoinSpaceResult.PartialSuccess -> {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index b296c4e5ea..37e6c3bbcc 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3248,6 +3248,9 @@
     <string name="dev_tools_event_content_hint">Event content</string>
 
     <string name="command_description_create_space">Create a community</string>
+    <string name="command_description_create_space">Create a Spcae</string>
+    <string name="command_description_join_space">Join the Space with the given id</string>
+    <string name="command_description_leave_room">Leave room with given id (or current room if null)</string>
 
     <string name="event_status_a11y_sending">Sending</string>
     <string name="event_status_a11y_sent">Sent</string>

From 2cc5c76fb38a3a1e50d18c9096bed981952f4334 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 16 Feb 2021 10:02:33 +0100
Subject: [PATCH 104/350] hide dev commands from completion

---
 .../command/AutocompleteCommandPresenter.kt   | 23 +++++---
 .../im/vector/app/features/command/Command.kt | 54 +++++++++----------
 vector/src/main/res/values/strings.xml        |  2 +-
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
index d121c68557..aabf15aebe 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
@@ -21,10 +21,12 @@ import androidx.recyclerview.widget.RecyclerView
 import im.vector.app.features.autocomplete.AutocompleteClickListener
 import im.vector.app.features.autocomplete.RecyclerViewPresenter
 import im.vector.app.features.command.Command
+import im.vector.app.features.settings.VectorPreferences
 import javax.inject.Inject
 
 class AutocompleteCommandPresenter @Inject constructor(context: Context,
-                                                       private val controller: AutocompleteCommandController) :
+                                                       private val controller: AutocompleteCommandController,
+                                                       private val vectorPreferences: VectorPreferences) :
         RecyclerViewPresenter<Command>(context), AutocompleteClickListener<Command> {
 
     init {
@@ -40,13 +42,18 @@ class AutocompleteCommandPresenter @Inject constructor(context: Context,
     }
 
     override fun onQuery(query: CharSequence?) {
-        val data = Command.values().filter {
-            if (query.isNullOrEmpty()) {
-                true
-            } else {
-                it.command.startsWith(query, 1, true)
-            }
-        }
+        val data = Command.values()
+                .filter {
+                    if (it.isDevCommand && !vectorPreferences.developerMode()) {
+                        return@filter false
+                    }
+
+                    if (query.isNullOrEmpty()) {
+                        true
+                    } else {
+                        it.command.startsWith(query, 1, true)
+                    }
+                }
         controller.setData(data)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/command/Command.kt b/vector/src/main/java/im/vector/app/features/command/Command.kt
index 2b78627d88..0b210cf298 100644
--- a/vector/src/main/java/im/vector/app/features/command/Command.kt
+++ b/vector/src/main/java/im/vector/app/features/command/Command.kt
@@ -24,33 +24,33 @@ import im.vector.app.R
  * the user can write theses messages to perform some actions
  * the list will be displayed in this order
  */
-enum class Command(val command: String, val parameters: String, @StringRes val description: Int) {
-    EMOTE("/me", "<message>", R.string.command_description_emote),
-    BAN_USER("/ban", "<user-id> [reason]", R.string.command_description_ban_user),
-    UNBAN_USER("/unban", "<user-id> [reason]", R.string.command_description_unban_user),
-    SET_USER_POWER_LEVEL("/op", "<user-id> [<power-level>]", R.string.command_description_op_user),
-    RESET_USER_POWER_LEVEL("/deop", "<user-id>", R.string.command_description_deop_user),
-    INVITE("/invite", "<user-id> [reason]", R.string.command_description_invite_user),
-    JOIN_ROOM("/join", "<room-alias> [reason]", R.string.command_description_join_room),
-    PART("/part", "<room-alias> [reason]", R.string.command_description_part_room),
-    TOPIC("/topic", "<topic>", R.string.command_description_topic),
-    KICK_USER("/kick", "<user-id> [reason]", R.string.command_description_kick_user),
-    CHANGE_DISPLAY_NAME("/nick", "<display-name>", R.string.command_description_nick),
-    MARKDOWN("/markdown", "<on|off>", R.string.command_description_markdown),
-    RAINBOW("/rainbow", "<message>", R.string.command_description_rainbow),
-    RAINBOW_EMOTE("/rainbowme", "<message>", R.string.command_description_rainbow_emote),
-    CLEAR_SCALAR_TOKEN("/clear_scalar_token", "", R.string.command_description_clear_scalar_token),
-    SPOILER("/spoiler", "<message>", R.string.command_description_spoiler),
-    POLL("/poll", "Question | Option 1 | Option 2 ...", R.string.command_description_poll),
-    SHRUG("/shrug", "<message>", R.string.command_description_shrug),
-    PLAIN("/plain", "<message>", R.string.command_description_plain),
-    DISCARD_SESSION("/discardsession", "", R.string.command_description_discard_session),
-    CONFETTI("/confetti", "<message>", R.string.command_confetti),
-    SNOW("/snow", "<message>", R.string.command_snow),
-    CREATE_SPACE("/createspace", "<name> <invitee>*", R.string.command_description_create_space),
-    ADD_TO_SPACE("/addToSpace", "spaceId", R.string.command_description_create_space),
-    JOIN_SPACE("/joinSpace", "spaceId", R.string.command_description_join_space),
-    LEAVE_ROOM("/leave", "<roomId?>", R.string.command_description_leave_room);
+enum class Command(val command: String, val parameters: String, @StringRes val description: Int, val isDevCommand: Boolean) {
+    EMOTE("/me", "<message>", R.string.command_description_emote, false),
+    BAN_USER("/ban", "<user-id> [reason]", R.string.command_description_ban_user, false),
+    UNBAN_USER("/unban", "<user-id> [reason]", R.string.command_description_unban_user, false),
+    SET_USER_POWER_LEVEL("/op", "<user-id> [<power-level>]", R.string.command_description_op_user, false),
+    RESET_USER_POWER_LEVEL("/deop", "<user-id>", R.string.command_description_deop_user, false),
+    INVITE("/invite", "<user-id> [reason]", R.string.command_description_invite_user, false),
+    JOIN_ROOM("/join", "<room-alias> [reason]", R.string.command_description_join_room, false),
+    PART("/part", "<room-alias> [reason]", R.string.command_description_part_room, false),
+    TOPIC("/topic", "<topic>", R.string.command_description_topic, false),
+    KICK_USER("/kick", "<user-id> [reason]", R.string.command_description_kick_user, false),
+    CHANGE_DISPLAY_NAME("/nick", "<display-name>", R.string.command_description_nick, false),
+    MARKDOWN("/markdown", "<on|off>", R.string.command_description_markdown, false),
+    RAINBOW("/rainbow", "<message>", R.string.command_description_rainbow, false),
+    RAINBOW_EMOTE("/rainbowme", "<message>", R.string.command_description_rainbow_emote, false),
+    CLEAR_SCALAR_TOKEN("/clear_scalar_token", "", R.string.command_description_clear_scalar_token, false),
+    SPOILER("/spoiler", "<message>", R.string.command_description_spoiler, false),
+    POLL("/poll", "Question | Option 1 | Option 2 ...", R.string.command_description_poll, false),
+    SHRUG("/shrug", "<message>", R.string.command_description_shrug, false),
+    PLAIN("/plain", "<message>", R.string.command_description_plain, false),
+    DISCARD_SESSION("/discardsession", "", R.string.command_description_discard_session, false),
+    CONFETTI("/confetti", "<message>", R.string.command_confetti, false),
+    SNOW("/snow", "<message>", R.string.command_snow, false),
+    CREATE_SPACE("/createspace", "<name> <invitee>*", R.string.command_description_create_space,  true),
+    ADD_TO_SPACE("/addToSpace", "spaceId", R.string.command_description_create_space, true),
+    JOIN_SPACE("/joinSpace", "spaceId", R.string.command_description_join_space, true),
+    LEAVE_ROOM("/leave", "<roomId?>", R.string.command_description_leave_room, true);
 
     val length
         get() = command.length + 1
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 37e6c3bbcc..84b2262510 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3248,7 +3248,7 @@
     <string name="dev_tools_event_content_hint">Event content</string>
 
     <string name="command_description_create_space">Create a community</string>
-    <string name="command_description_create_space">Create a Spcae</string>
+    <string name="command_description_create_space">Create a Space</string>
     <string name="command_description_join_space">Join the Space with the given id</string>
     <string name="command_description_leave_room">Leave room with given id (or current room if null)</string>
 

From 5aa698768a9304a5de4e636d7d3df3ba348aee81 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 16 Feb 2021 10:17:11 +0100
Subject: [PATCH 105/350] Support update of order/autojoin of child

---
 .../android/sdk/api/session/space/Space.kt    |  6 +++
 .../sdk/api/session/space/SpaceService.kt     |  5 ---
 .../internal/session/space/DefaultSpace.kt    | 43 ++++++++++++++++---
 vector/src/main/res/values/strings.xml        |  1 -
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 616393d00b..01a0dbc929 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -26,5 +26,11 @@ interface Space {
 
     suspend fun removeRoom(roomId: String)
 
+    @Throws
+    suspend fun setChildrenOrder(roomId: String, order: String?)
+
+    @Throws
+    suspend fun setChildrenAutoJoin(roomId: String, autoJoin: Boolean)
+
 //    fun getChildren() : List<IRoomSummary>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index bef3267086..3e30f14748 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -64,11 +64,6 @@ interface SpaceService {
 
     fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<SpaceSummary>
 
-    data class ChildAutoJoinInfo(
-            val roomIdOrAlias: String,
-            val viaServers: List<String> = emptyList()
-    )
-
     sealed class JoinSpaceResult {
         object Success : JoinSpaceResult()
         data class Fail(val error: Throwable) : JoinSpaceResult()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 0728c31974..264cfd44ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import java.lang.IllegalArgumentException
 
 class DefaultSpace(private val room: Room) : Space {
 
@@ -61,11 +62,39 @@ class DefaultSpace(private val room: Room) : Space {
         )
     }
 
-//    override fun getChildren(): List<IRoomSummary> {
-// //        asRoom().getStateEvents(setOf(EventType.STATE_SPACE_CHILD)).mapNotNull {
-// //            // statekeys are the roomIds
-// //
-// //        }
-//        return emptyList<IRoomSummary>()
-//    }
+    override suspend fun setChildrenOrder(roomId: String, order: String?) {
+        val existing = asRoom().getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+                .firstOrNull()
+                ?.content.toModel<SpaceChildContent>()
+                ?: throw IllegalArgumentException("$roomId is not a child of this space")
+
+        // edit state event and set via to null
+        asRoom().sendStateEvent(
+                eventType = EventType.STATE_SPACE_CHILD,
+                stateKey = roomId,
+                body = SpaceChildContent(
+                        order = order,
+                        via = existing.via,
+                        autoJoin = existing.autoJoin
+                ).toContent()
+        )
+    }
+
+    override suspend fun setChildrenAutoJoin(roomId: String, autoJoin: Boolean) {
+        val existing = asRoom().getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+                .firstOrNull()
+                ?.content.toModel<SpaceChildContent>()
+                ?: throw IllegalArgumentException("$roomId is not a child of this space")
+
+        // edit state event and set via to null
+        asRoom().sendStateEvent(
+                eventType = EventType.STATE_SPACE_CHILD,
+                stateKey = roomId,
+                body = SpaceChildContent(
+                        order = existing.order,
+                        via = existing.via,
+                        autoJoin = autoJoin
+                ).toContent()
+        )
+    }
 }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 84b2262510..01adc31bb1 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3247,7 +3247,6 @@
     <string name="dev_tools_success_state_event">State event sent!</string>
     <string name="dev_tools_event_content_hint">Event content</string>
 
-    <string name="command_description_create_space">Create a community</string>
     <string name="command_description_create_space">Create a Space</string>
     <string name="command_description_join_space">Join the Space with the given id</string>
     <string name="command_description_leave_room">Leave room with given id (or current room if null)</string>

From 883f70306f48d32f901795190a657742da03bbd3 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 23 Feb 2021 09:56:46 +0100
Subject: [PATCH 106/350] Rebase Fixes

---
 .../org/matrix/android/sdk/session/space/SpaceCreationTest.kt | 2 +-
 .../sdk/api/session/room/powerlevels/PowerLevelsHelper.kt     | 2 +-
 .../sdk/internal/session/room/state/SafePowerLevelContent.kt  | 2 +-
 .../session/room/timeline/TokenChunkEventPersistor.kt         | 4 ++--
 .../sdk/internal/session/room/uploads/GetUploadsTask.kt       | 2 +-
 .../app/features/spaces/explore/SpaceDirectoryFragment.kt     | 2 +-
 .../app/features/spaces/preview/SpacePreviewViewModel.kt      | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 90470233a1..2a99594321 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
index 7918376ca9..eb8dabb48e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
@@ -31,7 +31,7 @@ class PowerLevelsHelper(private val powerLevelsContent: PowerLevelsContent) {
      * @return the power level
      */
     fun getUserPowerLevelValue(userId: String): Int {
-        return powerLevelsContent.users?.get(userId)
+        return powerLevelsContent.users.get(userId)
                 ?: powerLevelsContent.usersDefault
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
index e5ab87ccac..a97709e38b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
@@ -50,7 +50,7 @@ internal fun JsonDict.toSafePowerLevelsContentDict(): JsonDict {
                         eventsDefault = content.eventsDefault,
                         events = content.events,
                         usersDefault = content.usersDefault,
-                        users = content.users ?: emptyMap(),
+                        users = content.users,
                         stateDefault = content.stateDefault,
                         notifications = content.notifications.mapValues { content.notificationLevel(it.key)  }
                 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index 903aef16df..a7cba2fe99 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -124,7 +124,7 @@ internal class TokenChunkEventPersistor @Inject constructor(@SessionDatabase pri
                            direction: PaginationDirection): Result {
         monarchy
                 .awaitTransaction { realm ->
-                    Timber.v("Start persisting ${receivedChunk.events?.size} events in $roomId towards $direction")
+                    Timber.v("Start persisting ${receivedChunk.events.size} events in $roomId towards $direction")
 
                     val nextToken: String?
                     val prevToken: String?
@@ -189,7 +189,7 @@ internal class TokenChunkEventPersistor @Inject constructor(@SessionDatabase pri
             receivedChunk: TokenChunkEvent,
             currentChunk: ChunkEntity
     ) {
-        Timber.v("Add ${receivedChunk.events?.size} events in chunk(${currentChunk.nextToken} | ${currentChunk.prevToken}")
+        Timber.v("Add ${receivedChunk.events.size} events in chunk(${currentChunk.nextToken} | ${currentChunk.prevToken}")
         val roomMemberContentsByUser = HashMap<String, RoomMemberContent?>()
         val eventList = receivedChunk.events
         val stateEvents = receivedChunk.stateEvents
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
index 74b8372b77..028c3e9193 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
@@ -94,7 +94,7 @@ internal class DefaultGetUploadsTask @Inject constructor(
                     nextToken = chunk.end ?: "",
                     hasMore = chunk.hasMore()
             )
-            events = chunk.events ?: emptyList()
+            events = chunk.events
         }
 
         var uploadEvents = listOf<UploadEvent>()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index 6b67e20405..d776d9ff51 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -21,7 +21,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class SpaceDirectoryArgs(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index 37dde7d287..987884d8c9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -78,7 +78,7 @@ class SpacePreviewViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleDismissInvite() = withState { state ->
+    private fun handleDismissInvite() {
         // Here we need to join the space himself as well as the default rooms in that space
         // TODO modal loading
         viewModelScope.launch(Dispatchers.IO) {
@@ -108,7 +108,7 @@ class SpacePreviewViewModel @AssistedInject constructor(
                     _viewEvents.post(SpacePreviewViewEvents.JoinSuccess)
                 }
                 is SpaceService.JoinSpaceResult.Fail -> {
-                    _viewEvents.post(SpacePreviewViewEvents.JoinFailure(joinResult.error?.toString()))
+                    _viewEvents.post(SpacePreviewViewEvents.JoinFailure(joinResult.error.toString()))
                 }
             }
         }

From d8a32298196bf1c4d28dab87bbd587b040a6e54f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 23 Feb 2021 11:52:29 +0100
Subject: [PATCH 107/350] a11y fixes

---
 .../res/layout/fragment_space_preview.xml     | 37 ++++++++++---------
 vector/src/main/res/layout/item_space.xml     |  2 +
 .../main/res/layout/item_space_roomchild.xml  |  6 ++-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 257797548e..5781ddb570 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -16,25 +16,25 @@
             style="@style/VectorToolbarStyle"
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
-            app:navigationIcon="@drawable/ic_x_18dp"
-            android:elevation="4dp">
+            android:elevation="4dp"
+            app:navigationIcon="@drawable/ic_x_18dp">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-<!--                <ImageView-->
-<!--                    android:id="@+id/spacePreviewClose"-->
-<!--                    android:layout_width="@dimen/layout_touch_size"-->
-<!--                    android:layout_height="@dimen/layout_touch_size"-->
-<!--                    android:clickable="true"-->
-<!--                    android:focusable="true"-->
-<!--                    android:foreground="?attr/selectableItemBackground"-->
-<!--                    android:scaleType="center"-->
-<!--                    android:src="@drawable/ic_x_18dp"-->
-<!--                    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                    app:layout_constraintStart_toStartOf="parent"-->
-<!--                    app:layout_constraintTop_toTopOf="parent" />-->
+                <!--                <ImageView-->
+                <!--                    android:id="@+id/spacePreviewClose"-->
+                <!--                    android:layout_width="@dimen/layout_touch_size"-->
+                <!--                    android:layout_height="@dimen/layout_touch_size"-->
+                <!--                    android:clickable="true"-->
+                <!--                    android:focusable="true"-->
+                <!--                    android:foreground="?attr/selectableItemBackground"-->
+                <!--                    android:scaleType="center"-->
+                <!--                    android:src="@drawable/ic_x_18dp"-->
+                <!--                    app:layout_constraintBottom_toBottomOf="parent"-->
+                <!--                    app:layout_constraintStart_toStartOf="parent"-->
+                <!--                    app:layout_constraintTop_toTopOf="parent" />-->
 
                 <ImageView
                     android:id="@+id/spacePreviewToolbarAvatar"
@@ -42,6 +42,7 @@
                     android:layout_height="40dp"
                     android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
+                    android:contentDescription="@string/avatar"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
@@ -96,16 +97,16 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?list_divider_color"/>
+            android:background="?list_divider_color" />
 
         <LinearLayout
             android:id="@+id/spacePreviewButtonBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_margin="8dp"
             android:elevation="2dp"
-            android:orientation="horizontal"
-            android:layout_margin="8dp">
+            android:gravity="center_horizontal"
+            android:orientation="horizontal">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/spacePreviewDeclineInviteButton"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index be23a5e546..9cd07f3215 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -16,6 +16,7 @@
         android:layout_height="42dp"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:contentDescription="@string/avatar"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintStart_toStartOf="parent"
@@ -44,6 +45,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="21dp"
+        android:importantForAccessibility="no"
         android:src="@drawable/ic_arrow_right"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index 0fdbd833f4..e12653077e 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -10,8 +10,8 @@
     <im.vector.app.features.spaces.preview.SpaceTabView
         android:id="@+id/spaceChildTabView"
         android:layout_width="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_marginStart="8dp" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -31,6 +31,7 @@
             android:layout_height="40dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="12dp"
+            android:contentDescription="@string/avatar"
             android:scaleType="centerInside"
             android:visibility="visible"
             app:layout_constraintStart_toStartOf="parent"
@@ -77,6 +78,7 @@
             android:layout_width="18dp"
             android:layout_height="18dp"
             android:layout_marginEnd="4dp"
+            android:importantForAccessibility="no"
             android:src="@drawable/ic_room_profile_member_list"
             app:layout_constraintBottom_toBottomOf="@+id/spaceChildMemberCountText"
             app:layout_constraintEnd_toStartOf="@+id/spaceChildMemberCountText"

From 4b27ad8ba6b4ced21afa1389f72ad62451b38e24 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 22 Feb 2021 19:59:19 +0100
Subject: [PATCH 108/350] Creation wizard WIP

---
 vector/src/main/AndroidManifest.xml           |   1 +
 .../im/vector/app/core/di/FragmentModule.kt   |  18 ++
 .../im/vector/app/core/di/ScreenComponent.kt  |   2 +
 .../form/FormEditableSquareAvatarItem.kt      |  80 +++++++++
 .../vector/app/features/home/HomeActivity.kt  |   4 +
 .../features/home/HomeActivitySharedAction.kt |   1 +
 .../features/spaces/SpaceCreationActivity.kt  | 135 ++++++++++++++
 .../app/features/spaces/SpaceListFragment.kt  |   5 +
 .../features/spaces/SpaceSummaryController.kt |  12 ++
 .../features/spaces/SpacesListViewModel.kt    |   7 +
 .../spaces/create/ChooseSpaceTypeFragment.kt  |  49 +++++
 .../create/CreateSpaceDefaultRoomsFragment.kt |  56 ++++++
 .../create/CreateSpaceDetailsFragment.kt      |  70 ++++++++
 .../spaces/create/CreateSpaceViewModel.kt     | 170 ++++++++++++++++++
 .../create/SpaceDefaultRoomEpoxyController.kt |  93 ++++++++++
 .../create/SpaceDetailEpoxyController.kt      |  90 ++++++++++
 .../spaces/create/WizardButtonView.kt         |  98 ++++++++++
 .../src/main/res/drawable/ic_camera_plain.xml |  10 ++
 .../src/main/res/drawable/ic_public_room.xml  |  13 ++
 .../src/main/res/drawable/ic_room_private.xml |  10 ++
 .../fragment_space_create_choose_type.xml     |  71 ++++++++
 ...agment_space_create_generic_epoxy_form.xml |  35 ++++
 .../layout/item_editable_square_avatar.xml    |  67 +++++++
 .../res/layout/view_space_type_button.xml     |  68 +++++++
 vector/src/main/res/values/attrs.xml          |  12 +-
 vector/src/main/res/values/strings.xml        |  18 ++
 26 files changed, 1194 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
 create mode 100644 vector/src/main/res/drawable/ic_camera_plain.xml
 create mode 100644 vector/src/main/res/drawable/ic_public_room.xml
 create mode 100644 vector/src/main/res/drawable/ic_room_private.xml
 create mode 100644 vector/src/main/res/layout/fragment_space_create_choose_type.xml
 create mode 100644 vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
 create mode 100644 vector/src/main/res/layout/item_editable_square_avatar.xml
 create mode 100644 vector/src/main/res/layout/view_space_type_button.xml

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index e66a123773..205669fb8a 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -274,6 +274,7 @@
         <activity android:name=".features.devtools.RoomDevToolActivity"/>
         <activity android:name=".features.spaces.SpacePreviewActivity"/>
         <activity android:name=".features.spaces.SpaceExploreActivity"/>
+        <activity android:name=".features.spaces.SpaceCreationActivity"/>
         <!-- Services -->
 
         <service
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index e79443a4e7..d3b46b5c64 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -118,6 +118,9 @@ import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
 import im.vector.app.features.share.IncomingShareFragment
 import im.vector.app.features.signout.soft.SoftLogoutFragment
 import im.vector.app.features.spaces.SpaceListFragment
+import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
+import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
+import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
 import im.vector.app.features.spaces.preview.SpacePreviewFragment
 import im.vector.app.features.terms.ReviewTermsFragment
 import im.vector.app.features.usercode.ShowUserCodeFragment
@@ -636,4 +639,19 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(SpacePreviewFragment::class)
     fun bindSpacePreviewFragment(fragment: SpacePreviewFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(ChooseSpaceTypeFragment::class)
+    fun bindCreateSpaceFragment(fragment: ChooseSpaceTypeFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(CreateSpaceDetailsFragment::class)
+    fun bindCreateSpaceDetailsFragment(fragment: CreateSpaceDetailsFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(CreateSpaceDefaultRoomsFragment::class)
+    fun bindCreateSpaceDefaultRoomsFragment(fragment: CreateSpaceDefaultRoomsFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index a1de892c4e..3633bb610a 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -77,6 +77,7 @@ import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheet
 import im.vector.app.features.share.IncomingShareActivity
 import im.vector.app.features.signout.soft.SoftLogoutActivity
+import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.ui.UiStateRepository
 import im.vector.app.features.usercode.UserCodeActivity
@@ -151,6 +152,7 @@ interface ScreenComponent {
     fun inject(activity: CallTransferActivity)
     fun inject(activity: ReAuthActivity)
     fun inject(activity: RoomDevToolActivity)
+    fun inject(activity: SpaceCreationActivity)
 
     /* ==========================================================================================
      * BottomSheets
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
new file mode 100644
index 0000000000..5023c1b483
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.app.features.form
+
+import android.net.Uri
+import android.view.View
+import android.widget.ImageView
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import com.airbnb.epoxy.EpoxyModelWithHolder
+import com.bumptech.glide.request.RequestOptions
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_editable_square_avatar)
+abstract class FormEditableSquareAvatarItem : EpoxyModelWithHolder<FormEditableSquareAvatarItem.Holder>() {
+
+    @EpoxyAttribute
+    var avatarRenderer: AvatarRenderer? = null
+
+    @EpoxyAttribute
+    var matrixItem: MatrixItem? = null
+
+    @EpoxyAttribute
+    var enabled: Boolean = true
+
+    @EpoxyAttribute
+    var imageUri: Uri? = null
+
+    @EpoxyAttribute
+    var clickListener: ClickListener? = null
+
+    @EpoxyAttribute
+    var deleteListener: ClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.imageContainer.onClick(clickListener?.takeIf { enabled })
+        if (matrixItem != null) {
+            avatarRenderer?.renderSpace(matrixItem!!, holder.image)
+        } else {
+            GlideApp.with(holder.image)
+                    .load(imageUri)
+                    .apply(RequestOptions.circleCropTransform())
+                    .into(holder.image)
+        }
+        holder.delete.isVisible = enabled && (imageUri != null || matrixItem?.avatarUrl?.isNotEmpty() == true)
+        holder.delete.onClick(deleteListener?.takeIf { enabled })
+    }
+
+    override fun unbind(holder: Holder) {
+        avatarRenderer?.clear(holder.image)
+        GlideApp.with(holder.image).clear(holder.image)
+        super.unbind(holder)
+    }
+    class Holder : VectorEpoxyHolder() {
+        val imageContainer by bind<View>(R.id.itemEditableAvatarImageContainer)
+        val image by bind<ImageView>(R.id.itemEditableAvatarImage)
+        val delete by bind<View>(R.id.itemEditableAvatarDelete)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 138ffc26f4..982b59263d 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -54,6 +54,7 @@ import im.vector.app.features.popup.VerificationVectorAlert
 import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
@@ -145,6 +146,9 @@ class HomeActivity :
                         is HomeActivitySharedAction.OpenSpacePreview -> {
                             startActivity(SpacePreviewActivity.newIntent(this, sharedAction.spaceId))
                         }
+                        is HomeActivitySharedAction.AddSpace -> {
+                            startActivity(SpaceCreationActivity.newIntent(this))
+                        }
                     }.exhaustive
                 }
                 .disposeOnDestroy()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
index f72354465b..72e3523336 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
@@ -25,5 +25,6 @@ sealed class HomeActivitySharedAction : VectorSharedAction {
     object OpenDrawer : HomeActivitySharedAction()
     object CloseDrawer : HomeActivitySharedAction()
     object OpenGroup : HomeActivitySharedAction()
+    object AddSpace : HomeActivitySharedAction()
     data class OpenSpacePreview(val spaceId: String) : HomeActivitySharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
new file mode 100644
index 0000000000..65c8102020
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.fragment.app.Fragment
+import com.airbnb.mvrx.viewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.toMvRxBundle
+import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
+import im.vector.app.features.spaces.create.CreateSpaceAction
+import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
+import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
+import im.vector.app.features.spaces.create.CreateSpaceEvents
+import im.vector.app.features.spaces.create.CreateSpaceState
+import im.vector.app.features.spaces.create.CreateSpaceViewModel
+import javax.inject.Inject
+
+class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Factory {
+
+    @Inject lateinit var viewModelFactory: CreateSpaceViewModel.Factory
+
+    override fun injectWith(injector: ScreenComponent) {
+        super.injectWith(injector)
+        injector.inject(this)
+    }
+
+    val viewModel: CreateSpaceViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (isFirstCreation()) {
+            when (withState(viewModel) { it.step }) {
+                CreateSpaceState.Step.ChooseType -> {
+                    navigateToFragment(ChooseSpaceTypeFragment::class.java)
+                }
+                CreateSpaceState.Step.SetDetails -> {
+                    navigateToFragment(ChooseSpaceTypeFragment::class.java)
+                }
+                CreateSpaceState.Step.AddRooms -> TODO()
+            }
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun initUiAndData() {
+        super.initUiAndData()
+        viewModel.subscribe(this) {
+            renderState(it)
+        }
+
+        viewModel.observeViewEvents {
+            when (it) {
+                CreateSpaceEvents.NavigateToDetails -> {
+                    navigateToFragment(CreateSpaceDetailsFragment::class.java)
+                }
+                CreateSpaceEvents.NavigateToChooseType -> {
+                    navigateToFragment(ChooseSpaceTypeFragment::class.java)
+                }
+                CreateSpaceEvents.Dismiss -> {
+                    finish()
+                }
+                CreateSpaceEvents.NavigateToAddRooms -> {
+                    navigateToFragment(CreateSpaceDefaultRoomsFragment::class.java)
+                }
+            }
+        }
+    }
+
+    private fun navigateToFragment(fragmentClass: Class<out Fragment>) {
+        val frag = supportFragmentManager.findFragmentByTag(fragmentClass.name) ?: createFragment(fragmentClass, Bundle().toMvRxBundle())
+        supportFragmentManager.beginTransaction()
+                .setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
+                .replace(R.id.container,
+                        frag,
+                        fragmentClass.name
+                )
+                .commit()
+    }
+
+    override fun onBackPressed() {
+        viewModel.handle(CreateSpaceAction.OnBackPressed)
+    }
+
+    private fun renderState(state: CreateSpaceState) {
+        val titleRes = when (state.step) {
+            CreateSpaceState.Step.ChooseType -> R.string.activity_create_space_title
+            CreateSpaceState.Step.SetDetails -> R.string.your_public_space
+            CreateSpaceState.Step.AddRooms   -> R.string.your_public_space
+        }
+        supportActionBar?.let {
+            it.title = getString(titleRes)
+        } ?: run {
+            setTitle(getString(titleRes))
+        }
+    }
+
+    companion object {
+        fun newIntent(context: Context): Intent {
+            return Intent(context, SpaceCreationActivity::class.java).apply {
+                // putExtra(MvRx.KEY_ARG, SpaceDirectoryArgs(spaceId))
+            }
+        }
+    }
+
+    override fun create(initialState: CreateSpaceState): CreateSpaceViewModel = viewModelFactory.create(initialState)
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index e14b920b2c..bc1af38473 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -57,6 +57,7 @@ class SpaceListFragment @Inject constructor(
             when (it) {
                 is SpaceListViewEvents.OpenSpaceSummary -> sharedActionViewModel.post(HomeActivitySharedAction.OpenSpacePreview(it.id))
                 is SpaceListViewEvents.OpenSpace -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup)
+                is SpaceListViewEvents.AddSpace -> sharedActionViewModel.post(HomeActivitySharedAction.AddSpace)
             }.exhaustive
         }
     }
@@ -78,4 +79,8 @@ class SpaceListFragment @Inject constructor(
     override fun onSpaceSelected(spaceSummary: SpaceSummary) {
         viewModel.handle(SpaceListAction.SelectSpace(spaceSummary))
     }
+
+    override fun onAddSpaceSelected() {
+        viewModel.handle(SpaceListAction.AddSpace)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 29d48b4cd1..d1bc3c6e1c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -19,8 +19,10 @@ package im.vector.app.features.spaces
 import com.airbnb.epoxy.EpoxyController
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericButtonItem
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItemHeader
+import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.grouplist.homeSpaceSummaryItem
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -103,9 +105,19 @@ class SpaceSummaryController @Inject constructor(
                         }
                     }
                 }
+
+        // Temporary item to create a new Space (will move with final design)
+
+        genericButtonItem {
+            id("create")
+            text(stringProvider.getString(R.string.add_space))
+            iconRes(R.drawable.ic_add_black)
+            buttonClickAction(DebouncedClickListener({ callback?.onAddSpaceSelected() }))
+        }
     }
 
     interface Callback {
         fun onSpaceSelected(spaceSummary: SpaceSummary)
+        fun onAddSpaceSelected()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index cbfa760f56..b8089d6f98 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -46,6 +46,7 @@ const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
 
 sealed class SpaceListAction : VectorViewModelAction {
     data class SelectSpace(val spaceSummary: SpaceSummary) : SpaceListAction()
+    object AddSpace : SpaceListAction()
 }
 
 /**
@@ -54,6 +55,7 @@ sealed class SpaceListAction : VectorViewModelAction {
 sealed class SpaceListViewEvents : VectorViewEvents {
     object OpenSpace : SpaceListViewEvents()
     data class OpenSpaceSummary(val id: String) : SpaceListViewEvents()
+    object AddSpace : SpaceListViewEvents()
 }
 
 data class SpaceListViewState(
@@ -110,6 +112,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     override fun handle(action: SpaceListAction) {
         when (action) {
             is SpaceListAction.SelectSpace -> handleSelectSpace(action)
+            else                           -> handleAddSpace()
         }
     }
 
@@ -136,6 +139,10 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         }
     }
 
+    private fun handleAddSpace() {
+        _viewEvents.post(SpaceListViewEvents.AddSpace)
+    }
+
     private fun observeGroupSummaries() {
         val roomSummaryQueryParams = roomSummaryQueryParams() {
             memberships = listOf(Membership.JOIN, Membership.INVITE)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
new file mode 100644
index 0000000000..080bb99ea4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.activityViewModel
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.databinding.FragmentSpaceCreateChooseTypeBinding
+import javax.inject.Inject
+
+class ChooseSpaceTypeFragment @Inject constructor(
+       // private val viewModelFactory: CreateSpaceViewModel.Factory,
+) : VectorBaseFragment<FragmentSpaceCreateChooseTypeBinding>() {
+
+    private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
+            FragmentSpaceCreateChooseTypeBinding.inflate(layoutInflater, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        views.publicButton.setOnClickListener(DebouncedClickListener({
+            sharedViewModel.handle(CreateSpaceAction.SetRoomType(SpaceType.Public))
+        }))
+
+        views.privateButton.setOnClickListener(DebouncedClickListener({
+            sharedViewModel.handle(CreateSpaceAction.SetRoomType(SpaceType.Private))
+        }))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
new file mode 100644
index 0000000000..2dc36f8715
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.activityViewModel
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentSpaceCreateGenericEpoxyFormBinding
+import javax.inject.Inject
+
+class CreateSpaceDefaultRoomsFragment @Inject constructor(
+        private val epoxyController: SpaceDefaultRoomEpoxyController
+) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(), SpaceDefaultRoomEpoxyController.Listener {
+
+    private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
+            FragmentSpaceCreateGenericEpoxyFormBinding.inflate(layoutInflater, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        views.recyclerView.configureWith(epoxyController)
+        epoxyController.listener = this
+
+        sharedViewModel.subscribe(this) {
+            epoxyController.setData(it)
+        }
+
+        views.nextButton.debouncedClicks {
+            sharedViewModel.handle(CreateSpaceAction.NextFromDetails)
+        }
+    }
+
+    // -----------------------------
+    // Epoxy controller listener methods
+    // -----------------------------
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
new file mode 100644
index 0000000000..506f71c92f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.activityViewModel
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentSpaceCreateGenericEpoxyFormBinding
+import javax.inject.Inject
+
+class CreateSpaceDetailsFragment @Inject constructor(
+        private val epoxyController: SpaceDetailEpoxyController
+) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(), SpaceDetailEpoxyController.Listener {
+
+    private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
+            FragmentSpaceCreateGenericEpoxyFormBinding.inflate(layoutInflater, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        views.recyclerView.configureWith(epoxyController)
+        epoxyController.listener = this
+
+        sharedViewModel.subscribe(this) {
+            epoxyController.setData(it)
+        }
+
+        views.nextButton.debouncedClicks {
+            sharedViewModel.handle(CreateSpaceAction.NextFromDetails)
+        }
+    }
+
+    // -----------------------------
+    // Epoxy controller listener methods
+    // -----------------------------
+
+    override fun onAvatarDelete() {
+    }
+
+    override fun onAvatarChange() {
+    }
+
+    override fun onNameChange(newName: String) {
+        sharedViewModel.handle(CreateSpaceAction.NameChanged(newName))
+    }
+
+    override fun onTopicChange(newTopic: String) {
+        sharedViewModel.handle(CreateSpaceAction.TopicChanged(newTopic))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
new file mode 100644
index 0000000000..aca8452300
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.net.Uri
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.Session
+
+data class CreateSpaceState(
+        val name: String? = null,
+        val avatarUri: Uri? = null,
+        val topic: String = "",
+        val step: Step = Step.ChooseType,
+        val spaceType: SpaceType? = null,
+        val nameInlineError : String? = null,
+        val defaultRooms: List<String>? = null
+) : MvRxState {
+
+    enum class Step {
+        ChooseType,
+        SetDetails,
+        AddRooms
+    }
+}
+
+enum class SpaceType {
+    Public,
+    Private
+}
+
+sealed class CreateSpaceAction : VectorViewModelAction {
+    data class SetRoomType(val type: SpaceType) : CreateSpaceAction()
+    data class NameChanged(val name: String) : CreateSpaceAction()
+    data class TopicChanged(val topic: String) : CreateSpaceAction()
+    object OnBackPressed : CreateSpaceAction()
+    object NextFromDetails : CreateSpaceAction()
+}
+
+sealed class CreateSpaceEvents : VectorViewEvents {
+    object NavigateToDetails : CreateSpaceEvents()
+    object NavigateToChooseType : CreateSpaceEvents()
+    object NavigateToAddRooms : CreateSpaceEvents()
+    object Dismiss : CreateSpaceEvents()
+}
+
+class CreateSpaceViewModel @AssistedInject constructor(
+        @Assisted initialState: CreateSpaceState,
+        private val session: Session,
+        private val stringProvider: StringProvider
+) : VectorViewModel<CreateSpaceState, CreateSpaceAction, CreateSpaceEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: CreateSpaceState): CreateSpaceViewModel
+    }
+
+    companion object : MvRxViewModelFactory<CreateSpaceViewModel, CreateSpaceState> {
+
+        override fun create(viewModelContext: ViewModelContext, state: CreateSpaceState): CreateSpaceViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    override fun handle(action: CreateSpaceAction) {
+        when (action) {
+            is CreateSpaceAction.SetRoomType -> {
+                setState {
+                    copy(
+                            step = CreateSpaceState.Step.SetDetails,
+                            spaceType = action.type
+                    )
+                }
+                _viewEvents.post(CreateSpaceEvents.NavigateToDetails)
+            }
+            is CreateSpaceAction.NameChanged -> {
+                setState {
+                    copy(
+                            nameInlineError = null,
+                            name = action.name
+                    )
+                }
+            }
+            is CreateSpaceAction.TopicChanged -> {
+                setState {
+                    copy(
+                            topic = action.topic
+                    )
+                }
+            }
+            CreateSpaceAction.OnBackPressed -> {
+                handleBackNavigation()
+            }
+            CreateSpaceAction.NextFromDetails -> {
+                handleNextFromDetails()
+            }
+        }.exhaustive
+    }
+
+    private fun handleBackNavigation() = withState { state ->
+        when (state.step) {
+            CreateSpaceState.Step.ChooseType -> {
+                _viewEvents.post(CreateSpaceEvents.Dismiss)
+            }
+            CreateSpaceState.Step.SetDetails -> {
+                setState {
+                    copy(
+                            step = CreateSpaceState.Step.ChooseType
+                    )
+                }
+                _viewEvents.post(CreateSpaceEvents.NavigateToChooseType)
+            }
+            CreateSpaceState.Step.AddRooms -> {
+                setState {
+                    copy(
+                            step = CreateSpaceState.Step.SetDetails
+                    )
+                }
+                _viewEvents.post(CreateSpaceEvents.NavigateToDetails)
+            }
+        }
+    }
+
+    private fun handleNextFromDetails() = withState { state ->
+        if (state.name.isNullOrBlank()) {
+            setState {
+                copy(
+                        nameInlineError = stringProvider.getString(R.string.create_space_error_empty_field_space_name)
+                )
+            }
+        } else {
+            setState {
+                copy(
+                        step = CreateSpaceState.Step.AddRooms
+                )
+            }
+            _viewEvents.post(CreateSpaceEvents.NavigateToAddRooms)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
new file mode 100644
index 0000000000..05abcf95b0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.features.form.formEditTextItem
+import javax.inject.Inject
+
+class SpaceDefaultRoomEpoxyController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider
+//        private val avatarRenderer: AvatarRenderer
+) : TypedEpoxyController<CreateSpaceState>() {
+
+    var listener: Listener? = null
+
+    override fun buildModels(data: CreateSpaceState?) {
+        genericFooterItem {
+            id("info_help_header")
+            style(GenericItem.STYLE.BIG_TEXT)
+            text(stringProvider.getString(R.string.create_spaces_room_public_header))
+            textColor(colorProvider.getColorFromAttribute(R.attr.riot_primary_text_color))
+        }
+
+        genericFooterItem {
+            id("info_help")
+            text(stringProvider.getString(R.string.create_spaces_room_public_header_desc))
+            textColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary))
+        }
+
+        formEditTextItem {
+            id("roomName1")
+            enabled(true)
+            value(data?.name)
+            hint(stringProvider.getString(R.string.create_room_name_hint))
+            showBottomSeparator(false)
+//            errorMessage(data?.nameInlineError)
+            onTextChange { text ->
+//                listener?.onNameChange(text)
+            }
+        }
+
+        formEditTextItem {
+            id("roomName2")
+            enabled(true)
+//            value(data?.name)
+            hint(stringProvider.getString(R.string.create_room_name_hint))
+            showBottomSeparator(false)
+//            errorMessage(data?.nameInlineError)
+            onTextChange { text ->
+//                listener?.onNameChange(text)
+            }
+        }
+
+        formEditTextItem {
+            id("roomName3")
+            enabled(true)
+//            value(data?.name)
+            hint(stringProvider.getString(R.string.create_room_name_hint))
+            showBottomSeparator(false)
+//            errorMessage(data?.nameInlineError)
+            onTextChange { text ->
+//                listener?.onNameChange(text)
+            }
+        }
+    }
+
+    interface Listener {
+//        fun onAvatarDelete()
+//        fun onAvatarChange()
+//        fun onNameChange(newName: String)
+//        fun onTopicChange(newTopic: String)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
new file mode 100644
index 0000000000..357b741ff4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.features.form.formEditTextItem
+import im.vector.app.features.form.formEditableSquareAvatarItem
+import im.vector.app.features.form.formMultiLineEditTextItem
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+import javax.inject.Inject
+
+class SpaceDetailEpoxyController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val avatarRenderer: AvatarRenderer
+) : TypedEpoxyController<CreateSpaceState>() {
+
+    var listener: Listener? = null
+
+    override fun buildModels(data: CreateSpaceState?) {
+        genericFooterItem {
+            id("info_help")
+            text(
+                    if (data?.spaceType == SpaceType.Public) {
+                        stringProvider.getString(R.string.create_spaces_details_public_header)
+                    } else {
+                        stringProvider.getString(R.string.create_spaces_details_private_header)
+                    }
+            )
+        }
+
+        formEditableSquareAvatarItem {
+            id("avatar")
+            enabled(true)
+            imageUri(data?.avatarUri)
+            avatarRenderer(avatarRenderer)
+            matrixItem(data?.name?.let { MatrixItem.RoomItem("", it, null).takeIf { !it.displayName.isNullOrBlank() } })
+            clickListener { listener?.onAvatarChange() }
+            deleteListener { listener?.onAvatarDelete() }
+        }
+
+        formEditTextItem {
+            id("name")
+            enabled(true)
+            value(data?.name)
+            hint(stringProvider.getString(R.string.create_room_name_hint))
+            showBottomSeparator(false)
+            errorMessage(data?.nameInlineError)
+            onTextChange { text ->
+                listener?.onNameChange(text)
+            }
+        }
+
+        formMultiLineEditTextItem {
+            id("topic")
+            enabled(true)
+            value(data?.topic)
+            hint(stringProvider.getString(R.string.create_room_topic_hint))
+            showBottomSeparator(false)
+            textSizeSp(15)
+            onTextChange { text ->
+                listener?.onTopicChange(text)
+            }
+        }
+    }
+
+    interface Listener {
+        fun onAvatarDelete()
+        fun onAvatarChange()
+        fun onNameChange(newName: String)
+        fun onTopicChange(newTopic: String)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
new file mode 100644
index 0000000000..552a98ded2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.util.AttributeSet
+import android.util.TypedValue
+import androidx.appcompat.content.res.AppCompatResources.getDrawable
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.withStyledAttributes
+import im.vector.app.R
+import im.vector.app.databinding.ViewSpaceTypeButtonBinding
+
+class WizardButtonView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
+    : ConstraintLayout(context, attrs, defStyle) {
+
+    private val views: ViewSpaceTypeButtonBinding
+
+    var title: String? = null
+        set(value) {
+            if (value != title) {
+                field = value
+                views.title.text = value
+            }
+        }
+
+    var subTitle: String? = null
+        set(value) {
+            if (value != subTitle) {
+                field = value
+                views.subTitle.text = value
+            }
+        }
+
+    var icon: Drawable? = null
+        set(value) {
+            if (value != icon) {
+                field = value
+                views.buttonImageView.setImageDrawable(value)
+            }
+        }
+
+//    private var tint: Int? = null
+//        set(value) {
+//            field = value
+//            if (value != null) {
+//                views.buttonImageView.imageTintList = ColorStateList.valueOf(value)
+//            } else {
+//                views.buttonImageView.clearColorFilter()
+//            }
+//        }
+
+//    var action: (() -> Unit)? = null
+
+    init {
+        inflate(context, R.layout.view_space_type_button, this)
+        views = ViewSpaceTypeButtonBinding.bind(this)
+
+        if (isInEditMode) {
+            title = "Title"
+            subTitle = "This is doing something"
+        }
+
+        context.withStyledAttributes(attrs, R.styleable.WizardButtonView) {
+            title = getString(R.styleable.WizardButtonView_title) ?: ""
+            subTitle = getString(R.styleable.WizardButtonView_subTitle) ?: ""
+            icon = getDrawable(R.styleable.WizardButtonView_icon)
+//            tint = getColor(R.styleable.WizardButtonView_iconTint, ThemeUtils.getColor(context, R.attr.riotx_text_primary))
+        }
+
+        val outValue = TypedValue()
+        context.theme.resolveAttribute(android.R.attr.selectableItemBackground, outValue, true)
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            this.foreground = getDrawable(context, outValue.resourceId)
+        }
+
+//        views.content.isClickable = true
+//        views.content.isFocusable = true
+//        views.content.setOnClickListener {
+//            action?.invoke()
+//        }
+    }
+}
diff --git a/vector/src/main/res/drawable/ic_camera_plain.xml b/vector/src/main/res/drawable/ic_camera_plain.xml
new file mode 100644
index 0000000000..56d55c9da1
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_camera_plain.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6.4931,1.6667C5.569,1.6667 4.7811,2.2962 4.5568,3.165C4.5039,3.3699 4.4261,3.5713 4.2866,3.7303L4.0563,3.9928C3.8664,4.2092 3.5925,4.3333 3.3046,4.3333H1.3333C0.597,4.3333 0,4.9303 0,5.6667V13C0,13.7364 0.597,14.3333 1.3333,14.3333H14.6667C15.403,14.3333 16,13.7364 16,13V5.6667C16,4.9303 15.403,4.3333 14.6667,4.3333H12.6954C12.4075,4.3333 12.1336,4.2092 11.9437,3.9928L11.7134,3.7303C11.5739,3.5713 11.4961,3.3699 11.4432,3.165C11.219,2.2962 10.431,1.6667 9.5069,1.6667H6.4931ZM10.6667,9C10.6667,10.4727 9.4728,11.6667 8,11.6667C6.5272,11.6667 5.3333,10.4727 5.3333,9C5.3333,7.5272 6.5272,6.3333 8,6.3333C9.4728,6.3333 10.6667,7.5272 10.6667,9Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_public_room.xml b/vector/src/main/res/drawable/ic_public_room.xml
new file mode 100644
index 0000000000..1520898831
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_public_room.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12Z"
+      android:fillColor="#C1C6CD"/>
+  <path
+      android:pathData="M18.6999,18.8177L19.6243,15.9652C19.6324,15.9404 19.6365,15.9143 19.6365,15.8882V15.0473C19.6365,14.9823 19.6111,14.9197 19.5657,14.8731L18.7105,13.9934C18.6916,13.9739 18.6697,13.9577 18.6456,13.9453L16.8092,13.0009C16.7852,12.9885 16.7632,12.9723 16.7443,12.9529L15.8919,12.0761C15.8449,12.0277 15.7802,12.0004 15.7127,12.0004H12.2501C12.1121,12.0004 12.0001,11.8885 12.0001,11.7504V10.2868C12.0001,10.1487 11.8882,10.0368 11.7501,10.0368H9.3865C9.2484,10.0368 9.1365,9.9248 9.1365,9.7868V8.3798C9.1365,8.2215 9.2818,8.103 9.4369,8.1349L13.6089,8.9931C13.7639,9.0251 13.9092,8.9066 13.9092,8.7483V7.1928C13.9092,7.1277 13.9346,7.0652 13.98,7.0185L16.6034,4.3201C16.6978,4.2231 16.6978,4.0686 16.6034,3.9716L14.9023,2.2219C14.8769,2.1957 14.8461,2.1755 14.8121,2.1625L13.3697,1.613C12.4823,1.275 11.5072,1.2439 10.6001,1.5247L9.1365,1.9777C7.1638,2.6207 5.6129,4.1612 4.9568,6.1296L4.621,7.1369C4.5407,7.3779 4.4931,7.6285 4.4795,7.8822L4.3696,9.9275C4.3659,9.9972 4.3914,10.0652 4.44,10.1152L6.1992,11.9247C6.2463,11.9731 6.311,12.0004 6.3785,12.0004H8.1214C8.1612,12.0004 8.2004,12.0099 8.2358,12.0281L9.9554,12.9124C10.0387,12.9553 10.091,13.0411 10.091,13.1348V15.8701C10.091,15.908 10.0996,15.9454 10.1162,15.9794L10.9772,17.7506C11.019,17.8367 11.1063,17.8913 11.202,17.8913H12.8491C12.9166,17.8913 12.9812,17.9186 13.0283,17.967L13.9092,18.8731L14.8357,19.8261C14.8543,19.8452 14.8697,19.8671 14.8813,19.8911L15.6626,21.4982C15.7383,21.654 15.9458,21.6874 16.0667,21.5631L16.7729,20.8368L17.7274,19.8549L18.6413,18.9149C18.6681,18.8874 18.6881,18.8542 18.6999,18.8177Z"
+      android:fillColor="#F4F6FA"
+      android:fillAlpha="0.91"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_room_private.xml b/vector/src/main/res/drawable/ic_room_private.xml
new file mode 100644
index 0000000000..cacdf15a3b
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_room_private.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.3333,2C8.3878,2 6,4.3878 6,7.3333V10C4.8954,10 4,10.8954 4,12V20C4,21.1046 4.8954,22 6,22H18C19.1046,22 20,21.1046 20,20V12C20,10.8954 19.1046,10 18,10V7.3333C18,4.3878 15.6122,2 12.6667,2H11.3333ZM15.3333,10V7.3333C15.3333,5.8606 14.1394,4.6667 12.6667,4.6667H11.3333C9.8606,4.6667 8.6667,5.8606 8.6667,7.3333V10H15.3333Z"
+      android:fillColor="#C1C6CD"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
new file mode 100644
index 0000000000..ddf61aabf8
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp">
+
+        <TextView
+            android:id="@+id/headerText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/create_spaces_type_header"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="18sp"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dp"
+            android:gravity="start"
+            android:text="@string/create_spaces_choose_type_label"
+            android:textColor="?riotx_text_primary"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
+            app:layout_constraintTop_toBottomOf="@id/headerText"
+            app:layout_constraintVertical_bias="1" />
+
+        <TextView
+            android:id="@+id/joinInfoHelpText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:gravity="start"
+            android:text="@string/create_spaces_join_info_help"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toTopOf="@id/publicButton" />
+
+        <im.vector.app.features.spaces.create.WizardButtonView
+            android:id="@+id/publicButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            app:icon="@drawable/ic_public_room"
+            app:layout_constraintBottom_toTopOf="@id/privateButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:subTitle="@string/space_type_public_desc"
+            app:title="@string/space_type_public" />
+
+        <im.vector.app.features.spaces.create.WizardButtonView
+            android:id="@+id/privateButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_room_private"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:subTitle="@string/space_type_private_desc"
+            app:title="@string/space_type_private" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
new file mode 100644
index 0000000000..3097664e02
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/buttonBar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:listitem="@layout/item_form_text_input" />
+
+    <FrameLayout
+        android:id="@+id/buttonBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?riotx_background"
+        android:elevation="2dp"
+        android:padding="8dp"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/nextButton"
+            style="@style/VectorButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/next_pf" />
+
+    </FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_editable_square_avatar.xml b/vector/src/main/res/layout/item_editable_square_avatar.xml
new file mode 100644
index 0000000000..b3ec057fd4
--- /dev/null
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/memberProfileInfoContainer"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background"
+    android:padding="16dp">
+
+    <!-- I cannot do what I want using layer-list, do it manually here-->
+    <FrameLayout
+        android:id="@+id/itemEditableAvatarImageContainer"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:background="@drawable/rounded_rect_shape_8"
+        android:contentDescription="@string/a11y_change_avatar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+
+        <ImageView
+            android:id="@+id/itemEditableAvatarImage"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:importantForAccessibility="no"
+            android:scaleType="fitCenter"
+            tools:alpha="0.3"
+            tools:src="@tools:sample/avatars" />
+
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/itemEditableAvatarDelete"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:background="@drawable/header_panel_round_background"
+        android:contentDescription="@string/a11y_delete_avatar"
+        android:scaleType="center"
+        android:src="@drawable/ic_delete"
+        android:visibility="gone"
+        app:layout_constraintCircle="@+id/itemEditableAvatarImageContainer"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="48dp"
+        app:tint="@color/riotx_destructive_accent"
+        tools:ignore="MissingConstraints"
+        tools:visibility="visible" />
+
+
+    <ImageView
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        android:background="@drawable/circle"
+        android:backgroundTint="?riotx_background"
+        android:padding="8dp"
+        android:src="@drawable/ic_camera_plain"
+        app:tint="?riotx_text_secondary"
+        app:layout_constraintCircle="@+id/itemEditableAvatarImageContainer"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="48dp"
+        tools:ignore="MissingConstraints" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
new file mode 100644
index 0000000000..1ccbed3201
--- /dev/null
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/rounded_rect_shape_8"
+    android:id="@+id/content"
+    android:padding="4dp">
+
+    <ImageView
+        android:id="@+id/buttonImageView"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_margin="8dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_public_room"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginBottom="8dp"
+        android:gravity="start"
+        android:textColor="?riotx_text_primary"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@id/rightChevron"
+        app:layout_constraintStart_toEndOf="@id/buttonImageView"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Public" />
+
+
+    <TextView
+        android:id="@+id/subTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginBottom="8dp"
+        android:gravity="start"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="12sp"
+        android:textStyle="normal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/rightChevron"
+        app:layout_constraintStart_toEndOf="@id/buttonImageView"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_goneMarginBottom="8dp"
+        tools:text="Open to anyone, best for communities" />
+
+    <ImageView
+        android:id="@+id/rightChevron"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:src="@drawable/ic_material_chevron_right_black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_secondary" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index ecc64bf07d..86105cf74d 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -54,8 +54,10 @@
         <attr name="forceStartPadding" format="boolean" />
     </declare-styleable>
 
+    <attr name="iconTint" format="color" />
+
     <declare-styleable name="SignOutBottomSheetActionButton">
-        <attr name="iconTint" format="color" />
+        <attr name="iconTint"/>
         <attr name="actionTitle" />
         <attr name="leftIcon" />
         <attr name="textColor" format="color" />
@@ -68,4 +70,12 @@
             <enum name="continue_with" value="2" />
         </attr>
     </declare-styleable>
+
+    <declare-styleable name="WizardButtonView">
+        <attr name="icon" format="reference" />
+        <attr name="iconTint"/>
+        <attr name="title" format="string" />
+        <attr name="subTitle" format="string" />
+    </declare-styleable>
+
 </resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 01adc31bb1..b2bfe76f57 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3259,4 +3259,22 @@
     <string name="event_status_failed_messages_warning">Messages failed to send</string>
     <string name="event_status_delete_all_failed_dialog_title">Delete unsent messages</string>
     <string name="event_status_delete_all_failed_dialog_message">Are you sure you want to delete all unsent messages in this room?</string>
+
+    <string name="add_space">Add Space</string>
+    <string name="your_public_space">Your public space</string>
+    <string name="create_spaces_type_header">Spaces are a new way to group rooms and people</string>
+    <string name="create_spaces_choose_type_label">What type of space do you want to create?</string>
+    <string name="create_spaces_join_info_help">To join an existing space, you need an invite.</string>
+    <string name="space_type_public">Public</string>
+    <string name="space_type_public_desc">Open to anyone, best for communities</string>
+    <string name="space_type_private">Private</string>
+    <string name="space_type_private_desc">Invite only, best for yourself or teams</string>
+    <string name="activity_create_space_title">Create a space</string>
+    <string name="create_spaces_details_public_header">Add some details to help it stand out. You can change these at any point.</string>
+    <string name="create_spaces_details_private_header">Add some details to help people identify it. You can change these at any point.</string>
+    <string name="create_space_error_empty_field_space_name">Give it a name to continue.</string>
+    <string name="create_spaces_room_public_header">What are some discussions you want to have in Runner’s World?</string>
+    <string name="create_spaces_room_public_header_desc">We’ll create rooms for them, and auto-join everyone. You can add more later too.</string>
+
+
 </resources>

From 6c69a6055da7fa45f4a7702696a76c7366b64707 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Feb 2021 00:17:27 +0100
Subject: [PATCH 109/350] Support retry after M_LIMIT_EXCEEDED

---
 .../sdk/internal/task/ConfigurableTask.kt     |  6 +++--
 .../matrix/android/sdk/internal/task/Task.kt  | 22 +++++++++++++++++++
 .../android/sdk/internal/task/TaskExecutor.kt |  6 ++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
index 97f9a0dd51..bc80cf7ee8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
@@ -37,7 +37,8 @@ internal data class ConfigurableTask<PARAMS, RESULT>(
         val id: UUID,
         val callbackThread: TaskThread,
         val executionThread: TaskThread,
-        val callback: MatrixCallback<RESULT>
+        val callback: MatrixCallback<RESULT>,
+        val maxRetryCount: Int = 0
 
 ) : Task<PARAMS, RESULT> by task {
 
@@ -57,7 +58,8 @@ internal data class ConfigurableTask<PARAMS, RESULT>(
                 id = id,
                 callbackThread = callbackThread,
                 executionThread = executionThread,
-                callback = callback
+                callback = callback,
+                maxRetryCount = retryCount
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
index a6c80a0b1a..a5d031e02a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
@@ -16,7 +16,29 @@
 
 package org.matrix.android.sdk.internal.task
 
+import kotlinx.coroutines.delay
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.shouldBeRetried
+import timber.log.Timber
+
 internal interface Task<PARAMS, RESULT> {
 
     suspend fun execute(params: PARAMS): RESULT
+
+    suspend fun executeRetry(params: PARAMS, remainingRetry: Int) : RESULT {
+        return try {
+            execute(params)
+        } catch (failure: Throwable) {
+            if (failure.shouldBeRetried() && remainingRetry > 0) {
+                Timber.d(failure, "## TASK: Retriable error")
+                if (failure is Failure.ServerError) {
+                    val waitTime = failure.error.retryAfterMillis ?: 0L
+                    Timber.d(failure, "## TASK: Quota wait time $waitTime")
+                    delay(waitTime + 100)
+                }
+                return executeRetry(params, remainingRetry - 1)
+            }
+            throw failure
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
index 478a356432..4da16eff22 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
@@ -40,9 +40,9 @@ internal class TaskExecutor @Inject constructor(private val coroutineDispatchers
                 .launch(task.callbackThread.toDispatcher()) {
                     val resultOrFailure = runCatching {
                         withContext(task.executionThread.toDispatcher()) {
-                            Timber.v("Enqueue task $task")
-                            Timber.v("Execute task $task on ${Thread.currentThread().name}")
-                            task.execute(task.params)
+                            Timber.v("## TASK: Enqueue task $task")
+                            Timber.v("## TASK: Execute task $task on ${Thread.currentThread().name}")
+                            task.executeRetry(task.params, task.maxRetryCount)
                         }
                     }
                     resultOrFailure

From 7d2d7b411e0efc7069932cafe4b7a1549d08dd2b Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Feb 2021 00:23:53 +0100
Subject: [PATCH 110/350] Space Create Wizard Flow

---
 .../session/room/failure/CreateRoomFailure.kt |  2 +-
 .../android/sdk/api/session/space/Space.kt    |  6 ++
 .../session/room/DefaultRoomService.kt        |  9 +-
 .../sdk/internal/session/room/SpaceGetter.kt  | 39 ++++++++
 .../session/room/create/CreateRoomTask.kt     |  2 +-
 .../session/room/state/DefaultStateService.kt |  2 +-
 .../internal/session/space/CreateSpaceTask.kt | 56 +++++++++++
 .../internal/session/space/DefaultSpace.kt    |  8 +-
 .../session/space/DefaultSpaceService.kt      | 38 +++-----
 .../sdk/internal/session/space/SpaceModule.kt |  8 ++
 .../app/features/form/FormEditTextItem.kt     |  9 ++
 .../form/FormEditableSquareAvatarItem.kt      | 31 ++++--
 .../grouplist/HomeSpaceSummaryItem.kt         |  4 +
 .../vector/app/features/home/HomeActivity.kt  | 21 +++-
 .../features/navigation/DefaultNavigator.kt   | 21 ++++
 .../app/features/navigation/Navigator.kt      |  2 +
 .../features/spaces/SpaceCreationActivity.kt  | 29 +++++-
 .../features/spaces/SpacesListViewModel.kt    | 15 ++-
 .../spaces/create/ChooseSpaceTypeFragment.kt  |  2 +-
 .../create/CreateSpaceDefaultRoomsFragment.kt |  6 +-
 .../create/CreateSpaceDetailsFragment.kt      | 16 +++-
 .../spaces/create/CreateSpaceViewModel.kt     | 94 +++++++++++++++++-
 .../spaces/create/CreateSpaceViewModelTask.kt | 95 +++++++++++++++++++
 .../create/SpaceDefaultRoomEpoxyController.kt | 26 +++--
 .../spaces/create/WizardButtonView.kt         |  3 +-
 vector/src/main/res/values/ids.xml            |  3 +
 vector/src/main/res/values/strings.xml        |  2 +
 27 files changed, 481 insertions(+), 68 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
 create mode 100644 vector/src/main/res/values/ids.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt
index 208cdd4556..deab0ca3e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt
@@ -21,7 +21,7 @@ import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.session.room.alias.RoomAliasError
 
 sealed class CreateRoomFailure : Failure.FeatureFailure() {
-    object CreatedWithTimeout : CreateRoomFailure()
+    data class CreatedWithTimeout(val roomID: String) : CreateRoomFailure()
     data class CreatedWithFederationFailure(val matrixError: MatrixError) : CreateRoomFailure()
     data class AliasError(val aliasError: RoomAliasError) : CreateRoomFailure()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 01a0dbc929..0172b3701b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -17,11 +17,17 @@
 package org.matrix.android.sdk.api.session.space
 
 import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 interface Space {
 
     fun asRoom() : Room
 
+    /**
+     * A current snapshot of [RoomSummary] associated with the room
+     */
+    fun spaceSummary(): SpaceSummary?
+
     suspend fun addChildren(roomId: String, viaServers: List<String>, order: String?, autoJoin: Boolean = false)
 
     suspend fun removeRoom(roomId: String)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 22f61bc517..4724167e87 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -66,8 +66,13 @@ internal class DefaultRoomService @Inject constructor(
         private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource
 ) : RoomService {
 
-    override suspend fun createRoom(createRoomParams: CreateRoomParams): String {
-        return createRoomTask.execute(createRoomParams)
+    override fun createRoom(createRoomParams: CreateRoomParams, callback: MatrixCallback<String>): Cancelable {
+        return createRoomTask
+                .configureWith(createRoomParams) {
+                    this.callback = callback
+                    this.retryCount = 3
+                }
+                .executeBy(taskExecutor)
     }
 
     override fun getRoom(roomId: String): Room? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt
new file mode 100644
index 0000000000..f440a67710
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room
+
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.space.Space
+import org.matrix.android.sdk.internal.session.space.DefaultSpace
+import org.matrix.android.sdk.internal.session.space.SpaceSummaryDataSource
+import javax.inject.Inject
+
+internal interface SpaceGetter {
+    fun get(spaceId: String): Space?
+}
+
+internal class DefaultSpaceGetter @Inject constructor(
+        private val roomGetter: RoomGetter,
+        private val spaceSummaryDataSource: SpaceSummaryDataSource
+) : SpaceGetter {
+
+    override fun get(spaceId: String): Space? {
+        return roomGetter.getRoom(spaceId)
+                ?.takeIf { it.roomSummary()?.roomType == RoomType.SPACE }
+                ?.let { DefaultSpace(it, spaceSummaryDataSource) }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
index bafe2b90ae..de6a71e581 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
@@ -102,7 +102,7 @@ internal class DefaultCreateRoomTask @Inject constructor(
                         .equalTo(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.JOIN.name)
             }
         } catch (exception: TimeoutCancellationException) {
-            throw CreateRoomFailure.CreatedWithTimeout
+            throw CreateRoomFailure.CreatedWithTimeout(roomId)
         }
 
         Realm.getInstance(realmConfiguration).executeTransactionAsync {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index 615bc99096..4948e3ace5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -73,7 +73,7 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
                 eventType = eventType,
                 body = body.toSafeJson(eventType)
         )
-        sendStateTask.execute(params)
+        sendStateTask.executeRetry(params, 3)
     }
 
     private fun JsonDict.toSafeJson(eventType: String): JsonDict {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt
new file mode 100644
index 0000000000..5f174587d0
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.space
+
+import io.realm.RealmConfiguration
+import kotlinx.coroutines.TimeoutCancellationException
+import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
+import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
+import org.matrix.android.sdk.internal.task.Task
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+/**
+ * A simple wrapper of create room task that adds waiting for DB entities of spaces
+ */
+internal interface CreateSpaceTask : Task<CreateRoomParams, String>
+
+internal class DefaultCreateSpaceTask @Inject constructor(
+        private val createRoomTask: CreateRoomTask,
+        @SessionDatabase private val realmConfiguration: RealmConfiguration
+) : CreateSpaceTask {
+
+    override suspend fun execute(params: CreateRoomParams): String {
+        val spaceId = createRoomTask.execute(params)
+
+        try {
+            awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(1L)) { realm ->
+                realm.where(SpaceSummaryEntity::class.java)
+                        .equalTo(SpaceSummaryEntityFields.SPACE_ID, spaceId)
+            }
+        } catch (exception: TimeoutCancellationException) {
+            throw CreateRoomFailure.CreatedWithTimeout(spaceId)
+        }
+
+        return spaceId
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 264cfd44ed..efba103ab7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -22,15 +22,19 @@ import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.space.Space
+import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
-import java.lang.IllegalArgumentException
 
-class DefaultSpace(private val room: Room) : Space {
+internal class DefaultSpace(private val room: Room, private val spaceSummaryDataSource: SpaceSummaryDataSource) : Space {
 
     override fun asRoom(): Room {
         return room
     }
 
+    override fun spaceSummary(): SpaceSummary? {
+        return spaceSummaryDataSource.getSpaceSummary(asRoom().roomId)
+    }
+
     override suspend fun addChildren(roomId: String, viaServers: List<String>, order: String?, autoJoin: Boolean) {
         asRoom().sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 906886d5e8..0210c81e5d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -22,7 +22,6 @@ import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import org.matrix.android.sdk.api.session.space.CreateSpaceParams
@@ -32,40 +31,33 @@ import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
 import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.session.room.RoomGetter
-import org.matrix.android.sdk.internal.session.room.alias.DeleteRoomAliasTask
-import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
-import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
-import org.matrix.android.sdk.internal.session.room.membership.RoomChangeMembershipStateDataSource
-import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
+import org.matrix.android.sdk.internal.session.room.SpaceGetter
 import org.matrix.android.sdk.internal.session.room.membership.leaving.LeaveRoomTask
-import org.matrix.android.sdk.internal.session.room.read.MarkAllRoomsReadTask
 import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
 import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
-import org.matrix.android.sdk.internal.session.user.accountdata.UpdateBreadcrumbsTask
-import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
 
 internal class DefaultSpaceService @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
-        private val createRoomTask: CreateRoomTask,
-        private val joinRoomTask: JoinRoomTask,
+        private val createSpaceTask: CreateSpaceTask,
+//        private val joinRoomTask: JoinRoomTask,
         private val joinSpaceTask: JoinSpaceTask,
-        private val markAllRoomsReadTask: MarkAllRoomsReadTask,
-        private val updateBreadcrumbsTask: UpdateBreadcrumbsTask,
-        private val roomIdByAliasTask: GetRoomIdByAliasTask,
-        private val deleteRoomAliasTask: DeleteRoomAliasTask,
-        private val roomGetter: RoomGetter,
+        private val spaceGetter: SpaceGetter,
+//        private val markAllRoomsReadTask: MarkAllRoomsReadTask,
+//        private val updateBreadcrumbsTask: UpdateBreadcrumbsTask,
+//        private val roomIdByAliasTask: GetRoomIdByAliasTask,
+//        private val deleteRoomAliasTask: DeleteRoomAliasTask,
+//        private val roomGetter: RoomGetter,
         private val spaceSummaryDataSource: SpaceSummaryDataSource,
         private val peekSpaceTask: PeekSpaceTask,
         private val resolveSpaceInfoTask: ResolveSpaceInfoTask,
-        private val leaveRoomTask: LeaveRoomTask,
-        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
-        private val taskExecutor: TaskExecutor
+        private val leaveRoomTask: LeaveRoomTask
+//        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
+//        private val taskExecutor: TaskExecutor
 ) : SpaceService {
 
     override suspend fun createSpace(params: CreateSpaceParams): String {
-        return createRoomTask.execute(params)
+        return createSpaceTask.executeRetry(params, 3)
     }
 
     override suspend fun createSpace(name: String, topic: String?, avatarUri: Uri?, isPublic: Boolean): String {
@@ -78,9 +70,7 @@ internal class DefaultSpaceService @Inject constructor(
     }
 
     override fun getSpace(spaceId: String): Space? {
-        return roomGetter.getRoom(spaceId)
-                ?.takeIf { it.roomSummary()?.roomType == RoomType.SPACE }
-                ?.let { DefaultSpace(it) }
+        return spaceGetter.get(spaceId)
     }
 
     override fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams): LiveData<List<SpaceSummary>> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
index 4612d9e142..84a2d5267f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
@@ -20,6 +20,8 @@ import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.room.DefaultSpaceGetter
+import org.matrix.android.sdk.internal.session.room.SpaceGetter
 import org.matrix.android.sdk.internal.session.space.peeking.DefaultPeekSpaceTask
 import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
 import retrofit2.Retrofit
@@ -45,4 +47,10 @@ internal abstract class SpaceModule {
 
     @Binds
     abstract fun bindJoinSpaceTask(task: DefaultJoinSpaceTask): JoinSpaceTask
+
+    @Binds
+    abstract fun bindSpaceGetter(getter: DefaultSpaceGetter): SpaceGetter
+
+    @Binds
+    abstract fun bindCreateSpaceTask(getter: DefaultCreateSpaceTask): CreateSpaceTask
 }
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index 68e2e6b371..a1bd2bd1a3 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.form
 
 import android.text.Editable
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
@@ -50,6 +51,12 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     @EpoxyAttribute
     var inputType: Int? = null
 
+    @EpoxyAttribute
+    var singleLine: Boolean? = null
+
+    @EpoxyAttribute
+    var imeOptions: Int? = null
+
     @EpoxyAttribute
     var onTextChange: ((String) -> Unit)? = null
 
@@ -69,6 +76,8 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         holder.textInputEditText.setTextSafe(value)
         holder.textInputEditText.isEnabled = enabled
         inputType?.let { holder.textInputEditText.inputType = it }
+        holder.textInputEditText.isSingleLine = singleLine ?: false
+        holder.textInputEditText.imeOptions = imeOptions ?: EditorInfo.IME_ACTION_NONE
 
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
         holder.bottomSeparator.isVisible = showBottomSeparator
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
index 5023c1b483..cbb545825d 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
@@ -16,13 +16,16 @@
 package im.vector.app.features.form
 
 import android.net.Uri
+import android.util.TypedValue
 import android.view.View
 import android.widget.ImageView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import com.bumptech.glide.request.RequestOptions
+import com.bumptech.glide.load.MultiTransformation
+import com.bumptech.glide.load.resource.bitmap.CenterCrop
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import im.vector.app.R
 import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
@@ -55,13 +58,24 @@ abstract class FormEditableSquareAvatarItem : EpoxyModelWithHolder<FormEditableS
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.imageContainer.onClick(clickListener?.takeIf { enabled })
-        if (matrixItem != null) {
-            avatarRenderer?.renderSpace(matrixItem!!, holder.image)
-        } else {
-            GlideApp.with(holder.image)
-                    .load(imageUri)
-                    .apply(RequestOptions.circleCropTransform())
-                    .into(holder.image)
+        when {
+            imageUri != null   -> {
+                val corner = TypedValue.applyDimension(
+                        TypedValue.COMPLEX_UNIT_DIP,
+                        8f,
+                        holder.view.resources.displayMetrics
+                ).toInt()
+                GlideApp.with(holder.image)
+                        .load(imageUri)
+                        .transform(MultiTransformation(CenterCrop(), RoundedCorners(corner)))
+                        .into(holder.image)
+            }
+            matrixItem != null -> {
+                avatarRenderer?.renderSpace(matrixItem!!, holder.image)
+            }
+            else               -> {
+                avatarRenderer?.clear(holder.image)
+            }
         }
         holder.delete.isVisible = enabled && (imageUri != null || matrixItem?.avatarUrl?.isNotEmpty() == true)
         holder.delete.onClick(deleteListener?.takeIf { enabled })
@@ -72,6 +86,7 @@ abstract class FormEditableSquareAvatarItem : EpoxyModelWithHolder<FormEditableS
         GlideApp.with(holder.image).clear(holder.image)
         super.unbind(holder)
     }
+
     class Holder : VectorEpoxyHolder() {
         val imageContainer by bind<View>(R.id.itemEditableAvatarImageContainer)
         val image by bind<ImageView>(R.id.itemEditableAvatarImage)
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
index ade86a9d89..c3f459f49e 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
@@ -35,6 +35,10 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
     @EpoxyAttribute var selected: Boolean = false
     @EpoxyAttribute var listener: (() -> Unit)? = null
 
+    override fun getViewType(): Int {
+        // mm.. it's reusing the same layout for basic space item
+        return R.id.space_item_home
+    }
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.rootView.setOnClickListener { listener?.invoke() }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 982b59263d..40d0cdd622 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home
 
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -36,6 +37,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.ToolbarConfigurable
 import im.vector.app.core.platform.VectorBaseActivity
@@ -103,6 +105,23 @@ class HomeActivity :
     @Inject lateinit var avatarRenderer: AvatarRenderer
     @Inject lateinit var initSyncStepFormatter: InitSyncStepFormatter
 
+    private val createSpaceResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val spaceId = activityResult.data?.extras?.getString(SpaceCreationActivity.RESULT_DATA_CREATED_SPACE_ID)
+            val defaultRoomsId = activityResult.data?.extras?.getString(SpaceCreationActivity.RESULT_DATA_DEFAULT_ROOM_ID)
+            views.drawerLayout.closeDrawer(GravityCompat.START)
+
+            // Here we want to change current space to the newly created one, and then immediatly open the default room
+            if (spaceId != null) {
+                navigator.switchToSpace(this, spaceId, defaultRoomsId)
+            }
+
+            // Also we should show the share space bottomsheet
+        } else {
+            // viewModel.handle(CrossSigningSettingsAction.ReAuthCancelled)
+        }
+    }
+
     private val drawerListener = object : DrawerLayout.SimpleDrawerListener() {
         override fun onDrawerStateChanged(newState: Int) {
             hideKeyboard()
@@ -147,7 +166,7 @@ class HomeActivity :
                             startActivity(SpacePreviewActivity.newIntent(this, sharedAction.spaceId))
                         }
                         is HomeActivitySharedAction.AddSpace -> {
-                            startActivity(SpaceCreationActivity.newIntent(this))
+                            createSpaceResultLauncher.launch(SpaceCreationActivity.newIntent(this))
                         }
                     }.exhaustive
                 }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 76e4cad28f..d6eeade97e 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -29,6 +29,7 @@ import androidx.core.app.ActivityOptionsCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
+import arrow.core.Option
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.fatalError
@@ -46,6 +47,7 @@ import im.vector.app.features.crypto.verification.SupportedVerificationMethodsPr
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.debug.DebugMenuActivity
 import im.vector.app.features.devtools.RoomDevToolActivity
+import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.RoomDetailArgs
 import im.vector.app.features.home.room.detail.search.SearchActivity
@@ -77,6 +79,7 @@ import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryDat
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
+import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -85,6 +88,7 @@ class DefaultNavigator @Inject constructor(
         private val sessionHolder: ActiveSessionHolder,
         private val vectorPreferences: VectorPreferences,
         private val widgetArgsBuilder: WidgetArgsBuilder,
+        private val selectedSpaceDataSource: SelectedSpaceDataSource,
         private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider
 ) : Navigator {
 
@@ -98,6 +102,23 @@ class DefaultNavigator @Inject constructor(
         startActivity(context, intent, buildTask)
     }
 
+    override fun switchToSpace(context: Context, spaceId: String, roomId: String?) {
+        if (sessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(spaceId) == null) {
+            fatalError("Trying to open an unknown space $spaceId", vectorPreferences.failFast())
+            return
+        }
+
+        sessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(spaceId)?.spaceSummary()?.let {
+            Timber.d("## Nav: Switching to space $spaceId / ${it.roomSummary.name}")
+            selectedSpaceDataSource.post(Option.just(it))
+        } ?: kotlin.run {
+            Timber.d("## Nav: Failed to switch to space $spaceId")
+        }
+        if (roomId != null) {
+            openRoom(context, roomId)
+        }
+    }
+
     override fun performDeviceVerification(context: Context, otherUserId: String, sasTransactionId: String) {
         val session = sessionHolder.getSafeActiveSession() ?: return
         val tx = session.cryptoService().verificationService().getExistingTransaction(otherUserId, sasTransactionId)
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index b4bd677b0c..fcd35be162 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -38,6 +38,8 @@ interface Navigator {
 
     fun openRoom(context: Context, roomId: String, eventId: String? = null, buildTask: Boolean = false)
 
+    fun switchToSpace(context: Context, spaceId: String, roomId: String?)
+
     fun performDeviceVerification(context: Context, otherUserId: String, sasTransactionId: String)
 
     fun requestSessionVerification(context: Context, otherSessionId: String)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 65c8102020..ed8b85f587 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -20,7 +20,9 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.viewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
@@ -91,6 +93,23 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
                 CreateSpaceEvents.NavigateToAddRooms -> {
                     navigateToFragment(CreateSpaceDefaultRoomsFragment::class.java)
                 }
+                is CreateSpaceEvents.ShowModalError -> {
+                    hideWaitingView()
+                    AlertDialog.Builder(this)
+                            .setMessage(it.errorMessage)
+                            .setPositiveButton(getString(R.string.ok), null)
+                            .show()
+                }
+                is CreateSpaceEvents.FinishSuccess -> {
+                    setResult(RESULT_OK, Intent().apply {
+                        putExtra(RESULT_DATA_CREATED_SPACE_ID, it.spaceId)
+                        putExtra(RESULT_DATA_DEFAULT_ROOM_ID, it.defaultRoomId)
+                    })
+                    finish()
+                }
+                CreateSpaceEvents.HideModalLoading -> {
+                    hideWaitingView()
+                }
             }
         }
     }
@@ -114,16 +133,24 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
         val titleRes = when (state.step) {
             CreateSpaceState.Step.ChooseType -> R.string.activity_create_space_title
             CreateSpaceState.Step.SetDetails -> R.string.your_public_space
-            CreateSpaceState.Step.AddRooms   -> R.string.your_public_space
+            CreateSpaceState.Step.AddRooms -> R.string.your_public_space
         }
         supportActionBar?.let {
             it.title = getString(titleRes)
         } ?: run {
             setTitle(getString(titleRes))
         }
+
+        if (state.creationResult is Loading) {
+            showWaitingView(getString(R.string.create_spaces_loading_message))
+        }
     }
 
     companion object {
+
+        const val RESULT_DATA_CREATED_SPACE_ID = "RESULT_DATA_CREATED_SPACE_ID"
+        const val RESULT_DATA_DEFAULT_ROOM_ID = "RESULT_DATA_DEFAULT_ROOM_ID"
+
         fun newIntent(context: Context): Intent {
             return Intent(context, SpaceCreationActivity::class.java).apply {
                 // putExtra(MvRx.KEY_ARG, SpaceDirectoryArgs(spaceId))
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index b8089d6f98..4ec6e7d4ad 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -86,8 +86,15 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     private var currentGroupId = ""
 
     init {
-        observeGroupSummaries()
+        observeSpaceSummaries()
         observeSelectionState()
+        selectedSpaceDataSource.observe().execute {
+            if (this.selectedSpace != it.invoke()?.orNull()) {
+                copy(
+                        selectedSpace = it.invoke()?.orNull()
+                )
+            } else this
+        }
     }
 
     private fun observeSelectionState() {
@@ -143,8 +150,8 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         _viewEvents.post(SpaceListViewEvents.AddSpace)
     }
 
-    private fun observeGroupSummaries() {
-        val roomSummaryQueryParams = roomSummaryQueryParams() {
+    private fun observeSpaceSummaries() {
+        val spaceSummaryQueryParams = roomSummaryQueryParams() {
             memberships = listOf(Membership.JOIN, Membership.INVITE)
             displayName = QueryStringValue.IsNotEmpty
             excludeType = listOf(/**RoomType.MESSAGING,$*/
@@ -171,7 +178,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                         },
                 session
                         .rx()
-                        .liveSpaceSummaries(roomSummaryQueryParams),
+                        .liveSpaceSummaries(spaceSummaryQueryParams),
                 BiFunction { allCommunityGroup, communityGroups ->
                     listOf(allCommunityGroup) + communityGroups
                 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
index 080bb99ea4..b174952ec6 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
@@ -43,7 +43,7 @@ class ChooseSpaceTypeFragment @Inject constructor(
         }))
 
         views.privateButton.setOnClickListener(DebouncedClickListener({
-            sharedViewModel.handle(CreateSpaceAction.SetRoomType(SpaceType.Private))
+            // sharedViewModel.handle(CreateSpaceAction.SetRoomType(SpaceType.Private))
         }))
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
index 2dc36f8715..fb1ed8e5f8 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
@@ -46,10 +46,14 @@ class CreateSpaceDefaultRoomsFragment @Inject constructor(
         }
 
         views.nextButton.debouncedClicks {
-            sharedViewModel.handle(CreateSpaceAction.NextFromDetails)
+            sharedViewModel.handle(CreateSpaceAction.NextFromDefaultRooms)
         }
     }
 
+    override fun onNameChange(index: Int, newName: String) {
+        sharedViewModel.handle(CreateSpaceAction.DefaultRoomNameChanged(index, newName))
+    }
+
     // -----------------------------
     // Epoxy controller listener methods
     // -----------------------------
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
index 506f71c92f..670876fdf1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
@@ -16,25 +16,32 @@
 
 package im.vector.app.features.spaces.create
 
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
 import im.vector.app.databinding.FragmentSpaceCreateGenericEpoxyFormBinding
 import javax.inject.Inject
 
 class CreateSpaceDetailsFragment @Inject constructor(
-        private val epoxyController: SpaceDetailEpoxyController
-) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(), SpaceDetailEpoxyController.Listener {
+        private val epoxyController: SpaceDetailEpoxyController,
+        private val colorProvider: ColorProvider
+) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(), SpaceDetailEpoxyController.Listener,
+        GalleryOrCameraDialogHelper.Listener {
 
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentSpaceCreateGenericEpoxyFormBinding.inflate(layoutInflater, container, false)
 
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -50,14 +57,19 @@ class CreateSpaceDetailsFragment @Inject constructor(
         }
     }
 
+    override fun onImageReady(uri: Uri?) {
+        sharedViewModel.handle(CreateSpaceAction.SetAvatar(uri))
+    }
     // -----------------------------
     // Epoxy controller listener methods
     // -----------------------------
 
     override fun onAvatarDelete() {
+        sharedViewModel.handle(CreateSpaceAction.SetAvatar(null))
     }
 
     override fun onAvatarChange() {
+        galleryOrCameraDialogHelper.show()
     }
 
     override fun onNameChange(newName: String) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index aca8452300..cd2680ef5f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -17,20 +17,29 @@
 package im.vector.app.features.spaces.create
 
 import android.net.Uri
+import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.R
+import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.core.resources.StringProvider
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 
 data class CreateSpaceState(
@@ -39,8 +48,9 @@ data class CreateSpaceState(
         val topic: String = "",
         val step: Step = Step.ChooseType,
         val spaceType: SpaceType? = null,
-        val nameInlineError : String? = null,
-        val defaultRooms: List<String>? = null
+        val nameInlineError: String? = null,
+        val defaultRooms: Map<Int, String?>? = null,
+        val creationResult: Async<String> = Uninitialized
 ) : MvRxState {
 
     enum class Step {
@@ -59,8 +69,11 @@ sealed class CreateSpaceAction : VectorViewModelAction {
     data class SetRoomType(val type: SpaceType) : CreateSpaceAction()
     data class NameChanged(val name: String) : CreateSpaceAction()
     data class TopicChanged(val topic: String) : CreateSpaceAction()
+    data class SetAvatar(val uri: Uri?) : CreateSpaceAction()
     object OnBackPressed : CreateSpaceAction()
     object NextFromDetails : CreateSpaceAction()
+    object NextFromDefaultRooms : CreateSpaceAction()
+    data class DefaultRoomNameChanged(val index: Int, val name: String) : CreateSpaceAction()
 }
 
 sealed class CreateSpaceEvents : VectorViewEvents {
@@ -68,12 +81,17 @@ sealed class CreateSpaceEvents : VectorViewEvents {
     object NavigateToChooseType : CreateSpaceEvents()
     object NavigateToAddRooms : CreateSpaceEvents()
     object Dismiss : CreateSpaceEvents()
+    data class FinishSuccess(val spaceId: String, val defaultRoomId: String?) : CreateSpaceEvents()
+    data class ShowModalError(val errorMessage: String) : CreateSpaceEvents()
+    object HideModalLoading : CreateSpaceEvents()
 }
 
 class CreateSpaceViewModel @AssistedInject constructor(
         @Assisted initialState: CreateSpaceState,
         private val session: Session,
-        private val stringProvider: StringProvider
+        private val stringProvider: StringProvider,
+        private val createSpaceViewModelTask: CreateSpaceViewModelTask,
+        private val errorFormatter: ErrorFormatter
 ) : VectorViewModel<CreateSpaceState, CreateSpaceAction, CreateSpaceEvents>(initialState) {
 
     @AssistedFactory
@@ -90,6 +108,12 @@ class CreateSpaceViewModel @AssistedInject constructor(
             }
             return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
         }
+
+        override fun initialState(viewModelContext: ViewModelContext): CreateSpaceState? {
+            return CreateSpaceState(
+                    defaultRooms = mapOf(0 to viewModelContext.activity.getString(R.string.create_spaces_default_public_room_name))
+            )
+        }
     }
 
     override fun handle(action: CreateSpaceAction) {
@@ -124,6 +148,21 @@ class CreateSpaceViewModel @AssistedInject constructor(
             CreateSpaceAction.NextFromDetails -> {
                 handleNextFromDetails()
             }
+            CreateSpaceAction.NextFromDefaultRooms -> {
+                handleNextFromDefaultRooms()
+            }
+            is CreateSpaceAction.DefaultRoomNameChanged -> {
+                setState {
+                    copy(
+                            defaultRooms = (defaultRooms ?: emptyMap()).toMutableMap().apply {
+                                this[action.index] = action.name
+                            }
+                    )
+                }
+            }
+            is CreateSpaceAction.SetAvatar -> {
+                setState { copy(avatarUri = action.uri) }
+            }
         }.exhaustive
     }
 
@@ -167,4 +206,53 @@ class CreateSpaceViewModel @AssistedInject constructor(
             _viewEvents.post(CreateSpaceEvents.NavigateToAddRooms)
         }
     }
+
+    private fun handleNextFromDefaultRooms() = withState { state ->
+        val spaceName = state.name ?: return@withState
+        setState {
+            copy(creationResult = Loading())
+        }
+        viewModelScope.launch(Dispatchers.IO) {
+            try {
+                val result = createSpaceViewModelTask.execute(
+                        CreateSpaceTaskParams(
+                                spaceName = spaceName,
+                                spaceTopic = state.topic,
+                                spaceAvatar = state.avatarUri,
+                                isPublic = state.spaceType == SpaceType.Public,
+                                defaultRooms = state.defaultRooms
+                                        ?.entries
+                                        ?.sortedBy { it.key }
+                                        ?.mapNotNull { it.value } ?: emptyList()
+                        )
+                )
+                when (result) {
+                    is CreateSpaceTaskResult.Success -> {
+                        setState {
+                            copy(creationResult = Success(result.spaceId))
+                        }
+                        _viewEvents.post(CreateSpaceEvents.FinishSuccess(result.spaceId, result.childIds.firstOrNull()))
+                    }
+                    is CreateSpaceTaskResult.PartialSuccess      -> {
+                        // XXX what can we do here?
+                        setState {
+                            copy(creationResult = Success(result.spaceId))
+                        }
+                        _viewEvents.post(CreateSpaceEvents.FinishSuccess(result.spaceId, result.childIds.firstOrNull()))
+                    }
+                    is CreateSpaceTaskResult.FailedToCreateSpace -> {
+                        setState {
+                            copy(creationResult = Fail(result.failure))
+                        }
+                        _viewEvents.post(CreateSpaceEvents.ShowModalError(errorFormatter.toHumanReadable(result.failure)))
+                    }
+                }
+            } catch (failure: Throwable) {
+                setState {
+                    copy(creationResult = Fail(failure))
+                }
+                _viewEvents.post(CreateSpaceEvents.ShowModalError(errorFormatter.toHumanReadable(failure)))
+            }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
new file mode 100644
index 0000000000..a565e290f6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.net.Uri
+import im.vector.app.core.platform.ViewModelTask
+import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
+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.internal.util.awaitCallback
+import timber.log.Timber
+import javax.inject.Inject
+
+sealed class CreateSpaceTaskResult {
+
+    data class Success(val spaceId: String, val childIds: List<String>) : CreateSpaceTaskResult()
+
+    data class PartialSuccess(val spaceId: String, val childIds: List<String>, val failedRooms: Map<String, Throwable>) : CreateSpaceTaskResult()
+
+    class FailedToCreateSpace(val failure: Throwable) : CreateSpaceTaskResult()
+}
+
+data class CreateSpaceTaskParams(
+        val spaceName: String,
+        val spaceTopic: String?,
+        val spaceAvatar: Uri? = null,
+        val isPublic: Boolean,
+        val defaultRooms: List<String> = emptyList()
+)
+
+class CreateSpaceViewModelTask @Inject constructor(
+        private val session: Session,
+        private val stringProvider: StringProvider
+) : ViewModelTask<CreateSpaceTaskParams, CreateSpaceTaskResult> {
+
+    override suspend fun execute(params: CreateSpaceTaskParams): CreateSpaceTaskResult {
+        val spaceID = try {
+            session.spaceService().createSpace(params.spaceName, params.spaceTopic, params.spaceAvatar, params.isPublic)
+        } catch (failure: Throwable) {
+            return CreateSpaceTaskResult.FailedToCreateSpace(failure)
+        }
+
+        val createdSpace = session.spaceService().getSpace(spaceID)
+
+        val childErrors = mutableMapOf<String, Throwable>()
+        val childIds = mutableListOf<String>()
+        if (params.isPublic) {
+            params.defaultRooms
+                    .filter { it.isNotBlank() }
+                    .forEach { roomName ->
+                        try {
+                            val roomId = try {
+                                awaitCallback<String> {
+                                    session.createRoom(CreateRoomParams().apply {
+                                        this.name = roomName
+                                        this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+                                    }, it)
+                                }
+                            } catch (timeout: CreateRoomFailure.CreatedWithTimeout) {
+                                // we ignore that?
+                                timeout.roomID
+                            }
+                            val via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
+                            createdSpace!!.addChildren(roomId, via, null, true)
+                            childIds.add(roomId)
+                        } catch (failure: Throwable) {
+                            Timber.d("Failed to create child room in $spaceID")
+                            childErrors[roomName] = failure
+                        }
+                    }
+        }
+
+        return if (childErrors.isEmpty()) {
+            CreateSpaceTaskResult.Success(spaceID, childIds)
+        } else {
+            CreateSpaceTaskResult.PartialSuccess(spaceID, childIds, childErrors)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
index 05abcf95b0..27b57713ba 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
@@ -28,7 +28,6 @@ import javax.inject.Inject
 class SpaceDefaultRoomEpoxyController @Inject constructor(
         private val stringProvider: StringProvider,
         private val colorProvider: ColorProvider
-//        private val avatarRenderer: AvatarRenderer
 ) : TypedEpoxyController<CreateSpaceState>() {
 
     var listener: Listener? = null
@@ -50,44 +49,41 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
         formEditTextItem {
             id("roomName1")
             enabled(true)
-            value(data?.name)
-            hint(stringProvider.getString(R.string.create_room_name_hint))
+            value(data?.defaultRooms?.get(0))
+            hint(stringProvider.getString(R.string.create_room_name_section))
             showBottomSeparator(false)
-//            errorMessage(data?.nameInlineError)
             onTextChange { text ->
-//                listener?.onNameChange(text)
+                listener?.onNameChange(0, text)
             }
         }
 
         formEditTextItem {
             id("roomName2")
             enabled(true)
-//            value(data?.name)
-            hint(stringProvider.getString(R.string.create_room_name_hint))
+            value(data?.defaultRooms?.get(1))
+            hint(stringProvider.getString(R.string.create_room_name_section))
             showBottomSeparator(false)
-//            errorMessage(data?.nameInlineError)
             onTextChange { text ->
-//                listener?.onNameChange(text)
+                listener?.onNameChange(1, text)
             }
         }
 
         formEditTextItem {
             id("roomName3")
             enabled(true)
-//            value(data?.name)
-            hint(stringProvider.getString(R.string.create_room_name_hint))
+            value(data?.defaultRooms?.get(2))
+            hint(stringProvider.getString(R.string.create_room_name_section))
             showBottomSeparator(false)
-//            errorMessage(data?.nameInlineError)
             onTextChange { text ->
-//                listener?.onNameChange(text)
+                listener?.onNameChange(2, text)
             }
         }
     }
 
     interface Listener {
-//        fun onAvatarDelete()
+        //        fun onAvatarDelete()
 //        fun onAvatarChange()
-//        fun onNameChange(newName: String)
+        fun onNameChange(index: Int, newName: String)
 //        fun onTopicChange(newTopic: String)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
index 552a98ded2..066c329c34 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.spaces.create
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.util.AttributeSet
 import android.util.TypedValue
 import androidx.appcompat.content.res.AppCompatResources.getDrawable
@@ -85,7 +86,7 @@ class WizardButtonView @JvmOverloads constructor(context: Context, attrs: Attrib
 
         val outValue = TypedValue()
         context.theme.resolveAttribute(android.R.attr.selectableItemBackground, outValue, true)
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             this.foreground = getDrawable(context, outValue.resourceId)
         }
 
diff --git a/vector/src/main/res/values/ids.xml b/vector/src/main/res/values/ids.xml
new file mode 100644
index 0000000000..099d6f4279
--- /dev/null
+++ b/vector/src/main/res/values/ids.xml
@@ -0,0 +1,3 @@
+<resources>
+    <item type="id" name="space_item_home" />
+</resources>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index b2bfe76f57..fb578f3802 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3275,6 +3275,8 @@
     <string name="create_space_error_empty_field_space_name">Give it a name to continue.</string>
     <string name="create_spaces_room_public_header">What are some discussions you want to have in Runner’s World?</string>
     <string name="create_spaces_room_public_header_desc">We’ll create rooms for them, and auto-join everyone. You can add more later too.</string>
+    <string name="create_spaces_default_public_room_name">General</string>
+    <string name="create_spaces_loading_message">Creating Space…</string>
 
 
 </resources>

From a901e1d1791c9e33019ef966d8c395eddc8440e2 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Feb 2021 18:22:16 +0100
Subject: [PATCH 111/350] Post Creation Share flow

---
 .../im/vector/app/core/di/ScreenComponent.kt  |   2 +
 .../grouplist/HomeSpaceSummaryItem.kt         |   3 +
 .../vector/app/features/home/HomeActivity.kt  |   8 +-
 .../home/room/detail/RoomDetailFragment.kt    | 164 ++++++++++--------
 .../features/navigation/DefaultNavigator.kt   |  11 +-
 .../app/features/navigation/Navigator.kt      |   4 +-
 .../features/permalink/PermalinkHandler.kt    |  53 +++---
 .../features/spaces/ShareSpaceBottomSheet.kt  | 107 ++++++++++++
 .../app/features/spaces/SpaceListFragment.kt  |   4 +
 .../features/spaces/SpaceSummaryController.kt |   3 +
 .../app/features/spaces/SpaceSummaryItem.kt   |  13 ++
 .../features/spaces/SpacesListViewModel.kt    |  39 ++++-
 .../spaces/create/WizardButtonView.kt         |  31 ++--
 vector/src/main/res/drawable/ic_mail.xml      |  21 +++
 .../src/main/res/drawable/ic_share_link.xml   |  12 ++
 .../res/layout/bottom_sheet_space_invite.xml  |  79 +++++++++
 vector/src/main/res/layout/item_space.xml     |  17 +-
 .../res/layout/view_space_type_button.xml     |   6 +-
 vector/src/main/res/values/strings.xml        |   8 +
 19 files changed, 454 insertions(+), 131 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
 create mode 100644 vector/src/main/res/drawable/ic_mail.xml
 create mode 100644 vector/src/main/res/drawable/ic_share_link.xml
 create mode 100644 vector/src/main/res/layout/bottom_sheet_space_invite.xml

diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index 3633bb610a..f9ffc9c612 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -77,6 +77,7 @@ import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheet
 import im.vector.app.features.share.IncomingShareActivity
 import im.vector.app.features.signout.soft.SoftLogoutActivity
+import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.ui.UiStateRepository
@@ -175,6 +176,7 @@ interface ScreenComponent {
     fun inject(bottomSheet: CallControlsBottomSheet)
     fun inject(bottomSheet: SignOutBottomSheetDialogFragment)
     fun inject(bottomSheet: MatrixToBottomSheet)
+    fun inject(bottomSheet: ShareSpaceBottomSheet)
 
     /* ==========================================================================================
      * Others
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
index c3f459f49e..f4c95215b8 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
@@ -22,6 +22,7 @@ import android.util.TypedValue
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
@@ -48,12 +49,14 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         holder.avatarImageView.background = ContextCompat.getDrawable(holder.view.context, R.drawable.space_home_background)
         holder.avatarImageView.setImageResource(R.drawable.ic_space_home)
         holder.avatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
+        holder.leaveView.isVisible = false
     }
 
     class Holder : VectorEpoxyHolder() {
         val avatarImageView by bind<ImageView>(R.id.groupAvatarImageView)
         val groupNameView by bind<TextView>(R.id.groupNameView)
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
+        val leaveView by bind<ImageView>(R.id.groupTmpLeave)
     }
 
     fun dpToPx(resources: Resources, dp: Int): Int {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 40d0cdd622..db7bb8fa16 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -111,14 +111,10 @@ class HomeActivity :
             val defaultRoomsId = activityResult.data?.extras?.getString(SpaceCreationActivity.RESULT_DATA_DEFAULT_ROOM_ID)
             views.drawerLayout.closeDrawer(GravityCompat.START)
 
-            // Here we want to change current space to the newly created one, and then immediatly open the default room
+            // Here we want to change current space to the newly created one, and then immediately open the default room
             if (spaceId != null) {
-                navigator.switchToSpace(this, spaceId, defaultRoomsId)
+                navigator.switchToSpace(this, spaceId, defaultRoomsId, true)
             }
-
-            // Also we should show the share space bottomsheet
-        } else {
-            // viewModel.handle(CrossSigningSettingsAction.ReAuthCancelled)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index b7e2e189d3..a585d7609a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -91,7 +91,9 @@ import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.platform.showOptimizedSnackbar
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.ui.views.ActiveConferenceView
 import im.vector.app.core.ui.views.CurrentCallsView
+import im.vector.app.core.ui.views.JumpToReadMarkerView
 import im.vector.app.core.ui.views.KnownCallsViewHolder
 import im.vector.app.core.ui.views.ActiveConferenceView
 import im.vector.app.core.ui.views.FailedMessagesWarningView
@@ -163,6 +165,7 @@ import im.vector.app.features.roomprofile.RoomProfileActivity
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
+import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgs
@@ -210,7 +213,8 @@ import javax.inject.Inject
 data class RoomDetailArgs(
         val roomId: String,
         val eventId: String? = null,
-        val sharedData: SharedData? = null
+        val sharedData: SharedData? = null,
+        val openShareSpaceForId: String? = null
 ) : Parcelable
 
 class RoomDetailFragment @Inject constructor(
@@ -293,7 +297,7 @@ class RoomDetailFragment @Inject constructor(
 
     private lateinit var attachmentsHelper: AttachmentsHelper
     private lateinit var keyboardStateUtils: KeyboardStateUtils
-    private lateinit var callActionsHandler : StartCallActionsHandler
+    private lateinit var callActionsHandler: StartCallActionsHandler
 
     private lateinit var attachmentTypeSelector: AttachmentTypeSelectorView
 
@@ -358,9 +362,9 @@ class RoomDetailFragment @Inject constructor(
             }
             when (mode) {
                 is SendMode.REGULAR -> renderRegularMode(mode.text)
-                is SendMode.EDIT    -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_edit, R.string.edit, mode.text)
-                is SendMode.QUOTE   -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.quote, mode.text)
-                is SendMode.REPLY   -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_reply, R.string.reply, mode.text)
+                is SendMode.EDIT -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_edit, R.string.edit, mode.text)
+                is SendMode.QUOTE -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.quote, mode.text)
+                is SendMode.REPLY -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_reply, R.string.reply, mode.text)
             }
         }
 
@@ -384,29 +388,30 @@ class RoomDetailFragment @Inject constructor(
                 RoomDetailViewEvents.DisplayPromptForIntegrationManager  -> displayPromptForIntegrationManager()
                 is RoomDetailViewEvents.OpenStickerPicker                -> openStickerPicker(it)
                 is RoomDetailViewEvents.DisplayEnableIntegrationsWarning -> displayDisabledIntegrationDialog()
-                is RoomDetailViewEvents.OpenIntegrationManager           -> openIntegrationManager()
-                is RoomDetailViewEvents.OpenFile                         -> startOpenFileIntent(it)
-                RoomDetailViewEvents.OpenActiveWidgetBottomSheet         -> onViewWidgetsClicked()
-                is RoomDetailViewEvents.ShowInfoOkDialog                 -> showDialogWithMessage(it.message)
-                is RoomDetailViewEvents.JoinJitsiConference              -> joinJitsiRoom(it.widget, it.withVideo)
-                RoomDetailViewEvents.ShowWaitingView                     -> vectorBaseActivity.showWaitingView()
-                RoomDetailViewEvents.HideWaitingView                     -> vectorBaseActivity.hideWaitingView()
-                is RoomDetailViewEvents.RequestNativeWidgetPermission    -> requestNativeWidgetPermission(it)
-                is RoomDetailViewEvents.OpenRoom                         -> handleOpenRoom(it)
-                RoomDetailViewEvents.OpenInvitePeople                    -> navigator.openInviteUsersToRoom(requireContext(), roomDetailArgs.roomId)
-                RoomDetailViewEvents.OpenSetRoomAvatarDialog             -> galleryOrCameraDialogHelper.show()
-                RoomDetailViewEvents.OpenRoomSettings                    -> handleOpenRoomSettings()
-                is RoomDetailViewEvents.ShowRoomAvatarFullScreen         -> it.matrixItem?.let { item ->
+                is RoomDetailViewEvents.OpenIntegrationManager -> openIntegrationManager()
+                is RoomDetailViewEvents.OpenFile -> startOpenFileIntent(it)
+                RoomDetailViewEvents.OpenActiveWidgetBottomSheet -> onViewWidgetsClicked()
+                is RoomDetailViewEvents.ShowInfoOkDialog -> showDialogWithMessage(it.message)
+                is RoomDetailViewEvents.JoinJitsiConference -> joinJitsiRoom(it.widget, it.withVideo)
+                RoomDetailViewEvents.ShowWaitingView -> vectorBaseActivity.showWaitingView()
+                RoomDetailViewEvents.HideWaitingView -> vectorBaseActivity.hideWaitingView()
+                is RoomDetailViewEvents.RequestNativeWidgetPermission -> requestNativeWidgetPermission(it)
+                is RoomDetailViewEvents.OpenRoom -> handleOpenRoom(it)
+                RoomDetailViewEvents.OpenInvitePeople -> navigator.openInviteUsersToRoom(requireContext(), roomDetailArgs.roomId)
+                RoomDetailViewEvents.OpenSetRoomAvatarDialog -> galleryOrCameraDialogHelper.show()
+                RoomDetailViewEvents.OpenRoomSettings -> handleOpenRoomSettings()
+                is RoomDetailViewEvents.ShowRoomAvatarFullScreen -> it.matrixItem?.let { item ->
                     navigator.openBigImageViewer(requireActivity(), it.view, item)
                 }
-                is RoomDetailViewEvents.StartChatEffect                  -> handleChatEffect(it.type)
-                RoomDetailViewEvents.StopChatEffects                     -> handleStopChatEffects()
-                is RoomDetailViewEvents.DisplayAndAcceptCall             -> acceptIncomingCall(it)
+                is RoomDetailViewEvents.StartChatEffect -> handleChatEffect(it.type)
+                RoomDetailViewEvents.StopChatEffects -> handleStopChatEffects()
+                is RoomDetailViewEvents.DisplayAndAcceptCall -> acceptIncomingCall(it)
             }.exhaustive
         }
 
         if (savedInstanceState == null) {
             handleShareData()
+            handleSpaceShare()
         }
     }
 
@@ -419,7 +424,7 @@ class RoomDetailFragment @Inject constructor(
         startActivity(intent)
     }
 
-        private fun handleChatEffect(chatEffect: ChatEffect) {
+    private fun handleChatEffect(chatEffect: ChatEffect) {
         when (chatEffect) {
             ChatEffect.CONFETTI -> {
                 views.viewKonfetti.isVisible = true
@@ -434,7 +439,7 @@ class RoomDetailFragment @Inject constructor(
                         .setPosition(-50f, views.viewKonfetti.width + 50f, -50f, -50f)
                         .streamFor(150, 3000L)
             }
-            ChatEffect.SNOW     -> {
+            ChatEffect.SNOW -> {
                 views.viewSnowFall.isVisible = true
                 views.viewSnowFall.restartFalling()
             }
@@ -627,17 +632,26 @@ class RoomDetailFragment @Inject constructor(
 
     private fun handleShareData() {
         when (val sharedData = roomDetailArgs.sharedData) {
-            is SharedData.Text        -> {
+            is SharedData.Text -> {
                 roomDetailViewModel.handle(RoomDetailAction.EnterRegularMode(sharedData.text, fromSharing = true))
             }
             is SharedData.Attachments -> {
                 // open share edition
                 onContentAttachmentsReady(sharedData.attachmentData)
             }
-            null                      -> Timber.v("No share data to process")
+            null -> Timber.v("No share data to process")
         }.exhaustive
     }
 
+    private fun handleSpaceShare() {
+        roomDetailArgs.openShareSpaceForId?.let { spaceId ->
+            ShareSpaceBottomSheet.show(childFragmentManager, spaceId)
+            view?.post {
+                handleChatEffect(ChatEffect.CONFETTI)
+            }
+        }
+    }
+
     override fun onDestroyView() {
         timelineEventController.callback = null
         timelineEventController.removeModelBuildListener(modelBuildListener)
@@ -760,8 +774,8 @@ class RoomDetailFragment @Inject constructor(
         withState(roomDetailViewModel) { state ->
             // Set the visual state of the call buttons (voice/video) to enabled/disabled according to user permissions
             val callButtonsEnabled = when (state.asyncRoomSummary.invoke()?.joinedMembersCount) {
-                1    -> false
-                2    -> state.isAllowedToStartWebRTCCall
+                1 -> false
+                2 -> state.isAllowedToStartWebRTCCall
                 else -> state.isAllowedToManageWidgets
             }
             setOf(R.id.voice_call, R.id.video_call).forEach {
@@ -791,7 +805,7 @@ class RoomDetailFragment @Inject constructor(
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.invite           -> {
+            R.id.invite -> {
                 navigator.openInviteUsersToRoom(requireActivity(), roomDetailArgs.roomId)
                 true
             }
@@ -807,19 +821,19 @@ class RoomDetailFragment @Inject constructor(
                 callActionsHandler.onVoiceCallClicked()
                 true
             }
-            R.id.video_call       -> {
+            R.id.video_call -> {
                 callActionsHandler.onVideoCallClicked()
                 true
             }
-            R.id.hangup_call      -> {
+            R.id.hangup_call -> {
                 roomDetailViewModel.handle(RoomDetailAction.EndCall)
                 true
             }
-            R.id.search           -> {
+            R.id.search -> {
                 handleSearchAction()
                 true
             }
-            R.id.dev_tools        -> {
+            R.id.dev_tools -> {
                 navigator.openDevTools(requireContext(), roomDetailArgs.roomId)
                 true
             }
@@ -921,9 +935,9 @@ class RoomDetailFragment @Inject constructor(
         when (roomDetailPendingAction) {
             is RoomDetailPendingAction.JumpToReadReceipt ->
                 roomDetailViewModel.handle(RoomDetailAction.JumpToReadReceipt(roomDetailPendingAction.userId))
-            is RoomDetailPendingAction.MentionUser       ->
+            is RoomDetailPendingAction.MentionUser ->
                 insertUserDisplayNameInTextEditor(roomDetailPendingAction.userId)
-            is RoomDetailPendingAction.OpenOrCreateDm    ->
+            is RoomDetailPendingAction.OpenOrCreateDm ->
                 roomDetailViewModel.handle(RoomDetailAction.OpenOrCreateDm(roomDetailPendingAction.userId))
         }.exhaustive
     }
@@ -1078,9 +1092,9 @@ class RoomDetailFragment @Inject constructor(
             withState(roomDetailViewModel) {
                 val showJumpToUnreadBanner = when (it.unreadState) {
                     UnreadState.Unknown,
-                    UnreadState.HasNoUnread            -> false
+                    UnreadState.HasNoUnread -> false
                     is UnreadState.ReadMarkerNotLoaded -> true
-                    is UnreadState.HasUnread           -> {
+                    is UnreadState.HasUnread -> {
                         if (it.canShowJumpToReadMarker) {
                             val lastVisibleItem = layoutManager.findLastVisibleItemPosition()
                             val positionOfReadMarker = timelineEventController.getPositionOfReadMarker()
@@ -1268,7 +1282,7 @@ class RoomDetailFragment @Inject constructor(
                 navigator.openRoom(vectorBaseActivity, async())
                 vectorBaseActivity.finish()
             }
-            is Fail    -> {
+            is Fail -> {
                 vectorBaseActivity.hideWaitingView()
                 vectorBaseActivity.toast(errorFormatter.toHumanReadable(async.error))
             }
@@ -1277,19 +1291,19 @@ class RoomDetailFragment @Inject constructor(
 
     private fun renderSendMessageResult(sendMessageResult: RoomDetailViewEvents.SendMessageResult) {
         when (sendMessageResult) {
-            is RoomDetailViewEvents.SlashCommandHandled        -> {
+            is RoomDetailViewEvents.SlashCommandHandled -> {
                 sendMessageResult.messageRes?.let { showSnackWithMessage(getString(it)) }
             }
-            is RoomDetailViewEvents.SlashCommandError          -> {
+            is RoomDetailViewEvents.SlashCommandError -> {
                 displayCommandError(getString(R.string.command_problem_with_parameters, sendMessageResult.command.command))
             }
-            is RoomDetailViewEvents.SlashCommandUnknown        -> {
+            is RoomDetailViewEvents.SlashCommandUnknown -> {
                 displayCommandError(getString(R.string.unrecognized_command, sendMessageResult.command))
             }
-            is RoomDetailViewEvents.SlashCommandResultOk       -> {
+            is RoomDetailViewEvents.SlashCommandResultOk -> {
                 updateComposerText("")
             }
-            is RoomDetailViewEvents.SlashCommandResultError    -> {
+            is RoomDetailViewEvents.SlashCommandResultError -> {
                 displayCommandError(errorFormatter.toHumanReadable(sendMessageResult.throwable))
             }
             is RoomDetailViewEvents.SlashCommandNotImplemented -> {
@@ -1311,7 +1325,7 @@ class RoomDetailFragment @Inject constructor(
     private fun displayE2eError(withHeldCode: WithHeldCode?) {
         val msgId = when (withHeldCode) {
             WithHeldCode.BLACKLISTED -> R.string.crypto_error_withheld_blacklisted
-            WithHeldCode.UNVERIFIED  -> R.string.crypto_error_withheld_unverified
+            WithHeldCode.UNVERIFIED -> R.string.crypto_error_withheld_unverified
             WithHeldCode.UNAUTHORISED,
             WithHeldCode.UNAVAILABLE -> R.string.crypto_error_withheld_generic
             else                     -> R.string.notice_crypto_unable_to_decrypt_friendly_desc
@@ -1362,7 +1376,7 @@ class RoomDetailFragment @Inject constructor(
 
     private fun displayRoomDetailActionSuccess(result: RoomDetailViewEvents.ActionSuccess) {
         when (val data = result.action) {
-            is RoomDetailAction.ReportContent             -> {
+            is RoomDetailAction.ReportContent -> {
                 when {
                     data.spam          -> {
                         AlertDialog.Builder(requireActivity())
@@ -1399,7 +1413,7 @@ class RoomDetailFragment @Inject constructor(
                     }
                 }
             }
-            is RoomDetailAction.RequestVerification       -> {
+            is RoomDetailAction.RequestVerification -> {
                 Timber.v("## SAS RequestVerification action")
                 VerificationBottomSheet.withArgs(
                         roomDetailArgs.roomId,
@@ -1414,7 +1428,7 @@ class RoomDetailFragment @Inject constructor(
                         data.transactionId
                 ).show(parentFragmentManager, "REQ")
             }
-            is RoomDetailAction.ResumeVerification        -> {
+            is RoomDetailAction.ResumeVerification -> {
                 val otherUserId = data.otherUserId ?: return
                 VerificationBottomSheet().apply {
                     arguments = Bundle().apply {
@@ -1557,11 +1571,11 @@ class RoomDetailFragment @Inject constructor(
             is MessageVerificationRequestContent -> {
                 roomDetailViewModel.handle(RoomDetailAction.ResumeVerification(informationData.eventId, null))
             }
-            is MessageWithAttachmentContent      -> {
+            is MessageWithAttachmentContent -> {
                 val action = RoomDetailAction.DownloadOrOpen(informationData.eventId, informationData.senderId, messageContent)
                 roomDetailViewModel.handle(action)
             }
-            is EncryptedEventContent             -> {
+            is EncryptedEventContent -> {
                 roomDetailViewModel.handle(RoomDetailAction.TapOnFailedToDecrypt(informationData.eventId))
             }
         }
@@ -1724,75 +1738,75 @@ class RoomDetailFragment @Inject constructor(
 
     private fun handleActions(action: EventSharedAction) {
         when (action) {
-            is EventSharedAction.OpenUserProfile            -> {
+            is EventSharedAction.OpenUserProfile -> {
                 openRoomMemberProfile(action.userId)
             }
-            is EventSharedAction.AddReaction                -> {
+            is EventSharedAction.AddReaction -> {
                 emojiActivityResultLauncher.launch(EmojiReactionPickerActivity.intent(requireContext(), action.eventId))
             }
-            is EventSharedAction.ViewReactions              -> {
+            is EventSharedAction.ViewReactions -> {
                 ViewReactionsBottomSheet.newInstance(roomDetailArgs.roomId, action.messageInformationData)
                         .show(requireActivity().supportFragmentManager, "DISPLAY_REACTIONS")
             }
-            is EventSharedAction.Copy                       -> {
+            is EventSharedAction.Copy -> {
                 // I need info about the current selected message :/
                 copyToClipboard(requireContext(), action.content, false)
                 showSnackWithMessage(getString(R.string.copied_to_clipboard))
             }
-            is EventSharedAction.Redact                     -> {
+            is EventSharedAction.Redact -> {
                 promptConfirmationToRedactEvent(action)
             }
-            is EventSharedAction.Share                      -> {
+            is EventSharedAction.Share -> {
                 onShareActionClicked(action)
             }
-            is EventSharedAction.Save                       -> {
+            is EventSharedAction.Save -> {
                 onSaveActionClicked(action)
             }
-            is EventSharedAction.ViewEditHistory            -> {
+            is EventSharedAction.ViewEditHistory -> {
                 onEditedDecorationClicked(action.messageInformationData)
             }
-            is EventSharedAction.ViewSource                 -> {
+            is EventSharedAction.ViewSource -> {
                 JSonViewerDialog.newInstance(
                         action.content,
                         -1,
                         createJSonViewerStyleProvider(colorProvider)
                 ).show(childFragmentManager, "JSON_VIEWER")
             }
-            is EventSharedAction.ViewDecryptedSource        -> {
+            is EventSharedAction.ViewDecryptedSource -> {
                 JSonViewerDialog.newInstance(
                         action.content,
                         -1,
                         createJSonViewerStyleProvider(colorProvider)
                 ).show(childFragmentManager, "JSON_VIEWER")
             }
-            is EventSharedAction.QuickReact                 -> {
+            is EventSharedAction.QuickReact -> {
                 // eventId,ClickedOn,Add
                 roomDetailViewModel.handle(RoomDetailAction.UpdateQuickReactAction(action.eventId, action.clickedOn, action.add))
             }
-            is EventSharedAction.Edit                       -> {
+            is EventSharedAction.Edit -> {
                 roomDetailViewModel.handle(RoomDetailAction.EnterEditMode(action.eventId, views.composerLayout.text.toString()))
             }
-            is EventSharedAction.Quote                      -> {
+            is EventSharedAction.Quote -> {
                 roomDetailViewModel.handle(RoomDetailAction.EnterQuoteMode(action.eventId, views.composerLayout.text.toString()))
             }
-            is EventSharedAction.Reply                      -> {
+            is EventSharedAction.Reply -> {
                 roomDetailViewModel.handle(RoomDetailAction.EnterReplyMode(action.eventId, views.composerLayout.text.toString()))
             }
-            is EventSharedAction.CopyPermalink              -> {
+            is EventSharedAction.CopyPermalink -> {
                 val permalink = session.permalinkService().createPermalink(roomDetailArgs.roomId, action.eventId)
                 copyToClipboard(requireContext(), permalink, false)
                 showSnackWithMessage(getString(R.string.copied_to_clipboard))
             }
-            is EventSharedAction.Resend                     -> {
+            is EventSharedAction.Resend -> {
                 roomDetailViewModel.handle(RoomDetailAction.ResendMessage(action.eventId))
             }
-            is EventSharedAction.Remove                     -> {
+            is EventSharedAction.Remove -> {
                 roomDetailViewModel.handle(RoomDetailAction.RemoveFailedEcho(action.eventId))
             }
             is EventSharedAction.Cancel                     -> {
                 handleCancelSend(action)
             }
-            is EventSharedAction.ReportContentSpam          -> {
+            is EventSharedAction.ReportContentSpam -> {
                 roomDetailViewModel.handle(RoomDetailAction.ReportContent(
                         action.eventId, action.senderId, "This message is spam", spam = true))
             }
@@ -1800,22 +1814,22 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.ReportContent(
                         action.eventId, action.senderId, "This message is inappropriate", inappropriate = true))
             }
-            is EventSharedAction.ReportContentCustom        -> {
+            is EventSharedAction.ReportContentCustom -> {
                 promptReasonToReportContent(action)
             }
-            is EventSharedAction.IgnoreUser                 -> {
+            is EventSharedAction.IgnoreUser -> {
                 action.senderId?.let { askConfirmationToIgnoreUser(it) }
             }
-            is EventSharedAction.OnUrlClicked               -> {
+            is EventSharedAction.OnUrlClicked -> {
                 onUrlClicked(action.url, action.title)
             }
-            is EventSharedAction.OnUrlLongClicked           -> {
+            is EventSharedAction.OnUrlLongClicked -> {
                 onUrlLongClicked(action.url)
             }
-            is EventSharedAction.ReRequestKey               -> {
+            is EventSharedAction.ReRequestKey -> {
                 roomDetailViewModel.handle(RoomDetailAction.ReRequestKeys(action.eventId))
             }
-            is EventSharedAction.UseKeyBackup               -> {
+            is EventSharedAction.UseKeyBackup -> {
                 context?.let {
                     startActivity(KeysBackupRestoreActivity.intent(it))
                 }
@@ -1955,10 +1969,10 @@ class RoomDetailFragment @Inject constructor(
 
     private fun launchAttachmentProcess(type: AttachmentTypeSelectorView.Type) {
         when (type) {
-            AttachmentTypeSelectorView.Type.CAMERA  -> attachmentsHelper.openCamera(requireContext(), attachmentPhotoActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.FILE    -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.CAMERA -> attachmentsHelper.openCamera(requireContext(), attachmentPhotoActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.FILE -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
             AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentImageActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.AUDIO   -> attachmentsHelper.selectAudio(attachmentAudioActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.AUDIO -> attachmentsHelper.selectAudio(attachmentAudioActivityResultLauncher)
             AttachmentTypeSelectorView.Type.CONTACT -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
             AttachmentTypeSelectorView.Type.STICKER -> roomDetailViewModel.handle(RoomDetailAction.SelectStickerAttachment)
         }.exhaustive
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index d6eeade97e..80cb82098b 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -70,6 +70,7 @@ import im.vector.app.features.roomprofile.RoomProfileActivity
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
+import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgsBuilder
@@ -102,7 +103,7 @@ class DefaultNavigator @Inject constructor(
         startActivity(context, intent, buildTask)
     }
 
-    override fun switchToSpace(context: Context, spaceId: String, roomId: String?) {
+    override fun switchToSpace(context: Context, spaceId: String, roomId: String?, openShareSheet: Boolean) {
         if (sessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(spaceId) == null) {
             fatalError("Trying to open an unknown space $spaceId", vectorPreferences.failFast())
             return
@@ -115,10 +116,16 @@ class DefaultNavigator @Inject constructor(
             Timber.d("## Nav: Failed to switch to space $spaceId")
         }
         if (roomId != null) {
-            openRoom(context, roomId)
+            val args = RoomDetailArgs(roomId, eventId = null, openShareSpaceForId = spaceId.takeIf { openShareSheet })
+            val intent = RoomDetailActivity.newIntent(context, args)
+            startActivity(context, intent, false)
         }
     }
 
+    override fun openSpacePreview(context: Context, spaceId: String) {
+        startActivity(context, SpacePreviewActivity.newIntent(context, spaceId), false)
+    }
+
     override fun performDeviceVerification(context: Context, otherUserId: String, sasTransactionId: String) {
         val session = sessionHolder.getSafeActiveSession() ?: return
         val tx = session.cryptoService().verificationService().getExistingTransaction(otherUserId, sasTransactionId)
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index fcd35be162..225a2b89ab 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -38,7 +38,9 @@ interface Navigator {
 
     fun openRoom(context: Context, roomId: String, eventId: String? = null, buildTask: Boolean = false)
 
-    fun switchToSpace(context: Context, spaceId: String, roomId: String?)
+    fun switchToSpace(context: Context, spaceId: String, roomId: String?, openShareSheet: Boolean)
+
+    fun openSpacePreview(context: Context, spaceId: String)
 
     fun performDeviceVerification(context: Context, otherUserId: String, sasTransactionId: String)
 
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index ae6d630c75..d43337fab0 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.rx.rx
@@ -147,33 +148,43 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
         val membership = roomSummary?.membership
         val eventId = permalinkData.eventId
         val roomAlias = permalinkData.getRoomAliasOrNull()
+        val isSpace = roomSummary?.roomType == RoomType.SPACE
         return when {
             membership == Membership.BAN     -> context.toast(R.string.error_opening_banned_room)
             membership?.isActive().orFalse() -> {
-                navigator.openRoom(context, roomId, eventId, buildTask)
+                if (isSpace) {
+//                    navigator.switchToSpace(context, roomId, null)
+                    navigator.openSpacePreview(context, roomId)
+                } else {
+                    navigator.openRoom(context, roomId, eventId, buildTask)
+                }
             }
             else                             -> {
-                if (roomSummary == null) {
-                    // we don't know this room, try to peek
-                    val roomPreviewData = RoomPreviewData(
-                            roomId = roomId,
-                            roomAlias = roomAlias,
-                            peekFromServer = true,
-                            buildTask = buildTask,
-                            homeServers = permalinkData.viaParameters
-                    )
-                    navigator.openRoomPreview(context, roomPreviewData)
+                if (isSpace) {
+                    navigator.openSpacePreview(context, roomId)
                 } else {
-                    val roomPreviewData = RoomPreviewData(
-                            roomId = roomId,
-                            eventId = eventId,
-                            roomAlias = roomAlias ?: roomSummary.canonicalAlias,
-                            roomName = roomSummary.displayName,
-                            avatarUrl = roomSummary.avatarUrl,
-                            buildTask = buildTask,
-                            homeServers = permalinkData.viaParameters
-                    )
-                    navigator.openRoomPreview(context, roomPreviewData)
+                    if (roomSummary == null) {
+                        // we don't know this room, try to peek
+                        val roomPreviewData = RoomPreviewData(
+                                roomId = roomId,
+                                roomAlias = roomAlias,
+                                peekFromServer = true,
+                                buildTask = buildTask,
+                                homeServers = permalinkData.viaParameters
+                        )
+                        navigator.openRoomPreview(context, roomPreviewData)
+                    } else {
+                        val roomPreviewData = RoomPreviewData(
+                                roomId = roomId,
+                                eventId = eventId,
+                                roomAlias = roomAlias ?: roomSummary.canonicalAlias,
+                                roomName = roomSummary.displayName,
+                                avatarUrl = roomSummary.avatarUrl,
+                                buildTask = buildTask,
+                                homeServers = permalinkData.viaParameters
+                        )
+                        navigator.openRoomPreview(context, roomPreviewData)
+                    }
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
new file mode 100644
index 0000000000..d3fb225083
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.FragmentManager
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.utils.startSharePlainTextIntent
+import im.vector.app.databinding.BottomSheetSpaceInviteBinding
+import im.vector.app.features.invite.InviteUsersToRoomActivity
+import kotlinx.parcelize.Parcelize
+import javax.inject.Inject
+
+class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpaceInviteBinding>() {
+
+    @Parcelize
+    data class Args(
+            val spaceId: String
+    ) : Parcelable
+
+    override val showExpanded = true
+
+    @Inject
+    lateinit var activeSessionHolder: ActiveSessionHolder
+
+    override fun injectWith(injector: ScreenComponent) {
+        injector.inject(this)
+    }
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSpaceInviteBinding {
+        return BottomSheetSpaceInviteBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // Not going for full view model for now, as it may change
+
+        val args: Args = arguments?.getParcelable(EXTRA_ARGS)
+                ?: return Unit.also { dismiss() }
+        val summary = activeSessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(args.spaceId)?.spaceSummary()
+
+        val spaceName = summary?.roomSummary?.name
+        views.descriptionText.text = getString(R.string.invite_people_to_your_space_desc, spaceName)
+
+        views.inviteByMailButton.debouncedClicks {
+        }
+
+        views.inviteByMxidButton.debouncedClicks {
+            val intent = InviteUsersToRoomActivity.getIntent(requireContext(), args.spaceId)
+            startActivity(intent)
+        }
+
+        views.inviteByLinkButton.debouncedClicks {
+            activeSessionHolder.getSafeActiveSession()?.permalinkService()?.createRoomPermalink(args.spaceId)?.let { permalink ->
+                startSharePlainTextIntent(
+                        fragment = this,
+                        activityResultLauncher = null,
+                        chooserTitle = getString(R.string.share_by_text),
+                        text = getString(R.string.share_space_link_message, spaceName, permalink),
+                        extraTitle = getString(R.string.share_space_link_message, spaceName, permalink)
+                )
+            }
+        }
+
+        views.skipButton.debouncedClicks {
+            dismiss()
+        }
+    }
+
+    companion object {
+
+        const val EXTRA_ARGS = "EXTRA_ARGS"
+
+        fun show(fragmentManager: FragmentManager, spaceId: String): ShareSpaceBottomSheet {
+            return ShareSpaceBottomSheet().apply {
+                isCancelable = true
+                arguments = Bundle().apply {
+                    this.putParcelable(EXTRA_ARGS, ShareSpaceBottomSheet.Args(spaceId = spaceId))
+                }
+            }.also {
+                it.show(fragmentManager, ShareSpaceBottomSheet::class.java.name)
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index bc1af38473..f2ef3b84a0 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -80,6 +80,10 @@ class SpaceListFragment @Inject constructor(
         viewModel.handle(SpaceListAction.SelectSpace(spaceSummary))
     }
 
+    override fun onLeaveSpace(spaceSummary: SpaceSummary) {
+        viewModel.handle(SpaceListAction.LeaveSpace(spaceSummary))
+    }
+
     override fun onAddSpaceSelected() {
         viewModel.handle(SpaceListAction.AddSpace)
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index d1bc3c6e1c..0402beb428 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -71,6 +71,7 @@ class SpaceSummaryController @Inject constructor(
                                 matrixItem(it.toMatrixItem())
                                 selected(false)
                                 listener { callback?.onSpaceSelected(it) }
+//                                lea { callback?.onSpaceSelected(it) }
                             }
                         }
                         genericFooterItem {
@@ -101,6 +102,7 @@ class SpaceSummaryController @Inject constructor(
                             id(groupSummary.spaceId)
                             matrixItem(groupSummary.toMatrixItem())
                             selected(isSelected)
+                            onLeave { callback?.onLeaveSpace(groupSummary) }
                             listener { callback?.onSpaceSelected(groupSummary) }
                         }
                     }
@@ -118,6 +120,7 @@ class SpaceSummaryController @Inject constructor(
 
     interface Callback {
         fun onSpaceSelected(spaceSummary: SpaceSummary)
+        fun onLeaveSpace(spaceSummary: SpaceSummary)
         fun onAddSpaceSelected()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index bf3a47461f..3f1971d9dc 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -18,12 +18,14 @@ package im.vector.app.features.spaces
 
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.util.MatrixItem
 
@@ -34,12 +36,22 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
     @EpoxyAttribute lateinit var matrixItem: MatrixItem
     @EpoxyAttribute var selected: Boolean = false
     @EpoxyAttribute var listener: (() -> Unit)? = null
+    @EpoxyAttribute var onLeave: (() -> Unit)? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.rootView.setOnClickListener { listener?.invoke() }
         holder.groupNameView.text = matrixItem.displayName
         holder.rootView.isChecked = selected
+        if (onLeave != null) {
+            holder.leaveView.setOnClickListener(
+                    DebouncedClickListener({ _ ->
+                        onLeave?.invoke()
+                    })
+            )
+        } else {
+            holder.leaveView.isVisible = false
+        }
         avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
     }
 
@@ -52,5 +64,6 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         val avatarImageView by bind<ImageView>(R.id.groupAvatarImageView)
         val groupNameView by bind<TextView>(R.id.groupNameView)
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
+        val leaveView by bind<ImageView>(R.id.groupTmpLeave)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 4ec6e7d4ad..28bc358e36 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.spaces
 
+import androidx.lifecycle.viewModelScope
 import arrow.core.Option
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -34,18 +35,22 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 
 const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
 
 sealed class SpaceListAction : VectorViewModelAction {
     data class SelectSpace(val spaceSummary: SpaceSummary) : SpaceListAction()
+    data class LeaveSpace(val spaceSummary: SpaceSummary) : SpaceListAction()
     object AddSpace : SpaceListAction()
 }
 
@@ -88,13 +93,18 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     init {
         observeSpaceSummaries()
         observeSelectionState()
-        selectedSpaceDataSource.observe().execute {
-            if (this.selectedSpace != it.invoke()?.orNull()) {
-                copy(
-                        selectedSpace = it.invoke()?.orNull()
-                )
-            } else this
-        }
+        selectedSpaceDataSource
+                .observe()
+                .subscribe {
+                    if (currentGroupId != it.orNull()?.spaceId) {
+                        setState {
+                            copy(
+                                    selectedSpace = it.orNull()
+                            )
+                        }
+                    }
+                }
+                .disposeOnClear()
     }
 
     private fun observeSelectionState() {
@@ -119,11 +129,12 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     override fun handle(action: SpaceListAction) {
         when (action) {
             is SpaceListAction.SelectSpace -> handleSelectSpace(action)
-            else                           -> handleAddSpace()
+            is SpaceListAction.LeaveSpace -> handleLeaveSpace(action)
+            SpaceListAction.AddSpace -> handleAddSpace()
         }
     }
 
-    // PRIVATE METHODS *****************************************************************************
+// PRIVATE METHODS *****************************************************************************
 
     private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
         // get uptodate version of the space
@@ -146,6 +157,16 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         }
     }
 
+    private fun handleLeaveSpace(action: SpaceListAction.LeaveSpace) {
+        viewModelScope.launch {
+            awaitCallback {
+                tryOrNull("Failed to leave space ${action.spaceSummary.spaceId}") {
+                    session.spaceService().getSpace(action.spaceSummary.spaceId)?.asRoom()?.leave(null, it)
+                }
+            }
+        }
+    }
+
     private fun handleAddSpace() {
         _viewEvents.post(SpaceListViewEvents.AddSpace)
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
index 066c329c34..a6b9b1978a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.spaces.create
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.util.AttributeSet
@@ -25,6 +26,7 @@ import androidx.appcompat.content.res.AppCompatResources.getDrawable
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.withStyledAttributes
 import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.databinding.ViewSpaceTypeButtonBinding
 
 class WizardButtonView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
@@ -36,7 +38,7 @@ class WizardButtonView @JvmOverloads constructor(context: Context, attrs: Attrib
         set(value) {
             if (value != title) {
                 field = value
-                views.title.text = value
+                views.title.setTextOrHide(value)
             }
         }
 
@@ -44,7 +46,7 @@ class WizardButtonView @JvmOverloads constructor(context: Context, attrs: Attrib
         set(value) {
             if (value != subTitle) {
                 field = value
-                views.subTitle.text = value
+                views.subTitle.setTextOrHide(value)
             }
         }
 
@@ -56,15 +58,13 @@ class WizardButtonView @JvmOverloads constructor(context: Context, attrs: Attrib
             }
         }
 
-//    private var tint: Int? = null
-//        set(value) {
-//            field = value
-//            if (value != null) {
-//                views.buttonImageView.imageTintList = ColorStateList.valueOf(value)
-//            } else {
-//                views.buttonImageView.clearColorFilter()
-//            }
-//        }
+    private var tint: Int? = null
+        set(value) {
+            field = value
+            if (value != null) {
+                views.buttonImageView.imageTintList = ColorStateList.valueOf(value)
+            }
+        }
 
 //    var action: (() -> Unit)? = null
 
@@ -72,16 +72,19 @@ class WizardButtonView @JvmOverloads constructor(context: Context, attrs: Attrib
         inflate(context, R.layout.view_space_type_button, this)
         views = ViewSpaceTypeButtonBinding.bind(this)
 
+        views.subTitle.setTextOrHide(null)
+
         if (isInEditMode) {
             title = "Title"
             subTitle = "This is doing something"
         }
 
         context.withStyledAttributes(attrs, R.styleable.WizardButtonView) {
-            title = getString(R.styleable.WizardButtonView_title) ?: ""
-            subTitle = getString(R.styleable.WizardButtonView_subTitle) ?: ""
+            title = getString(R.styleable.WizardButtonView_title)
+            subTitle = getString(R.styleable.WizardButtonView_subTitle)
             icon = getDrawable(R.styleable.WizardButtonView_icon)
-//            tint = getColor(R.styleable.WizardButtonView_iconTint, ThemeUtils.getColor(context, R.attr.riotx_text_primary))
+            tint = getColor(R.styleable.WizardButtonView_iconTint, -1)
+                    .takeIf { it != -1 }
         }
 
         val outValue = TypedValue()
diff --git a/vector/src/main/res/drawable/ic_mail.xml b/vector/src/main/res/drawable/ic_mail.xml
new file mode 100644
index 0000000000..80d25166b0
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_mail.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4H20C21.1,4 22,4.9 22,6V18C22,19.1 21.1,20 20,20H4C2.9,20 2,19.1 2,18V6C2,4.9 2.9,4 4,4Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#737D8C"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M22,6L12,13L2,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#737D8C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_share_link.xml b/vector/src/main/res/drawable/ic_share_link.xml
new file mode 100644
index 0000000000..d4eceb3b9a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_share_link.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12.5285,6.5409L13.0273,6.0421C14.4052,4.6643 16.6259,4.651 17.9874,6.0125C19.349,7.374 19.3357,9.5947 17.9579,10.9725L15.5878,13.3425C14.21,14.7203 11.9893,14.7335 10.6277,13.372M11.4717,17.4589L10.9727,17.9579C9.5948,19.3357 7.3741,19.349 6.0126,17.9875C4.651,16.626 4.6643,14.4053 6.0421,13.0275L8.412,10.6577C9.7899,9.2799 12.0106,9.2667 13.3721,10.6281"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#737D8C"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
new file mode 100644
index 0000000000..c8d29b2f7d
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/callControlsWrapper"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_bottom_sheet_background"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/headerText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:text="@string/invite_people_to_your_space"
+        android:textColor="?riotx_text_primary"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/descriptionText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
+        app:layout_constraintTop_toBottomOf="@id/headerText"
+        app:layout_constraintVertical_bias="1"
+        tools:text="@string/invite_people_to_your_space_desc" />
+
+
+    <im.vector.app.features.spaces.create.WizardButtonView
+        android:id="@+id/inviteByMailButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        app:icon="@drawable/ic_mail"
+        app:iconTint="?riotx_text_secondary"
+        app:title="@string/invite_by_email" />
+
+    <im.vector.app.features.spaces.create.WizardButtonView
+        android:id="@+id/inviteByMxidButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        app:icon="@drawable/ic_add_people"
+        app:iconTint="?riotx_text_secondary"
+        app:title="@string/invite_by_mxid" />
+
+
+    <im.vector.app.features.spaces.create.WizardButtonView
+        android:id="@+id/inviteByLinkButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        app:icon="@drawable/ic_share_link"
+        app:iconTint="?riotx_text_secondary"
+        app:title="@string/invite_by_link">
+
+    </im.vector.app.features.spaces.create.WizardButtonView>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/skipButton"
+        style="@style/VectorButtonStyleOutlined"
+        android:textAllCaps="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/layout_vertical_margin"
+        android:textColor="?colorAccent"
+        android:text="@string/skip_for_now"/>
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 9cd07f3215..f52ef31ead 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -35,11 +35,26 @@
         android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
-        app:layout_constraintEnd_toStartOf="@+id/groupAvatarChevron"
+        app:layout_constraintEnd_toStartOf="@+id/groupTmpLeave"
         app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem/random" />
 
+    <ImageView
+        android:id="@+id/groupTmpLeave"
+        android:clickable="true"
+        android:background="?selectableItemBackground"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:padding="4dp"
+        android:layout_marginEnd="4dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_room_actions_leave"
+        android:tint="@color/riotx_destructive_accent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/groupAvatarChevron"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ImageView
         android:id="@+id/groupAvatarChevron"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index 1ccbed3201..ac20b74d4a 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -2,10 +2,10 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/content"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/rounded_rect_shape_8"
-    android:id="@+id/content"
     android:padding="4dp">
 
     <ImageView
@@ -34,6 +34,7 @@
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
         app:layout_constraintStart_toEndOf="@id/buttonImageView"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginBottom="0dp"
         tools:text="Public" />
 
 
@@ -53,7 +54,8 @@
         app:layout_constraintStart_toEndOf="@id/buttonImageView"
         app:layout_constraintTop_toBottomOf="@id/title"
         app:layout_goneMarginBottom="8dp"
-        tools:text="Open to anyone, best for communities" />
+        tools:text="Open to anyone, best for communities"
+        tools:visibility="visible" />
 
     <ImageView
         android:id="@+id/rightChevron"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index fb578f3802..41b489002b 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3277,6 +3277,14 @@
     <string name="create_spaces_room_public_header_desc">We’ll create rooms for them, and auto-join everyone. You can add more later too.</string>
     <string name="create_spaces_default_public_room_name">General</string>
     <string name="create_spaces_loading_message">Creating Space…</string>
+    <string name="invite_people_to_your_space">Invite people to your space</string>
+    <string name="invite_people_to_your_space_desc">It’s just you at the moment.  %s will be even better with others.</string>
+    <string name="invite_by_email">Invite by email</string>
+    <string name="invite_by_mxid">Invite by username</string>
+    <string name="invite_by_link">Share link</string>
+    <!-- First one is the space name, and the second one is the matrix.to link -->
+    <string name="share_space_link_message">Join my space %1$s %2$s</string>
+    <string name="skip_for_now">Skip for now</string>
 
 
 </resources>

From 2952dca3a35e2309f2f10ad171e9cd25f4d0ce35 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Feb 2021 18:50:49 +0100
Subject: [PATCH 112/350] Default Rooms Handling

---
 .../java/im/vector/app/features/form/FormEditTextItem.kt   | 7 +++++++
 .../app/features/spaces/create/CreateSpaceViewModel.kt     | 5 ++++-
 .../spaces/create/SpaceDefaultRoomEpoxyController.kt       | 4 ++++
 vector/src/main/res/values/strings.xml                     | 1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index a1bd2bd1a3..42ce6d68a8 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -57,6 +57,9 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     @EpoxyAttribute
     var imeOptions: Int? = null
 
+    @EpoxyAttribute
+    var endIconMode: Int? = null
+
     @EpoxyAttribute
     var onTextChange: ((String) -> Unit)? = null
 
@@ -72,6 +75,10 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         holder.textInputLayout.hint = hint
         holder.textInputLayout.error = errorMessage
 
+        endIconMode?.let { mode ->
+            holder.textInputLayout.endIconMode = mode
+        }
+
         // Update only if text is different and value is not null
         holder.textInputEditText.setTextSafe(value)
         holder.textInputEditText.isEnabled = enabled
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index cd2680ef5f..9988bbe003 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -111,7 +111,10 @@ class CreateSpaceViewModel @AssistedInject constructor(
 
         override fun initialState(viewModelContext: ViewModelContext): CreateSpaceState? {
             return CreateSpaceState(
-                    defaultRooms = mapOf(0 to viewModelContext.activity.getString(R.string.create_spaces_default_public_room_name))
+                    defaultRooms = mapOf(
+                            0 to viewModelContext.activity.getString(R.string.create_spaces_default_public_room_name),
+                            1 to viewModelContext.activity.getString(R.string.create_spaces_default_public_random_room_name)
+                    )
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
index 27b57713ba..800de01b62 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.spaces.create
 
 import com.airbnb.epoxy.TypedEpoxyController
+import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
@@ -51,6 +52,7 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
             enabled(true)
             value(data?.defaultRooms?.get(0))
             hint(stringProvider.getString(R.string.create_room_name_section))
+            endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
             showBottomSeparator(false)
             onTextChange { text ->
                 listener?.onNameChange(0, text)
@@ -62,6 +64,7 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
             enabled(true)
             value(data?.defaultRooms?.get(1))
             hint(stringProvider.getString(R.string.create_room_name_section))
+            endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
             showBottomSeparator(false)
             onTextChange { text ->
                 listener?.onNameChange(1, text)
@@ -73,6 +76,7 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
             enabled(true)
             value(data?.defaultRooms?.get(2))
             hint(stringProvider.getString(R.string.create_room_name_section))
+            endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
             showBottomSeparator(false)
             onTextChange { text ->
                 listener?.onNameChange(2, text)
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 41b489002b..5c6966ef4e 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3276,6 +3276,7 @@
     <string name="create_spaces_room_public_header">What are some discussions you want to have in Runner’s World?</string>
     <string name="create_spaces_room_public_header_desc">We’ll create rooms for them, and auto-join everyone. You can add more later too.</string>
     <string name="create_spaces_default_public_room_name">General</string>
+    <string name="create_spaces_default_public_random_room_name">Random</string>
     <string name="create_spaces_loading_message">Creating Space…</string>
     <string name="invite_people_to_your_space">Invite people to your space</string>
     <string name="invite_people_to_your_space_desc">It’s just you at the moment.  %s will be even better with others.</string>

From a433f2f965355a0d06da06380f6a8efa34897433 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 26 Feb 2021 09:14:44 +0100
Subject: [PATCH 113/350] a11y

---
 vector/src/main/res/layout/item_editable_square_avatar.xml | 1 +
 vector/src/main/res/layout/item_space.xml                  | 2 +-
 vector/src/main/res/layout/item_space_subspace.xml         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/item_editable_square_avatar.xml b/vector/src/main/res/layout/item_editable_square_avatar.xml
index b3ec057fd4..3112b36a65 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -57,6 +57,7 @@
         android:backgroundTint="?riotx_background"
         android:padding="8dp"
         android:src="@drawable/ic_camera_plain"
+        android:contentDescription="@string/a11y_change_avatar"
         app:tint="?riotx_text_secondary"
         app:layout_constraintCircle="@+id/itemEditableAvatarImageContainer"
         app:layout_constraintCircleAngle="135"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index f52ef31ead..25b685b999 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -50,7 +50,7 @@
         android:layout_marginEnd="4dp"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_room_actions_leave"
-        android:tint="@color/riotx_destructive_accent"
+        app:tint="@color/riotx_destructive_accent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/groupAvatarChevron"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index ac654dc2b3..d3b243132e 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -28,6 +28,7 @@
         android:layout_height="24dp"
         android:scaleType="centerInside"
         android:visibility="visible"
+        android:contentDescription="@string/a11y_image"
         android:layout_marginStart="8dp"
         app:layout_constraintBottom_toBottomOf="@id/childSpaceName"
         app:layout_constraintStart_toEndOf="@id/childSpaceTab"

From 03ef480bea14a1c958655e0d71093eebcd88b1f2 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Sat, 27 Feb 2021 11:17:19 +0100
Subject: [PATCH 114/350] Fix missing param in string

---
 .../features/spaces/create/SpaceDefaultRoomEpoxyController.kt   | 2 +-
 vector/src/main/res/values/strings.xml                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
index 800de01b62..a1e46457e3 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
@@ -37,7 +37,7 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
         genericFooterItem {
             id("info_help_header")
             style(GenericItem.STYLE.BIG_TEXT)
-            text(stringProvider.getString(R.string.create_spaces_room_public_header))
+            text(stringProvider.getString(R.string.create_spaces_room_public_header, data?.name))
             textColor(colorProvider.getColorFromAttribute(R.attr.riot_primary_text_color))
         }
 
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 5c6966ef4e..272bec27fe 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3273,7 +3273,7 @@
     <string name="create_spaces_details_public_header">Add some details to help it stand out. You can change these at any point.</string>
     <string name="create_spaces_details_private_header">Add some details to help people identify it. You can change these at any point.</string>
     <string name="create_space_error_empty_field_space_name">Give it a name to continue.</string>
-    <string name="create_spaces_room_public_header">What are some discussions you want to have in Runner’s World?</string>
+    <string name="create_spaces_room_public_header">What are some discussions you want to have in %s?</string>
     <string name="create_spaces_room_public_header_desc">We’ll create rooms for them, and auto-join everyone. You can add more later too.</string>
     <string name="create_spaces_default_public_room_name">General</string>
     <string name="create_spaces_default_public_random_room_name">Random</string>

From ef42591534effb92d45c7e374d309d3e99a46a5d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Sat, 27 Feb 2021 11:13:54 +0100
Subject: [PATCH 115/350] Open Space Link initial commit

---
 .../api/session/room/peeking/PeekResult.kt    |   1 +
 .../session/room/peeking/PeekRoomTask.kt      |   9 +-
 .../im/vector/app/core/di/FragmentModule.kt   |  12 +
 .../vector/app/features/home/HomeActivity.kt  |  17 ++
 .../home/room/detail/RoomDetailFragment.kt    |   4 +-
 .../app/features/matrixto/MatrixToAction.kt   |   7 +
 .../features/matrixto/MatrixToBottomSheet.kt  |  83 +++----
 .../matrixto/MatrixToBottomSheetState.kt      |  34 ++-
 .../matrixto/MatrixToBottomSheetViewModel.kt  | 197 +++++++++++++++--
 .../matrixto/MatrixToRoomSpaceFragment.kt     | 207 ++++++++++++++++++
 .../features/matrixto/MatrixToUserFragment.kt |  99 +++++++++
 .../features/matrixto/MatrixToViewEvents.kt   |   2 +
 .../features/permalink/PermalinkHandler.kt    |  10 +-
 .../roomdirectory/PublicRoomsFragment.kt      |   3 +-
 .../layout/bottom_sheet_matrix_to_card.xml    |  88 +-------
 .../fragment_matrix_to_room_space_card.xml    | 145 ++++++++++++
 .../layout/fragment_matrix_to_user_card.xml   |  86 ++++++++
 vector/src/main/res/values/strings.xml        |   3 +
 18 files changed, 851 insertions(+), 156 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt
 create mode 100644 vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
 create mode 100644 vector/src/main/res/layout/fragment_matrix_to_user_card.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt
index a27e88aced..c213eee08d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt
@@ -24,6 +24,7 @@ sealed class PeekResult {
             val topic: String?,
             val avatarUrl: String?,
             val numJoinedMembers: Int?,
+            val roomType: String?,
             val viaServers: List<String>
     ) : PeekResult()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt
index 5b211c505f..5d45259304 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomNameContent
 import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsFilter
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
@@ -100,7 +101,8 @@ internal class DefaultPeekRoomTask @Inject constructor(
                     name = publicRepoResult.name,
                     topic = publicRepoResult.topic,
                     numJoinedMembers = publicRepoResult.numJoinedMembers,
-                    viaServers = serverList
+                    viaServers = serverList,
+                    roomType = null // would be nice to get that from directory...
             )
         }
 
@@ -130,6 +132,10 @@ internal class DefaultPeekRoomTask @Inject constructor(
                     .distinctBy { it.stateKey }
                     .count()
 
+            val roomType = stateEvents
+                    .lastOrNull { it.type == EventType.STATE_ROOM_CREATE }
+                    ?.let { it.content?.toModel<RoomCreateContent>()?.type }
+
             return PeekResult.Success(
                     roomId = roomId,
                     alias = alias,
@@ -137,6 +143,7 @@ internal class DefaultPeekRoomTask @Inject constructor(
                     name = name,
                     topic = topic,
                     numJoinedMembers = memberCount,
+                    roomType = roomType,
                     viaServers = serverList
             )
         } catch (failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index d3b46b5c64..a1be337dc6 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -72,6 +72,8 @@ import im.vector.app.features.login.LoginSplashFragment
 import im.vector.app.features.login.LoginWaitForEmailFragment
 import im.vector.app.features.login.LoginWebFragment
 import im.vector.app.features.login.terms.LoginTermsFragment
+import im.vector.app.features.matrixto.MatrixToRoomSpaceFragment
+import im.vector.app.features.matrixto.MatrixToUserFragment
 import im.vector.app.features.pin.PinFragment
 import im.vector.app.features.qrcode.QrCodeScannerFragment
 import im.vector.app.features.reactions.EmojiChooserFragment
@@ -654,4 +656,14 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(CreateSpaceDefaultRoomsFragment::class)
     fun bindCreateSpaceDefaultRoomsFragment(fragment: CreateSpaceDefaultRoomsFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(MatrixToUserFragment::class)
+    fun bindMatrixToUserFragment(fragment: MatrixToUserFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(MatrixToRoomSpaceFragment::class)
+    fun bindMatrixToRoomSpaceFragment(fragment: MatrixToRoomSpaceFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index db7bb8fa16..84098b8281 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -451,6 +451,23 @@ class HomeActivity :
         return true
     }
 
+    override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?): Boolean {
+        if (roomId == null) return false
+        val listener = object : MatrixToBottomSheet.InteractionListener {
+            override fun navigateToRoom(roomId: String) {
+                navigator.openRoom(this@HomeActivity, roomId)
+            }
+
+            override fun switchToSpace(spaceId: String) {
+                navigator.switchToSpace(this@HomeActivity, spaceId, null, false)
+            }
+        }
+
+        MatrixToBottomSheet.withLink(deepLink.toString(), listener)
+                .show(supportFragmentManager, "HA#MatrixToBottomSheet")
+        return true
+    }
+
     companion object {
         fun newIntent(context: Context, clearNotification: Boolean = false, accountCreation: Boolean = false): Intent {
             val args = HomeActivityArgs(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index a585d7609a..4d7f9b64f0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1445,7 +1445,7 @@ class RoomDetailFragment @Inject constructor(
     override fun onUrlClicked(url: String, title: String): Boolean {
         permalinkHandler
                 .launch(requireActivity(), url, object : NavigationInterceptor {
-                    override fun navToRoom(roomId: String?, eventId: String?): Boolean {
+                    override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?): Boolean {
                         // Same room?
                         if (roomId == roomDetailArgs.roomId) {
                             // Navigation to same room
@@ -1653,7 +1653,7 @@ class RoomDetailFragment @Inject constructor(
     override fun onRoomCreateLinkClicked(url: String) {
         permalinkHandler
                 .launch(requireContext(), url, object : NavigationInterceptor {
-                    override fun navToRoom(roomId: String?, eventId: String?): Boolean {
+                    override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?): Boolean {
                         requireActivity().finish()
                         return false
                     }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt
index e1c6800494..1c9d0bbb18 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt
@@ -21,4 +21,11 @@ import org.matrix.android.sdk.api.util.MatrixItem
 
 sealed class MatrixToAction : VectorViewModelAction {
     data class StartChattingWithUser(val matrixItem: MatrixItem) : MatrixToAction()
+    object FailedToResolveUser : MatrixToAction()
+    object FailedToStartChatting : MatrixToAction()
+    data class JoinSpace(val spaceID: String, val viaServers: List<String>?) : MatrixToAction()
+    data class JoinRoom(val roomId: String, val viaServers: List<String>?) : MatrixToAction()
+    data class OpenSpace(val spaceID: String) : MatrixToAction()
+    data class OpenRoom(val roomId: String) : MatrixToAction()
+//    data class OpenSpace(val spaceID: String) : MatrixToAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
index 1d897477a2..b9ef833850 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
@@ -21,22 +21,23 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.isInvisible
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
-import com.airbnb.mvrx.Fail
-import com.airbnb.mvrx.Loading
+import androidx.fragment.app.Fragment
+import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.MvRx
-import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
+import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
-import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetMatrixToCardBinding
 import im.vector.app.features.home.AvatarRenderer
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import javax.inject.Inject
+import kotlin.reflect.KClass
 
 class MatrixToBottomSheet :
         VectorBaseBottomSheetDialogFragment<BottomSheetMatrixToCardBinding>() {
@@ -65,63 +66,41 @@ class MatrixToBottomSheet :
 
     interface InteractionListener {
         fun navigateToRoom(roomId: String)
+        fun switchToSpace(spaceId: String) {}
     }
 
     override fun invalidate() = withState(viewModel) { state ->
         super.invalidate()
-        when (val item = state.matrixItem) {
-            Uninitialized -> {
-                views.matrixToCardContentLoading.isVisible = false
-                views.matrixToCardUserContentVisibility.isVisible = false
+        when (state.linkType) {
+            is PermalinkData.RoomLink -> {
+                views.matrixToCardContentLoading.isVisible = state.roomPeekResult is Incomplete
+                showFragment(MatrixToRoomSpaceFragment::class, Bundle())
             }
-            is Loading -> {
-                views.matrixToCardContentLoading.isVisible = true
-                views.matrixToCardUserContentVisibility.isVisible = false
+            is PermalinkData.UserLink -> {
+                views.matrixToCardContentLoading.isVisible = state.matrixItem is Incomplete
+                showFragment(MatrixToUserFragment::class, Bundle())
             }
-            is Success -> {
-                views.matrixToCardContentLoading.isVisible = false
-                views.matrixToCardUserContentVisibility.isVisible = true
-                views.matrixToCardNameText.setTextOrHide(item.invoke().displayName)
-                views.matrixToCardUserIdText.setTextOrHide(item.invoke().id)
-                avatarRenderer.render(item.invoke(), views.matrixToCardAvatar)
+            is PermalinkData.GroupLink -> {
             }
-            is Fail -> {
-                // TODO display some error copy?
-                dismiss()
+            is PermalinkData.FallbackLink -> {
             }
         }
+    }
 
-        when (state.startChattingState) {
-            Uninitialized -> {
-                views.matrixToCardButtonLoading.isVisible = false
-                views.matrixToCardSendMessageButton.isVisible = false
-            }
-            is Success -> {
-                views.matrixToCardButtonLoading.isVisible = false
-                views.matrixToCardSendMessageButton.isVisible = true
-            }
-            is Fail -> {
-                views.matrixToCardButtonLoading.isVisible = false
-                views.matrixToCardSendMessageButton.isVisible = true
-                // TODO display some error copy?
-                dismiss()
-            }
-            is Loading -> {
-                views.matrixToCardButtonLoading.isVisible = true
-                views.matrixToCardSendMessageButton.isInvisible = true
+    private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
+        if (childFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
+            childFragmentManager.commitTransaction {
+                replace(views.matrixToCardFragmentContainer.id,
+                        fragmentClass.java,
+                        bundle,
+                        fragmentClass.simpleName
+                )
             }
         }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        views.matrixToCardSendMessageButton.debouncedClicks {
-            withState(viewModel) {
-                it.matrixItem.invoke()?.let { item ->
-                    viewModel.handle(MatrixToAction.StartChattingWithUser(item))
-                }
-            }
-        }
 
         viewModel.observeViewEvents {
             when (it) {
@@ -130,6 +109,16 @@ class MatrixToBottomSheet :
                     dismiss()
                 }
                 MatrixToViewEvents.Dismiss -> dismiss()
+                is MatrixToViewEvents.NavigateToSpace -> {
+                    interactionListener?.switchToSpace(it.spaceId)
+                    dismiss()
+                }
+                is MatrixToViewEvents.ShowModalError -> {
+                    AlertDialog.Builder(requireContext())
+                            .setMessage(it.error)
+                            .setPositiveButton(getString(R.string.ok), null)
+                            .show()
+                }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt
index 9b1ce9fea8..c0d42d60dd 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt
@@ -19,15 +19,45 @@ package im.vector.app.features.matrixto
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.permalinks.PermalinkData
+import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.util.MatrixItem
 
 data class MatrixToBottomSheetState(
         val deepLink: String,
+        val linkType: PermalinkData,
         val matrixItem: Async<MatrixItem> = Uninitialized,
-        val startChattingState: Async<Unit> = Uninitialized
+        val startChattingState: Async<Unit> = Uninitialized,
+        val roomPeekResult: Async<RoomInfoResult> = Uninitialized
 ) : MvRxState {
 
     constructor(args: MatrixToBottomSheet.MatrixToArgs) : this(
-            deepLink = args.matrixToLink
+            deepLink = args.matrixToLink,
+            linkType = PermalinkParser.parse(args.matrixToLink)
     )
 }
+
+sealed class RoomInfoResult {
+    data class FullInfo(
+            val roomItem: MatrixItem.RoomItem,
+            val name: String,
+            val topic: String,
+            val memberCount: Int?,
+            val alias: String?,
+            val membership: Membership,
+            val roomType: String?,
+            val viaServers: List<String>?
+    ) : RoomInfoResult()
+
+    data class PartialInfo(
+            val roomId: String?,
+            val viaServers: List<String>
+    ) : RoomInfoResult()
+
+    data class UnknownAlias(
+            val alias: String?
+    ) : RoomInfoResult()
+
+    object NotFound : RoomInfoResult()
+}
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index b961383575..267322b58a 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -25,9 +25,10 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.R
+import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
@@ -35,19 +36,26 @@ import im.vector.app.features.createdirect.DirectRoomHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
-import org.matrix.android.sdk.api.session.permalinks.PermalinkParser
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.peeking.PeekResult
+import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
+import org.matrix.android.sdk.internal.util.awaitCallback
+import timber.log.Timber
 
 class MatrixToBottomSheetViewModel @AssistedInject constructor(
         @Assisted initialState: MatrixToBottomSheetState,
         private val session: Session,
         private val stringProvider: StringProvider,
         private val directRoomHelper: DirectRoomHelper,
-        private val rawService: RawService) : VectorViewModel<MatrixToBottomSheetState, MatrixToAction, MatrixToViewEvents>(initialState) {
+        private val errorFormatter: ErrorFormatter)
+    : VectorViewModel<MatrixToBottomSheetState, MatrixToAction, MatrixToViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory {
@@ -55,8 +63,23 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
     }
 
     init {
-        setState {
-            copy(matrixItem = Loading())
+        when (initialState.linkType) {
+            is PermalinkData.RoomLink -> {
+                setState {
+                    copy(roomPeekResult = Loading())
+                }
+            }
+            is PermalinkData.UserLink -> {
+                setState {
+                    copy(matrixItem = Loading())
+                }
+            }
+            is PermalinkData.GroupLink -> {
+                // Not yet supported
+            }
+            is PermalinkData.FallbackLink -> {
+                // Not yet supported
+            }
         }
         viewModelScope.launch(Dispatchers.IO) {
             resolveLink(initialState)
@@ -64,7 +87,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
     }
 
     private suspend fun resolveLink(initialState: MatrixToBottomSheetState) {
-        val permalinkData = PermalinkParser.parse(initialState.deepLink)
+        val permalinkData = initialState.linkType
         if (permalinkData is PermalinkData.FallbackLink) {
             setState {
                 copy(
@@ -75,8 +98,8 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
             return
         }
 
-        when (permalinkData)  {
-            is PermalinkData.UserLink     -> {
+        when (permalinkData) {
+            is PermalinkData.UserLink -> {
                 val user = resolveUser(permalinkData.userId)
                 setState {
                     copy(
@@ -85,11 +108,79 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                     )
                 }
             }
-            is PermalinkData.RoomLink     -> {
-                // not yet supported
-                _viewEvents.post(MatrixToViewEvents.Dismiss)
+            is PermalinkData.RoomLink -> {
+                // could this room be already known
+                val knownRoom = if (permalinkData.isRoomAlias) {
+                    tryOrNull {
+                        awaitCallback<Optional<RoomAliasDescription>> {
+                            session.getRoomIdByAlias(permalinkData.roomIdOrAlias, false, it)
+                        }
+                    }
+                            ?.getOrNull()
+                            ?.roomId?.let {
+                                session.getRoom(permalinkData.roomIdOrAlias)
+                            }
+                } else {
+                    session.getRoom(permalinkData.roomIdOrAlias)
+                }?.roomSummary()
+
+                if (knownRoom != null) {
+                    setState {
+                        copy(
+                                roomPeekResult = Success(
+                                        RoomInfoResult.FullInfo(
+                                                roomItem = knownRoom.toMatrixItem(),
+                                                name = knownRoom.name,
+                                                topic = knownRoom.topic,
+                                                memberCount = knownRoom.joinedMembersCount,
+                                                alias = knownRoom.canonicalAlias,
+                                                membership = knownRoom.membership,
+                                                roomType = knownRoom.roomType,
+                                                viaServers = null
+                                        )
+                                )
+                        )
+                    }
+                } else {
+
+                    val result = when (val peekResult = tryOrNull { resolveRoom(permalinkData.roomIdOrAlias) }) {
+                        is PeekResult.Success           -> {
+                            RoomInfoResult.FullInfo(
+                                    roomItem = MatrixItem.RoomItem(peekResult.roomId, peekResult.name, peekResult.avatarUrl),
+                                    name = peekResult.name ?: "",
+                                    topic = peekResult.topic ?: "",
+                                    memberCount = peekResult.numJoinedMembers,
+                                    alias = peekResult.alias,
+                                    membership = Membership.NONE,
+                                    roomType = peekResult.roomType,
+                                    viaServers = peekResult.viaServers.takeIf { it.isNotEmpty() } ?: permalinkData.viaParameters
+                            )
+                        }
+                        is PeekResult.PeekingNotAllowed -> {
+                            RoomInfoResult.PartialInfo(
+                                    roomId = permalinkData.roomIdOrAlias,
+                                    viaServers = permalinkData.viaParameters
+                            )
+                        }
+                        PeekResult.UnknownAlias         -> {
+                            RoomInfoResult.NotFound
+                        }
+                        null                            -> {
+                            RoomInfoResult.PartialInfo(
+                                    roomId = permalinkData.roomIdOrAlias,
+                                    viaServers = permalinkData.viaParameters
+                            ).takeIf { permalinkData.isRoomAlias.not() }
+                                    ?: RoomInfoResult.NotFound
+                        }
+                    }
+                    setState {
+                        copy(
+                                roomPeekResult = Success(result)
+                        )
+                    }
+                }
             }
-            is PermalinkData.GroupLink    -> {
+            is PermalinkData.GroupLink -> {
                 // not yet supported
                 _viewEvents.post(MatrixToViewEvents.Dismiss)
             }
@@ -105,6 +196,19 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                 ?: User(userId, null, null)
     }
 
+    /**
+     * Let's try to get some information about that room,
+     * main thing is trying to see if it's a space or a room
+     */
+    private suspend fun resolveRoom(roomIdOrAlias: String): PeekResult {
+        return tryOrNull { // this should not throw as it returns a result, but better be safe
+            awaitCallback {
+                session.peekRoom(roomIdOrAlias, it)
+            }
+        }
+                ?: PeekResult.PeekingNotAllowed(roomIdOrAlias, null, emptyList())
+    }
+
     companion object : MvRxViewModelFactory<MatrixToBottomSheetViewModel, MatrixToBottomSheetState> {
         override fun create(viewModelContext: ViewModelContext, state: MatrixToBottomSheetState): MatrixToBottomSheetViewModel? {
             val fragment: MatrixToBottomSheet = (viewModelContext as FragmentViewModelContext).fragment()
@@ -116,14 +220,75 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
     override fun handle(action: MatrixToAction) {
         when (action) {
             is MatrixToAction.StartChattingWithUser -> handleStartChatting(action)
+            MatrixToAction.FailedToResolveUser -> {
+                _viewEvents.post(MatrixToViewEvents.Dismiss)
+            }
+            MatrixToAction.FailedToStartChatting -> {
+                _viewEvents.post(MatrixToViewEvents.Dismiss)
+            }
+            is MatrixToAction.JoinSpace -> handleJoinSpace(action)
+            is MatrixToAction.JoinRoom -> handleJoinRoom(action)
+            is MatrixToAction.OpenSpace -> {
+                _viewEvents.post(MatrixToViewEvents.NavigateToSpace(action.spaceID))
+            }
+            is MatrixToAction.OpenRoom -> {
+                _viewEvents.post(MatrixToViewEvents.NavigateToRoom(action.roomId))
+            }
         }.exhaustive
     }
 
-    private fun handleStartChatting(action: MatrixToAction.StartChattingWithUser) {
+    private fun handleJoinSpace(joinSpace: MatrixToAction.JoinSpace) {
+        setState {
+            copy(startChattingState = Loading())
+        }
         viewModelScope.launch {
-            setState {
-                copy(startChattingState = Loading())
+            try {
+                val joinResult = session.spaceService().joinSpace(joinSpace.spaceID, null, joinSpace.viaServers?.take(3) ?: emptyList())
+                if (joinResult.isSuccess()) {
+                    _viewEvents.post(MatrixToViewEvents.NavigateToSpace(joinSpace.spaceID))
+                } else {
+                    val errMsg = errorFormatter.toHumanReadable((joinResult as? SpaceService.JoinSpaceResult.Fail)?.error)
+                    _viewEvents.post(MatrixToViewEvents.ShowModalError(errMsg))
+                }
+            } catch (failure: Throwable) {
+                _viewEvents.post(MatrixToViewEvents.ShowModalError(errorFormatter.toHumanReadable(failure)))
+            } finally {
+                setState {
+                    // we can hide this button has we will navigate out
+                    copy(startChattingState = Uninitialized)
+                }
             }
+
+        }
+    }
+
+    private fun handleJoinRoom(action: MatrixToAction.JoinRoom) {
+        setState {
+            copy(startChattingState = Loading())
+        }
+        viewModelScope.launch {
+            try {
+                awaitCallback<Unit> {
+                    session.joinRoom(action.roomId, null, action.viaServers?.take(3) ?: emptyList(), it)
+                }
+                _viewEvents.post(MatrixToViewEvents.NavigateToRoom(action.roomId))
+            } catch (failure: Throwable) {
+                _viewEvents.post(MatrixToViewEvents.ShowModalError(errorFormatter.toHumanReadable(failure)))
+            } finally {
+                setState {
+                    // we can hide this button has we will navigate out
+                    copy(startChattingState = Uninitialized)
+                }
+            }
+
+        }
+    }
+
+    private fun handleStartChatting(action: MatrixToAction.StartChattingWithUser) {
+        setState {
+            copy(startChattingState = Loading())
+        }
+        viewModelScope.launch {
             val roomId = try {
                 directRoomHelper.ensureDMExists(action.matrixItem.id)
             } catch (failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
new file mode 100644
index 0000000000..8ab2a46bad
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.matrixto
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.parentFragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentMatrixToRoomSpaceCardBinding
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import javax.inject.Inject
+
+class MatrixToRoomSpaceFragment @Inject constructor(
+        private val avatarRenderer: AvatarRenderer
+) : VectorBaseFragment<FragmentMatrixToRoomSpaceCardBinding>() {
+
+    private val sharedViewModel: MatrixToBottomSheetViewModel by parentFragmentViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentMatrixToRoomSpaceCardBinding {
+        return FragmentMatrixToRoomSpaceCardBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        views.matrixToCardMainButton.debouncedClicks {
+            mainButtonClicked()
+        }
+        views.matrixToCardSecondaryButton.debouncedClicks {
+            secondaryButtonClicked()
+        }
+    }
+
+    override fun invalidate() = withState(sharedViewModel) { state ->
+        when (val item = state.roomPeekResult) {
+            Uninitialized -> {
+                views.matrixToCardContentVisibility.isVisible = false
+            }
+            is Loading -> {
+                views.matrixToCardContentVisibility.isVisible = false
+            }
+            is Success -> {
+                views.matrixToCardContentVisibility.isVisible = true
+                when (val peek = item.invoke()) {
+                    is RoomInfoResult.FullInfo     -> {
+                        val matrixItem = peek.roomItem
+                        if (peek.roomType == RoomType.SPACE) {
+                            avatarRenderer.renderSpace(matrixItem, views.matrixToCardAvatar)
+                        } else {
+                            avatarRenderer.render(matrixItem, views.matrixToCardAvatar)
+                        }
+                        views.matrixToCardNameText.setTextOrHide(peek.name)
+                        views.matrixToCardAliasText.setTextOrHide(peek.alias)
+                        views.matrixToCardDescText.setTextOrHide(peek.topic)
+                        val memberCount = peek.memberCount
+                        if (memberCount != null) {
+                            views.matrixToMemberPills.isVisible = true
+                            views.spaceChildMemberCountText.text = resources.getQuantityString(R.plurals.room_title_members, memberCount, memberCount)
+                        } else {
+                            // hide the pill
+                            views.matrixToMemberPills.isVisible = false
+                        }
+
+                        when (peek.membership) {
+                            Membership.LEAVE,
+                            Membership.NONE   -> {
+                                views.matrixToCardMainButton.isVisible = true
+                                views.matrixToCardMainButton.text = getString(R.string.join_space)
+                                views.matrixToCardSecondaryButton.isVisible = false
+                            }
+                            Membership.INVITE -> {
+                                views.matrixToCardMainButton.isVisible = true
+                                views.matrixToCardSecondaryButton.isVisible = true
+                                views.matrixToCardMainButton.text = getString(R.string.join_space)
+                                views.matrixToCardSecondaryButton.text = getString(R.string.decline)
+                            }
+                            Membership.JOIN   -> {
+                                views.matrixToCardMainButton.isVisible = true
+                                views.matrixToCardSecondaryButton.isVisible = false
+                                views.matrixToCardMainButton.text = getString(R.string.action_open)
+                            }
+                            Membership.KNOCK,
+                            Membership.BAN    -> {
+                                // What to do here ?
+                                views.matrixToCardMainButton.isVisible = false
+                                views.matrixToCardSecondaryButton.isVisible = false
+                            }
+                        }
+                    }
+                    is RoomInfoResult.PartialInfo  -> {
+                        // It may still be possible to join
+                        views.matrixToCardNameText.text = peek.roomId
+                        views.matrixToCardAliasText.isVisible = false
+                        views.matrixToMemberPills.isVisible = false
+                        views.matrixToCardDescText.setTextOrHide(getString(R.string.room_preview_no_preview))
+
+                        views.matrixToCardMainButton.text = getString(R.string.join_anyway)
+                        views.matrixToCardSecondaryButton.isVisible = false
+                    }
+                    RoomInfoResult.NotFound        -> {
+                        // we cannot join :/
+                        views.matrixToCardNameText.isVisible = false
+                        views.matrixToCardAliasText.isVisible = false
+                        views.matrixToMemberPills.isVisible = false
+                        views.matrixToCardDescText.setTextOrHide(getString(R.string.room_preview_not_found))
+
+                        views.matrixToCardMainButton.isVisible = false
+                        views.matrixToCardSecondaryButton.isVisible = false
+                    }
+                    is RoomInfoResult.UnknownAlias -> {
+                        views.matrixToCardNameText.isVisible = false
+                        views.matrixToCardAliasText.isVisible = false
+                        views.spaceChildMemberCountText.isVisible = false
+                        views.matrixToCardDescText.setTextOrHide(getString(R.string.room_alias_preview_not_found))
+
+                        views.matrixToCardMainButton.isVisible = false
+                        views.matrixToCardSecondaryButton.isVisible = false
+                    }
+                }
+            }
+            is Fail -> {
+                // TODO display some error copy?
+                sharedViewModel.handle(MatrixToAction.FailedToResolveUser)
+            }
+        }
+
+        when (state.startChattingState) {
+            Uninitialized -> {
+                views.matrixToCardButtonLoading.isVisible = false
+//                views.matrixToCardMainButton.isVisible = false
+            }
+            is Success -> {
+                views.matrixToCardButtonLoading.isVisible = false
+                views.matrixToCardMainButton.isVisible = true
+            }
+            is Fail -> {
+                views.matrixToCardButtonLoading.isVisible = false
+                views.matrixToCardMainButton.isVisible = true
+                // TODO display some error copy?
+            }
+            is Loading -> {
+                views.matrixToCardButtonLoading.isVisible = true
+                views.matrixToCardMainButton.isInvisible = true
+            }
+        }
+    }
+
+    private fun mainButtonClicked() = withState(sharedViewModel) { state ->
+        when (val info = state.roomPeekResult.invoke()) {
+            is RoomInfoResult.FullInfo -> {
+                when (info.membership) {
+                    Membership.NONE,
+                    Membership.INVITE,
+                    Membership.LEAVE -> {
+                        if (info.roomType == RoomType.SPACE) {
+                            sharedViewModel.handle(MatrixToAction.JoinSpace(info.roomItem.id, info.viaServers))
+                        } else {
+                            sharedViewModel.handle(MatrixToAction.JoinRoom(info.roomItem.id, info.viaServers))
+                        }
+                    }
+                    Membership.JOIN  -> {
+                        if (info.roomType == RoomType.SPACE) {
+                            sharedViewModel.handle(MatrixToAction.OpenSpace(info.roomItem.id))
+                        } else {
+                            sharedViewModel.handle(MatrixToAction.OpenRoom(info.roomItem.id))
+                        }
+                    }
+                    else             -> {
+                    }
+                }
+            }
+            is RoomInfoResult.PartialInfo -> {
+            }
+            else                          -> {
+            }
+        }
+    }
+
+    fun secondaryButtonClicked() = withState(sharedViewModel) { state ->
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt
new file mode 100644
index 0000000000..3792183bca
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToUserFragment.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.matrixto
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.parentFragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentMatrixToUserCardBinding
+import im.vector.app.features.home.AvatarRenderer
+import javax.inject.Inject
+
+class MatrixToUserFragment @Inject constructor(
+        private val avatarRenderer: AvatarRenderer
+) : VectorBaseFragment<FragmentMatrixToUserCardBinding>() {
+
+    private val sharedViewModel: MatrixToBottomSheetViewModel by parentFragmentViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentMatrixToUserCardBinding {
+        return FragmentMatrixToUserCardBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        views.matrixToCardSendMessageButton.debouncedClicks {
+            withState(sharedViewModel) {
+                it.matrixItem.invoke()?.let { item ->
+                    sharedViewModel.handle(MatrixToAction.StartChattingWithUser(item))
+                }
+            }
+        }
+    }
+
+    override fun invalidate() = withState(sharedViewModel) { state ->
+        when (val item = state.matrixItem) {
+            Uninitialized -> {
+                views.matrixToCardUserContentVisibility.isVisible = false
+            }
+            is Loading -> {
+                views.matrixToCardUserContentVisibility.isVisible = false
+            }
+            is Success -> {
+                views.matrixToCardUserContentVisibility.isVisible = true
+                views.matrixToCardNameText.setTextOrHide(item.invoke().displayName)
+                views.matrixToCardUserIdText.setTextOrHide(item.invoke().id)
+                avatarRenderer.render(item.invoke(), views.matrixToCardAvatar)
+            }
+            is Fail -> {
+                // TODO display some error copy?
+                sharedViewModel.handle(MatrixToAction.FailedToResolveUser)
+            }
+        }
+
+        when (state.startChattingState) {
+            Uninitialized -> {
+                views.matrixToCardButtonLoading.isVisible = false
+                views.matrixToCardSendMessageButton.isVisible = false
+            }
+            is Success -> {
+                views.matrixToCardButtonLoading.isVisible = false
+                views.matrixToCardSendMessageButton.isVisible = true
+            }
+            is Fail -> {
+                views.matrixToCardButtonLoading.isVisible = false
+                views.matrixToCardSendMessageButton.isVisible = true
+                // TODO display some error copy?
+                sharedViewModel.handle(MatrixToAction.FailedToStartChatting)
+            }
+            is Loading -> {
+                views.matrixToCardButtonLoading.isVisible = true
+                views.matrixToCardSendMessageButton.isInvisible = true
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToViewEvents.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToViewEvents.kt
index f9491fd361..2c7bc07b23 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToViewEvents.kt
@@ -20,5 +20,7 @@ import im.vector.app.core.platform.VectorViewEvents
 
 sealed class MatrixToViewEvents : VectorViewEvents {
     data class NavigateToRoom(val roomId: String) : MatrixToViewEvents()
+    data class NavigateToSpace(val spaceId: String) : MatrixToViewEvents()
+    data class ShowModalError(val error: String) : MatrixToViewEvents()
     object Dismiss : MatrixToViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index d43337fab0..ca1a010a03 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -78,12 +78,12 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
             buildTask: Boolean
     ): Single<Boolean> {
         return when (permalinkData) {
-            is PermalinkData.RoomLink     -> {
+            is PermalinkData.RoomLink -> {
                 permalinkData.getRoomId()
                         .observeOn(AndroidSchedulers.mainThread())
                         .map {
                             val roomId = it.getOrNull()
-                            if (navigationInterceptor?.navToRoom(roomId, permalinkData.eventId) != true) {
+                            if (navigationInterceptor?.navToRoom(roomId, permalinkData.eventId, rawLink) != true) {
                                 openRoom(
                                         context = context,
                                         roomId = roomId,
@@ -94,11 +94,11 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
                             true
                         }
             }
-            is PermalinkData.GroupLink    -> {
+            is PermalinkData.GroupLink -> {
                 navigator.openGroupDetail(permalinkData.groupId, context, buildTask)
                 Single.just(true)
             }
-            is PermalinkData.UserLink     -> {
+            is PermalinkData.UserLink -> {
                 if (navigationInterceptor?.navToMemberProfile(permalinkData.userId, rawLink) != true) {
                     navigator.openRoomMemberProfile(userId = permalinkData.userId, roomId = null, context = context, buildTask = buildTask)
                 }
@@ -196,7 +196,7 @@ interface NavigationInterceptor {
     /**
      * Return true if the navigation has been intercepted
      */
-    fun navToRoom(roomId: String?, eventId: String? = null): Boolean {
+    fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri? = null): Boolean {
         return false
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
index cee30e7def..8214b26fea 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.roomdirectory
 
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -127,7 +128,7 @@ class PublicRoomsFragment @Inject constructor(
         val permalink = session.permalinkService().createPermalink(roomIdOrAlias)
         permalinkHandler
                 .launch(requireContext(), permalink, object : NavigationInterceptor {
-                    override fun navToRoom(roomId: String?, eventId: String?): Boolean {
+                    override fun navToRoom(roomId: String?, eventId: String?, deepLink: Uri?): Boolean {
                         requireActivity().finish()
                         return false
                     }
diff --git a/vector/src/main/res/layout/bottom_sheet_matrix_to_card.xml b/vector/src/main/res/layout/bottom_sheet_matrix_to_card.xml
index 37f9633728..652ec8421d 100644
--- a/vector/src/main/res/layout/bottom_sheet_matrix_to_card.xml
+++ b/vector/src/main/res/layout/bottom_sheet_matrix_to_card.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -10,88 +9,13 @@
         android:id="@+id/matrixToCardContentLoading"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:layout_centerInParent="true"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
-    <ImageView
-        android:id="@+id/matrixToCardAvatar"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="@dimen/layout_vertical_margin_big"
-        android:contentDescription="@string/avatar"
-        android:elevation="4dp"
-        android:transitionName="profile"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
-
-    <TextView
-        android:id="@+id/matrixToCardNameText"
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/matrixToCardFragmentContainer"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="@dimen/layout_vertical_margin_big"
-        android:layout_marginEnd="16dp"
-        android:maxLines="1"
-        android:singleLine="true"
-        android:textAlignment="center"
-        android:textColor="?riotx_text_primary"
-        android:textSize="15sp"
-        app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
-        tools:text="@sample/matrix.json/data/displayName" />
+        android:layout_height="wrap_content" />
 
-    <TextView
-        android:id="@+id/matrixToCardUserIdText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="16dp"
-        android:maxLines="1"
-        android:singleLine="true"
-        android:textAlignment="center"
-        android:textColor="?riotx_text_secondary"
-        android:textSize="15sp"
-        app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
-        tools:text="@sample/matrix.json/data/mxid" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/matrixToCardSendMessageButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="@dimen/layout_vertical_margin_big"
-        android:minWidth="130dp"
-        android:text="@string/start_chatting"
-        app:icon="@drawable/ic_fab_add_chat"
-        app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/matrixToCardUserIdText" />
-
-    <ProgressBar
-        android:id="@+id/matrixToCardButtonLoading"
-        style="?android:attr/progressBarStyleSmall"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/matrixToCardSendMessageButton"
-        app:layout_constraintEnd_toEndOf="@id/matrixToCardSendMessageButton"
-        app:layout_constraintStart_toStartOf="@id/matrixToCardSendMessageButton"
-        app:layout_constraintTop_toTopOf="@id/matrixToCardSendMessageButton"
-        tools:visibility="visible" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/matrixToCardUserContentVisibility"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:constraint_referenced_ids="matrixToCardAvatar,matrixToCardNameText,matrixToCardUserIdText"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
new file mode 100644
index 0000000000..6f49f15842
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="200dp"
+    android:padding="16dp">
+
+    <ImageView
+        android:id="@+id/matrixToCardAvatar"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginTop="@dimen/layout_vertical_margin_big"
+        android:contentDescription="@string/avatar"
+        android:elevation="4dp"
+        android:transitionName="profile"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/matrixToCardNameText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/layout_vertical_margin_big"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:textAlignment="center"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
+        tools:text="@sample/matrix.json/data/roomName" />
+
+    <TextView
+        android:id="@+id/matrixToCardAliasText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:textAlignment="center"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp"
+        app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
+        tools:text="@sample/matrix.json/data/roomAlias" />
+
+    <LinearLayout
+        android:id="@+id/matrixToMemberPills"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/pill_receipt"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingStart="12dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/matrixToCardAliasText">
+
+        <ImageView
+            android:id="@+id/spaceChildMemberCountIcon"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="4dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_room_profile_member_list"
+            app:tint="?riotx_text_primary" />
+
+        <TextView
+            android:id="@+id/spaceChildMemberCountText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:maxLines="1"
+            android:textColor="?riotx_text_primary"
+            tools:text="123 members" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/matrixToCardDescText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:maxLines="4"
+        android:textAlignment="center"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp"
+        app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
+        tools:text="@sample/matrix.json/data/roomTopic" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/matrixToCardMainButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="@dimen/layout_vertical_margin_big"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/matrixToCardDescText"
+        app:layout_constraintWidth_max="400dp"
+        tools:text="@string/join" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/matrixToCardSecondaryButton"
+        style="@style/VectorButtonStyleOutlined"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="@dimen/layout_vertical_margin_big"
+        android:textAllCaps="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/matrixToCardMainButton"
+        app:layout_constraintWidth_max="400dp"
+        tools:text="@string/dismiss" />
+
+    <ProgressBar
+        android:id="@+id/matrixToCardButtonLoading"
+        style="?android:attr/progressBarStyleSmall"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/matrixToCardMainButton"
+        app:layout_constraintEnd_toEndOf="@id/matrixToCardMainButton"
+        app:layout_constraintStart_toStartOf="@id/matrixToCardMainButton"
+        app:layout_constraintTop_toTopOf="@id/matrixToCardMainButton"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/matrixToCardContentVisibility"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="matrixToCardNameText,matrixToCardAvatar,matrixToCardNameText,matrixToCardDescText, matrixToCardMainButton, matrixToCardAliasText, matrixToCardSecondaryButton, matrixToMemberPills"
+        tools:visibility="visible" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
new file mode 100644
index 0000000000..03599779f1
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="200dp">
+
+    <ImageView
+        android:id="@+id/matrixToCardAvatar"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginTop="@dimen/layout_vertical_margin_big"
+        android:contentDescription="@string/avatar"
+        android:elevation="4dp"
+        android:transitionName="profile"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/matrixToCardNameText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="@dimen/layout_vertical_margin_big"
+        android:layout_marginEnd="16dp"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:textAlignment="center"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
+        tools:text="@sample/matrix.json/data/displayName" />
+
+    <TextView
+        android:id="@+id/matrixToCardUserIdText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="16dp"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:textAlignment="center"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp"
+        app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
+        tools:text="@sample/matrix.json/data/mxid" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/matrixToCardSendMessageButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="@dimen/layout_vertical_margin_big"
+        android:minWidth="130dp"
+        android:text="@string/start_chatting"
+        app:icon="@drawable/ic_fab_add_chat"
+        app:iconTint="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/matrixToCardUserIdText" />
+
+    <ProgressBar
+        android:id="@+id/matrixToCardButtonLoading"
+        style="?android:attr/progressBarStyleSmall"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/matrixToCardSendMessageButton"
+        app:layout_constraintEnd_toEndOf="@id/matrixToCardSendMessageButton"
+        app:layout_constraintStart_toStartOf="@id/matrixToCardSendMessageButton"
+        app:layout_constraintTop_toTopOf="@id/matrixToCardSendMessageButton"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/matrixToCardUserContentVisibility"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="matrixToCardAvatar,matrixToCardNameText,matrixToCardUserIdText"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 272bec27fe..93c42dc723 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3286,6 +3286,9 @@
     <!-- First one is the space name, and the second one is the matrix.to link -->
     <string name="share_space_link_message">Join my space %1$s %2$s</string>
     <string name="skip_for_now">Skip for now</string>
+    <string name="join_space">Join Space</string>
+    <string name="join_anyway">Join Anyway</string>
+    <string name="room_alias_preview_not_found">This alias is not accessible at this time.\nTry again later, or ask a room admin to check if you have access.</string>
 
 
 </resources>

From bb0b1ed0983059be2e2584b74ef430e797f5ef81 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 3 Mar 2021 15:16:46 +0100
Subject: [PATCH 116/350] Some fixes + join actions

---
 .../matrixto/MatrixToBottomSheetViewModel.kt  | 15 ++-----
 .../matrixto/MatrixToRoomSpaceFragment.kt     | 14 ++++++-
 .../features/navigation/DefaultNavigator.kt   | 24 +++++++++++
 .../app/features/navigation/Navigator.kt      |  2 +
 .../features/permalink/PermalinkHandler.kt    | 40 +++++--------------
 5 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index 267322b58a..e608774f33 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -47,7 +47,6 @@ import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 import org.matrix.android.sdk.internal.util.awaitCallback
-import timber.log.Timber
 
 class MatrixToBottomSheetViewModel @AssistedInject constructor(
         @Assisted initialState: MatrixToBottomSheetState,
@@ -118,7 +117,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                     }
                             ?.getOrNull()
                             ?.roomId?.let {
-                                session.getRoom(permalinkData.roomIdOrAlias)
+                                session.getRoom(it)
                             }
                 } else {
                     session.getRoom(permalinkData.roomIdOrAlias)
@@ -142,7 +141,6 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                         )
                     }
                 } else {
-
                     val result = when (val peekResult = tryOrNull { resolveRoom(permalinkData.roomIdOrAlias) }) {
                         is PeekResult.Success           -> {
                             RoomInfoResult.FullInfo(
@@ -163,7 +161,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                             )
                         }
                         PeekResult.UnknownAlias         -> {
-                            RoomInfoResult.NotFound
+                            RoomInfoResult.UnknownAlias(permalinkData.roomIdOrAlias)
                         }
                         null                            -> {
                             RoomInfoResult.PartialInfo(
@@ -201,12 +199,9 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
      * main thing is trying to see if it's a space or a room
      */
     private suspend fun resolveRoom(roomIdOrAlias: String): PeekResult {
-        return tryOrNull { // this should not throw as it returns a result, but better be safe
-            awaitCallback {
-                session.peekRoom(roomIdOrAlias, it)
-            }
+        return awaitCallback {
+            session.peekRoom(roomIdOrAlias, it)
         }
-                ?: PeekResult.PeekingNotAllowed(roomIdOrAlias, null, emptyList())
     }
 
     companion object : MvRxViewModelFactory<MatrixToBottomSheetViewModel, MatrixToBottomSheetState> {
@@ -258,7 +253,6 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                     copy(startChattingState = Uninitialized)
                 }
             }
-
         }
     }
 
@@ -280,7 +274,6 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                     copy(startChattingState = Uninitialized)
                 }
             }
-
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 8ab2a46bad..31dc537395 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -87,17 +87,23 @@ class MatrixToRoomSpaceFragment @Inject constructor(
                             views.matrixToMemberPills.isVisible = false
                         }
 
+                        val joinTextRes = if (peek.roomType == RoomType.SPACE) {
+                            R.string.join_space
+                        } else {
+                            R.string.join_room
+                        }
+
                         when (peek.membership) {
                             Membership.LEAVE,
                             Membership.NONE   -> {
                                 views.matrixToCardMainButton.isVisible = true
-                                views.matrixToCardMainButton.text = getString(R.string.join_space)
+                                views.matrixToCardMainButton.text = getString(joinTextRes)
                                 views.matrixToCardSecondaryButton.isVisible = false
                             }
                             Membership.INVITE -> {
                                 views.matrixToCardMainButton.isVisible = true
                                 views.matrixToCardSecondaryButton.isVisible = true
-                                views.matrixToCardMainButton.text = getString(R.string.join_space)
+                                views.matrixToCardMainButton.text = getString(joinTextRes)
                                 views.matrixToCardSecondaryButton.text = getString(R.string.decline)
                             }
                             Membership.JOIN   -> {
@@ -196,6 +202,10 @@ class MatrixToRoomSpaceFragment @Inject constructor(
                 }
             }
             is RoomInfoResult.PartialInfo -> {
+                // we can try to join anyway
+                if (info.roomId != null) {
+                    sharedViewModel.handle(MatrixToAction.JoinRoom(info.roomId, info.viaServers))
+                }
             }
             else                          -> {
             }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 80cb82098b..27c29ae42b 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -54,6 +54,7 @@ import im.vector.app.features.home.room.detail.search.SearchActivity
 import im.vector.app.features.home.room.detail.search.SearchArgs
 import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
 import im.vector.app.features.invite.InviteUsersToRoomActivity
+import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.media.AttachmentData
 import im.vector.app.features.media.BigImageViewerActivity
 import im.vector.app.features.media.VectorAttachmentViewerActivity
@@ -119,6 +120,12 @@ class DefaultNavigator @Inject constructor(
             val args = RoomDetailArgs(roomId, eventId = null, openShareSpaceForId = spaceId.takeIf { openShareSheet })
             val intent = RoomDetailActivity.newIntent(context, args)
             startActivity(context, intent, false)
+        } else {
+            // go back to home if we are showing room details?
+            // This is a bit ugly, but the navigator is supposed to know about the activity stack
+            if (context is RoomDetailActivity) {
+                context.finish()
+            }
         }
     }
 
@@ -225,6 +232,23 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
+    override fun openMatrixToBottomSheet(context: Context, link: String) {
+        if (context is AppCompatActivity) {
+            val listener = object : MatrixToBottomSheet.InteractionListener {
+                override fun navigateToRoom(roomId: String) {
+                    openRoom(context, roomId)
+                }
+
+                override fun switchToSpace(spaceId: String) {
+                    this@DefaultNavigator.switchToSpace(context, spaceId, null, openShareSheet = false)
+                }
+            }
+            // TODO check if there is already one??
+            MatrixToBottomSheet.withLink(link, listener)
+                    .show(context.supportFragmentManager, "HA#MatrixToBottomSheet")
+        }
+    }
+
     override fun openRoomDirectory(context: Context, initialFilter: String) {
         val intent = RoomDirectoryActivity.getIntent(context, initialFilter)
         context.startActivity(intent)
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 225a2b89ab..489cd37987 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -58,6 +58,8 @@ interface Navigator {
 
     fun openRoomPreview(context: Context, roomPreviewData: RoomPreviewData)
 
+    fun openMatrixToBottomSheet(context: Context, link: String)
+
     fun openCreateRoom(context: Context, initialName: String = "")
 
     fun openCreateDirectRoom(context: Context)
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index ca1a010a03..1fea25159f 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -22,7 +22,6 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.toast
 import im.vector.app.features.navigation.Navigator
-import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
@@ -88,6 +87,7 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
                                         context = context,
                                         roomId = roomId,
                                         permalinkData = permalinkData,
+                                        rawLink = rawLink,
                                         buildTask = buildTask
                                 )
                             }
@@ -137,6 +137,7 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
             context: Context,
             roomId: String?,
             permalinkData: PermalinkData.RoomLink,
+            rawLink: Uri,
             buildTask: Boolean
     ) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
@@ -152,40 +153,17 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
         return when {
             membership == Membership.BAN     -> context.toast(R.string.error_opening_banned_room)
             membership?.isActive().orFalse() -> {
-                if (isSpace) {
-//                    navigator.switchToSpace(context, roomId, null)
-                    navigator.openSpacePreview(context, roomId)
-                } else {
+                if (!isSpace && membership == Membership.JOIN) {
+                    // If it's a room you're in, let's just open it, you can tap back if needed
                     navigator.openRoom(context, roomId, eventId, buildTask)
+                } else {
+                    // maybe open space preview navigator.openSpacePreview(context, roomId)? if already joined?
+                    navigator.openMatrixToBottomSheet(context, rawLink.toString())
                 }
             }
             else                             -> {
-                if (isSpace) {
-                    navigator.openSpacePreview(context, roomId)
-                } else {
-                    if (roomSummary == null) {
-                        // we don't know this room, try to peek
-                        val roomPreviewData = RoomPreviewData(
-                                roomId = roomId,
-                                roomAlias = roomAlias,
-                                peekFromServer = true,
-                                buildTask = buildTask,
-                                homeServers = permalinkData.viaParameters
-                        )
-                        navigator.openRoomPreview(context, roomPreviewData)
-                    } else {
-                        val roomPreviewData = RoomPreviewData(
-                                roomId = roomId,
-                                eventId = eventId,
-                                roomAlias = roomAlias ?: roomSummary.canonicalAlias,
-                                roomName = roomSummary.displayName,
-                                avatarUrl = roomSummary.avatarUrl,
-                                buildTask = buildTask,
-                                homeServers = permalinkData.viaParameters
-                        )
-                        navigator.openRoomPreview(context, roomPreviewData)
-                    }
-                }
+                // XXX this could trigger another server load
+                navigator.openMatrixToBottomSheet(context, rawLink.toString())
             }
         }
     }

From 80f1c6cb2d08b4edd4af2798d6f453ec6a004e70 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 11 Mar 2021 22:15:40 +0100
Subject: [PATCH 117/350] post rebase fix

---
 .../vector/app/features/home/room/detail/RoomDetailFragment.kt  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 4d7f9b64f0..df38511b70 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -95,9 +95,7 @@ import im.vector.app.core.ui.views.ActiveConferenceView
 import im.vector.app.core.ui.views.CurrentCallsView
 import im.vector.app.core.ui.views.JumpToReadMarkerView
 import im.vector.app.core.ui.views.KnownCallsViewHolder
-import im.vector.app.core.ui.views.ActiveConferenceView
 import im.vector.app.core.ui.views.FailedMessagesWarningView
-import im.vector.app.core.ui.views.JumpToReadMarkerView
 import im.vector.app.core.ui.views.NotificationAreaView
 import im.vector.app.core.utils.Debouncer
 import im.vector.app.core.utils.DimensionConverter

From 0c5ca9f51b97431ddad655a927fcbe7909d3f26e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 11 Mar 2021 22:35:11 +0100
Subject: [PATCH 118/350] Space hierachy SDK updates

---
 .../org/matrix/android/sdk/rx/RxSession.kt    |  10 +-
 .../sdk/session/space/SpaceHierarchyTest.kt   | 373 ++++++++++++++++++
 .../android/sdk/api/session/room/Room.kt      |   3 +
 .../sdk/api/session/room/RoomService.kt       |   5 +
 .../session/room/RoomSummaryQueryParams.kt    |  25 +-
 .../sdk/api/session/room/model/RoomSummary.kt |  26 +-
 .../api/session/room/model/SpaceChildInfo.kt  |  10 +-
 .../{IRoomSummary.kt => SpaceParentInfo.kt}   |  21 +-
 .../android/sdk/api/session/space/Space.kt    |   4 +-
 .../sdk/api/session/space/SpaceService.kt     |  14 +-
 .../sdk/api/session/space/SpaceSummary.kt     |  27 --
 .../session/space/model/SpaceParentContent.kt |   6 -
 .../matrix/android/sdk/api/util/MatrixItem.kt |   3 -
 .../database/RealmSessionStoreMigration.kt    |  38 +-
 .../database/mapper/RoomSummaryMapper.kt      |  26 +-
 .../database/mapper/SpaceSummaryMapper.kt     |  40 --
 .../sdk/internal/database/model/RoomEntity.kt |   1 -
 .../database/model/RoomSummaryEntity.kt       |   4 +-
 .../database/model/SessionRealmModule.kt      |   4 +-
 ...foEntity.kt => SpaceChildSummaryEntity.kt} |  20 +-
 .../model/SpaceParentSummaryEntity.kt         |  49 +++
 .../database/model/SpaceSummaryEntity.kt      |  41 --
 .../query/SpaceSummaryEntityQueries.kt        |  55 ---
 .../sdk/internal/session/room/DefaultRoom.kt  |  11 +
 .../session/room/DefaultRoomService.kt        |  20 +-
 .../sdk/internal/session/room/SpaceGetter.kt  |   4 +-
 ...shipHelper.kt => RoomChildRelationInfo.kt} |  39 +-
 .../room/summary/HierarchyLiveDataHelper.kt   |  67 ++++
 .../room/summary/RoomSummaryDataSource.kt     | 166 +++++++-
 .../room/summary/RoomSummaryUpdater.kt        |  85 ++--
 .../internal/session/space/CreateSpaceTask.kt |   8 +-
 .../internal/session/space/DefaultSpace.kt    |   7 +-
 .../session/space/DefaultSpaceService.kt      |  85 +++-
 .../internal/session/space/JoinSpaceTask.kt   |  37 +-
 .../session/space/SpaceSummaryDataSource.kt   |  93 -----
 .../internal/session/sync/RoomSyncHandler.kt  |   3 +
 .../grouplist/SelectedSpaceDataSource.kt      |   4 +-
 .../app/features/home/HomeDetailFragment.kt   |   6 +-
 .../app/features/home/HomeDetailViewState.kt  |   3 +-
 .../timeline/factory/TimelineItemFactory.kt   |  10 +-
 .../timeline/format/NoticeEventFormatter.kt   |   2 +
 .../matrixto/MatrixToRoomSpaceFragment.kt     |   2 +-
 .../features/navigation/DefaultNavigator.kt   |   2 +-
 .../settings/SharedPreferenceLiveData.kt      |  54 +++
 .../features/settings/VectorPreferences.kt    |   9 +
 .../settings/VectorSettingsLabsFragment.kt    |  10 +-
 .../features/spaces/ShareSpaceBottomSheet.kt  |   2 +-
 .../app/features/spaces/SpaceListFragment.kt  |   6 +-
 .../features/spaces/SpaceSummaryController.kt |  22 +-
 .../app/features/spaces/SpaceSummaryItem.kt   |  25 ++
 .../features/spaces/SpacesListViewModel.kt    |  55 ++-
 .../spaces/explore/SpaceDirectoryViewModel.kt |   4 +-
 .../spaces/preview/SpacePreviewViewModel.kt   |  12 +-
 vector/src/main/res/layout/item_group.xml     |   2 +-
 vector/src/main/res/layout/item_space.xml     |  20 +-
 vector/src/main/res/values/strings.xml        |   3 +-
 .../src/main/res/xml/vector_settings_labs.xml |   3 +-
 57 files changed, 1211 insertions(+), 475 deletions(-)
 create mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/{IRoomSummary.kt => SpaceParentInfo.kt} (61%)
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/{SpaceChildInfoEntity.kt => SpaceChildSummaryEntity.kt} (69%)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceParentSummaryEntity.kt
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/SpaceSummaryEntityQueries.kt
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/{RoomRelationshipHelper.kt => RoomChildRelationInfo.kt} (64%)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryDataSource.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/SharedPreferenceLiveData.kt

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 7cc0d69bb9..38b0a3a343 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -39,7 +39,6 @@ import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
-import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.session.user.model.User
@@ -68,13 +67,20 @@ class RxSession(private val session: Session) {
                 }
     }
 
-    fun liveSpaceSummaries(queryParams: SpaceSummaryQueryParams): Observable<List<SpaceSummary>> {
+    fun liveSpaceSummaries(queryParams: SpaceSummaryQueryParams): Observable<List<RoomSummary>> {
         return session.spaceService().getSpaceSummariesLive(queryParams).asObservable()
                 .startWithCallable {
                     session.spaceService().getSpaceSummaries(queryParams)
                 }
     }
 
+    fun liveFlattenRoomSummaryChildOf(spaceId: String?): Observable<List<RoomSummary>> {
+        return session.getFlattenRoomSummaryChildOfLive(spaceId).asObservable()
+                .startWithCallable {
+                    session.getFlattenRoomSummaryChildOf(spaceId)
+                }
+    }
+
     fun liveBreadcrumbs(queryParams: RoomSummaryQueryParams): Observable<List<RoomSummary>> {
         return session.getBreadcrumbsLive(queryParams).asObservable()
                 .startWithCallable {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
new file mode 100644
index 0000000000..b512983ea6
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -0,0 +1,373 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.session.space
+
+import android.util.Log
+import androidx.lifecycle.Observer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.SessionTestParams
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class SpaceHierarchyTest : InstrumentedTest {
+
+    private val commonTestHelper = CommonTestHelper(context())
+
+    @Test
+    fun createCanonicalChildRelation() {
+        val session = commonTestHelper.createAccount("Jhon", SessionTestParams(true))
+        val spaceName = "My Space"
+        val topic = "A public space for test"
+        val spaceId: String
+        runBlocking {
+            spaceId = session.spaceService().createSpace(spaceName, topic, null, true)
+            // wait a bit to let the summry update it self :/
+            delay(400)
+        }
+
+        val syncedSpace = session.spaceService().getSpace(spaceId)
+
+        val roomId = commonTestHelper.doSync<String> {
+            session.createRoom(CreateRoomParams().apply { name = "General" }, it)
+        }
+
+        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+
+        runBlocking {
+            syncedSpace!!.addChildren(roomId, viaServers, null, true)
+        }
+
+        runBlocking {
+            session.spaceService().setSpaceParent(roomId, spaceId, true, viaServers)
+        }
+
+        Thread.sleep(9000)
+
+        val parents = session.getRoom(roomId)?.roomSummary()?.spaceParents
+        val canonicalParents = session.getRoom(roomId)?.roomSummary()?.spaceParents?.filter { it.canonical == true }
+
+        parents?.forEach {
+            Log.d("## TEST", "parent : $it")
+        }
+
+        assertNotNull(parents)
+        assertEquals(1, parents.size)
+        assertEquals(spaceName, parents.first().roomSummary?.name)
+
+        assertNotNull(canonicalParents)
+        assertEquals(1, canonicalParents.size)
+        assertEquals(spaceName, canonicalParents.first().roomSummary?.name)
+    }
+
+    @Test
+    fun testCreateChildRelations() {
+        val session = commonTestHelper.createAccount("Jhon", SessionTestParams(true))
+        val spaceName = "My Space"
+        val topic = "A public space for test"
+        Log.d("## TEST", "Before")
+        val spaceId = runBlocking {
+            session.spaceService().createSpace(spaceName, topic, null, true)
+        }
+
+        Log.d("## TEST", "created space $spaceId ${Thread.currentThread()}")
+        val syncedSpace = session.spaceService().getSpace(spaceId)
+
+        val children = listOf("General" to true /*canonical*/, "Random" to false)
+
+        val roomIdList = children.map {
+            commonTestHelper.doSync<String> { cb ->
+                session.createRoom(CreateRoomParams().apply { name = it.first }, cb)
+            } to it.second
+        }
+
+        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+
+        runBlocking {
+            roomIdList.forEach { entry ->
+                syncedSpace!!.addChildren(entry.first, viaServers, null, true)
+            }
+        }
+
+        runBlocking {
+            roomIdList.forEach {
+                session.spaceService().setSpaceParent(it.first, spaceId, it.second, viaServers)
+            }
+            delay(400)
+        }
+
+        roomIdList.forEach {
+            val parents = session.getRoom(it.first)?.roomSummary()?.spaceParents
+            val canonicalParents = session.getRoom(it.first)?.roomSummary()?.spaceParents?.filter { it.canonical == true }
+
+            assertNotNull(parents)
+            assertEquals(1, parents.size, "Unexpected number of parent")
+            assertEquals(spaceName, parents.first().roomSummary?.name, "Unexpected parent name ")
+            assertEquals(if (it.second) 1 else 0, canonicalParents?.size ?: 0, "Parent of ${it.first} should be canonical ${it.second}")
+        }
+    }
+
+    @Test
+    fun testFilteringBySpace() {
+        val session = commonTestHelper.createAccount("John", SessionTestParams(true))
+
+        val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+                Triple("A1", true /*auto-join*/, true/*canonical*/),
+                Triple("A2", true, true)
+        ))
+
+        val spaceBInfo = createPublicSpace(session, "SpaceB", listOf(
+                Triple("B1", true /*auto-join*/, true/*canonical*/),
+                Triple("B2", true, true),
+                Triple("B3", true, true)
+        ))
+
+        val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+                Triple("C1", true /*auto-join*/, true/*canonical*/),
+                Triple("C2", true, true)
+        ))
+
+        // add C as a subspace of A
+        val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
+        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+        runBlocking {
+            spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
+            session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
+        }
+
+        // Create orphan rooms
+
+        val orphan1 = commonTestHelper.doSync<String> { cb ->
+            session.createRoom(CreateRoomParams().apply { name = "O1" }, cb)
+        }
+        val orphan2 = commonTestHelper.doSync<String> { cb ->
+            session.createRoom(CreateRoomParams().apply { name = "O2" }, cb)
+        }
+
+        val allRooms = session.getRoomSummaries(roomSummaryQueryParams { excludeType = listOf(RoomType.SPACE) })
+
+        assertEquals(9, allRooms.size, "Unexpected number of rooms")
+
+        val orphans = session.getFlattenRoomSummaryChildOf(null)
+
+        assertEquals(2, orphans.size, "Unexpected number of orphan rooms")
+        assertTrue(orphans.indexOfFirst { it.roomId == orphan1 } != -1, "O1 should be an orphan")
+        assertTrue(orphans.indexOfFirst { it.roomId == orphan2 } != -1, "O2 should be an orphan ${orphans.map { it.name }}")
+
+        val aChildren = session.getFlattenRoomSummaryChildOf(spaceAInfo.spaceId)
+
+        assertEquals(4, aChildren.size, "Unexpected number of flatten child rooms")
+        assertTrue(aChildren.indexOfFirst { it.name == "A1" } != -1, "A1 should be a child of A")
+        assertTrue(aChildren.indexOfFirst { it.name == "A2" } != -1, "A2 should be a child of A")
+        assertTrue(aChildren.indexOfFirst { it.name == "C1" } != -1, "CA should be a grand child of A")
+        assertTrue(aChildren.indexOfFirst { it.name == "C2" } != -1, "A1 should be a grand child of A")
+
+        // Add a non canonical child and check that it does not appear as orphan
+        val a3 = commonTestHelper.doSync<String> { cb ->
+            session.createRoom(CreateRoomParams().apply { name = "A3" }, cb)
+        }
+        runBlocking {
+            spaceA!!.addChildren(a3, viaServers, null, false)
+            delay(400)
+            // here we do not set the parent!!
+        }
+
+        val orphansUpdate = session.getFlattenRoomSummaryChildOf(null)
+        assertEquals(2, orphansUpdate.size, "Unexpected number of orphan rooms ${orphansUpdate.map { it.name }}")
+    }
+
+    @Test
+    fun testBreakCycle() {
+        val session = commonTestHelper.createAccount("John", SessionTestParams(true))
+
+        val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+                Triple("A1", true /*auto-join*/, true/*canonical*/),
+                Triple("A2", true, true)
+        ))
+
+        val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+                Triple("C1", true /*auto-join*/, true/*canonical*/),
+                Triple("C2", true, true)
+        ))
+
+        // add C as a subspace of A
+        val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
+        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+        runBlocking {
+            spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
+            session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
+        }
+
+        // add back A as subspace of C
+        runBlocking {
+            val spaceC = session.spaceService().getSpace(spaceCInfo.spaceId)
+            spaceC!!.addChildren(spaceAInfo.spaceId, viaServers, null, true)
+        }
+
+        Thread.sleep(1000)
+
+        // A -> C -> A
+
+        val aChildren = session.getFlattenRoomSummaryChildOf(spaceAInfo.spaceId)
+
+        assertEquals(4, aChildren.size, "Unexpected number of flatten child rooms ${aChildren.map { it.name }}")
+        assertTrue(aChildren.indexOfFirst { it.name == "A1" } != -1, "A1 should be a child of A")
+        assertTrue(aChildren.indexOfFirst { it.name == "A2" } != -1, "A2 should be a child of A")
+        assertTrue(aChildren.indexOfFirst { it.name == "C1" } != -1, "CA should be a grand child of A")
+        assertTrue(aChildren.indexOfFirst { it.name == "C2" } != -1, "A1 should be a grand child of A")
+    }
+
+    @Test
+    fun testLiveFlatChildren() {
+        val session = commonTestHelper.createAccount("John", SessionTestParams(true))
+
+        val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+                Triple("A1", true /*auto-join*/, true/*canonical*/),
+                Triple("A2", true, true)
+        ))
+
+        val spaceBInfo = createPublicSpace(session, "SpaceB", listOf(
+                Triple("B1", true /*auto-join*/, true/*canonical*/),
+                Triple("B2", true, true),
+                Triple("B3", true, true)
+        ))
+
+        // add B as a subspace of A
+        val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
+        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+        runBlocking {
+            spaceA!!.addChildren(spaceBInfo.spaceId, viaServers, null, true)
+            session.spaceService().setSpaceParent(spaceBInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
+        }
+
+        val flatAChildren = runBlocking(Dispatchers.Main) {
+            session.getFlattenRoomSummaryChildOfLive(spaceAInfo.spaceId)
+        }
+
+        commonTestHelper.waitWithLatch { latch ->
+
+            val childObserver = object : Observer<List<RoomSummary>> {
+                override fun onChanged(children: List<RoomSummary>?) {
+//                    Log.d("## TEST", "Space A flat children update : ${children?.map { it.name }}")
+                    System.out.println("## TEST | Space A flat children update : ${children?.map { it.name }}")
+                    if (children?.indexOfFirst { it.name == "C1" } != -1
+                            && children?.indexOfFirst { it.name == "C2" } != -1
+                    ) {
+                        // B1 has been added live!
+                        latch.countDown()
+                        flatAChildren.removeObserver(this)
+                    }
+                }
+            }
+
+            val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+                    Triple("C1", true /*auto-join*/, true/*canonical*/),
+                    Triple("C2", true, true)
+            ))
+
+            // add C as subspace of B
+            runBlocking {
+                val spaceB = session.spaceService().getSpace(spaceBInfo.spaceId)
+                spaceB!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
+            }
+
+            // C1 and C2 should be in flatten child of A now
+
+            GlobalScope.launch(Dispatchers.Main) { flatAChildren.observeForever(childObserver) }
+        }
+
+        // Test part one of the rooms
+
+        val bRoomId = spaceBInfo.roomIds.first()
+        val bRoom = session.getRoom(bRoomId)
+
+        commonTestHelper.waitWithLatch { latch ->
+
+            val childObserver = object : Observer<List<RoomSummary>> {
+                override fun onChanged(children: List<RoomSummary>?) {
+                    System.out.println("## TEST | Space A flat children update : ${children?.map { it.name }}")
+                    if (children?.any { it.roomId == bRoomId } == false) {
+                        // B1 has been added live!
+                        latch.countDown()
+                        flatAChildren.removeObserver(this)
+                    }
+                }
+            }
+
+            // part from b room
+            commonTestHelper.doSync<Unit> {
+                bRoom!!.leave(null, it)
+            }
+            // The room should have disapear from flat children
+            GlobalScope.launch(Dispatchers.Main) { flatAChildren.observeForever(childObserver) }
+        }
+    }
+
+    data class TestSpaceCreationResult(
+            val spaceId: String,
+            val roomIds: List<String>
+    )
+
+    private fun createPublicSpace(session: Session,
+                                  spaceName: String,
+                                  childInfo: List<Triple<String, Boolean, Boolean?>>
+            /** Name, auto-join, canonical*/
+    ): TestSpaceCreationResult {
+        val spaceId = runBlocking {
+            session.spaceService().createSpace(spaceName, "Test Topic", null, true)
+        }
+
+        val syncedSpace = session.spaceService().getSpace(spaceId)
+        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+
+        val roomIds =
+                childInfo.map { entry ->
+                    commonTestHelper.doSync<String> { cb ->
+                        session.createRoom(CreateRoomParams().apply { name = entry.first }, cb)
+                    }
+                }
+
+        roomIds.forEachIndexed { index, roomId ->
+            runBlocking {
+                syncedSpace!!.addChildren(roomId, viaServers, null, childInfo[index].second)
+                val canonical = childInfo[index].third
+                if (canonical != null) {
+                    session.spaceService().setSpaceParent(roomId, spaceId, canonical, viaServers)
+                }
+            }
+        }
+        return TestSpaceCreationResult(spaceId, roomIds)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 257c83564e..5f2bc716f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -34,6 +34,8 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
 import org.matrix.android.sdk.api.session.search.SearchResult
+import org.matrix.android.sdk.api.session.space.Space
+import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 
 /**
@@ -90,5 +92,6 @@ interface Room :
                limit: Int,
                beforeLimit: Int,
                afterLimit: Int,
+//    fun getSpaceParents(): List<SpaceSummary>
                includeProfile: Boolean): SearchResult
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 22045366cb..5296ad58b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -20,6 +20,7 @@ import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
@@ -197,4 +198,8 @@ interface RoomService {
                 .setEnablePlaceholders(false)
                 .setPrefetchDistance(10)
                 .build()
+
+    fun getFlattenRoomSummaryChildOf(spaceId: String?, memberships: List<Membership> = Membership.activeMemberships()) : List<RoomSummary>
+
+    fun getFlattenRoomSummaryChildOfLive(spaceId: String?, memberships: List<Membership> = Membership.activeMemberships()): LiveData<List<RoomSummary>>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index c8d52302e9..47618e31c9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -21,11 +21,27 @@ import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 
 fun roomSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {}): RoomSummaryQueryParams {
     return RoomSummaryQueryParams.Builder().apply(init).build()
 }
 
+fun spaceSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) = {}): SpaceSummaryQueryParams {
+    return RoomSummaryQueryParams.Builder()
+            .apply(init)
+            .apply {
+                this.includeType = listOf(RoomType.SPACE)
+                this.excludeType = null
+                this.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            }.build()
+}
+
+enum class RoomCategoryFilter {
+    ONLY_DM,
+    ONLY_ROOMS,
+    ALL
+}
 /**
  * This class can be used to filter room summaries to use with:
  * [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
@@ -37,7 +53,8 @@ data class RoomSummaryQueryParams(
         val memberships: List<Membership>,
         val roomCategoryFilter: RoomCategoryFilter?,
         val roomTagQueryFilter: RoomTagQueryFilter?
-        val excludeType: List<String?>
+        val excludeType: List<String?>?,
+        val includeType: List<String?>?
 ) {
 
     class Builder {
@@ -49,6 +66,7 @@ data class RoomSummaryQueryParams(
         var roomCategoryFilter: RoomCategoryFilter? = RoomCategoryFilter.ALL
         var roomTagQueryFilter: RoomTagQueryFilter? = null
         var excludeType: List<String?> = listOf(RoomType.SPACE)
+        var includeType: List<String?>? = null
 
         fun build() = RoomSummaryQueryParams(
                 roomId = roomId,
@@ -56,8 +74,9 @@ data class RoomSummaryQueryParams(
                 canonicalAlias = canonicalAlias,
                 memberships = memberships,
                 roomCategoryFilter = roomCategoryFilter,
-                roomTagQueryFilter = roomTagQueryFilter
-                excludeType = excludeType
+                roomTagQueryFilter = roomTagQueryFilter,
+                excludeType = excludeType,
+                includeType = includeType
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index ac87a16911..f08f605a24 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -27,18 +27,18 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
  * It can be retrieved by [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
  */
 data class RoomSummary constructor(
-        override val roomId: String,
+        val roomId: String,
         // Computed display name
-        override val displayName: String = "",
-        override val name: String = "",
-        override val topic: String = "",
-        override val avatarUrl: String = "",
-        override val canonicalAlias: String? = null,
-        override val aliases: List<String> = emptyList(),
-        override val joinedMembersCount: Int? = 0,
-        override val invitedMembersCount: Int? = 0,
+        val displayName: String = "",
+        val name: String = "",
+        val topic: String = "",
+        val avatarUrl: String = "",
+        val canonicalAlias: String? = null,
+        val aliases: List<String> = emptyList(),
+        val joinedMembersCount: Int? = 0,
+        val invitedMembersCount: Int? = 0,
         val latestPreviewableEvent: TimelineEvent? = null,
-        override val otherMemberIds: List<String> = emptyList(),
+        val otherMemberIds: List<String> = emptyList(),
         val isDirect: Boolean = false,
         val notificationCount: Int = 0,
         val highlightCount: Int = 0,
@@ -55,8 +55,10 @@ data class RoomSummary constructor(
         val breadcrumbsIndex: Int = NOT_IN_BREADCRUMBS,
         val roomEncryptionTrustLevel: RoomEncryptionTrustLevel? = null,
         val hasFailedSending: Boolean = false,
-        override val roomType: String? = null
-) : IRoomSummary {
+        val roomType: String? = null,
+        val spaceParents: List<SpaceParentInfo>? = null,
+        val children: List<SpaceChildInfo>? = null
+) {
 
     val isVersioned: Boolean
         get() = versioningState != VersioningState.NONE
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
index 38d9f1e74e..1302a34daa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
@@ -17,8 +17,16 @@
 package org.matrix.android.sdk.api.session.room.model
 
 data class SpaceChildInfo(
-        val roomSummary: IRoomSummary?,
+        val childRoomId: String,
+        // We might not know this child at all,
+        // i.e we just know it exists but no info on type/name/etc..
+        val isKnown: Boolean,
+        val roomType: String?,
+        val name: String?,
+        val topic: String?,
+        val avatarUrl: String?,
         val order: String?,
+        val activeMemberCount: Int?,
         val autoJoin: Boolean,
         val viaServers: List<String>
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/IRoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceParentInfo.kt
similarity index 61%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/IRoomSummary.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceParentInfo.kt
index 1724f00c99..5ed81b0646 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/IRoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceParentInfo.kt
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,16 +16,9 @@
 
 package org.matrix.android.sdk.api.session.room.model
 
-interface IRoomSummary {
-    val roomId: String
-    val displayName: String
-    val name: String
-    val topic: String
-    val avatarUrl: String
-    val canonicalAlias: String?
-    val aliases: List<String>
-    val joinedMembersCount: Int?
-    val invitedMembersCount: Int?
-    val otherMemberIds: List<String>
-    val roomType: String?
-}
+data class SpaceParentInfo(
+        val parentId: String?,
+        val roomSummary: RoomSummary?,
+        val canonical: Boolean?,
+        val viaServers: List<String>
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 0172b3701b..cfbffc128c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -24,9 +24,9 @@ interface Space {
     fun asRoom() : Room
 
     /**
-     * A current snapshot of [RoomSummary] associated with the room
+     * A current snapshot of [RoomSummary] associated with the space
      */
-    fun spaceSummary(): SpaceSummary?
+    fun spaceSummary(): RoomSummary?
 
     suspend fun addChildren(roomId: String, viaServers: List<String>, order: String?, autoJoin: Boolean = false)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index 3e30f14748..15b6f7d852 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -60,9 +60,9 @@ interface SpaceService {
      * Get a live list of space summaries. This list is refreshed as soon as the data changes.
      * @return the [LiveData] of List[SpaceSummary]
      */
-    fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams): LiveData<List<SpaceSummary>>
+    fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams): LiveData<List<RoomSummary>>
 
-    fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<SpaceSummary>
+    fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<RoomSummary>
 
     sealed class JoinSpaceResult {
         object Success : JoinSpaceResult()
@@ -79,4 +79,14 @@ interface SpaceService {
                           viaServers: List<String> = emptyList()): JoinSpaceResult
 
     suspend fun rejectInvite(spaceId: String, reason: String?)
+
+//    fun getSpaceParentsOfRoom(roomId: String) : List<SpaceSummary>
+
+    /**
+     * Let this room declare that it has a parent.
+     * @param canonical true if it should be the main parent of this room
+     * In practice, well behaved rooms should only have one canonical parent, but given this is not enforced:
+     * if multiple are present the client should select the one with the lowest room ID, as determined via a lexicographic utf-8 ordering.
+     */
+    suspend fun setSpaceParent(childRoomId: String, parentSpaceId: String, canonical: Boolean, viaServers: List<String>)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt
deleted file mode 100644
index 1473ed7a96..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceSummary.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.api.session.space
-
-import org.matrix.android.sdk.api.session.room.model.IRoomSummary
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
-
-data class SpaceSummary(
-        val spaceId: String,
-        val roomSummary: RoomSummary,
-        val children: List<SpaceChildInfo>
-) : IRoomSummary by roomSummary
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceParentContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceParentContent.kt
index b3f7267580..871a494914 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceParentContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceParentContent.kt
@@ -26,7 +26,6 @@ import com.squareup.moshi.JsonClass
  *  "state_key": "!space:example.com",
  *  "content": {
  *      "via": ["example.com"],
- *      "present": true,
  *      "canonical": true,
  *  }
  * }
@@ -38,11 +37,6 @@ data class SpaceParentContent(
          * Parents where via is not present are ignored.
          */
         @Json(name = "via") val via: List<String>? = null,
-        /**
-         * present: true key is included to distinguish from a deleted state event
-         * Parent where present is not present (sic) or is not set to true are ignored.
-         */
-        @Json(name = "present") val present: Boolean? = false,
         /**
          * Canonical determines whether this is the main parent for the space.
          * When a user joins a room with a canonical parent, clients may switch to view the room
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
index a792248764..a904b43faa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
-import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.user.model.User
 import java.util.Locale
 
@@ -152,8 +151,6 @@ fun RoomSummary.toMatrixItem() = MatrixItem.RoomItem(roomId, displayName, avatar
 
 fun RoomSummary.toRoomAliasMatrixItem() = MatrixItem.RoomAliasItem(canonicalAlias ?: roomId, displayName, avatarUrl)
 
-fun SpaceSummary.toMatrixItem() = MatrixItem.RoomItem(spaceId, displayName, avatarUrl)
-
 // If no name is available, use room alias as Riot-Web does
 fun PublicRoom.toMatrixItem() = MatrixItem.RoomItem(roomId, name ?: getPrimaryAlias() ?: "", avatarUrl)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index b14ed9e9c7..9dd8cda8b9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.database
 
 import io.realm.DynamicRealm
-import io.realm.FieldAttribute
 import io.realm.RealmMigration
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntityFields
@@ -31,8 +30,8 @@ import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomTagEntityFields
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
-import org.matrix.android.sdk.internal.database.model.SpaceChildInfoEntityFields
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.SpaceParentSummaryEntityFields
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -200,21 +199,34 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
     fun migrateTo10(realm: DynamicRealm) {
         Timber.d("Step 9 -> 10")
+        realm.schema.create("SpaceChildSummaryEntity")
+                ?.addField(SpaceChildSummaryEntityFields.ORDER, String::class.java)
+                ?.addField(SpaceChildSummaryEntityFields.CHILD_ROOM_ID, String::class.java)
+                ?.addField(SpaceChildSummaryEntityFields.AUTO_JOIN, Boolean::class.java)
+                ?.setNullable(SpaceChildSummaryEntityFields.AUTO_JOIN, true)
+                ?.addRealmObjectField(SpaceChildSummaryEntityFields.CHILD_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
+
+//        realm.schema.create("SpaceSummaryEntity")
+//                ?.addField(SpaceSummaryEntityFields.SPACE_ID, String::class.java, FieldAttribute.PRIMARY_KEY)
+//                ?.setRequired(SpaceSummaryEntityFields.SPACE_ID, true)
+//                ?.addRealmObjectField(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
+//                ?.addRealmListField(SpaceSummaryEntityFields.CHILDREN.`$`, spaceChildInfoSchema!!)
+
+        realm.schema.create("SpaceParentSummaryEntity")
+                ?.addField(SpaceParentSummaryEntityFields.PARENT_ROOM_ID, String::class.java)
+                ?.addField(SpaceParentSummaryEntityFields.CANONICAL, Boolean::class.java)
+                ?.setNullable(SpaceParentSummaryEntityFields.CANONICAL, true)
+//                ?.addRealmListField(RoomParentRelationInfoEntityFields.VIA_SERVERS.`$`, String::class.java)
+//                ?.addRealmObjectField(RoomParentRelationInfoEntityFields.SPACE_SUMMARY_ENTITY.`$`, realm.schema.get("SpaceSummaryEntity")!!)
+                ?.addRealmObjectField(SpaceParentSummaryEntityFields.PARENT_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
+
         realm.schema.get("RoomSummaryEntity")
                 ?.addField(RoomSummaryEntityFields.ROOM_TYPE, String::class.java)
                 ?.transform { obj ->
                     // Should I put messaging type here?
                     obj.setString(RoomSummaryEntityFields.ROOM_TYPE, null)
                 }
-
-        val spaceChildInfoSchema = realm.schema.create("SpaceChildInfoEntity")
-                ?.addField(SpaceChildInfoEntityFields.ORDER,  String::class.java)
-                ?.addRealmListField(SpaceChildInfoEntityFields.VIA_SERVERS.`$`, String::class.java)
-                ?.addRealmObjectField(SpaceChildInfoEntityFields.ROOM_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
-
-        realm.schema.create("SpaceSummaryEntity")
-                ?.addField(SpaceSummaryEntityFields.SPACE_ID, String::class.java, FieldAttribute.PRIMARY_KEY)
-                ?.addRealmObjectField(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
-                ?.addRealmListField(SpaceSummaryEntityFields.CHILDREN.`$`, spaceChildInfoSchema!!)
+                ?.addRealmListField(RoomSummaryEntityFields.PARENTS.`$`, realm.schema.get("SpaceParentSummaryEntity")!!)
+                ?.addRealmListField(RoomSummaryEntityFields.CHILDREN.`$`, realm.schema.get("SpaceChildSummaryEntity")!!)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index c74eb4460d..410500ed8e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -17,6 +17,8 @@
 package org.matrix.android.sdk.internal.database.mapper
 
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.session.room.model.SpaceParentInfo
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
@@ -64,7 +66,29 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                 roomEncryptionTrustLevel = roomSummaryEntity.roomEncryptionTrustLevel,
                 inviterId = roomSummaryEntity.inviterId,
                 hasFailedSending = roomSummaryEntity.hasFailedSending,
-                roomType = roomSummaryEntity.roomType
+                roomType = roomSummaryEntity.roomType,
+                spaceParents = roomSummaryEntity.parents.map { relationInfoEntity ->
+                    SpaceParentInfo(
+                            parentId = relationInfoEntity.parentRoomId,
+                            roomSummary = relationInfoEntity.parentSummaryEntity?.let { map(it) },
+                            canonical = relationInfoEntity.canonical ?: false,
+                            viaServers = relationInfoEntity.viaServers.toList()
+                    )
+                },
+                children = roomSummaryEntity.children.map {
+                    SpaceChildInfo(
+                            childRoomId = it.childRoomId ?: "",
+                            isKnown = it.childSummaryEntity != null,
+                            roomType = it.childSummaryEntity?.roomType,
+                            name = it.childSummaryEntity?.name,
+                            topic = it.childSummaryEntity?.topic,
+                            avatarUrl = it.childSummaryEntity?.avatarUrl,
+                            activeMemberCount = it.childSummaryEntity?.joinedMembersCount,
+                            order = it.order,
+                            autoJoin = it.autoJoin ?: false,
+                            viaServers = it.viaServers.toList()
+                    )
+                }
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
deleted file mode 100644
index d08528598d..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/SpaceSummaryMapper.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.database.mapper
-
-import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
-import org.matrix.android.sdk.api.session.space.SpaceSummary
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
-import javax.inject.Inject
-
-internal class SpaceSummaryMapper @Inject constructor(private val roomSummaryMapper: RoomSummaryMapper) {
-
-    fun map(spaceSummaryEntity: SpaceSummaryEntity): SpaceSummary {
-        return SpaceSummary(
-                spaceId = spaceSummaryEntity.spaceId,
-                roomSummary = roomSummaryMapper.map(spaceSummaryEntity.roomSummaryEntity!!),
-                children = spaceSummaryEntity.children.map {
-                    SpaceChildInfo(
-                            roomSummary = it.roomSummaryEntity?.let { rs -> roomSummaryMapper.map(rs) },
-                            autoJoin = it.autoJoin ?: false,
-                            viaServers = it.viaServers.map { it },
-                            order = it.order
-                    )
-                }
-        )
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
index 3ff2532604..58297776f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
@@ -43,6 +43,5 @@ internal open class RoomEntity(@PrimaryKey var roomId: String = "",
         set(value) {
             membersLoadStatusStr = value.name
         }
-
     companion object
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index c87ac15a78..85e4595da5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -28,6 +28,9 @@ import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 
 internal open class RoomSummaryEntity(
         @PrimaryKey var roomId: String = ""
+        var roomType: String? = null,
+        var parents: RealmList<SpaceParentSummaryEntity> = RealmList(),
+        var children: RealmList<SpaceChildSummaryEntity> = RealmList()
 ) : RealmObject() {
 
     var displayName: String? = ""
@@ -244,6 +247,5 @@ internal open class RoomSummaryEntity(
                 roomEncryptionTrustLevelStr = value?.name
             }
         }
-
     companion object
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index 76116be1a8..72ae512fa5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -62,7 +62,7 @@ import io.realm.annotations.RealmModule
             UserAccountDataEntity::class,
             ScalarTokenEntity::class,
             WellknownIntegrationManagerConfigEntity::class,
-            SpaceSummaryEntity::class,
-            SpaceChildInfoEntity::class
+            SpaceChildSummaryEntity::class,
+            SpaceParentSummaryEntity::class
         ])
 internal class SessionRealmModule
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt
similarity index 69%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt
index 7862207901..982c9ece6a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt
@@ -22,14 +22,22 @@ import io.realm.RealmObject
 /**
  * Decorates room summary with space related information.
  */
-internal open class SpaceChildInfoEntity(
-        var viaServers: RealmList<String> = RealmList(),
-        // Use for alphabetic ordering of this child
+internal open class SpaceChildSummaryEntity(
+//        var isSpace: Boolean = false,
+
         var order: String? = null,
-        // If true, this child should be join when parent is joined
+
         var autoJoin: Boolean? = null,
-        // link to the actual room (check type to see if it's a subspace)
-        var roomSummaryEntity: RoomSummaryEntity? = null
+
+        var childRoomId: String? = null,
+        // Link to the actual space summary if it is known locally
+        var childSummaryEntity: RoomSummaryEntity? = null,
+
+        var viaServers: RealmList<String> = RealmList()
+//        var owner: RoomSummaryEntity? = null,
+
+//        var level: Int = 0
+
 ) : RealmObject() {
 
     companion object
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceParentSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceParentSummaryEntity.kt
new file mode 100644
index 0000000000..af32cd2b83
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceParentSummaryEntity.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.model
+
+import io.realm.RealmList
+import io.realm.RealmObject
+
+/**
+ * Decorates room summary with space related information.
+ */
+internal open class SpaceParentSummaryEntity(
+        /**
+         * Determines whether this is the main parent for the space
+         * When a user joins a room with a canonical parent, clients may switch to view the room in the context of that space,
+         * peeking into it in order to find other rooms and group them together.
+         * In practice, well behaved rooms should only have one canonical parent, but given this is not enforced:
+         * if multiple are present the client should select the one with the lowest room ID,
+         * as determined via a lexicographic utf-8 ordering.
+         */
+        var canonical: Boolean? = null,
+
+        var parentRoomId: String? = null,
+        // Link to the actual space summary if it is known locally
+        var parentSummaryEntity: RoomSummaryEntity? = null,
+
+        var viaServers: RealmList<String> = RealmList()
+
+//        var child: RoomSummaryEntity? = null,
+
+//        var level: Int = 0
+
+) : RealmObject() {
+
+    companion object
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt
deleted file mode 100644
index e63b5b9d55..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceSummaryEntity.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.database.model
-
-import io.realm.RealmList
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
-
-internal open class SpaceSummaryEntity(@PrimaryKey var spaceId: String = "",
-                                       var roomSummaryEntity: RoomSummaryEntity? = null,
-                                       var children: RealmList<SpaceChildInfoEntity> = RealmList()
-                                        // TODO public / private .. and more
-) : RealmObject() {
-
-    // Do we want to denormalize that ?
-
-//    private var membershipStr: String = Membership.NONE.name
-//    var membership: Membership
-//        get() {
-//            return Membership.valueOf(membershipStr)
-//        }
-//        set(value) {
-//            membershipStr = value.name
-//        }
-
-    companion object
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/SpaceSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/SpaceSummaryEntityQueries.kt
deleted file mode 100644
index b6403c596f..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/SpaceSummaryEntityQueries.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.database.query
-
-import io.realm.Realm
-import io.realm.RealmQuery
-import io.realm.kotlin.createObject
-import io.realm.kotlin.where
-import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
-
-internal fun SpaceSummaryEntity.Companion.where(realm: Realm, roomId: String? = null): RealmQuery<SpaceSummaryEntity> {
-    val query = realm.where<SpaceSummaryEntity>()
-    query.isNotNull(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`)
-    if (roomId != null) {
-        query.equalTo(SpaceSummaryEntityFields.SPACE_ID, roomId)
-    }
-    query.sort(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.DISPLAY_NAME)
-    return query
-}
-
-internal fun SpaceSummaryEntity.Companion.findByAlias(realm: Realm, roomAlias: String): SpaceSummaryEntity? {
-    val spaceSummary = realm.where<SpaceSummaryEntity>()
-            .isNotNull(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`)
-            .equalTo(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.CANONICAL_ALIAS, roomAlias)
-            .findFirst()
-    if (spaceSummary != null) {
-        return spaceSummary
-    }
-    return realm.where<SpaceSummaryEntity>()
-            .isNotNull(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`)
-            .contains(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.FLAT_ALIASES, "|$roomAlias")
-            .findFirst()
-}
-
-internal fun SpaceSummaryEntity.Companion.getOrCreate(realm: Realm, roomId: String): SpaceSummaryEntity {
-    return where(realm, roomId).findFirst() ?: realm.createObject<SpaceSummaryEntity>(roomId).also {
-        it.roomSummaryEntity = RoomSummaryEntity.getOrCreate(realm, roomId)
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index 1d8eb6c95e..1c22faa7b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -24,6 +24,7 @@ import org.matrix.android.sdk.api.session.room.alias.AliasService
 import org.matrix.android.sdk.api.session.room.call.RoomCallService
 import org.matrix.android.sdk.api.session.room.members.MembershipService
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.relation.RelationService
 import org.matrix.android.sdk.api.session.room.notification.RoomPushRuleService
 import org.matrix.android.sdk.api.session.room.read.ReadService
@@ -36,11 +37,16 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
 import org.matrix.android.sdk.api.session.search.SearchResult
+import org.matrix.android.sdk.api.session.space.Space
+import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.search.SearchTask
+import org.matrix.android.sdk.internal.session.space.DefaultSpace
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.awaitCallback
 import java.security.InvalidParameterException
 import javax.inject.Inject
@@ -148,4 +154,9 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
                 )
         )
     }
+
+    override fun asSpace(): Space? {
+        if (roomSummary()?.roomType != RoomType.SPACE) return null
+        return DefaultSpace(this, roomSummaryDataSource)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 4724167e87..cd39e633dd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.api.session.room.RoomService
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
@@ -33,6 +34,7 @@ import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.mapper.RoomSummaryMapper
 import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.di.SessionDatabase
@@ -63,7 +65,9 @@ internal class DefaultRoomService @Inject constructor(
         private val peekRoomTask: PeekRoomTask,
         private val roomGetter: RoomGetter,
         private val roomSummaryDataSource: RoomSummaryDataSource,
-        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource
+        private val roomSummaryMapper: RoomSummaryMapper,
+        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
+        private val taskExecutor: TaskExecutor
 ) : RoomService {
 
     override fun createRoom(createRoomParams: CreateRoomParams, callback: MatrixCallback<String>): Cancelable {
@@ -168,4 +172,18 @@ internal class DefaultRoomService @Inject constructor(
     override suspend fun peekRoom(roomIdOrAlias: String): PeekResult {
         return peekRoomTask.execute(PeekRoomTask.Params(roomIdOrAlias))
     }
+
+    override fun getFlattenRoomSummaryChildOf(spaceId: String?, memberships: List<Membership>): List<RoomSummary> {
+        if (spaceId == null) {
+            return roomSummaryDataSource.getFlattenOrphanRooms()
+        }
+        return roomSummaryDataSource.getAllRoomSummaryChildOf(spaceId, memberships)
+    }
+
+    override fun getFlattenRoomSummaryChildOfLive(spaceId: String?, memberships: List<Membership>): LiveData<List<RoomSummary>> {
+        if (spaceId == null) {
+            return roomSummaryDataSource.getFlattenOrphanRoomsLive()
+        }
+        return roomSummaryDataSource.getAllRoomSummaryChildOfLive(spaceId, memberships)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt
index f440a67710..0f64bb60ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt
@@ -18,8 +18,8 @@ package org.matrix.android.sdk.internal.session.room
 
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.space.Space
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.space.DefaultSpace
-import org.matrix.android.sdk.internal.session.space.SpaceSummaryDataSource
 import javax.inject.Inject
 
 internal interface SpaceGetter {
@@ -28,7 +28,7 @@ internal interface SpaceGetter {
 
 internal class DefaultSpaceGetter @Inject constructor(
         private val roomGetter: RoomGetter,
-        private val spaceSummaryDataSource: SpaceSummaryDataSource
+        private val spaceSummaryDataSource: RoomSummaryDataSource
 ) : SpaceGetter {
 
     override fun get(spaceId: String): Space? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
similarity index 64%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
index c04f5d3948..06ab21d8db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomRelationshipHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
@@ -20,6 +20,7 @@ import io.realm.Realm
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import org.matrix.android.sdk.api.session.space.model.SpaceParentContent
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
 import org.matrix.android.sdk.internal.database.query.whereType
@@ -35,8 +36,8 @@ import timber.log.Timber
  *
  *  - Separately, rooms can claim parents via the m.room.parent state event:
  */
-internal class RoomRelationshipHelper(private val realm: Realm,
-                                      private val roomId: String
+internal class RoomChildRelationInfo(private val realm: Realm,
+                                     private val roomId: String
 ) {
 
     data class SpaceChildInfo(
@@ -46,15 +47,24 @@ internal class RoomRelationshipHelper(private val realm: Realm,
             val viaServers: List<String>
     )
 
+    data class SpaceParentInfo(
+            val roomId: String,
+            val canonical: Boolean,
+            val viaServers: List<String>,
+            val stateEventSender: String
+    )
+
     /**
      * Gets the ordered list of valid child description.
      */
     fun getDirectChildrenDescriptions(): List<SpaceChildInfo> {
         return CurrentStateEventEntity.whereType(realm, roomId, EventType.STATE_SPACE_CHILD)
-                .findAll()
+                .findAll().also {
+                    Timber.v("## Space: Found ${it.count()} m.space.child state events for $roomId")
+                }
                 .mapNotNull {
                     ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.let { scc ->
-                        Timber.d("## Space child desc state event $scc")
+                        Timber.v("## Space child desc state event $scc")
                         // Children where via is not present are ignored.
                         scc.via?.let { via ->
                             SpaceChildInfo(
@@ -68,4 +78,25 @@ internal class RoomRelationshipHelper(private val realm: Realm,
                 }
                 .sortedBy { it.order }
     }
+
+    fun getParentDescriptions(): List<SpaceParentInfo> {
+        return CurrentStateEventEntity.whereType(realm, roomId, EventType.STATE_SPACE_PARENT)
+                .findAll().also {
+                    Timber.v("## Space: Found ${it.count()} m.space.parent state events for $roomId")
+                }
+                .mapNotNull {
+                    ContentMapper.map(it.root?.content).toModel<SpaceParentContent>()?.let { scc ->
+                        Timber.v("## Space parent desc state event $scc")
+                        // Parent where via is not present are ignored.
+                        scc.via?.let { via ->
+                            SpaceParentInfo(
+                                    roomId = it.stateKey,
+                                    canonical = scc.canonical ?: false,
+                                    viaServers = via,
+                                    stateEventSender = it.root?.sender ?: ""
+                            )
+                        }
+                    }
+                }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt
new file mode 100644
index 0000000000..ced1ad963e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.session.room.summary
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.Optional
+
+internal class HierarchyLiveDataHelper(
+        val spaceId: String,
+        val memberships: List<Membership>,
+        val roomSummaryDataSource: RoomSummaryDataSource) {
+
+    private val sources = HashMap<String, LiveData<Optional<RoomSummary>>>()
+    private val mediatorLiveData = MediatorLiveData<List<String>>()
+
+    fun liveData() = mediatorLiveData
+
+    init {
+        onChange()
+    }
+
+    private fun parentsToCheck(): List<RoomSummary> {
+        val spaces = ArrayList<RoomSummary>()
+        roomSummaryDataSource.getSpaceSummary(spaceId)?.let {
+            roomSummaryDataSource.flattenSubSpace(it, emptyList(), spaces, memberships)
+        }
+        return spaces
+    }
+
+    private fun onChange() {
+        val existingSources = sources.keys.toList()
+        val newSources = parentsToCheck().map { it.roomId }
+        val addedSources = newSources.filter { !existingSources.contains(it) }
+        val removedSource = existingSources.filter { !newSources.contains(it) }
+        addedSources.forEach {
+            val liveData = roomSummaryDataSource.getSpaceSummaryLive(it)
+            mediatorLiveData.addSource(liveData) { onChange() }
+            sources[it] = liveData
+        }
+
+        removedSource.forEach {
+            sources[it]?.let { mediatorLiveData.removeSource(it) }
+        }
+
+        sources[spaceId]?.value?.getOrNull()?.let { spaceSummary ->
+            val results = ArrayList<RoomSummary>()
+            roomSummaryDataSource.flattenChild(spaceSummary, emptyList(), results, memberships)
+            mediatorLiveData.postValue(results.map { it.roomId })
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 576e7f4eba..2468661ada 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +28,17 @@ import io.realm.Sort
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
+import io.realm.kotlin.where
+import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.spaceSummaryQueryParams
+import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.mapper.RoomSummaryMapper
@@ -84,6 +93,36 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         )
     }
 
+    fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams): LiveData<List<RoomSummary>> {
+        return getRoomSummariesLive(queryParams)
+    }
+
+    fun getSpaceSummary(roomIdOrAlias: String): RoomSummary? {
+        return getRoomSummary(roomIdOrAlias).let {
+            it?.takeIf { it.roomType == RoomType.SPACE }
+        }
+    }
+
+    fun getSpaceSummaryLive(roomId: String): LiveData<Optional<RoomSummary>> {
+        val liveData = monarchy.findAllMappedWithChanges(
+                { realm ->
+                    RoomSummaryEntity.where(realm, roomId)
+                            .isNotEmpty(RoomSummaryEntityFields.DISPLAY_NAME)
+                            .equalTo(RoomSummaryEntityFields.ROOM_TYPE, RoomType.SPACE)
+                },
+                {
+                    roomSummaryMapper.map(it)
+                }
+        )
+        return Transformations.map(liveData) { results ->
+            results.firstOrNull().toOptional()
+        }
+    }
+
+    fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<RoomSummary> {
+        return getRoomSummaries(spaceSummaryQueryParams)
+    }
+
     fun getBreadcrumbs(queryParams: RoomSummaryQueryParams): List<RoomSummary> {
         return monarchy.fetchAllMappedSync(
                 { breadcrumbsQuery(it, queryParams) },
@@ -190,9 +229,134 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
             }
         }
 
-        queryParams.excludeType.forEach {
+        queryParams.excludeType?.forEach {
             query.notEqualTo(RoomSummaryEntityFields.ROOM_TYPE, it)
         }
+        queryParams.includeType?.forEach {
+            query.equalTo(RoomSummaryEntityFields.ROOM_TYPE, it)
+        }
+        queryParams.roomCategoryFilter?.let {
+            when (it) {
+                RoomCategoryFilter.ONLY_DM -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+                RoomCategoryFilter.ONLY_ROOMS -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
+                RoomCategoryFilter.ALL -> {
+                    // nop
+                }
+            }
+        }
         return query
     }
+
+    fun getAllRoomSummaryChildOf(spaceAliasOrId: String, memberShips: List<Membership>): List<RoomSummary> {
+        val space = getSpaceSummary(spaceAliasOrId) ?: return emptyList()
+        val result = ArrayList<RoomSummary>()
+        flattenChild(space, emptyList(), result, memberShips)
+        return result
+    }
+
+    fun getAllRoomSummaryChildOfLive(spaceId: String, memberShips: List<Membership>): LiveData<List<RoomSummary>> {
+        // we want to listen to all spaces in hierarchy and on change compute back all childs
+        // and switch map to listen thoose?
+        val mediatorLiveData = HierarchyLiveDataHelper(spaceId, memberShips, this).liveData()
+
+        return Transformations.switchMap(mediatorLiveData) { allIds ->
+            monarchy.findAllMappedWithChanges(
+                    {
+                        it.where<RoomSummaryEntity>()
+                                .`in`(RoomSummaryEntityFields.ROOM_ID, allIds.toTypedArray())
+                                .`in`(RoomSummaryEntityFields.MEMBERSHIP_STR, memberShips.map { it.name }.toTypedArray())
+                                .equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
+                    },
+                    {
+                        roomSummaryMapper.map(it)
+                    })
+        }
+    }
+
+    fun getFlattenOrphanRooms(): List<RoomSummary> {
+        return getRoomSummaries(roomSummaryQueryParams {
+            memberships = Membership.activeMemberships()
+            excludeType = listOf(RoomType.SPACE)
+            roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+        }).filter {
+            // we need to check if orphan
+            isOrphan(it)
+        }
+    }
+
+    fun getFlattenOrphanRoomsLive(): LiveData<List<RoomSummary>> {
+        return Transformations.map(
+                getRoomSummariesLive(roomSummaryQueryParams {
+                    memberships = Membership.activeMemberships()
+                    excludeType = listOf(RoomType.SPACE)
+                    roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                })) {
+            it.filter {
+                isOrphan(it)
+            }
+        }
+    }
+
+    private fun isOrphan(roomSummary: RoomSummary): Boolean {
+        if (roomSummary.roomType == RoomType.SPACE && roomSummary.membership.isActive()) {
+            return false
+        }
+        // all parents line should be orphan
+        roomSummary.spaceParents?.forEach { info ->
+            if (info.roomSummary != null && !info.roomSummary.membership.isLeft()) {
+                if (!isOrphan(info.roomSummary)) {
+                    return false
+                }
+            }
+        }
+
+        // it may not have a parent relation but could be a child of some other....
+        for (spaceSummary in getSpaceSummaries(spaceSummaryQueryParams { memberships = Membership.activeMemberships() })) {
+            if (spaceSummary.children?.any { it.childRoomId == roomSummary.roomId } == true) {
+                return false
+            }
+        }
+
+        return true
+    }
+
+    fun flattenChild(current: RoomSummary, parenting: List<String>, output: MutableList<RoomSummary>, memberShips: List<Membership>) {
+        current.children?.sortedBy { it.order ?: it.name }?.forEach { childInfo ->
+            if (childInfo.roomType == RoomType.SPACE) {
+                // Add recursive
+                if (!parenting.contains(childInfo.childRoomId)) { // avoid cycles!
+                    getSpaceSummary(childInfo.childRoomId)?.let { subSpace ->
+                        if (memberShips.isEmpty() || memberShips.contains(subSpace.membership)) {
+                            flattenChild(subSpace, parenting + listOf(current.roomId), output, memberShips)
+                        }
+                    }
+                }
+            } else if (childInfo.isKnown) {
+                getRoomSummary(childInfo.childRoomId)?.let {
+                    if (memberShips.isEmpty() || memberShips.contains(it.membership)) {
+                        if (!it.isDirect) {
+                            output.add(it)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fun flattenSubSpace(current: RoomSummary, parenting: List<String>, output: MutableList<RoomSummary>, memberShips: List<Membership>) {
+        output.add(current)
+        current.children?.sortedBy { it.order ?: it.name }?.forEach {
+            if (it.roomType == RoomType.SPACE) {
+                // Add recursive
+                if (!parenting.contains(it.childRoomId)) { // avoid cycles!
+                    getSpaceSummary(it.childRoomId)?.let { subSpace ->
+                        if (memberShips.isEmpty() || memberShips.contains(subSpace.membership)) {
+                            output.add(subSpace)
+                            flattenSubSpace(subSpace, parenting + listOf(current.roomId), output, memberShips)
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 3d01021811..e7cb9688dd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -39,19 +39,22 @@ import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.EventEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
-import org.matrix.android.sdk.internal.database.model.SpaceChildInfoEntity
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntity
+import org.matrix.android.sdk.internal.database.model.SpaceParentSummaryEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.query.findAllInRoomWithSendStates
 import org.matrix.android.sdk.internal.database.query.getOrCreate
 import org.matrix.android.sdk.internal.database.query.getOrNull
 import org.matrix.android.sdk.internal.database.query.isEventRead
+import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.database.query.whereType
 import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.extensions.clearWith
 import org.matrix.android.sdk.internal.session.room.RoomAvatarResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomDisplayNameResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
-import org.matrix.android.sdk.internal.session.room.relationship.RoomRelationshipHelper
+import org.matrix.android.sdk.internal.session.room.relationship.RoomChildRelationInfo
+import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncSummary
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncUnreadNotifications
 import timber.log.Timber
@@ -62,7 +65,8 @@ internal class RoomSummaryUpdater @Inject constructor(
         private val roomDisplayNameResolver: RoomDisplayNameResolver,
         private val roomAvatarResolver: RoomAvatarResolver,
         private val eventDecryptor: EventDecryptor,
-        private val crossSigningService: DefaultCrossSigningService) {
+        private val crossSigningService: DefaultCrossSigningService,
+        private val stateEventDataSource: StateEventDataSource) {
 
     fun update(realm: Realm,
                roomId: String,
@@ -163,28 +167,6 @@ internal class RoomSummaryUpdater @Inject constructor(
                 crossSigningService.onUsersDeviceUpdate(otherRoomMembers)
             }
         }
-
-        if (roomType == RoomType.SPACE) {
-            Timber.v("## Space: Updating summary for Space $roomId membership: ${roomSummaryEntity.membership}")
-            val spaceSummaryEntity = SpaceSummaryEntity()
-            spaceSummaryEntity.spaceId = roomId
-            spaceSummaryEntity.roomSummaryEntity = roomSummaryEntity
-            spaceSummaryEntity.children.clear()
-            spaceSummaryEntity.children.addAll(
-                    RoomRelationshipHelper(realm, roomId).getDirectChildrenDescriptions()
-                            .map {
-                                Timber.v("## Space: Updating summary for room $roomId with info $it")
-                                realm.createObject<SpaceChildInfoEntity>().apply {
-                                    this.roomSummaryEntity = RoomSummaryEntity.getOrCreate(realm, it.roomId)
-                                    this.order = it.order
-                                    this.autoJoin = it.autoJoin
-                                }.also {
-                                    Timber.v("## Space: Updating summary for room $roomId with children $it")
-                                }
-                            }
-            )
-            realm.insertOrUpdate(spaceSummaryEntity)
-        }
     }
 
     private fun RoomSummaryEntity.updateHasFailedSending() {
@@ -196,4 +178,55 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.updateHasFailedSending()
         roomSummaryEntity.latestPreviewableEvent = RoomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId)
     }
+
+    /**
+     * Should be called at the end of the room sync, to check and validate all parent/child relations
+     */
+    fun validateSpaceRelationship(realm: Realm) {
+        // Do level 0 stuffs
+
+        realm.where(RoomSummaryEntity::class.java).findAll().forEach { roomSummary ->
+            if (roomSummary.roomType == RoomType.SPACE) {
+                roomSummary.children.clearWith { it.deleteFromRealm() }
+                roomSummary.children.addAll(
+                        RoomChildRelationInfo(realm, roomSummary.roomId).getDirectChildrenDescriptions()
+                                .map {
+                                    Timber.v("## Space: Updating summary for room ${roomSummary.roomId} with info $it")
+                                    realm.createObject<SpaceChildSummaryEntity>().apply {
+                                        this.childRoomId = it.roomId
+                                        this.childSummaryEntity = RoomSummaryEntity.where(realm, it.roomId).findFirst()
+                                        this.order = it.order
+                                        this.autoJoin = it.autoJoin
+                                        this.viaServers.addAll(it.viaServers)
+//                                        this.level = 0
+                                    }.also {
+                                        Timber.v("## Space: Updating summary for room ${roomSummary.roomId} with children $it")
+                                    }
+                                }
+                )
+            }
+
+            // check parents
+            roomSummary.parents.clearWith { it.deleteFromRealm() }
+            roomSummary.parents.addAll(
+                    RoomChildRelationInfo(realm, roomSummary.roomId).getParentDescriptions()
+                            .map { parentInfo ->
+                                Timber.v("## Space: Updating summary for room ${roomSummary.roomId} with parent info $parentInfo")
+                                realm.createObject<SpaceParentSummaryEntity>().apply {
+                                    this.parentRoomId = parentInfo.roomId
+                                    this.parentSummaryEntity = RoomSummaryEntity.where(realm, parentInfo.roomId).findFirst()
+                                    this.canonical = parentInfo.canonical
+                                    this.viaServers.addAll(parentInfo.viaServers)
+//                            this.level = 0
+                                }.also {
+                                    Timber.v("## Space: Updating summary for room ${roomSummary.roomId} with parent $it")
+                                }
+                            }
+            )
+        }
+    }
+
+//    private fun isValidCanonical() : Boolean {
+//
+//    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt
index 5f174587d0..826fa76f77 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt
@@ -21,8 +21,8 @@ import kotlinx.coroutines.TimeoutCancellationException
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
 import org.matrix.android.sdk.internal.task.Task
@@ -44,8 +44,8 @@ internal class DefaultCreateSpaceTask @Inject constructor(
 
         try {
             awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(1L)) { realm ->
-                realm.where(SpaceSummaryEntity::class.java)
-                        .equalTo(SpaceSummaryEntityFields.SPACE_ID, spaceId)
+                realm.where(RoomSummaryEntity::class.java)
+                        .equalTo(RoomSummaryEntityFields.ROOM_ID, spaceId)
             }
         } catch (exception: TimeoutCancellationException) {
             throw CreateRoomFailure.CreatedWithTimeout(spaceId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index efba103ab7..13b9465d58 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -21,17 +21,18 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.space.Space
-import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 
-internal class DefaultSpace(private val room: Room, private val spaceSummaryDataSource: SpaceSummaryDataSource) : Space {
+internal class DefaultSpace(private val room: Room, private val spaceSummaryDataSource: RoomSummaryDataSource) : Space {
 
     override fun asRoom(): Room {
         return room
     }
 
-    override fun spaceSummary(): SpaceSummary? {
+    override fun spaceSummary(): RoomSummary? {
         return spaceSummaryDataSource.getSpaceSummary(asRoom().roomId)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 0210c81e5d..cdd2673fde 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -19,26 +19,37 @@ package org.matrix.android.sdk.internal.session.space
 import android.net.Uri
 import androidx.lifecycle.LiveData
 import com.zhuinden.monarchy.Monarchy
+import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.space.CreateSpaceParams
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.SpaceService
-import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import org.matrix.android.sdk.api.session.space.model.SpaceParentContent
 import org.matrix.android.sdk.internal.di.SessionDatabase
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.RoomGetter
 import org.matrix.android.sdk.internal.session.room.SpaceGetter
 import org.matrix.android.sdk.internal.session.room.membership.leaving.LeaveRoomTask
+import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
 import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
+import java.lang.IllegalArgumentException
 import javax.inject.Inject
 
 internal class DefaultSpaceService @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
+        @UserId private val userId: String,
         private val createSpaceTask: CreateSpaceTask,
 //        private val joinRoomTask: JoinRoomTask,
         private val joinSpaceTask: JoinSpaceTask,
@@ -47,8 +58,9 @@ internal class DefaultSpaceService @Inject constructor(
 //        private val updateBreadcrumbsTask: UpdateBreadcrumbsTask,
 //        private val roomIdByAliasTask: GetRoomIdByAliasTask,
 //        private val deleteRoomAliasTask: DeleteRoomAliasTask,
-//        private val roomGetter: RoomGetter,
-        private val spaceSummaryDataSource: SpaceSummaryDataSource,
+        private val roomGetter: RoomGetter,
+        private val roomSummaryDataSource: RoomSummaryDataSource,
+        private val stateEventDataSource: StateEventDataSource,
         private val peekSpaceTask: PeekSpaceTask,
         private val resolveSpaceInfoTask: ResolveSpaceInfoTask,
         private val leaveRoomTask: LeaveRoomTask
@@ -73,12 +85,12 @@ internal class DefaultSpaceService @Inject constructor(
         return spaceGetter.get(spaceId)
     }
 
-    override fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams): LiveData<List<SpaceSummary>> {
-        return spaceSummaryDataSource.getRoomSummariesLive(queryParams)
+    override fun getSpaceSummariesLive(queryParams: SpaceSummaryQueryParams): LiveData<List<RoomSummary>> {
+        return roomSummaryDataSource.getSpaceSummariesLive(queryParams)
     }
 
-    override fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<SpaceSummary> {
-        return spaceSummaryDataSource.getSpaceSummaries(spaceSummaryQueryParams)
+    override fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<RoomSummary> {
+        return roomSummaryDataSource.getSpaceSummaries(spaceSummaryQueryParams)
     }
 
     override suspend fun peekSpace(spaceId: String): SpacePeekResult {
@@ -108,21 +120,16 @@ internal class DefaultSpaceService @Inject constructor(
                                         ?.firstOrNull { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
                                         ?.content.toModel<SpaceChildContent>()
                                 SpaceChildInfo(
-                                        roomSummary = RoomSummary(
-                                                roomId = childSummary.roomId,
-                                                roomType = childSummary.roomType,
-                                                name = childSummary.name ?: "",
-                                                displayName = childSummary.name ?: "",
-                                                topic = childSummary.topic ?: "",
-                                                joinedMembersCount = childSummary.numJoinedMembers,
-                                                avatarUrl = childSummary.avatarUrl ?: "",
-                                                encryptionEventTs = null,
-                                                typingUsers = emptyList(),
-                                                isEncrypted = false
-                                        ),
+                                        childRoomId = childSummary.roomId,
+                                        isKnown = true,
+                                        roomType = childSummary.roomType,
+                                        name = childSummary.name,
+                                        topic = childSummary.topic,
+                                        avatarUrl = childSummary.avatarUrl,
                                         order = childStateEv?.order,
                                         autoJoin = childStateEv?.autoJoin ?: false,
-                                        viaServers = childStateEv?.via ?: emptyList()
+                                        viaServers = childStateEv?.via ?: emptyList(),
+                                        activeMemberCount = childSummary.numJoinedMembers
                                 )
                             } ?: emptyList()
             )
@@ -138,4 +145,42 @@ internal class DefaultSpaceService @Inject constructor(
     override suspend fun rejectInvite(spaceId: String, reason: String?) {
         leaveRoomTask.execute(LeaveRoomTask.Params(spaceId, reason))
     }
+
+//    override fun getSpaceParentsOfRoom(roomId: String): List<SpaceSummary> {
+//        return spaceSummaryDataSource.getParentsOfRoom(roomId)
+//    }
+
+    override suspend fun setSpaceParent(childRoomId: String, parentSpaceId: String, canonical: Boolean, viaServers: List<String>) {
+        // Should we perform some validation here?,
+        // and if client want to bypass, it could use sendStateEvent directly?
+        if (canonical) {
+            // check that we can send m.child in the parent room
+            if (roomSummaryDataSource.getRoomSummary(parentSpaceId)?.membership != Membership.JOIN) {
+                throw UnsupportedOperationException("Cannot add canonical child if not member of parent")
+            }
+            val powerLevelsEvent = stateEventDataSource.getStateEvent(
+                    roomId = parentSpaceId,
+                    eventType = EventType.STATE_ROOM_POWER_LEVELS,
+                    stateKey = QueryStringValue.NoCondition
+            )
+            val powerLevelsContent = powerLevelsEvent?.content?.toModel<PowerLevelsContent>()
+                    ?: throw UnsupportedOperationException("Cannot add canonical child, not enough power level")
+            val powerLevelsHelper = PowerLevelsHelper(powerLevelsContent)
+            if (!powerLevelsHelper.isUserAllowedToSend(userId, true, EventType.STATE_SPACE_CHILD)) {
+                throw UnsupportedOperationException("Cannot add canonical child, not enough power level")
+            }
+        }
+
+        val room = roomGetter.getRoom(childRoomId)
+                ?: throw IllegalArgumentException("Unknown Room $childRoomId")
+
+        room.sendStateEvent(
+                eventType = EventType.STATE_SPACE_PARENT,
+                stateKey = parentSpaceId,
+                body = SpaceParentContent(
+                        via = viaServers,
+                        canonical = canonical
+                ).toContent()
+        )
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index 6ee3652761..9379c0d650 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -22,11 +22,12 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.task.Task
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
@@ -45,7 +46,7 @@ internal class DefaultJoinSpaceTask @Inject constructor(
         private val joinRoomTask: JoinRoomTask,
         @SessionDatabase
         private val realmConfiguration: RealmConfiguration,
-        private val spaceSummaryDataSource: SpaceSummaryDataSource
+        private val roomSummaryDataSource: RoomSummaryDataSource
 ) : JoinSpaceTask {
 
     override suspend fun execute(params: JoinSpaceTask.Params): SpaceService.JoinSpaceResult {
@@ -65,15 +66,15 @@ internal class DefaultJoinSpaceTask @Inject constructor(
         Timber.v("## Space: > Wait for post joined sync ${params.roomIdOrAlias} ...")
         try {
             awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(2L)) { realm ->
-                realm.where(SpaceSummaryEntity::class.java)
+                realm.where(RoomSummaryEntity::class.java)
                         .apply {
                             if (params.roomIdOrAlias.startsWith("!")) {
-                                equalTo(SpaceSummaryEntityFields.SPACE_ID, params.roomIdOrAlias)
+                                equalTo(RoomSummaryEntityFields.ROOM_ID, params.roomIdOrAlias)
                             } else {
-                                equalTo(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.CANONICAL_ALIAS, params.roomIdOrAlias)
+                                equalTo(RoomSummaryEntityFields.CANONICAL_ALIAS, params.roomIdOrAlias)
                             }
                         }
-                        .equalTo(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.MEMBERSHIP_STR, Membership.JOIN.name)
+                        .equalTo(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.JOIN.name)
             }
         } catch (exception: TimeoutCancellationException) {
             Timber.w("## Space: > Error created with timeout")
@@ -83,21 +84,21 @@ internal class DefaultJoinSpaceTask @Inject constructor(
         val errors = HashMap<String, Throwable>()
         Timber.v("## Space: > Sync done ...")
         // after that i should have the children (? do I need to paginate to get state)
-        val summary = spaceSummaryDataSource.getSpaceSummary(params.roomIdOrAlias)
-        Timber.v("## Space: Found space summary Name:[${summary?.roomSummary?.name}] children: ${summary?.children?.size}")
+        val summary = roomSummaryDataSource.getSpaceSummary(params.roomIdOrAlias)
+        Timber.v("## Space: Found space summary Name:[${summary?.name}] children: ${summary?.children?.size}")
         summary?.children?.forEach {
-            val childRoomSummary = it.roomSummary ?: return@forEach
-            Timber.v("## Space: Processing child :[${childRoomSummary.roomId}] autoJoin:${it.autoJoin}")
+//            val childRoomSummary = it.roomSummary ?: return@forEach
+            Timber.v("## Space: Processing child :[${it.childRoomId}] autoJoin:${it.autoJoin}")
             if (it.autoJoin) {
                 // I should try to join as well
-                if (childRoomSummary.roomType == RoomType.SPACE) {
+                if (it.roomType == RoomType.SPACE) {
                     // recursively join auto-joined child of this space?
-                    when (val subspaceJoinResult = this.execute(JoinSpaceTask.Params(it.roomSummary.roomId, null, it.viaServers))) {
+                    when (val subspaceJoinResult = this.execute(JoinSpaceTask.Params(it.childRoomId, null, it.viaServers))) {
                         SpaceService.JoinSpaceResult.Success -> {
                             // nop
                         }
                         is SpaceService.JoinSpaceResult.Fail -> {
-                            errors[it.roomSummary.roomId] = subspaceJoinResult.error
+                            errors[it.childRoomId] = subspaceJoinResult.error
                         }
                         is SpaceService.JoinSpaceResult.PartialSuccess -> {
                             errors.putAll(subspaceJoinResult.failedRooms)
@@ -105,15 +106,15 @@ internal class DefaultJoinSpaceTask @Inject constructor(
                     }
                 } else {
                     try {
-                        Timber.v("## Space: Joining room child ${childRoomSummary.roomId}")
+                        Timber.v("## Space: Joining room child ${it.childRoomId}")
                         joinRoomTask.execute(JoinRoomTask.Params(
-                                roomIdOrAlias = childRoomSummary.roomId,
+                                roomIdOrAlias = it.childRoomId,
                                 reason = "Auto-join parent space",
                                 viaServers = it.viaServers
                         ))
                     } catch (failure: Throwable) {
-                        errors[it.roomSummary.roomId] = failure
-                        Timber.e("## Space: Failed to join room child ${childRoomSummary.roomId}")
+                        errors[it.childRoomId] = failure
+                        Timber.e("## Space: Failed to join room child ${it.childRoomId}")
                     }
                 }
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryDataSource.kt
deleted file mode 100644
index c15e81c287..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryDataSource.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.session.space
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.Transformations
-import com.zhuinden.monarchy.Monarchy
-import io.realm.Realm
-import io.realm.RealmQuery
-import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
-import org.matrix.android.sdk.api.session.room.model.VersioningState
-import org.matrix.android.sdk.api.session.space.SpaceSummary
-import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
-import org.matrix.android.sdk.api.util.Optional
-import org.matrix.android.sdk.api.util.toOptional
-import org.matrix.android.sdk.internal.database.mapper.SpaceSummaryMapper
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntity
-import org.matrix.android.sdk.internal.database.model.SpaceSummaryEntityFields
-import org.matrix.android.sdk.internal.database.query.findByAlias
-import org.matrix.android.sdk.internal.database.query.where
-import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.query.process
-import org.matrix.android.sdk.internal.util.fetchCopyMap
-import javax.inject.Inject
-
-internal class SpaceSummaryDataSource @Inject constructor(
-        @SessionDatabase private val monarchy: Monarchy,
-        private val spaceSummaryMapper: SpaceSummaryMapper
-) {
-
-    fun getSpaceSummary(roomIdOrAlias: String): SpaceSummary? {
-        return monarchy
-                .fetchCopyMap({
-                    if (roomIdOrAlias.startsWith("!")) {
-                        // It's a roomId
-                        SpaceSummaryEntity.where(it, roomId = roomIdOrAlias).findFirst()
-                    } else {
-                        // Assume it's a room alias
-                        SpaceSummaryEntity.findByAlias(it, roomIdOrAlias)
-                    }
-                }, { entity, _ ->
-                    spaceSummaryMapper.map(entity)
-                })
-    }
-
-    fun getSpaceSummaryLive(roomId: String): LiveData<Optional<SpaceSummary>> {
-        val liveData = monarchy.findAllMappedWithChanges(
-                { realm -> SpaceSummaryEntity.where(realm, roomId).isNotEmpty(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.DISPLAY_NAME) },
-                { spaceSummaryMapper.map(it) }
-        )
-        return Transformations.map(liveData) { results ->
-            results.firstOrNull().toOptional()
-        }
-    }
-
-    fun getSpaceSummaries(queryParams: SpaceSummaryQueryParams): List<SpaceSummary> {
-        return monarchy.fetchAllMappedSync(
-                { spaceSummariesQuery(it, queryParams) },
-                { spaceSummaryMapper.map(it) }
-        )
-    }
-
-    fun getRoomSummariesLive(queryParams: RoomSummaryQueryParams): LiveData<List<SpaceSummary>> {
-        return monarchy.findAllMappedWithChanges(
-                { spaceSummariesQuery(it, queryParams) },
-                { spaceSummaryMapper.map(it) }
-        )
-    }
-
-    private fun spaceSummariesQuery(realm: Realm, queryParams: SpaceSummaryQueryParams): RealmQuery<SpaceSummaryEntity> {
-        val query = SpaceSummaryEntity.where(realm)
-        query.process(SpaceSummaryEntityFields.SPACE_ID, queryParams.roomId)
-        query.process(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.DISPLAY_NAME, queryParams.displayName)
-        query.process(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.CANONICAL_ALIAS, queryParams.canonicalAlias)
-        query.process(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.MEMBERSHIP_STR, queryParams.memberships)
-        query.notEqualTo(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.VERSIONING_STATE_STR, VersioningState.UPGRADED_ROOM_JOINED.name)
-        return query
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 95fbb2f1b0..5a1de41b95 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -95,6 +95,9 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         handleRoomSync(realm, HandlingStrategy.JOINED(roomsSyncResponse.join), isInitialSync, aggregator, reporter)
         handleRoomSync(realm, HandlingStrategy.INVITED(roomsSyncResponse.invite), isInitialSync, aggregator, reporter)
         handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, aggregator, reporter)
+
+        // post room sync validation
+        roomSummaryUpdater.validateSpaceRelationship(realm)
     }
 
     // PRIVATE METHODS *****************************************************************************
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt b/vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt
index d95251c271..e8293d7e99 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt
@@ -18,9 +18,9 @@ package im.vector.app.features.grouplist
 
 import arrow.core.Option
 import im.vector.app.core.utils.BehaviorDataSource
-import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class SelectedSpaceDataSource @Inject constructor() : BehaviorDataSource<Option<SpaceSummary>>(Option.empty())
+class SelectedSpaceDataSource @Inject constructor() : BehaviorDataSource<Option<RoomSummary>>(Option.empty())
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 6bc3f27fd4..faf85124d3 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -55,7 +55,7 @@ import im.vector.app.features.workers.signout.BannerState
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
-import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import timber.log.Timber
@@ -252,10 +252,10 @@ class HomeDetailFragment @Inject constructor(
         }
     }
 
-    private fun onSpaceChange(spaceSummary: SpaceSummary?) {
+    private fun onSpaceChange(spaceSummary: RoomSummary?) {
         spaceSummary?.let {
             // Use GlideApp with activity context to avoid the glideRequests to be paused
-            if (spaceSummary.spaceId == ALL_COMMUNITIES_GROUP_ID) {
+            if (spaceSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
                 // Special case
                 views.groupToolbarAvatarImageView.background = ContextCompat.getDrawable(requireContext(), R.drawable.space_home_background)
                 views.groupToolbarAvatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
index dd316dcece..d2ca7e9115 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
@@ -22,12 +22,11 @@ import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.session.sync.SyncState
 
 data class HomeDetailViewState(
         val groupSummary: Option<GroupSummary> = Option.empty(),
-        val spaceSummary: Option<SpaceSummary> = Option.empty(),
+        val spaceSummary: Option<RoomSummary> = Option.empty(),
         val asyncRooms: Async<List<RoomSummary>> = Uninitialized,
         val displayMode: RoomListDisplayMode = RoomListDisplayMode.PEOPLE,
         val notificationCountCatchup: Int = 0,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 47bc60eb75..06541c1fc3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -60,19 +60,21 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.STATE_ROOM_HISTORY_VISIBILITY,
                 EventType.STATE_ROOM_SERVER_ACL,
                 EventType.STATE_ROOM_GUEST_ACCESS,
-                EventType.REDACTION,
                 EventType.STATE_ROOM_ALIASES,
-                EventType.KEY_VERIFICATION_ACCEPT,
                 EventType.KEY_VERIFICATION_START,
+                EventType.KEY_VERIFICATION_ACCEPT,
                 EventType.KEY_VERIFICATION_KEY,
                 EventType.KEY_VERIFICATION_READY,
-                EventType.KEY_VERIFICATION_MAC,
                 EventType.CALL_CANDIDATES,
+                EventType.KEY_VERIFICATION_MAC,
                 EventType.CALL_REPLACES,
                 EventType.CALL_SELECT_ANSWER,
                 EventType.CALL_NEGOTIATE,
                 EventType.REACTION,
-                EventType.STATE_ROOM_POWER_LEVELS -> noticeItemFactory.create(params)
+                EventType.STATE_ROOM_POWER_LEVELS,
+                EventType.STATE_SPACE_CHILD,
+                EventType.STATE_SPACE_PARENT,
+                EventType.REDACTION             -> noticeItemFactory.create(event, highlight, callback)
                 EventType.STATE_ROOM_WIDGET_LEGACY,
                 EventType.STATE_ROOM_WIDGET     -> widgetItemFactory.create(params)
                 EventType.STATE_ROOM_ENCRYPTION -> encryptionItemFactory.create(params)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 878cec0a07..71504daeff 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -107,6 +107,8 @@ class NoticeEventFormatter @Inject constructor(
             EventType.KEY_VERIFICATION_DONE,
             EventType.KEY_VERIFICATION_KEY,
             EventType.KEY_VERIFICATION_READY,
+            EventType.STATE_SPACE_CHILD,
+            EventType.STATE_SPACE_PARENT,
             EventType.REDACTION                     -> formatDebug(timelineEvent.root)
             else                                    -> {
                 Timber.v("Type $type not handled by this formatter")
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 31dc537395..a7b5543157 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -212,6 +212,6 @@ class MatrixToRoomSpaceFragment @Inject constructor(
         }
     }
 
-    fun secondaryButtonClicked() = withState(sharedViewModel) { state ->
+    private fun secondaryButtonClicked() = withState(sharedViewModel) { _ ->
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 27c29ae42b..548f0b986d 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -111,7 +111,7 @@ class DefaultNavigator @Inject constructor(
         }
 
         sessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(spaceId)?.spaceSummary()?.let {
-            Timber.d("## Nav: Switching to space $spaceId / ${it.roomSummary.name}")
+            Timber.d("## Nav: Switching to space $spaceId / ${it.name}")
             selectedSpaceDataSource.post(Option.just(it))
         } ?: kotlin.run {
             Timber.d("## Nav: Failed to switch to space $spaceId")
diff --git a/vector/src/main/java/im/vector/app/features/settings/SharedPreferenceLiveData.kt b/vector/src/main/java/im/vector/app/features/settings/SharedPreferenceLiveData.kt
new file mode 100644
index 0000000000..08e83258a1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/SharedPreferenceLiveData.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings
+
+import android.content.SharedPreferences
+import androidx.lifecycle.LiveData
+
+abstract class SharedPreferenceLiveData<T>(protected val sharedPrefs: SharedPreferences,
+                                           protected val key: String,
+                                           private val defValue: T) : LiveData<T>() {
+
+    private val preferenceChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { _, key ->
+        if (key == this.key) {
+            value = getValueFromPreferences(key, defValue)
+        }
+    }
+
+    abstract fun getValueFromPreferences(key: String, defValue: T): T
+
+    override fun onActive() {
+        super.onActive()
+        value = getValueFromPreferences(key, defValue)
+        sharedPrefs.registerOnSharedPreferenceChangeListener(preferenceChangeListener)
+    }
+
+    override fun onInactive() {
+        sharedPrefs.unregisterOnSharedPreferenceChangeListener(preferenceChangeListener)
+        super.onInactive()
+    }
+
+    companion object {
+        fun booleanLiveData(sharedPrefs: SharedPreferences, key: String, defaultValue: Boolean): SharedPreferenceLiveData<Boolean> {
+            return object : SharedPreferenceLiveData<Boolean>(sharedPrefs, key, defaultValue) {
+                override fun getValueFromPreferences(key: String, defValue: Boolean): Boolean {
+                    return this.sharedPrefs.getBoolean(key, defValue)
+                }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 222c8da6b7..4d1c9b5728 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -20,6 +20,7 @@ import android.media.RingtoneManager
 import android.net.Uri
 import android.provider.MediaStore
 import androidx.core.content.edit
+import androidx.lifecycle.LiveData
 import com.squareup.seismic.ShakeDetector
 import im.vector.app.BuildConfig
 import im.vector.app.R
@@ -312,6 +313,14 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_LABS_USE_SPACES, false)
     }
 
+    fun labSpacesLive(): LiveData<Boolean> {
+        return SharedPreferenceLiveData.booleanLiveData(
+                defaultPrefs,
+                SETTINGS_LABS_USE_SPACES,
+                false
+        )
+    }
+
     fun failFast(): Boolean {
         return BuildConfig.DEBUG || (developerMode() && defaultPrefs.getBoolean(SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY, false))
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
index 6a4ea83d68..cc2ca4eb4d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
@@ -17,6 +17,9 @@
 package im.vector.app.features.settings
 
 import im.vector.app.R
+import im.vector.app.core.preference.VectorSwitchPreference
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
 import javax.inject.Inject
 
 class VectorSettingsLabsFragment @Inject constructor(
@@ -27,6 +30,11 @@ class VectorSettingsLabsFragment @Inject constructor(
     override val preferenceXmlRes = R.xml.vector_settings_labs
 
     override fun bindPref() {
-        // Nothing to do
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_USE_SPACES)!!.let { pref ->
+            pref.setOnPreferenceChangeListener { _, _ ->
+                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = false))
+                true
+            }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
index d3fb225083..2a6e3dace9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
@@ -61,7 +61,7 @@ class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpa
                 ?: return Unit.also { dismiss() }
         val summary = activeSessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(args.spaceId)?.spaceSummary()
 
-        val spaceName = summary?.roomSummary?.name
+        val spaceName = summary?.name
         views.descriptionText.text = getString(R.string.invite_people_to_your_space_desc, spaceName)
 
         views.inviteByMailButton.debouncedClicks {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index f2ef3b84a0..b3e16a709d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -32,7 +32,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGroupListBinding
 import im.vector.app.features.home.HomeActivitySharedAction
 import im.vector.app.features.home.HomeSharedActionViewModel
-import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 class SpaceListFragment @Inject constructor(
@@ -76,11 +76,11 @@ class SpaceListFragment @Inject constructor(
         spaceController.update(state)
     }
 
-    override fun onSpaceSelected(spaceSummary: SpaceSummary) {
+    override fun onSpaceSelected(spaceSummary: RoomSummary) {
         viewModel.handle(SpaceListAction.SelectSpace(spaceSummary))
     }
 
-    override fun onLeaveSpace(spaceSummary: SpaceSummary) {
+    override fun onLeaveSpace(spaceSummary: RoomSummary) {
         viewModel.handle(SpaceListAction.LeaveSpace(spaceSummary))
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 0402beb428..7718da79dc 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -26,7 +26,7 @@ import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.grouplist.homeSpaceSummaryItem
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.space.SpaceSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -51,13 +51,13 @@ class SpaceSummaryController @Inject constructor(
         buildGroupModels(nonNullViewState.asyncSpaces(), nonNullViewState.selectedSpace)
     }
 
-    private fun buildGroupModels(summaries: List<SpaceSummary>?, selected: SpaceSummary?) {
+    private fun buildGroupModels(summaries: List<RoomSummary>?, selected: RoomSummary?) {
         if (summaries.isNullOrEmpty()) {
             return
         }
         // show invites on top
 
-        summaries.filter { it.roomSummary.membership == Membership.INVITE }
+        summaries.filter { it.membership == Membership.INVITE }
                 .let { invites ->
                     if (invites.isNotEmpty()) {
                         genericItemHeader {
@@ -67,7 +67,7 @@ class SpaceSummaryController @Inject constructor(
                         invites.forEach {
                             spaceSummaryItem {
                                 avatarRenderer(avatarRenderer)
-                                id(it.spaceId)
+                                id(it.roomId)
                                 matrixItem(it.toMatrixItem())
                                 selected(false)
                                 listener { callback?.onSpaceSelected(it) }
@@ -87,19 +87,19 @@ class SpaceSummaryController @Inject constructor(
         }
 
         summaries
-                .filter { it.roomSummary.membership == Membership.JOIN }
+                .filter { it.membership == Membership.JOIN }
                 .forEach { groupSummary ->
-                    val isSelected = groupSummary.spaceId == selected?.spaceId
-                    if (groupSummary.spaceId == ALL_COMMUNITIES_GROUP_ID) {
+                    val isSelected = groupSummary.roomId == selected?.roomId
+                    if (groupSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
                         homeSpaceSummaryItem {
-                            id(groupSummary.spaceId)
+                            id(groupSummary.roomId)
                             selected(isSelected)
                             listener { callback?.onSpaceSelected(groupSummary) }
                         }
                     } else {
                         spaceSummaryItem {
                             avatarRenderer(avatarRenderer)
-                            id(groupSummary.spaceId)
+                            id(groupSummary.roomId)
                             matrixItem(groupSummary.toMatrixItem())
                             selected(isSelected)
                             onLeave { callback?.onLeaveSpace(groupSummary) }
@@ -119,8 +119,8 @@ class SpaceSummaryController @Inject constructor(
     }
 
     interface Callback {
-        fun onSpaceSelected(spaceSummary: SpaceSummary)
-        fun onLeaveSpace(spaceSummary: SpaceSummary)
+        fun onSpaceSelected(spaceSummary: RoomSummary)
+        fun onLeaveSpace(spaceSummary: RoomSummary)
         fun onAddSpaceSelected()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 3f1971d9dc..ffd27446f4 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -18,6 +18,8 @@ package im.vector.app.features.spaces
 
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
@@ -37,6 +39,8 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
     @EpoxyAttribute var selected: Boolean = false
     @EpoxyAttribute var listener: (() -> Unit)? = null
     @EpoxyAttribute var onLeave: (() -> Unit)? = null
+    @EpoxyAttribute var toggleExpand: (() -> Unit)? = null
+    @EpoxyAttribute var expanded: Boolean? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
@@ -52,6 +56,26 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         } else {
             holder.leaveView.isVisible = false
         }
+
+        when (expanded) {
+            null -> {
+                holder.collapseIndicator.isGone = true
+            }
+            else -> {
+                holder.collapseIndicator.isVisible = true
+                holder.collapseIndicator.setImageDrawable(
+                        ContextCompat.getDrawable(holder.view.context,
+                                if (expanded!!) R.drawable.ic_expand_less else R.drawable.ic_expand_more
+                        )
+                )
+                holder.collapseIndicator.setOnClickListener(
+                        DebouncedClickListener({ _ ->
+                            toggleExpand?.invoke()
+                        })
+                )
+            }
+        }
+
         avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
     }
 
@@ -65,5 +89,6 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         val groupNameView by bind<TextView>(R.id.groupNameView)
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
         val leaveView by bind<ImageView>(R.id.groupTmpLeave)
+        val collapseIndicator by bind<ImageView>(R.id.groupChildrenCollapse)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 28bc358e36..de5ca6a137 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -42,15 +42,14 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 
 const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
 
 sealed class SpaceListAction : VectorViewModelAction {
-    data class SelectSpace(val spaceSummary: SpaceSummary) : SpaceListAction()
-    data class LeaveSpace(val spaceSummary: SpaceSummary) : SpaceListAction()
+    data class SelectSpace(val spaceSummary: RoomSummary) : SpaceListAction()
+    data class LeaveSpace(val spaceSummary: RoomSummary) : SpaceListAction()
     object AddSpace : SpaceListAction()
 }
 
@@ -64,8 +63,8 @@ sealed class SpaceListViewEvents : VectorViewEvents {
 }
 
 data class SpaceListViewState(
-        val asyncSpaces: Async<List<SpaceSummary>> = Uninitialized,
-        val selectedSpace: SpaceSummary? = null
+        val asyncSpaces: Async<List<RoomSummary>> = Uninitialized,
+        val selectedSpace: RoomSummary? = null
 ) : MvRxState
 
 class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
@@ -96,7 +95,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         selectedSpaceDataSource
                 .observe()
                 .subscribe {
-                    if (currentGroupId != it.orNull()?.spaceId) {
+                    if (currentGroupId != it.orNull()?.roomId) {
                         setState {
                             copy(
                                     selectedSpace = it.orNull()
@@ -111,8 +110,8 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         selectSubscribe(SpaceListViewState::selectedSpace) { spaceSummary ->
             if (spaceSummary != null) {
                 // We only want to open group if the updated selectedGroup is a different one.
-                if (currentGroupId != spaceSummary.spaceId) {
-                    currentGroupId = spaceSummary.spaceId
+                if (currentGroupId != spaceSummary.roomId) {
+                    currentGroupId = spaceSummary.roomId
                     _viewEvents.post(SpaceListViewEvents.OpenSpace)
                 }
                 val optionGroup = Option.just(spaceSummary)
@@ -120,7 +119,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
             } else {
                 // If selected group is null we force to default. It can happens when leaving the selected group.
                 setState {
-                    copy(selectedSpace = this.asyncSpaces()?.find { it.spaceId == ALL_COMMUNITIES_GROUP_ID })
+                    copy(selectedSpace = this.asyncSpaces()?.find { it.roomId == ALL_COMMUNITIES_GROUP_ID })
                 }
             }
         }
@@ -138,17 +137,17 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
 
     private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
         // get uptodate version of the space
-        val summary = session.spaceService().getSpaceSummaries(roomSummaryQueryParams { roomId = QueryStringValue.Equals(action.spaceSummary.spaceId) })
+        val summary = session.spaceService().getSpaceSummaries(roomSummaryQueryParams { roomId = QueryStringValue.Equals(action.spaceSummary.roomId) })
                 .firstOrNull()
-        if (summary?.roomSummary?.membership == Membership.INVITE) {
-            _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary(summary.roomSummary.roomId))
+        if (summary?.membership == Membership.INVITE) {
+            _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary(summary.roomId))
 //            viewModelScope.launch(Dispatchers.IO) {
 //                tryOrNull { session.spaceService().peekSpace(action.spaceSummary.spaceId) }.let {
 //                    Timber.d("PEEK RESULT/ $it")
 //                }
 //            }
         } else {
-            if (state.selectedSpace?.spaceId != action.spaceSummary.spaceId) {
+            if (state.selectedSpace?.roomId != action.spaceSummary.roomId) {
 //                state.selectedSpace?.let {
 //                    selectedSpaceDataSource.post(Option.just(state.selectedSpace))
 //                }
@@ -160,8 +159,8 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     private fun handleLeaveSpace(action: SpaceListAction.LeaveSpace) {
         viewModelScope.launch {
             awaitCallback {
-                tryOrNull("Failed to leave space ${action.spaceSummary.spaceId}") {
-                    session.spaceService().getSpace(action.spaceSummary.spaceId)?.asRoom()?.leave(null, it)
+                tryOrNull("Failed to leave space ${action.spaceSummary.roomId}") {
+                    session.spaceService().getSpace(action.spaceSummary.roomId)?.asRoom()?.leave(null, it)
                 }
             }
         }
@@ -178,23 +177,19 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
             excludeType = listOf(/**RoomType.MESSAGING,$*/
                     null)
         }
-        Observable.combineLatest<SpaceSummary, List<SpaceSummary>, List<SpaceSummary>>(
+        Observable.combineLatest<RoomSummary, List<RoomSummary>, List<RoomSummary>>(
                 session
                         .rx()
                         .liveUser(session.myUserId)
                         .map { optionalUser ->
-                            SpaceSummary(
-                                    spaceId = ALL_COMMUNITIES_GROUP_ID,
-                                    roomSummary = RoomSummary(
-                                            roomId = ALL_COMMUNITIES_GROUP_ID,
-                                            membership = Membership.JOIN,
-                                            displayName = stringProvider.getString(R.string.group_all_communities),
-                                            avatarUrl = optionalUser.getOrNull()?.avatarUrl ?: "",
-                                            encryptionEventTs = 0,
-                                            isEncrypted = false,
-                                            typingUsers = emptyList()
-                                    ),
-                                    children = emptyList()
+                            RoomSummary(
+                                    roomId = ALL_COMMUNITIES_GROUP_ID,
+                                    membership = Membership.JOIN,
+                                    displayName = stringProvider.getString(R.string.group_all_communities),
+                                    avatarUrl = optionalUser.getOrNull()?.avatarUrl ?: "",
+                                    encryptionEventTs = 0,
+                                    isEncrypted = false,
+                                    typingUsers = emptyList()
                             )
                         },
                 session
@@ -205,9 +200,9 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                 }
         )
                 .execute { async ->
-                    val currentSelectedGroupId = selectedSpace?.spaceId
+                    val currentSelectedGroupId = selectedSpace?.roomId
                     val newSelectedGroup = if (currentSelectedGroupId != null) {
-                        async()?.find { it.spaceId == currentSelectedGroupId }
+                        async()?.find { it.roomId == currentSelectedGroupId }
                     } else {
                         async()?.firstOrNull()
                     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index a5d1e16101..31f7162c2a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -35,8 +35,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.api.session.space.SpaceSummary
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
@@ -45,7 +45,7 @@ data class SpaceDirectoryState(
         // The current filter
         val spaceId: String,
         val currentFilter: String = "",
-        val summary: Async<SpaceSummary> = Uninitialized,
+        val summary: Async<RoomSummary> = Uninitialized,
         // True if more result are available server side
         val hasMore: Boolean = false,
         // Set of joined roomId / spaces,
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index 987884d8c9..66a702f685 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -156,12 +156,12 @@ class SpacePreviewViewModel @AssistedInject constructor(
                     childInfoList = Success(
                             resolveResult.second.map {
                                 ChildInfo(
-                                        roomId = it.roomSummary?.roomId ?: "",
-                                        avatarUrl = it.roomSummary?.avatarUrl,
-                                        name = it.roomSummary?.name,
-                                        topic = it.roomSummary?.topic,
-                                        memberCount = it.roomSummary?.joinedMembersCount,
-                                        isSubSpace = it.roomSummary?.roomType == RoomType.SPACE,
+                                        roomId = it.childRoomId,
+                                        avatarUrl = it.avatarUrl,
+                                        name = it.name,
+                                        topic = it.topic,
+                                        memberCount = it.activeMemberCount,
+                                        isSubSpace = it.roomType == RoomType.SPACE,
                                         children = Uninitialized,
                                         viaServers = null
                                 )
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index 6c2721ff33..9cd07f3215 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -5,7 +5,7 @@
     android:id="@+id/itemGroupLayout"
     android:layout_width="match_parent"
     android:layout_height="65dp"
-    android:background="@drawable/bg_group_item"
+    android:background="@drawable/bg_space_item"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground">
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 25b685b999..92f0fcc1d5 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -35,11 +35,28 @@
         android:textSize="15sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
-        app:layout_constraintEnd_toStartOf="@+id/groupTmpLeave"
+        app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
         app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem/random" />
 
+
+    <ImageView
+        android:id="@+id/groupChildrenCollapse"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:importantForAccessibility="no"
+        tools:src="@drawable/ic_expand_more_white"
+        android:src="@drawable/ic_expand_less_white"
+        android:visibility="gone"
+        tools:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintEnd_toStartOf="@+id/groupTmpLeave"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
+
     <ImageView
         android:id="@+id/groupTmpLeave"
         android:clickable="true"
@@ -61,6 +78,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="21dp"
         android:importantForAccessibility="no"
+        android:visibility="gone"
         android:src="@drawable/ic_arrow_right"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 93c42dc723..4f9f50b847 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2186,7 +2186,8 @@
     <string name="labs_swipe_to_reply_in_timeline">Enable swipe to reply in timeline</string>
     <string name="labs_show_unread_notifications_as_tab">Add a dedicated tab for unread notifications on main screen.</string>
 
-    <string name="labs_experimental_spaces">Enable Spaces (formerly known as ‘groups as rooms’) to allow users to organise rooms into more useful groups.</string>
+    <string name="labs_experimental_spaces">Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.</string>
+    <string name="labs_experimental_spaces_desc">Warning: This will trigger a clear cache and initial sync</string>
 
     <string name="link_copied_to_clipboard">Link copied to clipboard</string>
 
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index ed1ea222a2..aa55a3c5ec 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -49,6 +49,7 @@
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_USE_SPACES"
-        android:title="@string/labs_experimental_spaces" />
+        android:title="@string/labs_experimental_spaces"
+        android:summary="@string/labs_experimental_spaces_desc"/>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file

From 48fef45ce353ecfbe9b554f0af3ff028f14ae4f6 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 16 Mar 2021 09:36:56 +0100
Subject: [PATCH 119/350] Code quality

---
 .../database/RealmSessionStoreMigration.kt    | 10 ++-------
 .../room/summary/RoomSummaryDataSource.kt     | 22 +++++++++----------
 tools/check/forbidden_strings_in_code.txt     |  2 +-
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 9dd8cda8b9..48479fd746 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -205,20 +205,14 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 ?.addField(SpaceChildSummaryEntityFields.AUTO_JOIN, Boolean::class.java)
                 ?.setNullable(SpaceChildSummaryEntityFields.AUTO_JOIN, true)
                 ?.addRealmObjectField(SpaceChildSummaryEntityFields.CHILD_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
-
-//        realm.schema.create("SpaceSummaryEntity")
-//                ?.addField(SpaceSummaryEntityFields.SPACE_ID, String::class.java, FieldAttribute.PRIMARY_KEY)
-//                ?.setRequired(SpaceSummaryEntityFields.SPACE_ID, true)
-//                ?.addRealmObjectField(SpaceSummaryEntityFields.ROOM_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
-//                ?.addRealmListField(SpaceSummaryEntityFields.CHILDREN.`$`, spaceChildInfoSchema!!)
+                ?.addRealmListField(SpaceChildSummaryEntityFields.VIA_SERVERS.`$`, String::class.java)
 
         realm.schema.create("SpaceParentSummaryEntity")
                 ?.addField(SpaceParentSummaryEntityFields.PARENT_ROOM_ID, String::class.java)
                 ?.addField(SpaceParentSummaryEntityFields.CANONICAL, Boolean::class.java)
                 ?.setNullable(SpaceParentSummaryEntityFields.CANONICAL, true)
-//                ?.addRealmListField(RoomParentRelationInfoEntityFields.VIA_SERVERS.`$`, String::class.java)
-//                ?.addRealmObjectField(RoomParentRelationInfoEntityFields.SPACE_SUMMARY_ENTITY.`$`, realm.schema.get("SpaceSummaryEntity")!!)
                 ?.addRealmObjectField(SpaceParentSummaryEntityFields.PARENT_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
+                ?.addRealmListField(SpaceParentSummaryEntityFields.VIA_SERVERS.`$`, String::class.java)
 
         realm.schema.get("RoomSummaryEntity")
                 ?.addField(RoomSummaryEntityFields.ROOM_TYPE, String::class.java)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 2468661ada..fd54ac63ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -274,14 +274,13 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
     }
 
     fun getFlattenOrphanRooms(): List<RoomSummary> {
-        return getRoomSummaries(roomSummaryQueryParams {
-            memberships = Membership.activeMemberships()
-            excludeType = listOf(RoomType.SPACE)
-            roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-        }).filter {
-            // we need to check if orphan
-            isOrphan(it)
-        }
+        return getRoomSummaries(
+                roomSummaryQueryParams {
+                    memberships = Membership.activeMemberships()
+                    excludeType = listOf(RoomType.SPACE)
+                    roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                }
+        ).filter { isOrphan(it) }
     }
 
     fun getFlattenOrphanRoomsLive(): LiveData<List<RoomSummary>> {
@@ -290,10 +289,9 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                     memberships = Membership.activeMemberships()
                     excludeType = listOf(RoomType.SPACE)
                     roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                })) {
-            it.filter {
-                isOrphan(it)
-            }
+                })
+        ) {
+            it.filter { isOrphan(it) }
         }
     }
 
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 5a53ececec..a4ec75e19f 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===94
+enum class===97
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

From e364a36ee6acbbb65676d3a8b23555a36412d79e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 16 Mar 2021 09:42:10 +0100
Subject: [PATCH 120/350] cleaning

---
 .../java/org/matrix/android/sdk/api/session/room/Room.kt   | 3 ++-
 .../internal/database/model/SpaceParentSummaryEntity.kt    | 4 ----
 .../sdk/internal/session/space/DefaultSpaceService.kt      | 7 -------
 .../im/vector/app/features/permalink/PermalinkHandler.kt   | 2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 5f2bc716f6..1bbc090ef0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -92,6 +92,7 @@ interface Room :
                limit: Int,
                beforeLimit: Int,
                afterLimit: Int,
-//    fun getSpaceParents(): List<SpaceSummary>
                includeProfile: Boolean): SearchResult
+
+    fun asSpace(): Space?
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceParentSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceParentSummaryEntity.kt
index af32cd2b83..30517717f4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceParentSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceParentSummaryEntity.kt
@@ -39,10 +39,6 @@ internal open class SpaceParentSummaryEntity(
 
         var viaServers: RealmList<String> = RealmList()
 
-//        var child: RoomSummaryEntity? = null,
-
-//        var level: Int = 0
-
 ) : RealmObject() {
 
     companion object
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index cdd2673fde..ab104901d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -51,21 +51,14 @@ internal class DefaultSpaceService @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         @UserId private val userId: String,
         private val createSpaceTask: CreateSpaceTask,
-//        private val joinRoomTask: JoinRoomTask,
         private val joinSpaceTask: JoinSpaceTask,
         private val spaceGetter: SpaceGetter,
-//        private val markAllRoomsReadTask: MarkAllRoomsReadTask,
-//        private val updateBreadcrumbsTask: UpdateBreadcrumbsTask,
-//        private val roomIdByAliasTask: GetRoomIdByAliasTask,
-//        private val deleteRoomAliasTask: DeleteRoomAliasTask,
         private val roomGetter: RoomGetter,
         private val roomSummaryDataSource: RoomSummaryDataSource,
         private val stateEventDataSource: StateEventDataSource,
         private val peekSpaceTask: PeekSpaceTask,
         private val resolveSpaceInfoTask: ResolveSpaceInfoTask,
         private val leaveRoomTask: LeaveRoomTask
-//        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
-//        private val taskExecutor: TaskExecutor
 ) : SpaceService {
 
     override suspend fun createSpace(params: CreateSpaceParams): String {
diff --git a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
index 1fea25159f..aa977730db 100644
--- a/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
@@ -148,7 +148,7 @@ class PermalinkHandler @Inject constructor(private val activeSessionHolder: Acti
         val roomSummary = session.getRoomSummary(roomId)
         val membership = roomSummary?.membership
         val eventId = permalinkData.eventId
-        val roomAlias = permalinkData.getRoomAliasOrNull()
+//        val roomAlias = permalinkData.getRoomAliasOrNull()
         val isSpace = roomSummary?.roomType == RoomType.SPACE
         return when {
             membership == Membership.BAN     -> context.toast(R.string.error_opening_banned_room)

From 01c56824b7456d1b43660cca6015f216df0a3074 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 16 Mar 2021 10:25:46 +0100
Subject: [PATCH 121/350] small a11Y fix

---
 vector/src/main/res/layout/item_space_top_summary.xml | 1 +
 vector/src/main/res/layout/view_space_type_button.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index e4e2bbdd76..35ca5ebf34 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -11,6 +11,7 @@
         android:layout_width="16dp"
         android:layout_height="16dp"
         android:src="@drawable/ic_room_profile_member_list"
+        android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="@+id/spaceSummaryMemberCountText"
         app:layout_constraintStart_toEndOf="@+id/spaceSummaryMemberCountText"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index ac20b74d4a..6ddb126469 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -61,6 +61,7 @@
         android:id="@+id/rightChevron"
         android:layout_width="16dp"
         android:layout_height="16dp"
+        android:importantForAccessibility="no"
         android:src="@drawable/ic_material_chevron_right_black"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

From 0da9be327ac2fc0ba302c6665563600fe22cfc22 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 16 Mar 2021 11:00:39 +0100
Subject: [PATCH 122/350] Removed unneeded id.home menu handling

---
 .../vector/app/features/spaces/SpaceCreationActivity.kt  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index ed8b85f587..c5dd09ee84 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -19,7 +19,6 @@ package im.vector.app.features.spaces
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.MenuItem
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import com.airbnb.mvrx.Loading
@@ -65,14 +64,6 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressed()
-            return true
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     override fun initUiAndData() {
         super.initUiAndData()
         viewModel.subscribe(this) {

From 802853d205ae9d57e6dcb73bd8fa14a426ca2cbb Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 18 Mar 2021 09:42:21 +0100
Subject: [PATCH 123/350] Suggested Space support

---
 .../android/sdk/api/session/space/Space.kt    |   7 +-
 .../session/space/model/SpaceChildContent.kt  |   9 +-
 .../internal/session/space/DefaultSpace.kt    |   8 +-
 .../sdk/internal/session/space/SpaceApi.kt    |   2 +-
 .../session/space/SpaceSummaryParams.kt       |   5 +-
 .../session/sync/ReadReceiptHandler.kt        |   2 +-
 .../java/im/vector/app/AppStateHandler.kt     |  11 ++
 .../im/vector/app/core/di/VectorComponent.kt  |   4 +
 ...CurrentSpaceSuggestedRoomListDataSource.kt |  25 ++++
 .../app/features/home/HomeDetailFragment.kt   |   3 +-
 .../features/home/room/list/RoomListAction.kt |   1 +
 .../home/room/list/RoomListFragment.kt        |   5 +
 .../home/room/list/RoomListViewModel.kt       |  38 +++++-
 .../home/room/list/RoomSummaryItemFactory.kt  |  18 +++
 .../home/room/list/SuggestedRoomItem.kt       | 117 +++++++++++++++++
 .../matrixto/MatrixToBottomSheetViewModel.kt  |  32 ++++-
 .../features/spaces/SpacesListViewModel.kt    |   5 +-
 .../spaces/create/CreateSpaceViewModelTask.kt |  16 ++-
 .../ui/SharedPreferencesUiStateRepository.kt  |  14 +-
 .../app/features/ui/UiStateRepository.kt      |   4 +
 .../main/res/layout/item_suggested_room.xml   | 123 ++++++++++++++++++
 vector/src/main/res/values/strings.xml        |   2 +
 22 files changed, 430 insertions(+), 21 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/CurrentSpaceSuggestedRoomListDataSource.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomItem.kt
 create mode 100644 vector/src/main/res/layout/item_suggested_room.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index cfbffc128c..ba76276fde 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -21,14 +21,17 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 interface Space {
 
-    fun asRoom() : Room
+    fun asRoom(): Room
 
     /**
      * A current snapshot of [RoomSummary] associated with the space
      */
     fun spaceSummary(): RoomSummary?
 
-    suspend fun addChildren(roomId: String, viaServers: List<String>, order: String?, autoJoin: Boolean = false)
+    suspend fun addChildren(roomId: String, viaServers: List<String>,
+                            order: String?,
+                            autoJoin: Boolean = false,
+                            suggested: Boolean? = false)
 
     suspend fun removeRoom(roomId: String)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
index f7abf7e618..f84d781eb6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
@@ -46,7 +46,14 @@ data class SpaceChildContent(
          * be automatically joined by members of that space.
          * (This is not a force-join, which are descoped for a future MSC; the user can subsequently part these room if they desire.)
          */
-        @Json(name = "auto_join") val autoJoin: Boolean? = false
+        @Json(name = "auto_join") val autoJoin: Boolean? = false,
+
+        /**
+         * If `suggested` is set to `true`, that indicates that the child should be advertised to
+         * members of the space by the client. This could be done by showing them eagerly
+         * in the room list. This is should be ignored if `auto_join` is set to `true`.
+         */
+        @Json(name = "suggested") val suggested: Boolean? = false
 ) {
     /**
      * Orders which are not strings, or do not consist solely of ascii characters in the range \x20 (space) to \x7F (~),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 13b9465d58..76496769ec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -36,14 +36,18 @@ internal class DefaultSpace(private val room: Room, private val spaceSummaryData
         return spaceSummaryDataSource.getSpaceSummary(asRoom().roomId)
     }
 
-    override suspend fun addChildren(roomId: String, viaServers: List<String>, order: String?, autoJoin: Boolean) {
+    override suspend fun addChildren(roomId: String, viaServers: List<String>,
+                                     order: String?,
+                                     autoJoin: Boolean,
+                                     suggested: Boolean?) {
         asRoom().sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
                         via = viaServers,
                         autoJoin = autoJoin,
-                        order = order
+                        order = order,
+                        suggested = suggested
                 ).toContent()
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
index 5919a90b99..249ebd2fd2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
@@ -35,7 +35,7 @@ internal interface SpaceApi {
      *
      *  MSC 2946 https://github.com/matrix-org/matrix-doc/blob/kegan/spaces-summary/proposals/2946-spaces-summary.md
      */
-    @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "rooms/{roomId}/spaces")
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc2946/rooms/{roomId}/spaces")
     fun getSpaces(@Path("roomId") spaceId: String,
                   @Body params: SpaceSummaryParams
     ): Call<SpacesResponse>
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
index a3c6b3cc84..af5aec0554 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
@@ -26,5 +26,8 @@ internal data class SpaceSummaryParams(
         /** The maximum number of rooms/subspaces to return, server can override this, default: 100 */
         @Json(name = "limit") val limit: Int = 100,
         /** A token to use if this is a subsequent HTTP hit, default: "".*/
-        @Json(name = "batch") val batch: String = ""
+        @Json(name = "batch") val batch: String = "",
+        /** whether we should only return children with the "suggested" flag set.*/
+        @Json(name = "suggested_only") val suggestedOnly: Boolean = false
+
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index e5d9217db7..fc1a2c3870 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -143,7 +143,7 @@ internal class ReadReceiptHandler @Inject constructor(
         @Suppress("UNCHECKED_CAST")
         val content = dataFromFile
                 .events
-                .firstOrNull { it.type == EventType.RECEIPT }
+                ?.firstOrNull { it.type == EventType.RECEIPT }
                 ?.content as? ReadReceiptContent
 
         if (content == null) {
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index edec704f18..22816085fb 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -33,6 +33,17 @@ class AppStateHandler @Inject constructor() : LifecycleObserver {
 
     private val compositeDisposable = CompositeDisposable()
 
+    init {
+        // restore current space from ui state
+        sessionDataSource.currentValue?.orNull()?.let { session ->
+            uiStateRepository.getSelectedSpace(session.sessionId)?.let { selectedSpaceId ->
+                session.getRoomSummary(selectedSpaceId)?.let {
+                    selectedSpaceDataSource.post(Option.just(it))
+                }
+            }
+        }
+    }
+
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun entersForeground() {
     }
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
index 3a197d3f83..e75f2416eb 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
@@ -37,6 +37,8 @@ import im.vector.app.features.crypto.verification.IncomingVerificationRequestHan
 import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.CurrentSpaceSuggestedRoomListDataSource
+import im.vector.app.features.home.HomeRoomListDataSource
 import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
 import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
@@ -118,6 +120,8 @@ interface VectorComponent {
 
     fun selectedSpaceStore(): SelectedSpaceDataSource
 
+    fun currentSpaceSuggestedRoomListDataSource(): CurrentSpaceSuggestedRoomListDataSource
+
     fun roomDetailPendingActionStore(): RoomDetailPendingActionStore
 
     fun activeSessionObservableStore(): ActiveSessionDataSource
diff --git a/vector/src/main/java/im/vector/app/features/home/CurrentSpaceSuggestedRoomListDataSource.kt b/vector/src/main/java/im/vector/app/features/home/CurrentSpaceSuggestedRoomListDataSource.kt
new file mode 100644
index 0000000000..21fd37c8fc
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/CurrentSpaceSuggestedRoomListDataSource.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home
+
+import im.vector.app.core.utils.BehaviorDataSource
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CurrentSpaceSuggestedRoomListDataSource @Inject constructor() : BehaviorDataSource<List<SpaceChildInfo>>()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index faf85124d3..1f600de9e1 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -58,7 +58,6 @@ import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
-import timber.log.Timber
 import javax.inject.Inject
 
 private const val INDEX_PEOPLE = 0
@@ -363,7 +362,7 @@ class HomeDetailFragment @Inject constructor(
     }
 
     override fun invalidate() = withState(viewModel) {
-        Timber.v(it.toString())
+//        Timber.v(it.toString())
         views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_people).render(it.notificationCountPeople, it.notificationHighlightPeople)
         views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_rooms).render(it.notificationCountRooms, it.notificationHighlightRooms)
         views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_notification).render(it.notificationCountCatchup, it.notificationHighlightCatchup)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
index 883efb2e60..37f7d148aa 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
@@ -29,4 +29,5 @@ sealed class RoomListAction : VectorViewModelAction {
     data class ChangeRoomNotificationState(val roomId: String, val notificationState: RoomNotificationState) : RoomListAction()
     data class ToggleTag(val roomId: String, val tag: String) : RoomListAction()
     data class LeaveRoom(val roomId: String) : RoomListAction()
+    data class JoinSuggestedRoom(val roomId: String, val viaServers: List<String>?) : RoomListAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index aaa5bbcde5..edc3de58e0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -52,6 +52,7 @@ import im.vector.app.features.notifications.NotificationDrawerManager
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import javax.inject.Inject
@@ -421,6 +422,10 @@ class RoomListFragment @Inject constructor(
         roomListViewModel.handle(RoomListAction.AcceptInvitation(room))
     }
 
+    override fun onJoinSuggestedRoom(room: SpaceChildInfo) {
+        roomListViewModel.handle(RoomListAction.JoinSuggestedRoom(room.childRoomId, room.viaServers))
+    }
+
     override fun onRejectRoomInvitation(room: RoomSummary) {
         notificationDrawerManager.clearMemberShipNotificationForRoom(room.roomId)
         roomListViewModel.handle(RoomListAction.RejectInvitation(room))
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 423a950591..45a6f2218f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -18,8 +18,11 @@ package im.vector.app.features.home.room.list
 
 import androidx.annotation.StringRes
 import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
@@ -166,6 +169,7 @@ class RoomListViewModel @Inject constructor(
             is RoomListAction.ChangeRoomNotificationState -> handleChangeNotificationMode(action)
             is RoomListAction.ToggleTag                   -> handleToggleTag(action)
             is RoomListAction.ToggleSection               -> handleToggleSection(action.section)
+            is RoomListAction.JoinSuggestedRoom           -> handleJoinSuggestedRoom(action)
         }.exhaustive
     }
 
@@ -316,6 +320,38 @@ class RoomListViewModel @Inject constructor(
         }
     }
 
+    private fun handleJoinSuggestedRoom(action: RoomListAction.JoinSuggestedRoom) {
+        setState {
+            copy(
+                    suggestedRoomJoiningState = this.suggestedRoomJoiningState.toMutableMap().apply {
+                        this[action.roomId] = Loading()
+                    }.toMap()
+            )
+        }
+        viewModelScope.launch {
+            try {
+                awaitCallback<Unit> {
+                    session.joinRoom(action.roomId, null, action.viaServers ?: emptyList(), it)
+                }
+                setState {
+                    copy(
+                            suggestedRoomJoiningState = this.suggestedRoomJoiningState.toMutableMap().apply {
+                                this[action.roomId] = Success(Unit)
+                            }.toMap()
+                    )
+                }
+            } catch (failure: Throwable) {
+                setState {
+                    copy(
+                            suggestedRoomJoiningState = this.suggestedRoomJoiningState.toMutableMap().apply {
+                                this[action.roomId] = Fail(failure)
+                            }.toMap()
+                    )
+                }
+            }
+        }
+    }
+
     private fun handleToggleTag(action: RoomListAction.ToggleTag) {
         session.getRoom(action.roomId)?.let { room ->
             viewModelScope.launch(Dispatchers.IO) {
@@ -342,7 +378,7 @@ class RoomListViewModel @Inject constructor(
 
     private fun String.otherTag(): String? {
         return when (this) {
-            RoomTag.ROOM_TAG_FAVOURITE    -> RoomTag.ROOM_TAG_LOW_PRIORITY
+            RoomTag.ROOM_TAG_FAVOURITE -> RoomTag.ROOM_TAG_LOW_PRIORITY
             RoomTag.ROOM_TAG_LOW_PRIORITY -> RoomTag.ROOM_TAG_FAVOURITE
             else                          -> null
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index fa6c970d8a..0c6651dd08 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -16,6 +16,9 @@
 
 package im.vector.app.features.home.room.list
 
+import android.view.View
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.Loading
 import im.vector.app.R
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
@@ -28,6 +31,8 @@ import im.vector.app.features.home.room.typing.TypingHelper
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -50,6 +55,19 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
         }
     }
 
+    fun createSuggestion(spaceChildInfo: SpaceChildInfo,
+                         suggestedRoomJoiningStates: Map<String, Async<Unit>>,
+                         onJoinClick: View.OnClickListener) : VectorEpoxyModel<*> {
+        return SuggestedRoomItem_()
+                .id("sug_${spaceChildInfo.childRoomId}")
+                .matrixItem(MatrixItem.RoomItem(spaceChildInfo.childRoomId, spaceChildInfo.name, spaceChildInfo.avatarUrl))
+                .avatarRenderer(avatarRenderer)
+                .topic(spaceChildInfo.topic)
+                .loading(suggestedRoomJoiningStates[spaceChildInfo.childRoomId] is Loading)
+                .memberCount(spaceChildInfo.activeMemberCount ?: 0)
+                .buttonClickListener(onJoinClick)
+    }
+
     private fun createInvitationItem(roomSummary: RoomSummary,
                                      changeMembershipState: ChangeMembershipState,
                                      listener: RoomListListener?): VectorEpoxyModel<*> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomItem.kt
new file mode 100644
index 0000000000..bdd196f750
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomItem.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import android.view.HapticFeedbackConstants
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.ProgressBar
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.themes.ThemeUtils
+import me.gujun.android.span.image
+import me.gujun.android.span.span
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_suggested_room)
+abstract class SuggestedRoomItem : VectorEpoxyModel<SuggestedRoomItem.Holder>() {
+
+    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+
+    // Used only for diff calculation
+    @EpoxyAttribute var topic: String? = null
+
+    @EpoxyAttribute var memberCount: Int = 0
+    @EpoxyAttribute var loading: Boolean = false
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemLongClickListener: View.OnLongClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemClickListener: View.OnClickListener? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var buttonClickListener: View.OnClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.rootView.setOnClickListener(itemClickListener)
+        holder.rootView.setOnLongClickListener {
+            it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
+            itemLongClickListener?.onLongClick(it) ?: false
+        }
+        holder.titleView.text = matrixItem.getBestName()
+        avatarRenderer.render(matrixItem, holder.avatarImageView)
+
+        holder.descriptionText.text = span {
+            span {
+                apply {
+                    val tintColor = ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
+                    ContextCompat.getDrawable(holder.view.context, R.drawable.ic_room_profile_member_list)
+                            ?.apply {
+                                ThemeUtils.tintDrawableWithColor(this, tintColor)
+                            }?.let {
+                                image(it)
+                            }
+                }
+                +" $memberCount"
+                apply {
+                    topic?.let {
+                        +" - $topic"
+                    }
+                }
+            }
+        }
+
+        if (loading) {
+            holder.joinButtonLoading.isVisible = true
+            holder.joinButton.isInvisible = true
+        } else {
+            holder.joinButtonLoading.isVisible = false
+            holder.joinButton.isVisible = true
+        }
+
+        holder.joinButton.setOnClickListener {
+            // local echo
+            holder.joinButtonLoading.isVisible = true
+            holder.joinButton.isInvisible = true
+            buttonClickListener?.onClick(it)
+        }
+    }
+
+    override fun unbind(holder: Holder) {
+        holder.rootView.setOnClickListener(null)
+        holder.rootView.setOnLongClickListener(null)
+        avatarRenderer.clear(holder.avatarImageView)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val titleView by bind<TextView>(R.id.roomNameView)
+        val joinButton by bind<Button>(R.id.joinSuggestedRoomButton)
+        val joinButtonLoading by bind<ProgressBar>(R.id.joinSuggestedLoading)
+        val descriptionText by bind<TextView>(R.id.suggestedRoomDescription)
+        val avatarImageView by bind<ImageView>(R.id.roomAvatarImageView)
+        val rootView by bind<ViewGroup>(R.id.itemRoomLayout)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index e608774f33..3ac5218800 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -36,6 +36,7 @@ import im.vector.app.features.createdirect.DirectRoomHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -47,6 +48,7 @@ import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 import org.matrix.android.sdk.internal.util.awaitCallback
+import javax.net.ssl.HttpsURLConnection
 
 class MatrixToBottomSheetViewModel @AssistedInject constructor(
         @Assisted initialState: MatrixToBottomSheetState,
@@ -122,8 +124,8 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                 } else {
                     session.getRoom(permalinkData.roomIdOrAlias)
                 }?.roomSummary()
-
-                if (knownRoom != null) {
+                val forceRefresh = true
+                if (!forceRefresh && knownRoom != null) {
                     setState {
                         copy(
                                 roomPeekResult = Success(
@@ -141,7 +143,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                         )
                     }
                 } else {
-                    val result = when (val peekResult = tryOrNull { resolveRoom(permalinkData.roomIdOrAlias) }) {
+                    val result = when (val peekResult = tryOrNull { resolveSpace(permalinkData) }) {
                         is PeekResult.Success           -> {
                             RoomInfoResult.FullInfo(
                                     roomItem = MatrixItem.RoomItem(peekResult.roomId, peekResult.name, peekResult.avatarUrl),
@@ -188,6 +190,30 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
         }
     }
 
+    private suspend fun resolveSpace(permalinkData: PermalinkData.RoomLink) : PeekResult {
+        try {
+           return session.spaceService().querySpaceChildren(permalinkData.roomIdOrAlias).let {
+               val roomSummary = it.first
+               PeekResult.Success(
+                       roomId = roomSummary.roomId,
+                       alias = roomSummary.canonicalAlias,
+                       avatarUrl = roomSummary.avatarUrl,
+                       name = roomSummary.name,
+                       topic = roomSummary.topic,
+                       numJoinedMembers = roomSummary.joinedMembersCount,
+                       roomType = roomSummary.roomType,
+                       viaServers = emptyList()
+               )
+           }
+        } catch (failure: Throwable) {
+            if (failure is Failure.OtherServerError && failure.httpCode == HttpsURLConnection.HTTP_NOT_FOUND) {
+                return resolveRoom(permalinkData.roomIdOrAlias)
+            } else {
+                throw failure
+            }
+        }
+    }
+
     private suspend fun resolveUser(userId: String): User {
         return tryOrNull { session.resolveUser(userId) }
         // Create raw user in case the user is not searchable
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index de5ca6a137..fd7dbd006c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -33,6 +33,7 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.grouplist.SelectedSpaceDataSource
+import im.vector.app.features.ui.UiStateRepository
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import kotlinx.coroutines.launch
@@ -70,7 +71,8 @@ data class SpaceListViewState(
 class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
                                                       private val selectedSpaceDataSource: SelectedSpaceDataSource,
                                                       private val session: Session,
-                                                      private val stringProvider: StringProvider
+                                                      private val stringProvider: StringProvider,
+                                                      private val uiStateRepository: UiStateRepository
 ) : VectorViewModel<SpaceListViewState, SpaceListAction, SpaceListViewEvents>(initialState) {
 
     @AssistedFactory
@@ -152,6 +154,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
 //                    selectedSpaceDataSource.post(Option.just(state.selectedSpace))
 //                }
                 setState { copy(selectedSpace = action.spaceSummary) }
+                uiStateRepository.storeSelectedSpace(action.spaceSummary.roomId, session.sessionId)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
index a565e290f6..154c75ad82 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.spaces.create
 
 import android.net.Uri
 import im.vector.app.core.platform.ViewModelTask
-import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
@@ -45,8 +44,8 @@ data class CreateSpaceTaskParams(
 )
 
 class CreateSpaceViewModelTask @Inject constructor(
-        private val session: Session,
-        private val stringProvider: StringProvider
+        private val session: Session
+//        private val stringProvider: StringProvider
 ) : ViewModelTask<CreateSpaceTaskParams, CreateSpaceTaskResult> {
 
     override suspend fun execute(params: CreateSpaceTaskParams): CreateSpaceTaskResult {
@@ -77,10 +76,17 @@ class CreateSpaceViewModelTask @Inject constructor(
                                 timeout.roomID
                             }
                             val via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
-                            createdSpace!!.addChildren(roomId, via, null, true)
+                            createdSpace!!.addChildren(roomId, via, null, autoJoin = false, suggested = true)
+                            // set canonical
+                            session.spaceService().setSpaceParent(
+                                    roomId,
+                                    createdSpace.asRoom().roomId,
+                                    true,
+                                    via
+                            )
                             childIds.add(roomId)
                         } catch (failure: Throwable) {
-                            Timber.d("Failed to create child room in $spaceID")
+                            Timber.d("Space: Failed to create child room in $spaceID")
                             childErrors[roomName] = failure
                         }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index d550329189..781f3f8cb6 100644
--- a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -39,7 +39,7 @@ class SharedPreferencesUiStateRepository @Inject constructor(
     override fun getDisplayMode(): RoomListDisplayMode {
         return when (sharedPreferences.getInt(KEY_DISPLAY_MODE, VALUE_DISPLAY_MODE_CATCHUP)) {
             VALUE_DISPLAY_MODE_PEOPLE -> RoomListDisplayMode.PEOPLE
-            VALUE_DISPLAY_MODE_ROOMS  -> RoomListDisplayMode.ROOMS
+            VALUE_DISPLAY_MODE_ROOMS -> RoomListDisplayMode.ROOMS
             else                      -> if (vectorPreferences.labAddNotificationTab()) {
                 RoomListDisplayMode.NOTIFICATIONS
             } else {
@@ -59,10 +59,22 @@ class SharedPreferencesUiStateRepository @Inject constructor(
         }
     }
 
+    override fun storeSelectedSpace(roomId: String?, sessionId: String) {
+        sharedPreferences.edit {
+            putString("$KEY_SELECTED_SPACE@$sessionId", roomId)
+        }
+    }
+
+    override fun getSelectedSpace(sessionId: String): String? {
+        return sharedPreferences.getString("$KEY_SELECTED_SPACE@$sessionId", null)
+    }
+
     companion object {
         private const val KEY_DISPLAY_MODE = "UI_STATE_DISPLAY_MODE"
         private const val VALUE_DISPLAY_MODE_CATCHUP = 0
         private const val VALUE_DISPLAY_MODE_PEOPLE = 1
         private const val VALUE_DISPLAY_MODE_ROOMS = 2
+
+        private const val KEY_SELECTED_SPACE = "UI_STATE_SELECTED_SPACE"
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
index 3223bf6028..e247b2f1d1 100644
--- a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
@@ -31,4 +31,8 @@ interface UiStateRepository {
     fun getDisplayMode(): RoomListDisplayMode
 
     fun storeDisplayMode(displayMode: RoomListDisplayMode)
+
+    fun storeSelectedSpace(roomId: String?, sessionId: String)
+
+    fun getSelectedSpace(sessionId: String): String?
 }
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
new file mode 100644
index 0000000000..71b41ff17d
--- /dev/null
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemRoomLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background">
+
+    <FrameLayout
+        android:id="@+id/roomAvatarContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="12dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/roomAvatarImageView"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:contentDescription="@string/avatar"
+            tools:src="@tools:sample/avatars" />
+
+    </FrameLayout>
+
+
+    <!-- Margin bottom does not work, so I use space -->
+    <Space
+        android:id="@+id/roomAvatarBottomSpace"
+        android:layout_width="0dp"
+        android:layout_height="12dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/roomAvatarContainer"
+        tools:layout_marginStart="20dp" />
+
+    <TextView
+        android:id="@+id/roomNameView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="8dp"
+        android:duplicateParentState="true"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toStartOf="@+id/joinSuggestedRoomButton"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@sample/matrix.json/data/displayName" />
+
+    <TextView
+        android:id="@+id/suggestedRoomDescription"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toStartOf="@id/joinSuggestedRoomButton"
+        app:layout_constraintStart_toStartOf="@+id/roomNameView"
+        app:layout_constraintTop_toBottomOf="@+id/roomNameView"
+        tools:text="@sample/matrix.json/data/message" />
+
+    <!-- Margin bottom does not work, so I use space -->
+    <Space
+        android:id="@+id/roomLastEventBottomSpace"
+        android:layout_width="0dp"
+        android:layout_height="7dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/roomLastEventView"
+        tools:layout_marginStart="120dp" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/joinSuggestedRoomButton"
+        style="@style/VectorButtonStyleOutlined"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:maxWidth="@dimen/button_max_width"
+        android:text="@string/join"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ProgressBar
+        android:id="@+id/joinSuggestedLoading"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        app:layout_constraintBottom_toBottomOf="@id/joinSuggestedRoomButton"
+        app:layout_constraintEnd_toEndOf="@id/joinSuggestedRoomButton"
+        app:layout_constraintStart_toStartOf="@id/joinSuggestedRoomButton"
+        app:layout_constraintTop_toTopOf="@id/joinSuggestedRoomButton" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/roomBottomBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="roomAvatarBottomSpace,roomLastEventBottomSpace" />
+
+    <View
+        android:id="@+id/roomDividerView"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?riotx_header_panel_border_mobile"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/roomBottomBarrier" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 4f9f50b847..11dc475804 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -476,6 +476,7 @@
     <string name="invitations_header">Invites</string>
     <string name="low_priority_header">Low priority</string>
     <string name="system_alerts_header">"System Alerts"</string>
+    <string name="suggested_header">Suggested Rooms</string>
 
     <!-- People fragment -->
     <string name="direct_chats_header">Conversations</string>
@@ -3291,5 +3292,6 @@
     <string name="join_anyway">Join Anyway</string>
     <string name="room_alias_preview_not_found">This alias is not accessible at this time.\nTry again later, or ask a room admin to check if you have access.</string>
 
+    <string name="suggested_rooms_pills_on_empty_text">You’re not in any rooms yet. Below are some suggested rooms, but you can see more with the green button bottom right.</string>
 
 </resources>

From 06a84d985ad934080991387cc9a3f941a7f0520f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 19 Mar 2021 10:24:26 +0100
Subject: [PATCH 124/350] Basic support to browse space directory

---
 .../api/session/room/model/SpaceChildInfo.kt  |   3 +-
 .../sdk/api/session/space/SpaceService.kt     |   3 +-
 .../database/mapper/RoomSummaryMapper.kt      |   3 +-
 .../session/space/DefaultSpaceService.kt      |  16 +-
 .../session/space/ResolveSpaceInfoTask.kt     |  17 +-
 .../sdk/internal/session/space/SpaceApi.kt    |   1 +
 .../session/space/SpaceSummaryParams.kt       |   8 +-
 .../im/vector/app/core/di/FragmentModule.kt   |   6 +
 .../im/vector/app/core/di/ScreenComponent.kt  |   2 +
 .../home/room/list/RoomSummaryItemFactory.kt  |   5 +-
 ...estedRoomItem.kt => SpaceChildInfoItem.kt} |  19 ++-
 .../features/navigation/DefaultNavigator.kt   |  14 +-
 .../features/spaces/SpaceExploreActivity.kt   |  50 ++++--
 .../explore/SpaceDirectoryController.kt       |  83 +++++++---
 .../spaces/explore/SpaceDirectoryFragment.kt  |  56 ++++++-
 .../spaces/explore/SpaceDirectoryViewModel.kt | 152 +++++++++++++++---
 .../src/main/res/drawable/ic_member_small.xml |  10 ++
 .../layout/fragment_room_directory_picker.xml |   1 -
 .../main/res/layout/item_suggested_room.xml   |   1 +
 vector/src/main/res/values/strings.xml        |   1 +
 20 files changed, 361 insertions(+), 90 deletions(-)
 rename vector/src/main/java/im/vector/app/features/home/room/list/{SuggestedRoomItem.kt => SpaceChildInfoItem.kt} (87%)
 create mode 100644 vector/src/main/res/drawable/ic_member_small.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
index 1302a34daa..fd5fbf7bb0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
@@ -28,5 +28,6 @@ data class SpaceChildInfo(
         val order: String?,
         val activeMemberCount: Int?,
         val autoJoin: Boolean,
-        val viaServers: List<String>
+        val viaServers: List<String>,
+        val parentRoomId: String?
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index 15b6f7d852..390f8c6718 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -54,7 +54,8 @@ interface SpaceService {
     /**
      * Get's information of a space by querying the server
      */
-    suspend fun querySpaceChildren(spaceId: String): Pair<RoomSummary, List<SpaceChildInfo>>
+    suspend fun querySpaceChildren(spaceId: String, suggestedOnly: Boolean? = null, autoJoinedOnly: Boolean? = null)
+            : Pair<RoomSummary, List<SpaceChildInfo>>
 
     /**
      * Get a live list of space summaries. This list is refreshed as soon as the data changes.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 410500ed8e..87ac48e107 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -86,7 +86,8 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                             activeMemberCount = it.childSummaryEntity?.joinedMembersCount,
                             order = it.order,
                             autoJoin = it.autoJoin ?: false,
-                            viaServers = it.viaServers.toList()
+                            viaServers = it.viaServers.toList(),
+                            parentRoomId = roomSummaryEntity.roomId
                     )
                 }
         )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index ab104901d5..02ebc266c0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -44,7 +44,6 @@ import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.space.peeking.PeekSpaceTask
 import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
-import java.lang.IllegalArgumentException
 import javax.inject.Inject
 
 internal class DefaultSpaceService @Inject constructor(
@@ -90,8 +89,8 @@ internal class DefaultSpaceService @Inject constructor(
         return peekSpaceTask.execute(PeekSpaceTask.Params(spaceId))
     }
 
-    override suspend fun querySpaceChildren(spaceId: String): Pair<RoomSummary, List<SpaceChildInfo>> {
-        return resolveSpaceInfoTask.execute(ResolveSpaceInfoTask.Params.withId(spaceId)).let { response ->
+    override suspend fun querySpaceChildren(spaceId: String, suggestedOnly: Boolean?, autoJoinedOnly: Boolean?): Pair<RoomSummary, List<SpaceChildInfo>> {
+        return resolveSpaceInfoTask.execute(ResolveSpaceInfoTask.Params.withId(spaceId, suggestedOnly, autoJoinedOnly)).let { response ->
             val spaceDesc = response.rooms?.firstOrNull { it.roomId == spaceId }
             Pair(
                     first = RoomSummary(
@@ -111,7 +110,7 @@ internal class DefaultSpaceService @Inject constructor(
                             ?.map { childSummary ->
                                 val childStateEv = response.events
                                         ?.firstOrNull { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
-                                        ?.content.toModel<SpaceChildContent>()
+                                val childStateEvContent = childStateEv?.content.toModel<SpaceChildContent>()
                                 SpaceChildInfo(
                                         childRoomId = childSummary.roomId,
                                         isKnown = true,
@@ -119,10 +118,11 @@ internal class DefaultSpaceService @Inject constructor(
                                         name = childSummary.name,
                                         topic = childSummary.topic,
                                         avatarUrl = childSummary.avatarUrl,
-                                        order = childStateEv?.order,
-                                        autoJoin = childStateEv?.autoJoin ?: false,
-                                        viaServers = childStateEv?.via ?: emptyList(),
-                                        activeMemberCount = childSummary.numJoinedMembers
+                                        order = childStateEvContent?.order,
+                                        autoJoin = childStateEvContent?.autoJoin ?: false,
+                                        viaServers = childStateEvContent?.via ?: emptyList(),
+                                        activeMemberCount = childSummary.numJoinedMembers,
+                                        parentRoomId = childStateEv?.roomId
                                 )
                             } ?: emptyList()
             )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
index 1eacdce8df..4326b1934e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
@@ -23,12 +23,15 @@ import javax.inject.Inject
 internal interface ResolveSpaceInfoTask : Task<ResolveSpaceInfoTask.Params, SpacesResponse> {
     data class Params(
             val spaceId: String,
-            val maxRoomPerSpace: Int,
+            val maxRoomPerSpace: Int?,
             val limit: Int,
-            val batchToken: String?
+            val batchToken: String?,
+            val suggestedOnly: Boolean?,
+            val autoJoinOnly: Boolean?
     ) {
         companion object {
-            fun withId(spaceId: String) = Params(spaceId, 10, 20, null)
+            fun withId(spaceId: String, suggestedOnly: Boolean?, autoJoinOnly: Boolean?) =
+                    Params(spaceId, 10, 20, null, suggestedOnly, autoJoinOnly)
         }
     }
 }
@@ -37,7 +40,13 @@ internal class DefaultResolveSpaceInfoTask @Inject constructor(
         private val spaceApi: SpaceApi
 ) : ResolveSpaceInfoTask {
     override suspend fun execute(params: ResolveSpaceInfoTask.Params): SpacesResponse {
-        val body = SpaceSummaryParams(maxRoomPerSpace = params.maxRoomPerSpace, limit = params.limit, batch = params.batchToken ?: "")
+        val body = SpaceSummaryParams(
+                maxRoomPerSpace = params.maxRoomPerSpace,
+                limit = params.limit,
+                batch = params.batchToken ?: "",
+                autoJoinedOnly = params.autoJoinOnly,
+                suggestedOnly = params.suggestedOnly
+        )
         return executeRequest<SpacesResponse>(null) {
             apiCall = spaceApi.getSpaces(params.spaceId, body)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
index 249ebd2fd2..3a63cd0c01 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
@@ -29,6 +29,7 @@ internal interface SpaceApi {
      * POST /_matrix/client/r0/rooms/{roomID}/spaces
      *  {
      *  "max_rooms_per_space": 5,      // The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1.
+     *    "auto_join_only": true,        // If true, only return m.space.child events with auto_join:true, default: false, which returns all events.
      *  "limit": 100,                  // The maximum number of rooms/subspaces to return, server can override this, default: 100.
      *  "batch": "opaque_string"       // A token to use if this is a subsequent HTTP hit, default: "".
      *  }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
index af5aec0554..c76987e66d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
@@ -22,12 +22,14 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 internal data class SpaceSummaryParams(
         /**  The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1*/
-        @Json(name = "max_rooms_per_space") val maxRoomPerSpace: Int = 100,
+        @Json(name = "max_rooms_per_space") val maxRoomPerSpace: Int?,
         /** The maximum number of rooms/subspaces to return, server can override this, default: 100 */
-        @Json(name = "limit") val limit: Int = 100,
+        @Json(name = "limit") val limit: Int?,
         /** A token to use if this is a subsequent HTTP hit, default: "".*/
         @Json(name = "batch") val batch: String = "",
         /** whether we should only return children with the "suggested" flag set.*/
-        @Json(name = "suggested_only") val suggestedOnly: Boolean = false
+        @Json(name = "suggested_only") val suggestedOnly: Boolean?,
+        /** whether we should only return children with the "suggested" flag set.*/
+        @Json(name = "auto_join_only") val autoJoinedOnly: Boolean?
 
 )
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index a1be337dc6..9e2d249bbe 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -123,6 +123,7 @@ import im.vector.app.features.spaces.SpaceListFragment
 import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
 import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
 import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
+import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
 import im.vector.app.features.spaces.preview.SpacePreviewFragment
 import im.vector.app.features.terms.ReviewTermsFragment
 import im.vector.app.features.usercode.ShowUserCodeFragment
@@ -666,4 +667,9 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(MatrixToRoomSpaceFragment::class)
     fun bindMatrixToRoomSpaceFragment(fragment: MatrixToRoomSpaceFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SpaceDirectoryFragment::class)
+    fun bindSpaceDirectoryFragment(fragment: SpaceDirectoryFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index f9ffc9c612..b1c1e73081 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -79,6 +79,7 @@ import im.vector.app.features.share.IncomingShareActivity
 import im.vector.app.features.signout.soft.SoftLogoutActivity
 import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
+import im.vector.app.features.spaces.SpaceExploreActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.ui.UiStateRepository
 import im.vector.app.features.usercode.UserCodeActivity
@@ -154,6 +155,7 @@ interface ScreenComponent {
     fun inject(activity: ReAuthActivity)
     fun inject(activity: RoomDevToolActivity)
     fun inject(activity: SpaceCreationActivity)
+    fun inject(activity: SpaceExploreActivity)
 
     /* ==========================================================================================
      * BottomSheets
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 0c6651dd08..2f073a68c6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -57,12 +57,13 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
 
     fun createSuggestion(spaceChildInfo: SpaceChildInfo,
                          suggestedRoomJoiningStates: Map<String, Async<Unit>>,
-                         onJoinClick: View.OnClickListener) : VectorEpoxyModel<*> {
-        return SuggestedRoomItem_()
+                         onJoinClick: View.OnClickListener): VectorEpoxyModel<*> {
+        return SpaceChildInfoItem_()
                 .id("sug_${spaceChildInfo.childRoomId}")
                 .matrixItem(MatrixItem.RoomItem(spaceChildInfo.childRoomId, spaceChildInfo.name, spaceChildInfo.avatarUrl))
                 .avatarRenderer(avatarRenderer)
                 .topic(spaceChildInfo.topic)
+                .buttonLabel(stringProvider.getString(R.string.join))
                 .loading(suggestedRoomJoiningStates[spaceChildInfo.childRoomId] is Loading)
                 .memberCount(spaceChildInfo.activeMemberCount ?: 0)
                 .buttonClickListener(onJoinClick)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt
similarity index 87%
rename from vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomItem.kt
rename to vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt
index bdd196f750..cb9c8b1f2e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceChildInfoItem.kt
@@ -38,7 +38,7 @@ import me.gujun.android.span.span
 import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_suggested_room)
-abstract class SuggestedRoomItem : VectorEpoxyModel<SuggestedRoomItem.Holder>() {
+abstract class SpaceChildInfoItem : VectorEpoxyModel<SpaceChildInfoItem.Holder>() {
 
     @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute lateinit var matrixItem: MatrixItem
@@ -48,6 +48,9 @@ abstract class SuggestedRoomItem : VectorEpoxyModel<SuggestedRoomItem.Holder>()
 
     @EpoxyAttribute var memberCount: Int = 0
     @EpoxyAttribute var loading: Boolean = false
+    @EpoxyAttribute var space: Boolean = false
+
+    @EpoxyAttribute var buttonLabel: String? = null
 
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemLongClickListener: View.OnLongClickListener? = null
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemClickListener: View.OnClickListener? = null
@@ -61,13 +64,17 @@ abstract class SuggestedRoomItem : VectorEpoxyModel<SuggestedRoomItem.Holder>()
             itemLongClickListener?.onLongClick(it) ?: false
         }
         holder.titleView.text = matrixItem.getBestName()
-        avatarRenderer.render(matrixItem, holder.avatarImageView)
+        if (space) {
+            avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
+        } else {
+            avatarRenderer.render(matrixItem, holder.avatarImageView)
+        }
 
         holder.descriptionText.text = span {
             span {
                 apply {
                     val tintColor = ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
-                    ContextCompat.getDrawable(holder.view.context, R.drawable.ic_room_profile_member_list)
+                    ContextCompat.getDrawable(holder.view.context, R.drawable.ic_member_small)
                             ?.apply {
                                 ThemeUtils.tintDrawableWithColor(this, tintColor)
                             }?.let {
@@ -83,6 +90,8 @@ abstract class SuggestedRoomItem : VectorEpoxyModel<SuggestedRoomItem.Holder>()
             }
         }
 
+        holder.joinButton.text = buttonLabel
+
         if (loading) {
             holder.joinButtonLoading.isVisible = true
             holder.joinButton.isInvisible = true
@@ -93,8 +102,8 @@ abstract class SuggestedRoomItem : VectorEpoxyModel<SuggestedRoomItem.Holder>()
 
         holder.joinButton.setOnClickListener {
             // local echo
-            holder.joinButtonLoading.isVisible = true
-            holder.joinButton.isInvisible = true
+            holder.joinButton.isEnabled = false
+            holder.view.postDelayed({ holder.joinButton.isEnabled = true }, 400)
             buttonClickListener?.onClick(it)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 548f0b986d..c2986dfbc2 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -71,6 +71,7 @@ import im.vector.app.features.roomprofile.RoomProfileActivity
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
+import im.vector.app.features.spaces.SpaceExploreActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.widgets.WidgetActivity
@@ -250,8 +251,17 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openRoomDirectory(context: Context, initialFilter: String) {
-        val intent = RoomDirectoryActivity.getIntent(context, initialFilter)
-        context.startActivity(intent)
+        val selectedSpace = selectedSpaceDataSource.currentValue?.orNull()?.let {
+            sessionHolder.getSafeActiveSession()?.getRoomSummary(it.roomId)
+        }
+        if (selectedSpace == null) {
+            val intent = RoomDirectoryActivity.getIntent(context, initialFilter)
+            context.startActivity(intent)
+        } else {
+            SpaceExploreActivity.newIntent(context, selectedSpace.roomId).let {
+                context.startActivity(it)
+            }
+        }
     }
 
     override fun openCreateRoom(context: Context, initialName: String) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index 298f51922b..e07896de50 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -20,47 +20,60 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import com.airbnb.mvrx.MvRx
+import com.airbnb.mvrx.viewModel
 import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.spaces.explore.SpaceDirectoryArgs
 import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
-import im.vector.app.features.spaces.preview.SpacePreviewArgs
-import im.vector.app.features.spaces.preview.SpacePreviewFragment
+import im.vector.app.features.spaces.explore.SpaceDirectoryState
+import im.vector.app.features.spaces.explore.SpaceDirectoryViewEvents
+import im.vector.app.features.spaces.explore.SpaceDirectoryViewModel
+import javax.inject.Inject
 
-class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>() {
+class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceDirectoryViewModel.Factory {
+
+    @Inject lateinit var spaceDirectoryViewModelFactory: SpaceDirectoryViewModel.Factory
+
+    override fun injectWith(injector: ScreenComponent) {
+        injector.inject(this)
+    }
 
     override fun getBinding(): ActivitySimpleBinding = ActivitySimpleBinding.inflate(layoutInflater)
-    // lateinit var sharedActionViewModel: SpacePreviewSharedActionViewModel
+
+    override fun getTitleRes(): Int = R.string.space_explore_activity_title
+
+    val sharedViewModel: SpaceDirectoryViewModel by viewModel()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-//        sharedActionViewModel = viewModelProvider.get(SpacePreviewSharedActionViewModel::class.java)
-//        sharedActionViewModel
-//                .observe()
-//                .subscribe { action ->
-//                    when (action) {
-//                        SpacePreviewSharedAction.DismissAction -> finish()
-//                        SpacePreviewSharedAction.ShowModalLoading -> showWaitingView()
-//                        SpacePreviewSharedAction.HideModalLoading -> hideWaitingView()
-//                        is SpacePreviewSharedAction.ShowErrorMessage -> action.error?.let { showSnackbar(it) }
-//                    }
-//                }.disposeOnDestroy()
 
         if (isFirstCreation()) {
             val simpleName = SpaceDirectoryFragment::class.java.simpleName
-            val args = intent?.getParcelableExtra<SpacePreviewArgs>(MvRx.KEY_ARG)
+            val args = intent?.getParcelableExtra<SpaceDirectoryArgs>(MvRx.KEY_ARG)
             if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
                 supportFragmentManager.commitTransaction {
                     replace(R.id.simpleFragmentContainer,
-                            SpacePreviewFragment::class.java,
+                            SpaceDirectoryFragment::class.java,
                             Bundle().apply { this.putParcelable(MvRx.KEY_ARG, args) },
                             simpleName
                     )
                 }
             }
         }
+
+        sharedViewModel.observeViewEvents {
+            when (it) {
+                SpaceDirectoryViewEvents.Dismiss -> {
+                    finish()
+                }
+                is SpaceDirectoryViewEvents.NavigateToRoom -> {
+                    navigator.openRoom(this, it.roomId)
+                }
+            }
+        }
     }
 
     companion object {
@@ -70,4 +83,7 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>() {
             }
         }
     }
+
+    override fun create(initialState: SpaceDirectoryState): SpaceDirectoryViewModel =
+            spaceDirectoryViewModelFactory.create(initialState)
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 2c46607987..44d98766d5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -16,38 +16,77 @@
 
 package im.vector.app.features.spaces.explore
 
+import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
-import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
-import com.airbnb.mvrx.Success
-import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.R
 import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.spaceChildInfoItem
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.util.MatrixItem
+import javax.inject.Inject
 
-class SpaceDirectoryController : TypedEpoxyController<SpaceDirectoryState>() {
+class SpaceDirectoryController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val stringProvider: StringProvider
+) : TypedEpoxyController<SpaceDirectoryState>() {
+
+    interface InteractionListener {
+        fun onButtonClick(spaceChildInfo: SpaceChildInfo)
+        fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo)
+    }
+
+    var listener: InteractionListener? = null
 
     override fun buildModels(data: SpaceDirectoryState?) {
-        when (data?.summary) {
-            is Success -> {
-//                val directories = roomDirectoryListCreator.computeDirectories(asyncThirdPartyProtocol())
-//
-//                directories.forEach {
-//                    buildDirectory(it)
-//                }
+        val results = data?.spaceSummaryApiResult
+
+        if (results is Incomplete) {
+            loadingItem {
+                id("loading")
             }
-            is Incomplete -> {
-                loadingItem {
-                    id("loading")
+        } else {
+            val flattenChildInfo = results?.invoke()
+                    ?.filter {
+                        it.parentRoomId == (data.hierarchyStack.lastOrNull() ?: data.spaceId)
+                    }
+                    ?: emptyList()
+
+            if (flattenChildInfo.isEmpty()) {
+                genericFooterItem {
+                    id("empty_footer")
+                    stringProvider.getString(R.string.no_result_placeholder)
                 }
-            }
-            is Fail -> {
-                errorWithRetryItem {
-                    id("error")
-//                    text(errorFormatter.toHumanReadable(asyncThirdPartyProtocol.error))
-//                    listener { callback?.retry() }
+            } else {
+                flattenChildInfo.forEach { info ->
+                    val isSpace = info.roomType == RoomType.SPACE
+                    val isJoined = data?.joinedRoomsIds?.contains(info.childRoomId) == true
+                    val isLoading = data?.changeMembershipStates?.get(info.childRoomId)?.isInProgress() ?: false
+                    spaceChildInfoItem {
+                        id(info.childRoomId)
+                        matrixItem(MatrixItem.RoomItem(info.childRoomId, info.name, info.avatarUrl))
+                        avatarRenderer(avatarRenderer)
+                        topic(info.topic)
+                        memberCount(info.activeMemberCount ?: 0)
+                        space(isSpace)
+                        loading(isLoading)
+                        buttonLabel(
+                                if (isJoined) stringProvider.getString(R.string.action_open)
+                                else stringProvider.getString(R.string.join)
+                        )
+                        apply {
+                            if (isSpace) {
+                                itemClickListener(View.OnClickListener { listener?.onSpaceChildClick(info) })
+                            }
+                        }
+                        buttonClickListener(View.OnClickListener { listener?.onButtonClick(info) })
+                    }
                 }
             }
-            else          -> {
-            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index d776d9ff51..567012675e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -16,20 +16,74 @@
 
 package im.vector.app.features.spaces.explore
 
+import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import javax.inject.Inject
 
 @Parcelize
 data class SpaceDirectoryArgs(
         val spaceId: String
 ) : Parcelable
 
-class SpaceDirectoryFragment : VectorBaseFragment<FragmentRoomDirectoryPickerBinding>() {
+class SpaceDirectoryFragment @Inject constructor(
+        private val epoxyController: SpaceDirectoryController
+) : VectorBaseFragment<FragmentRoomDirectoryPickerBinding>(),
+        SpaceDirectoryController.InteractionListener,
+        OnBackPressed {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentRoomDirectoryPickerBinding.inflate(layoutInflater, container, false)
+
+    private val viewModel by activityViewModel(SpaceDirectoryViewModel::class)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        vectorBaseActivity.setSupportActionBar(views.toolbar)
+
+        vectorBaseActivity.supportActionBar?.let {
+            it.setDisplayShowHomeEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+        }
+        epoxyController.listener = this
+        views.roomDirectoryPickerList.configureWith(epoxyController)
+    }
+
+    override fun onDestroyView() {
+        epoxyController.listener = null
+        views.roomDirectoryPickerList.cleanup()
+        super.onDestroyView()
+    }
+
+    override fun invalidate() = withState(viewModel) {
+        epoxyController.setData(it)
+    }
+
+    override fun onButtonClick(spaceChildInfo: SpaceChildInfo) {
+        viewModel.handle(SpaceDirectoryViewAction.JoinOrOpen(spaceChildInfo))
+    }
+
+    override fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo) {
+        if (spaceChildInfo.roomType == RoomType.SPACE) {
+            viewModel.handle(SpaceDirectoryViewAction.ExploreSubSpace(spaceChildInfo))
+        }
+    }
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        viewModel.handle(SpaceDirectoryViewAction.HandleBack)
+        return true
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index 31f7162c2a..107ce9ee19 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -19,9 +19,12 @@ package im.vector.app.features.spaces.explore
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
@@ -30,38 +33,54 @@ import dagger.assisted.AssistedInject
 import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
-import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
-import org.matrix.android.sdk.rx.unwrap
+import timber.log.Timber
 
 data class SpaceDirectoryState(
         // The current filter
         val spaceId: String,
         val currentFilter: String = "",
-        val summary: Async<RoomSummary> = Uninitialized,
+        val spaceSummary: Async<RoomSummary> = Uninitialized,
+        val spaceSummaryApiResult: Async<List<SpaceChildInfo>> = Uninitialized,
+        val childList: List<SpaceChildInfo> = emptyList(),
+        val hierarchyStack: List<String> = emptyList(),
         // True if more result are available server side
         val hasMore: Boolean = false,
         // Set of joined roomId / spaces,
-        val joinedRoomsIds: Set<String> = emptySet()
+        val joinedRoomsIds: Set<String> = emptySet(),
+        // keys are room alias or roomId
+        val changeMembershipStates: Map<String, ChangeMembershipState> = emptyMap()
 ) : MvRxState {
-    constructor(args: SpaceDirectoryArgs) : this(spaceId = args.spaceId)
+    constructor(args: SpaceDirectoryArgs) : this(
+            spaceId = args.spaceId
+    )
 }
 
-sealed class SpaceDirectoryViewAction : VectorViewModelAction
+sealed class SpaceDirectoryViewAction : VectorViewModelAction {
+    data class ExploreSubSpace(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
+    data class JoinOrOpen(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
+    object HandleBack : SpaceDirectoryViewAction()
+}
 
-sealed class SpaceDirectoryViewEvents : VectorViewEvents
+sealed class SpaceDirectoryViewEvents : VectorViewEvents {
+    object Dismiss : SpaceDirectoryViewEvents()
+    data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewEvents()
+}
 
 class SpaceDirectoryViewModel @AssistedInject constructor(
         @Assisted initialState: SpaceDirectoryState,
         private val session: Session
-) : VectorViewModel<SpaceDirectoryState, VectorViewModelAction, SpaceDirectoryViewEvents>(initialState) {
+) : VectorViewModel<SpaceDirectoryState, SpaceDirectoryViewAction, SpaceDirectoryViewEvents>(initialState) {
 
     @AssistedFactory
     interface Factory {
@@ -79,24 +98,113 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
     }
 
     init {
-        val queryParams = roomSummaryQueryParams {
-            roomId = QueryStringValue.Equals(initialState.spaceId)
+
+        val spaceSum = session.getRoomSummary(initialState.spaceId)
+        setState {
+            copy(
+                    childList = spaceSum?.children ?: emptyList(),
+                    spaceSummaryApiResult = Loading()
+            )
         }
 
         viewModelScope.launch(Dispatchers.IO) {
-            session
-                    .rx()
-                    .liveSpaceSummaries(queryParams)
-                    .observeOn(Schedulers.computation())
-                    .map { sum -> Optional.from(sum.firstOrNull()) }
-                    .unwrap()
-                    .execute { async ->
-                        copy(summary = async)
+            try {
+                val query = session.spaceService().querySpaceChildren(initialState.spaceId)
+                setState {
+                    copy(
+                            spaceSummaryApiResult = Success(query.second)
+                    )
+                }
+            } catch (failure: Throwable) {
+                setState {
+                    copy(
+                            spaceSummaryApiResult = Fail(failure)
+                    )
+                }
+            }
+        }
+        observeJoinedRooms()
+        observeMembershipChanges()
+    }
+
+    private fun observeJoinedRooms() {
+        val queryParams = roomSummaryQueryParams {
+            memberships = listOf(Membership.JOIN)
+        }
+        session
+                .rx()
+                .liveRoomSummaries(queryParams)
+                .subscribe { list ->
+                    val joinedRoomIds = list
+                            ?.map { it.roomId }
+                            ?.toSet()
+                            ?: emptySet()
+
+                    setState {
+                        copy(joinedRoomsIds = joinedRoomIds)
                     }
+                }
+                .disposeOnClear()
+    }
+
+    private fun observeMembershipChanges() {
+        session.rx()
+                .liveRoomChangeMembershipState()
+                .subscribe {
+                    setState { copy(changeMembershipStates = it) }
+                }
+                .disposeOnClear()
+    }
+
+    override fun handle(action: SpaceDirectoryViewAction) {
+        when (action) {
+            is SpaceDirectoryViewAction.ExploreSubSpace -> {
+                setState {
+                    copy(hierarchyStack = hierarchyStack + listOf(action.spaceChildInfo.childRoomId))
+                }
+            }
+            SpaceDirectoryViewAction.HandleBack -> {
+                withState {
+                    if (it.hierarchyStack.isEmpty()) {
+                        _viewEvents.post(SpaceDirectoryViewEvents.Dismiss)
+                    } else {
+                        setState {
+                            copy(
+                                    hierarchyStack = hierarchyStack.dropLast(1)
+                            )
+                        }
+                    }
+                }
+            }
+            is SpaceDirectoryViewAction.JoinOrOpen -> {
+                handleJoinOrOpen(action.spaceChildInfo)
+            }
         }
     }
 
-    override fun handle(action: VectorViewModelAction) {
-        TODO("Not yet implemented")
+    private fun handleJoinOrOpen(spaceChildInfo: SpaceChildInfo) = withState { state ->
+        val isSpace = spaceChildInfo.roomType == RoomType.SPACE
+        if (state.joinedRoomsIds.contains(spaceChildInfo.childRoomId)) {
+            if (isSpace) {
+                handle(SpaceDirectoryViewAction.ExploreSubSpace(spaceChildInfo))
+            } else {
+                _viewEvents.post(SpaceDirectoryViewEvents.NavigateToRoom(spaceChildInfo.childRoomId))
+            }
+        } else {
+            // join
+            viewModelScope.launch {
+                try {
+                    if (isSpace) {
+                        session.spaceService().joinSpace(spaceChildInfo.childRoomId, null, spaceChildInfo.viaServers)
+                    } else {
+                        awaitCallback<Unit> {
+                            session.joinRoom(spaceChildInfo.childRoomId, null, spaceChildInfo.viaServers, it)
+                        }
+                    }
+                } catch (failure: Throwable) {
+                    Timber.e(failure, "## Space: Failed to join room or subsapce")
+                }
+            }
+        }
     }
 }
diff --git a/vector/src/main/res/drawable/ic_member_small.xml b/vector/src/main/res/drawable/ic_member_small.xml
new file mode 100644
index 0000000000..9298c5f80c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_member_small.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M16,8C16,12.4183 12.4183,16 8,16C3.5817,16 0,12.4183 0,8C0,3.5817 3.5817,0 8,0C12.4183,0 16,3.5817 16,8ZM7.3333,6.1667C7.3333,7.3633 6.4379,8.3333 5.3333,8.3333C4.2288,8.3333 3.3333,7.3633 3.3333,6.1667C3.3333,4.97 4.2288,4 5.3333,4C6.4379,4 7.3333,4.97 7.3333,6.1667ZM13.2564,7.2315C13.2564,8.2798 12.472,9.1296 11.5043,9.1296C10.5366,9.1296 9.7522,8.2798 9.7522,7.2315C9.7522,6.1832 10.5366,5.3333 11.5043,5.3333C12.472,5.3333 13.2564,6.1832 13.2564,7.2315ZM8.6666,12.5969C8.6666,11.0353 7.5698,9.7298 6.1045,9.4089C5.855,9.3593 5.5971,9.3333 5.3333,9.3333C3.9862,9.3333 2.7946,10.0107 2.0698,11.0489C3.1767,13.1974 5.4167,14.6667 8,14.6667C8.225,14.6667 8.4474,14.6555 8.6666,14.6338L8.6666,12.5969ZM13.9475,11.015C13.1422,12.6005 11.7216,13.8208 10,14.3615L10,12.5969C10,11.8856 9.8385,11.2121 9.5501,10.611C10.1084,10.2288 10.7807,10.0057 11.5043,10.0057C12.4545,10.0057 13.3163,10.3904 13.9475,11.015Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_room_directory_picker.xml b/vector/src/main/res/layout/fragment_room_directory_picker.xml
index 9a4a306a00..f0b7a22b8c 100644
--- a/vector/src/main/res/layout/fragment_room_directory_picker.xml
+++ b/vector/src/main/res/layout/fragment_room_directory_picker.xml
@@ -32,5 +32,4 @@
             tools:listitem="@layout/item_room_directory" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index 71b41ff17d..7a3b73487c 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -5,6 +5,7 @@
     android:id="@+id/itemRoomLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:foreground="?attr/selectableItemBackground"
     android:background="?riotx_background">
 
     <FrameLayout
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 11dc475804..a7a5f26d56 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3294,4 +3294,5 @@
 
     <string name="suggested_rooms_pills_on_empty_text">You’re not in any rooms yet. Below are some suggested rooms, but you can see more with the green button bottom right.</string>
 
+    <string name="space_explore_activity_title">Explore rooms</string>
 </resources>

From 681b5b3ddcfbe692bbce8c42e1a379632880cd35 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 19 Mar 2021 17:30:53 +0100
Subject: [PATCH 125/350] Simple space context menu

---
 .../im/vector/app/core/di/ScreenComponent.kt  |   2 +
 .../vector/app/features/home/HomeActivity.kt  |   7 +
 .../features/home/HomeActivitySharedAction.kt |   1 +
 .../app/features/home/HomeDetailFragment.kt   |  18 ++-
 .../roomprofile/RoomProfileActivity.kt        |   4 +
 .../app/features/spaces/SpaceListFragment.kt  |   4 +-
 .../spaces/SpaceSettingsMenuBottomSheet.kt    | 135 ++++++++++++++++++
 .../features/spaces/SpaceSummaryController.kt |   4 +-
 .../app/features/spaces/SpaceSummaryItem.kt   |  12 +-
 vector/src/main/res/drawable/ic_explore.xml   |  13 ++
 .../layout/bottom_sheet_space_settings.xml    | 120 ++++++++++++++++
 .../main/res/layout/fragment_home_detail.xml  |   1 +
 vector/src/main/res/layout/item_space.xml     |   4 +-
 vector/src/main/res/values/strings.xml        |   3 +
 14 files changed, 312 insertions(+), 16 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
 create mode 100644 vector/src/main/res/drawable/ic_explore.xml
 create mode 100644 vector/src/main/res/layout/bottom_sheet_space_settings.xml

diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index b1c1e73081..59939a1318 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -80,6 +80,7 @@ import im.vector.app.features.signout.soft.SoftLogoutActivity
 import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpaceExploreActivity
+import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.ui.UiStateRepository
 import im.vector.app.features.usercode.UserCodeActivity
@@ -179,6 +180,7 @@ interface ScreenComponent {
     fun inject(bottomSheet: SignOutBottomSheetDialogFragment)
     fun inject(bottomSheet: MatrixToBottomSheet)
     fun inject(bottomSheet: ShareSpaceBottomSheet)
+    fun inject(bottomSheet: SpaceSettingsMenuBottomSheet)
 
     /* ==========================================================================================
      * Others
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 84098b8281..452afd434b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -58,6 +58,7 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
+import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
@@ -164,6 +165,12 @@ class HomeActivity :
                         is HomeActivitySharedAction.AddSpace -> {
                             createSpaceResultLauncher.launch(SpaceCreationActivity.newIntent(this))
                         }
+                        is HomeActivitySharedAction.ShowSpaceSettings -> {
+                            // open bottom sheet
+                            SpaceSettingsMenuBottomSheet
+                                    .newInstance(sharedAction.spaceId)
+                                    .show(supportFragmentManager, "SPACE_SETTINGS")
+                        }
                     }.exhaustive
                 }
                 .disposeOnDestroy()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
index 72e3523336..e87ce3476f 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
@@ -27,4 +27,5 @@ sealed class HomeActivitySharedAction : VectorSharedAction {
     object OpenGroup : HomeActivitySharedAction()
     object AddSpace : HomeActivitySharedAction()
     data class OpenSpacePreview(val spaceId: String) : HomeActivitySharedAction()
+    data class ShowSpaceSettings(val spaceId: String) : HomeActivitySharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 1f600de9e1..a17d5f16aa 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -273,10 +273,10 @@ class HomeDetailFragment @Inject constructor(
         serverBackupStatusViewModel
                 .subscribe(this) {
                     when (val banState = it.bannerState.invoke()) {
-                        is BannerState.Setup  -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Setup(banState.numberOfKeys), false)
+                        is BannerState.Setup -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Setup(banState.numberOfKeys), false)
                         BannerState.BackingUp -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.BackingUp, false)
                         null,
-                        BannerState.Hidden    -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Hidden, false)
+                        BannerState.Hidden -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Hidden, false)
                     }
                 }
         views.homeKeysBackupBanner.delegate = this
@@ -300,6 +300,16 @@ class HomeDetailFragment @Inject constructor(
         views.groupToolbarAvatarImageView.debouncedClicks {
             sharedActionViewModel.post(HomeActivitySharedAction.OpenDrawer)
         }
+
+        views.homeToolbarContent.debouncedClicks {
+            withState(viewModel) {
+                val currentSpace = it.spaceSummary.orNull()
+                        ?.takeIf { it.roomId != ALL_COMMUNITIES_GROUP_ID }
+                if (vectorPreferences.labSpaces() && currentSpace != null) {
+                    sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(currentSpace.roomId))
+                }
+            }
+        }
     }
 
     private fun setupBottomNavigationView() {
@@ -307,7 +317,7 @@ class HomeDetailFragment @Inject constructor(
         views.bottomNavigationView.setOnNavigationItemSelectedListener {
             val displayMode = when (it.itemId) {
                 R.id.bottom_action_people -> RoomListDisplayMode.PEOPLE
-                R.id.bottom_action_rooms  -> RoomListDisplayMode.ROOMS
+                R.id.bottom_action_rooms -> RoomListDisplayMode.ROOMS
                 else                      -> RoomListDisplayMode.NOTIFICATIONS
             }
             viewModel.handle(HomeDetailAction.SwitchDisplayMode(displayMode))
@@ -385,7 +395,7 @@ class HomeDetailFragment @Inject constructor(
 
     private fun RoomListDisplayMode.toMenuId() = when (this) {
         RoomListDisplayMode.PEOPLE -> R.id.bottom_action_people
-        RoomListDisplayMode.ROOMS  -> R.id.bottom_action_rooms
+        RoomListDisplayMode.ROOMS -> R.id.bottom_action_rooms
         else                       -> R.id.bottom_action_notification
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
index 7cb713d378..e45ad69e7e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
@@ -54,6 +54,7 @@ class RoomProfileActivity :
 
         const val EXTRA_DIRECT_ACCESS_ROOM_ROOT = 0
         const val EXTRA_DIRECT_ACCESS_ROOM_SETTINGS = 1
+        const val EXTRA_DIRECT_ACCESS_ROOM_MEMBERS = 2
 
         fun newIntent(context: Context, roomId: String, directAccess: Int?): Intent {
             val roomProfileArgs = RoomProfileArgs(roomId)
@@ -97,6 +98,9 @@ class RoomProfileActivity :
                     addFragment(R.id.simpleFragmentContainer, RoomProfileFragment::class.java, roomProfileArgs)
                     addFragmentToBackstack(R.id.simpleFragmentContainer, RoomSettingsFragment::class.java, roomProfileArgs)
                 }
+                EXTRA_DIRECT_ACCESS_ROOM_MEMBERS -> {
+                    addFragment(R.id.simpleFragmentContainer, RoomMemberListFragment::class.java, roomProfileArgs)
+                }
                 else -> addFragment(R.id.simpleFragmentContainer, RoomProfileFragment::class.java, roomProfileArgs)
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index b3e16a709d..011453e642 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -80,8 +80,8 @@ class SpaceListFragment @Inject constructor(
         viewModel.handle(SpaceListAction.SelectSpace(spaceSummary))
     }
 
-    override fun onLeaveSpace(spaceSummary: RoomSummary) {
-        viewModel.handle(SpaceListAction.LeaveSpace(spaceSummary))
+    override fun onSpaceSettings(spaceSummary: RoomSummary) {
+        sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(spaceSummary.roomId))
     }
 
     override fun onAddSpaceSelected() {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
new file mode 100644
index 0000000000..02d40e96dd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.args
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetSpaceSettingsBinding
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import im.vector.app.features.roomprofile.RoomProfileActivity
+import im.vector.app.features.settings.VectorPreferences
+import io.reactivex.android.schedulers.AndroidSchedulers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
+import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.internal.util.awaitCallback
+import timber.log.Timber
+import javax.inject.Inject
+
+@Parcelize
+data class SpaceBottomSheetSettingsArgs(
+        val spaceId: String
+) : Parcelable
+
+class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpaceSettingsBinding>() {
+
+    @Inject lateinit var navigator: Navigator
+    @Inject lateinit var activeSessionHolder: ActiveSessionHolder
+    @Inject lateinit var avatarRenderer: AvatarRenderer
+    @Inject lateinit var vectorPreferences: VectorPreferences
+
+    private val spaceArgs: SpaceBottomSheetSettingsArgs by args()
+
+    override fun injectWith(injector: ScreenComponent) {
+        injector.inject(this)
+    }
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSpaceSettingsBinding {
+        return BottomSheetSpaceSettingsBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val session = activeSessionHolder.getSafeActiveSession() ?: return
+        val roomSummary = session.getRoomSummary(spaceArgs.spaceId)
+        roomSummary?.let { roomSummary ->
+            avatarRenderer.renderSpace(roomSummary.toMatrixItem(), views.roomAvatarImageView)
+            views.roomNameView.text = roomSummary.displayName
+            views.roomDescription.text = roomSummary.topic
+        }
+
+        val room = session.getRoom(spaceArgs.spaceId) ?: return
+
+        PowerLevelsObservableFactory(room)
+                .createObservable()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { powerLevelContent ->
+                    val powerLevelsHelper = PowerLevelsHelper(powerLevelContent)
+                    val canInvite = powerLevelsHelper.isUserAbleToInvite(session.myUserId)
+                    views.invitePeople.isVisible = canInvite
+                }.disposeOnDestroyView()
+
+        views.invitePeople.views.bottomSheetActionClickableZone.debouncedClicks {
+            navigator.openInviteUsersToRoom(requireContext(), spaceArgs.spaceId)
+        }
+
+        views.showMemberList.views.bottomSheetActionClickableZone.debouncedClicks {
+            navigator.openRoomProfile(requireContext(), spaceArgs.spaceId, RoomProfileActivity.EXTRA_DIRECT_ACCESS_ROOM_MEMBERS)
+        }
+
+        views.spaceSettings.isVisible = vectorPreferences.developerMode()
+        views.spaceSettings.views.bottomSheetActionClickableZone.debouncedClicks {
+            navigator.openRoomProfile(requireContext(), spaceArgs.spaceId)
+        }
+
+        views.exploreRooms.views.bottomSheetActionClickableZone.debouncedClicks {
+            startActivity(SpaceExploreActivity.newIntent(requireContext(), spaceArgs.spaceId))
+        }
+
+        views.leaveSpace.views.bottomSheetActionClickableZone.debouncedClicks {
+            AlertDialog.Builder(requireContext())
+                    .setMessage(getString(R.string.space_leave_prompt_msg))
+                    .setPositiveButton(R.string.leave) { _, _ ->
+                        GlobalScope.launch {
+                            try {
+                                awaitCallback {
+                                    session.getRoom(spaceArgs.spaceId)?.leave(null, it)
+                                }
+                            } catch (failure: Throwable) {
+                                Timber.e(failure, "Failed to leave space")
+                            }
+                        }
+                        dismiss()
+                    }
+                    .setNegativeButton(R.string.cancel, null)
+                    .show()
+        }
+    }
+
+    companion object {
+        fun newInstance(spaceId: String): SpaceSettingsMenuBottomSheet {
+            return SpaceSettingsMenuBottomSheet().apply {
+                setArguments(SpaceBottomSheetSettingsArgs(spaceId))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 7718da79dc..7c9c3969b1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -102,7 +102,7 @@ class SpaceSummaryController @Inject constructor(
                             id(groupSummary.roomId)
                             matrixItem(groupSummary.toMatrixItem())
                             selected(isSelected)
-                            onLeave { callback?.onLeaveSpace(groupSummary) }
+                            onMore { callback?.onSpaceSettings(groupSummary) }
                             listener { callback?.onSpaceSelected(groupSummary) }
                         }
                     }
@@ -120,7 +120,7 @@ class SpaceSummaryController @Inject constructor(
 
     interface Callback {
         fun onSpaceSelected(spaceSummary: RoomSummary)
-        fun onLeaveSpace(spaceSummary: RoomSummary)
+        fun onSpaceSettings(spaceSummary: RoomSummary)
         fun onAddSpaceSelected()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index ffd27446f4..af151a1624 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -38,7 +38,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
     @EpoxyAttribute lateinit var matrixItem: MatrixItem
     @EpoxyAttribute var selected: Boolean = false
     @EpoxyAttribute var listener: (() -> Unit)? = null
-    @EpoxyAttribute var onLeave: (() -> Unit)? = null
+    @EpoxyAttribute var onMore: (() -> Unit)? = null
     @EpoxyAttribute var toggleExpand: (() -> Unit)? = null
     @EpoxyAttribute var expanded: Boolean? = null
 
@@ -47,14 +47,14 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         holder.rootView.setOnClickListener { listener?.invoke() }
         holder.groupNameView.text = matrixItem.displayName
         holder.rootView.isChecked = selected
-        if (onLeave != null) {
-            holder.leaveView.setOnClickListener(
+        if (onMore != null) {
+            holder.moreView.setOnClickListener(
                     DebouncedClickListener({ _ ->
-                        onLeave?.invoke()
+                        onMore?.invoke()
                     })
             )
         } else {
-            holder.leaveView.isVisible = false
+            holder.moreView.isVisible = false
         }
 
         when (expanded) {
@@ -88,7 +88,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         val avatarImageView by bind<ImageView>(R.id.groupAvatarImageView)
         val groupNameView by bind<TextView>(R.id.groupNameView)
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
-        val leaveView by bind<ImageView>(R.id.groupTmpLeave)
+        val moreView by bind<ImageView>(R.id.groupTmpLeave)
         val collapseIndicator by bind<ImageView>(R.id.groupChildrenCollapse)
     }
 }
diff --git a/vector/src/main/res/drawable/ic_explore.xml b/vector/src/main/res/drawable/ic_explore.xml
new file mode 100644
index 0000000000..09a496170f
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_explore.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.6667,12C22.6667,17.8911 17.8911,22.6667 12,22.6667C6.109,22.6667 1.3333,17.8911 1.3333,12C1.3333,6.109 6.109,1.3334 12,1.3334C17.8911,1.3334 22.6667,6.109 22.6667,12ZM17.8333,7.1022C18.0778,6.5711 17.4288,5.9221 16.8977,6.1666L10.2263,9.238C9.7853,9.4411 9.4402,9.7861 9.2372,10.2271L6.1657,16.8986C5.9212,17.4297 6.5702,18.0787 7.1013,17.8341L13.7727,14.7627C14.2137,14.5597 14.5588,14.2146 14.7618,13.7736L17.8333,7.1022Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M13.178,13.1789C12.5271,13.8298 11.4719,13.8298 10.821,13.1789C10.1701,12.528 10.1701,11.4727 10.821,10.8219C11.4719,10.171 12.5271,10.171 13.178,10.8219C13.8289,11.4727 13.8289,12.528 13.178,13.1789Z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
new file mode 100644
index 0000000000..65d87257c6
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/callControlsWrapper"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?riotx_bottom_sheet_background"
+    android:orientation="vertical">
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:padding="8dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="8dp">
+
+        <ImageView
+            android:id="@+id/roomAvatarImageView"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:contentDescription="@string/avatar"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@tools:sample/avatars" />
+
+        <TextView
+            android:id="@+id/roomNameView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
+            android:layout_marginEnd="8dp"
+            android:duplicateParentState="true"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?riotx_text_primary"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/roomAvatarImageView"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@sample/matrix.json/data/displayName" />
+
+        <TextView
+            android:id="@+id/roomDescription"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/layout_horizontal_margin"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="8dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/roomAvatarImageView"
+            app:layout_constraintTop_toBottomOf="@+id/roomNameView"
+            tools:text="@sample/matrix.json/data/message" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?vctr_list_divider_color" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/invitePeople"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/invite_people_menu"
+        app:leftIcon="@drawable/ic_invite_people"
+        app:tint="?attr/riotx_text_primary"
+        app:titleTextColor="?attr/riotx_text_primary" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/showMemberList"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/list_members"
+        app:leftIcon="@drawable/ic_room_profile_member_list"
+        app:tint="?attr/riotx_text_primary"
+        app:titleTextColor="?attr/riotx_text_primary" />
+
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/spaceSettings"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/settings"
+        app:leftIcon="@drawable/ic_settings_root_general"
+        app:tint="?attr/riotx_text_primary"
+        app:titleTextColor="?attr/riotx_text_primary" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/exploreRooms"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/space_explore_activity_title"
+        app:leftIcon="@drawable/ic_explore"
+        app:tint="?attr/riotx_text_primary"
+        app:titleTextColor="?attr/riotx_text_primary"
+        tools:actionDescription="" />
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/leaveSpace"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/leave_space"
+        app:leftIcon="@drawable/ic_room_actions_leave"
+        app:tint="@color/riotx_destructive_accent"
+        app:titleTextColor="@color/riotx_destructive_accent" />
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index ba2b630efe..bea64bcab1 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -35,6 +35,7 @@
                 android:layout_weight="1"
                 android:gravity="start"
                 android:orientation="vertical"
+                android:id="@+id/homeToolbarContent"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp">
 
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index 92f0fcc1d5..ce3b5c69bc 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -66,8 +66,8 @@
         android:padding="4dp"
         android:layout_marginEnd="4dp"
         android:importantForAccessibility="no"
-        android:src="@drawable/ic_room_actions_leave"
-        app:tint="@color/riotx_destructive_accent"
+        android:src="@drawable/ic_more_vertical"
+        app:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/groupAvatarChevron"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index a7a5f26d56..3e357b3b89 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3281,6 +3281,7 @@
     <string name="create_spaces_default_public_random_room_name">Random</string>
     <string name="create_spaces_loading_message">Creating Space…</string>
     <string name="invite_people_to_your_space">Invite people to your space</string>
+    <string name="invite_people_menu">Invite people</string>
     <string name="invite_people_to_your_space_desc">It’s just you at the moment.  %s will be even better with others.</string>
     <string name="invite_by_email">Invite by email</string>
     <string name="invite_by_mxid">Invite by username</string>
@@ -3295,4 +3296,6 @@
     <string name="suggested_rooms_pills_on_empty_text">You’re not in any rooms yet. Below are some suggested rooms, but you can see more with the green button bottom right.</string>
 
     <string name="space_explore_activity_title">Explore rooms</string>
+    <string name="leave_space">Leave Space</string>
+    <string name="space_leave_prompt_msg">Are you sure you want to leave the space?</string>
 </resources>

From 872b383c4d3bb625348be73391b4f208dd27dfdf Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 19 Mar 2021 18:55:29 +0100
Subject: [PATCH 126/350] cleaning

---
 .../app/features/spaces/SpaceSettingsMenuBottomSheet.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index 02d40e96dd..5153401d39 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -71,11 +71,11 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
 
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         val roomSummary = session.getRoomSummary(spaceArgs.spaceId)
-        roomSummary?.let { roomSummary ->
-            avatarRenderer.renderSpace(roomSummary.toMatrixItem(), views.roomAvatarImageView)
-            views.roomNameView.text = roomSummary.displayName
-            views.roomDescription.text = roomSummary.topic
+        roomSummary?.toMatrixItem()?.let {
+            avatarRenderer.renderSpace(it, views.roomAvatarImageView)
         }
+        views.roomNameView.text = roomSummary?.displayName
+        views.roomDescription.text = roomSummary?.topic
 
         val room = session.getRoom(spaceArgs.spaceId) ?: return
 

From ea5e48b9404dac9a0f23627bcaf682a973303bb4 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 22 Mar 2021 11:40:28 +0100
Subject: [PATCH 127/350] 1 depth hierarchy support in space panel

---
 .../sdk/session/space/SpaceHierarchyTest.kt   | 40 +++++++++
 .../sdk/api/session/space/SpaceService.kt     |  2 +
 .../room/summary/RoomSummaryDataSource.kt     | 27 +++++-
 .../session/space/DefaultSpaceService.kt      |  3 +
 .../app/features/spaces/SpaceListFragment.kt  |  4 +
 .../features/spaces/SpaceSummaryController.kt | 90 ++++++++++++++-----
 .../app/features/spaces/SpaceSummaryItem.kt   | 51 +++++++----
 .../features/spaces/SpacesListViewModel.kt    | 23 ++++-
 vector/src/main/res/layout/item_space.xml     | 32 ++++---
 9 files changed, 217 insertions(+), 55 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index b512983ea6..b3396fed6f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -370,4 +370,44 @@ class SpaceHierarchyTest : InstrumentedTest {
         }
         return TestSpaceCreationResult(spaceId, roomIds)
     }
+
+    @Test
+    fun testRootSpaces() {
+        val session = commonTestHelper.createAccount("John", SessionTestParams(true))
+
+        val spaceAInfo = createPublicSpace(session, "SpaceA", listOf(
+                Triple("A1", true /*auto-join*/, true/*canonical*/),
+                Triple("A2", true, true)
+        ))
+
+        val spaceBInfo = createPublicSpace(session, "SpaceB", listOf(
+                Triple("B1", true /*auto-join*/, true/*canonical*/),
+                Triple("B2", true, true),
+                Triple("B3", true, true)
+        ))
+
+        val spaceCInfo = createPublicSpace(session, "SpaceC", listOf(
+                Triple("C1", true /*auto-join*/, true/*canonical*/),
+                Triple("C2", true, true)
+        ))
+
+        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+
+        // add C as subspace of B
+        runBlocking {
+            val spaceB = session.spaceService().getSpace(spaceBInfo.spaceId)
+            spaceB!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
+        }
+
+        // + A
+        //   a1, a2
+        // + B
+         //  b1, b2, b3
+        //   + C
+        //     + c1, c2
+
+        val rootSpaces = session.spaceService().getRootSpaceSummaries()
+
+        assertEquals(2, rootSpaces.size, "Unexpected number of root spaces ${rootSpaces.map { it.name }}")
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index 390f8c6718..604d06d9ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -90,4 +90,6 @@ interface SpaceService {
      * if multiple are present the client should select the one with the lowest room ID, as determined via a lexicographic utf-8 ordering.
      */
     suspend fun setSpaceParent(childRoomId: String, parentSpaceId: String, canonical: Boolean, viaServers: List<String>)
+
+    fun getRootSpaceSummaries(): List<RoomSummary>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index fd54ac63ee..c2d4e318cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -123,6 +123,23 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         return getRoomSummaries(spaceSummaryQueryParams)
     }
 
+    fun getRootSpaceSummaries(): List<RoomSummary> {
+        return getRoomSummaries(spaceSummaryQueryParams {
+            memberships = listOf(Membership.JOIN)
+        })
+                .let { allJoinedSpace ->
+                    val allFlattenChildren = arrayListOf<RoomSummary>()
+                    allJoinedSpace.forEach {
+                        flattenSubSpace(it, emptyList(), allFlattenChildren, listOf(Membership.JOIN), false)
+                    }
+                    val knownNonOrphan = allFlattenChildren.map { it.roomId }.distinct()
+                    // keep only root rooms
+                    allJoinedSpace.filter { candidate ->
+                        !knownNonOrphan.contains(candidate.roomId)
+                    }
+                }
+    }
+
     fun getBreadcrumbs(queryParams: RoomSummaryQueryParams): List<RoomSummary> {
         return monarchy.fetchAllMappedSync(
                 { breadcrumbsQuery(it, queryParams) },
@@ -341,8 +358,14 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         }
     }
 
-    fun flattenSubSpace(current: RoomSummary, parenting: List<String>, output: MutableList<RoomSummary>, memberShips: List<Membership>) {
-        output.add(current)
+    fun flattenSubSpace(current: RoomSummary,
+                        parenting: List<String>,
+                        output: MutableList<RoomSummary>,
+                        memberShips: List<Membership>,
+                        includeCurrent: Boolean = true) {
+        if (includeCurrent) {
+            output.add(current)
+        }
         current.children?.sortedBy { it.order ?: it.name }?.forEach {
             if (it.roomType == RoomType.SPACE) {
                 // Add recursive
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 02ebc266c0..e6d30e2712 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -85,6 +85,9 @@ internal class DefaultSpaceService @Inject constructor(
         return roomSummaryDataSource.getSpaceSummaries(spaceSummaryQueryParams)
     }
 
+    override fun getRootSpaceSummaries(): List<RoomSummary> {
+        return roomSummaryDataSource.getRootSpaceSummaries()
+    }
     override suspend fun peekSpace(spaceId: String): SpacePeekResult {
         return peekSpaceTask.execute(PeekSpaceTask.Params(spaceId))
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index 011453e642..bc7be74442 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -84,6 +84,10 @@ class SpaceListFragment @Inject constructor(
         sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(spaceSummary.roomId))
     }
 
+    override fun onToggleExpand(spaceSummary: RoomSummary) {
+        viewModel.handle(SpaceListAction.ToggleExpand(spaceSummary))
+    }
+
     override fun onAddSpaceSelected() {
         viewModel.handle(SpaceListAction.AddSpace)
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 7c9c3969b1..0417889eaf 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -27,6 +27,7 @@ import im.vector.app.features.grouplist.homeSpaceSummaryItem
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -48,10 +49,17 @@ class SpaceSummaryController @Inject constructor(
 
     override fun buildModels() {
         val nonNullViewState = viewState ?: return
-        buildGroupModels(nonNullViewState.asyncSpaces(), nonNullViewState.selectedSpace)
+        buildGroupModels(
+                nonNullViewState.asyncSpaces(),
+                nonNullViewState.selectedSpace,
+                nonNullViewState.rootSpaces,
+                nonNullViewState.expandedStates)
     }
 
-    private fun buildGroupModels(summaries: List<RoomSummary>?, selected: RoomSummary?) {
+    private fun buildGroupModels(summaries: List<RoomSummary>?,
+                                 selected: RoomSummary?,
+                                 rootSpaces: List<RoomSummary>?,
+                                 expandedStates: Map<String, Boolean>) {
         if (summaries.isNullOrEmpty()) {
             return
         }
@@ -86,29 +94,66 @@ class SpaceSummaryController @Inject constructor(
             text(stringProvider.getString(R.string.spaces_header))
         }
 
-        summaries
-                .filter { it.membership == Membership.JOIN }
-                .forEach { groupSummary ->
-                    val isSelected = groupSummary.roomId == selected?.roomId
-                    if (groupSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
-                        homeSpaceSummaryItem {
-                            id(groupSummary.roomId)
-                            selected(isSelected)
-                            listener { callback?.onSpaceSelected(groupSummary) }
-                        }
-                    } else {
-                        spaceSummaryItem {
-                            avatarRenderer(avatarRenderer)
-                            id(groupSummary.roomId)
-                            matrixItem(groupSummary.toMatrixItem())
-                            selected(isSelected)
-                            onMore { callback?.onSpaceSettings(groupSummary) }
-                            listener { callback?.onSpaceSelected(groupSummary) }
-                        }
+        summaries.firstOrNull { it.roomId == ALL_COMMUNITIES_GROUP_ID }
+                ?.let {
+                    homeSpaceSummaryItem {
+                        id(it.roomId)
+                        selected(it.roomId == selected?.roomId)
+                        listener { callback?.onSpaceSelected(it) }
                     }
                 }
 
-        // Temporary item to create a new Space (will move with final design)
+//        summaries
+//                .filter { it.membership == Membership.JOIN }
+        rootSpaces
+                ?.forEach { groupSummary ->
+                    val isSelected = groupSummary.roomId == selected?.roomId
+//                    if (groupSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
+//                        homeSpaceSummaryItem {
+//                            id(groupSummary.roomId)
+//                            selected(isSelected)
+//                            listener { callback?.onSpaceSelected(groupSummary) }
+//                        }
+//                    } else {
+                    // does it have children?
+                    val subSpaces = groupSummary.children?.filter { childInfo ->
+                        summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
+                    }
+                    val hasChildren = (subSpaces?.size ?: 0) > 0
+                    val expanded = expandedStates[groupSummary.roomId] == true
+
+                    spaceSummaryItem {
+                        avatarRenderer(avatarRenderer)
+                        id(groupSummary.roomId)
+                        hasChildren(hasChildren)
+                        expanded(expanded)
+                        matrixItem(groupSummary.toMatrixItem())
+                        selected(isSelected)
+                        onMore { callback?.onSpaceSettings(groupSummary) }
+                        listener { callback?.onSpaceSelected(groupSummary) }
+                        toggleExpand { callback?.onToggleExpand(groupSummary) }
+                    }
+
+                    if (hasChildren && expanded) {
+                        // it's expanded
+                            subSpaces?.forEach { child ->
+                                summaries.firstOrNull { it.roomId == child.childRoomId }?.let {  childSum ->
+                                    val isSelected = childSum.roomId == selected?.roomId
+                                    spaceSummaryItem {
+                                        avatarRenderer(avatarRenderer)
+                                        id(child.childRoomId)
+                                        hasChildren(false)
+                                        selected(isSelected)
+                                        matrixItem(MatrixItem.RoomItem(child.childRoomId, child.name, child.avatarUrl))
+                                        listener { callback?.onSpaceSelected(childSum) }
+                                        indent(1)
+                                    }
+                                }
+                            }
+                    }
+                }
+
+// Temporary item to create a new Space (will move with final design)
 
         genericButtonItem {
             id("create")
@@ -121,6 +166,7 @@ class SpaceSummaryController @Inject constructor(
     interface Callback {
         fun onSpaceSelected(spaceSummary: RoomSummary)
         fun onSpaceSettings(spaceSummary: RoomSummary)
+        fun onToggleExpand(spaceSummary: RoomSummary)
         fun onAddSpaceSelected()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index af151a1624..e3deca5367 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.spaces
 
 import android.widget.ImageView
+import android.widget.Space
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
@@ -40,7 +41,9 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
     @EpoxyAttribute var listener: (() -> Unit)? = null
     @EpoxyAttribute var onMore: (() -> Unit)? = null
     @EpoxyAttribute var toggleExpand: (() -> Unit)? = null
-    @EpoxyAttribute var expanded: Boolean? = null
+    @EpoxyAttribute var expanded: Boolean = false
+    @EpoxyAttribute var hasChildren: Boolean = false
+    @EpoxyAttribute var indent: Int = 0
 
     override fun bind(holder: Holder) {
         super.bind(holder)
@@ -57,25 +60,36 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
             holder.moreView.isVisible = false
         }
 
-        when (expanded) {
-            null -> {
-                holder.collapseIndicator.isGone = true
-            }
-            else -> {
-                holder.collapseIndicator.isVisible = true
-                holder.collapseIndicator.setImageDrawable(
-                        ContextCompat.getDrawable(holder.view.context,
-                                if (expanded!!) R.drawable.ic_expand_less else R.drawable.ic_expand_more
-                        )
-                )
-                holder.collapseIndicator.setOnClickListener(
-                        DebouncedClickListener({ _ ->
-                            toggleExpand?.invoke()
-                        })
-                )
-            }
+        if (hasChildren) {
+//            holder.collapseIndicator.setOnClickListener(
+//                    DebouncedClickListener({ _ ->
+//                        toggleExpand?.invoke()
+//                    })
+//            )
+//            when (expanded) {
+//                null -> {
+//                    holder.collapseIndicator.isGone = true
+//                }
+//                else -> {
+            holder.collapseIndicator.isVisible = true
+            holder.collapseIndicator.setImageDrawable(
+                    ContextCompat.getDrawable(holder.view.context,
+                            if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more
+                    )
+            )
+            holder.collapseIndicator.setOnClickListener(
+                    DebouncedClickListener({ _ ->
+                        toggleExpand?.invoke()
+                    })
+            )
+//                }
+//            }
+        } else {
+            holder.collapseIndicator.isGone = true
         }
 
+        holder.indentSpace.isVisible = indent > 0
+
         avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
     }
 
@@ -90,5 +104,6 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
         val moreView by bind<ImageView>(R.id.groupTmpLeave)
         val collapseIndicator by bind<ImageView>(R.id.groupChildrenCollapse)
+        val indentSpace by bind<Space>(R.id.indent)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index fd7dbd006c..1f15d76a80 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -51,6 +51,7 @@ const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
 sealed class SpaceListAction : VectorViewModelAction {
     data class SelectSpace(val spaceSummary: RoomSummary) : SpaceListAction()
     data class LeaveSpace(val spaceSummary: RoomSummary) : SpaceListAction()
+    data class ToggleExpand(val spaceSummary: RoomSummary) : SpaceListAction()
     object AddSpace : SpaceListAction()
 }
 
@@ -65,7 +66,9 @@ sealed class SpaceListViewEvents : VectorViewEvents {
 
 data class SpaceListViewState(
         val asyncSpaces: Async<List<RoomSummary>> = Uninitialized,
-        val selectedSpace: RoomSummary? = null
+        val selectedSpace: RoomSummary? = null,
+        val rootSpaces: List<RoomSummary>? = null,
+        val expandedStates: Map<String, Boolean> = emptyMap()
 ) : MvRxState
 
 class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
@@ -132,6 +135,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
             is SpaceListAction.SelectSpace -> handleSelectSpace(action)
             is SpaceListAction.LeaveSpace -> handleLeaveSpace(action)
             SpaceListAction.AddSpace -> handleAddSpace()
+            is SpaceListAction.ToggleExpand -> handleToggleExpand(action)
         }
     }
 
@@ -159,6 +163,15 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         }
     }
 
+    private fun handleToggleExpand(action: SpaceListAction.ToggleExpand) = withState { state ->
+        val updatedToggleStates = state.expandedStates.toMutableMap().apply {
+            this[action.spaceSummary.roomId] = !(this[action.spaceSummary.roomId] ?: false)
+        }
+        setState {
+            copy(expandedStates = updatedToggleStates)
+        }
+    }
+
     private fun handleLeaveSpace(action: SpaceListAction.LeaveSpace) {
         viewModelScope.launch {
             awaitCallback {
@@ -199,7 +212,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                         .rx()
                         .liveSpaceSummaries(spaceSummaryQueryParams),
                 BiFunction { allCommunityGroup, communityGroups ->
-                    listOf(allCommunityGroup) + communityGroups
+                    (listOf(allCommunityGroup) + communityGroups)
                 }
         )
                 .execute { async ->
@@ -209,7 +222,11 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                     } else {
                         async()?.firstOrNull()
                     }
-                    copy(asyncSpaces = async, selectedSpace = newSelectedGroup)
+                    copy(
+                            asyncSpaces = async,
+                            selectedSpace = newSelectedGroup,
+                            rootSpaces = session.spaceService().getRootSpaceSummaries()
+                    )
                 }
     }
 }
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index ce3b5c69bc..fc7b43216a 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -10,6 +10,16 @@
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground">
 
+    <Space
+        android:id="@+id/indent"
+        android:layout_width="30dp"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
     <ImageView
         android:id="@+id/groupAvatarImageView"
         android:layout_width="42dp"
@@ -19,7 +29,7 @@
         android:contentDescription="@string/avatar"
         android:duplicateParentState="true"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@id/indent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@tools:sample/avatars" />
 
@@ -46,31 +56,33 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
+        android:background="?selectableItemBackground"
+        android:clickable="true"
         android:importantForAccessibility="no"
-        tools:src="@drawable/ic_expand_more_white"
         android:src="@drawable/ic_expand_less_white"
         android:visibility="gone"
-        tools:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toStartOf="@+id/groupTmpLeave"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?riotx_text_primary"
-        tools:ignore="MissingPrefix" />
+        tools:ignore="MissingPrefix"
+        tools:src="@drawable/ic_expand_more_white"
+        tools:visibility="visible" />
 
     <ImageView
         android:id="@+id/groupTmpLeave"
-        android:clickable="true"
-        android:background="?selectableItemBackground"
         android:layout_width="30dp"
         android:layout_height="30dp"
-        android:padding="4dp"
         android:layout_marginEnd="4dp"
+        android:background="?selectableItemBackground"
+        android:clickable="true"
         android:importantForAccessibility="no"
+        android:padding="4dp"
         android:src="@drawable/ic_more_vertical"
-        app:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/groupAvatarChevron"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_secondary" />
 
     <ImageView
         android:id="@+id/groupAvatarChevron"
@@ -78,8 +90,8 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="21dp"
         android:importantForAccessibility="no"
-        android:visibility="gone"
         android:src="@drawable/ic_arrow_right"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"

From 55083a5602f39c30c36990b6882b16a8b6a915b9 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 24 Mar 2021 14:37:45 +0100
Subject: [PATCH 128/350] Design review changes

---
 .../relationship/RoomChildRelationInfo.kt     | 16 ++++----
 .../app/core/ui/list/GenericFooterItem.kt     | 10 ++++-
 .../im/vector/app/core/ui/list/GenericItem.kt |  4 +-
 .../form/FormMultiLineEditTextItem.kt         |  2 +-
 .../home/room/list/RoomListViewModel.kt       |  2 +
 .../home/room/list/RoomListViewState.kt       |  2 +
 .../features/spaces/ShareSpaceBottomSheet.kt  |  9 +++--
 .../features/spaces/SpaceCreationActivity.kt  |  1 +
 .../spaces/SpaceSettingsMenuBottomSheet.kt    |  4 +-
 .../create/CreateSpaceDefaultRoomsFragment.kt | 14 +++++--
 .../create/CreateSpaceDetailsFragment.kt      | 11 ++++-
 .../create/SpaceDefaultRoomEpoxyController.kt | 32 +++++++++++----
 .../create/SpaceDetailEpoxyController.kt      | 16 +++++++-
 .../spaces/create/WizardButtonView.kt         |  4 +-
 .../res/drawable/rounded_rect_shape_16.xml    | 11 +++++
 .../res/layout/bottom_sheet_space_invite.xml  | 40 ++++++++++++-------
 .../fragment_space_create_choose_type.xml     | 30 +++++++++-----
 ...agment_space_create_generic_epoxy_form.xml |  4 +-
 .../layout/item_editable_square_avatar.xml    |  2 +-
 .../res/layout/view_space_type_button.xml     |  8 ++--
 vector/src/main/res/values/strings.xml        |  6 ++-
 21 files changed, 166 insertions(+), 62 deletions(-)
 create mode 100644 vector/src/main/res/drawable/rounded_rect_shape_16.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
index 06ab21d8db..5c478c9b25 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
@@ -59,9 +59,10 @@ internal class RoomChildRelationInfo(private val realm: Realm,
      */
     fun getDirectChildrenDescriptions(): List<SpaceChildInfo> {
         return CurrentStateEventEntity.whereType(realm, roomId, EventType.STATE_SPACE_CHILD)
-                .findAll().also {
-                    Timber.v("## Space: Found ${it.count()} m.space.child state events for $roomId")
-                }
+                .findAll()
+//                .also {
+//                    Timber.v("## Space: Found ${it.count()} m.space.child state events for $roomId")
+//                }
                 .mapNotNull {
                     ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.let { scc ->
                         Timber.v("## Space child desc state event $scc")
@@ -81,12 +82,13 @@ internal class RoomChildRelationInfo(private val realm: Realm,
 
     fun getParentDescriptions(): List<SpaceParentInfo> {
         return CurrentStateEventEntity.whereType(realm, roomId, EventType.STATE_SPACE_PARENT)
-                .findAll().also {
-                    Timber.v("## Space: Found ${it.count()} m.space.parent state events for $roomId")
-                }
+                .findAll()
+//                .also {
+//                    Timber.v("## Space: Found ${it.count()} m.space.parent state events for $roomId")
+//                }
                 .mapNotNull {
                     ContentMapper.map(it.root?.content).toModel<SpaceParentContent>()?.let { scc ->
-                        Timber.v("## Space parent desc state event $scc")
+//                        Timber.v("## Space parent desc state event $scc")
                         // Parent where via is not present are ignored.
                         scc.via?.let { via ->
                             SpaceParentInfo(
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
index 2539e59ae4..c0d309fe5b 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
@@ -15,6 +15,7 @@
  */
 package im.vector.app.core.ui.list
 
+import android.graphics.Typeface
 import android.view.Gravity
 import android.widget.TextView
 import androidx.annotation.ColorInt
@@ -36,7 +37,7 @@ import im.vector.app.features.themes.ThemeUtils
 abstract class GenericFooterItem : VectorEpoxyModel<GenericFooterItem.Holder>() {
 
     @EpoxyAttribute
-    var text: String? = null
+    var text: CharSequence? = null
 
     @EpoxyAttribute
     var style: GenericItem.STYLE = GenericItem.STYLE.NORMAL_TEXT
@@ -53,10 +54,17 @@ abstract class GenericFooterItem : VectorEpoxyModel<GenericFooterItem.Holder>()
 
     override fun bind(holder: Holder) {
         super.bind(holder)
+
         holder.text.setTextOrHide(text)
+        holder.text.typeface = Typeface.DEFAULT
         when (style) {
             GenericItem.STYLE.BIG_TEXT    -> holder.text.textSize = 18f
             GenericItem.STYLE.NORMAL_TEXT -> holder.text.textSize = 14f
+            GenericItem.STYLE.SUBHEADER -> holder.text.textSize = 16f
+            GenericItem.STYLE.TITLE -> {
+                holder.text.textSize = 20f
+                holder.text.typeface = Typeface.DEFAULT_BOLD
+            }
         }
         holder.text.gravity = if (centered) Gravity.CENTER_HORIZONTAL else Gravity.START
 
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
index 3a1337e78c..65e80bf7f4 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
@@ -40,7 +40,9 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
 
     enum class STYLE {
         BIG_TEXT,
-        NORMAL_TEXT
+        NORMAL_TEXT,
+        TITLE,
+        SUBHEADER
     }
 
     class Action(var title: String) {
diff --git a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
index 4ba668a051..6c6f6d284d 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
@@ -73,7 +73,7 @@ abstract class FormMultiLineEditTextItem : VectorEpoxyModel<FormMultiLineEditTex
         holder.textInputLayout.error = errorMessage
 
         holder.textInputEditText.typeface = typeFace
-        holder.textInputEditText.textSize = textSizeSp?.toFloat() ?: 12f
+        holder.textInputEditText.textSize = textSizeSp?.toFloat() ?: 14f
         holder.textInputEditText.minLines = minLines
 
         // Update only if text is different and value is not null
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 45a6f2218f..b06dc8dfa6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -27,6 +27,8 @@ import com.airbnb.mvrx.ViewModelContext
 import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.utils.DataSource
+import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.RoomListDisplayMode
 import io.reactivex.schedulers.Schedulers
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index 104a3710f7..e53c3e6bde 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -24,6 +24,8 @@ data class RoomListViewState(
         val displayMode: RoomListDisplayMode,
         val roomFilter: String = "",
         val roomMembershipChanges: Map<String, ChangeMembershipState> = emptyMap()
+        val asyncSuggestedRooms: Async<List<SpaceChildInfo>> = Uninitialized,
+        val suggestedRoomJoiningState: Map<String, Async<Unit>> = emptyMap()
 ) : MvRxState {
 
     constructor(args: RoomListParams) : this(displayMode = args.displayMode)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
index 2a6e3dace9..2f69ba89b9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/ShareSpaceBottomSheet.kt
@@ -21,6 +21,7 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
@@ -64,6 +65,8 @@ class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpa
         val spaceName = summary?.name
         views.descriptionText.text = getString(R.string.invite_people_to_your_space_desc, spaceName)
 
+        // XXX enable back when supported
+        views.inviteByMailButton.isVisible = false
         views.inviteByMailButton.debouncedClicks {
         }
 
@@ -84,9 +87,9 @@ class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpa
             }
         }
 
-        views.skipButton.debouncedClicks {
-            dismiss()
-        }
+//        views.skipButton.debouncedClicks {
+//            dismiss()
+//        }
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index c5dd09ee84..682813dfd9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -66,6 +66,7 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
 
     override fun initUiAndData() {
         super.initUiAndData()
+
         viewModel.subscribe(this) {
             renderState(it)
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index 5153401d39..4477c048dd 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -89,7 +89,9 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
                 }.disposeOnDestroyView()
 
         views.invitePeople.views.bottomSheetActionClickableZone.debouncedClicks {
-            navigator.openInviteUsersToRoom(requireContext(), spaceArgs.spaceId)
+//            navigator.openInviteUsersToRoom(requireContext(), spaceArgs.spaceId)
+            dismiss()
+            ShareSpaceBottomSheet.show(requireFragmentManager(), spaceArgs.spaceId)
         }
 
         views.showMemberList.views.bottomSheetActionClickableZone.debouncedClicks {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
index fb1ed8e5f8..4fe4c6e82a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
@@ -22,13 +22,17 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSpaceCreateGenericEpoxyFormBinding
 import javax.inject.Inject
 
 class CreateSpaceDefaultRoomsFragment @Inject constructor(
         private val epoxyController: SpaceDefaultRoomEpoxyController
-) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(), SpaceDefaultRoomEpoxyController.Listener {
+) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(),
+        SpaceDefaultRoomEpoxyController.Listener,
+        OnBackPressed {
 
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
 
@@ -46,6 +50,7 @@ class CreateSpaceDefaultRoomsFragment @Inject constructor(
         }
 
         views.nextButton.debouncedClicks {
+            view.hideKeyboard()
             sharedViewModel.handle(CreateSpaceAction.NextFromDefaultRooms)
         }
     }
@@ -54,7 +59,8 @@ class CreateSpaceDefaultRoomsFragment @Inject constructor(
         sharedViewModel.handle(CreateSpaceAction.DefaultRoomNameChanged(index, newName))
     }
 
-    // -----------------------------
-    // Epoxy controller listener methods
-    // -----------------------------
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        sharedViewModel.handle(CreateSpaceAction.OnBackPressed)
+        return true
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
index 670876fdf1..3e420ee632 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
@@ -24,6 +24,8 @@ import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
 import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.databinding.FragmentSpaceCreateGenericEpoxyFormBinding
@@ -33,7 +35,7 @@ class CreateSpaceDetailsFragment @Inject constructor(
         private val epoxyController: SpaceDetailEpoxyController,
         private val colorProvider: ColorProvider
 ) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(), SpaceDetailEpoxyController.Listener,
-        GalleryOrCameraDialogHelper.Listener {
+        GalleryOrCameraDialogHelper.Listener, OnBackPressed {
 
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
 
@@ -53,6 +55,7 @@ class CreateSpaceDetailsFragment @Inject constructor(
         }
 
         views.nextButton.debouncedClicks {
+            view.hideKeyboard()
             sharedViewModel.handle(CreateSpaceAction.NextFromDetails)
         }
     }
@@ -60,6 +63,7 @@ class CreateSpaceDetailsFragment @Inject constructor(
     override fun onImageReady(uri: Uri?) {
         sharedViewModel.handle(CreateSpaceAction.SetAvatar(uri))
     }
+
     // -----------------------------
     // Epoxy controller listener methods
     // -----------------------------
@@ -79,4 +83,9 @@ class CreateSpaceDetailsFragment @Inject constructor(
     override fun onTopicChange(newTopic: String) {
         sharedViewModel.handle(CreateSpaceAction.TopicChanged(newTopic))
     }
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        sharedViewModel.handle(CreateSpaceAction.OnBackPressed)
+        return true
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
index a1e46457e3..aa4b2beae4 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
@@ -33,10 +33,12 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
 
     var listener: Listener? = null
 
+//    var shouldForceFocusOnce = true
+
     override fun buildModels(data: CreateSpaceState?) {
         genericFooterItem {
             id("info_help_header")
-            style(GenericItem.STYLE.BIG_TEXT)
+            style(GenericItem.STYLE.TITLE)
             text(stringProvider.getString(R.string.create_spaces_room_public_header, data?.name))
             textColor(colorProvider.getColorFromAttribute(R.attr.riot_primary_text_color))
         }
@@ -47,10 +49,12 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
             textColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary))
         }
 
+        val firstRoomName = data?.defaultRooms?.get(0)
         formEditTextItem {
             id("roomName1")
             enabled(true)
-            value(data?.defaultRooms?.get(0))
+            value(firstRoomName)
+            singleLine(true)
             hint(stringProvider.getString(R.string.create_room_name_section))
             endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
             showBottomSeparator(false)
@@ -59,10 +63,12 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
             }
         }
 
+        val secondRoomName = data?.defaultRooms?.get(1)
         formEditTextItem {
             id("roomName2")
             enabled(true)
-            value(data?.defaultRooms?.get(1))
+            value(secondRoomName)
+            singleLine(true)
             hint(stringProvider.getString(R.string.create_room_name_section))
             endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
             showBottomSeparator(false)
@@ -71,23 +77,35 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
             }
         }
 
+        val thirdRoomName = data?.defaultRooms?.get(2)
         formEditTextItem {
             id("roomName3")
             enabled(true)
-            value(data?.defaultRooms?.get(2))
+            value(thirdRoomName)
+            singleLine(true)
             hint(stringProvider.getString(R.string.create_room_name_section))
             endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
             showBottomSeparator(false)
             onTextChange { text ->
                 listener?.onNameChange(2, text)
             }
+//            onBind { _, view, _ ->
+//                if (shouldForceFocusOnce
+//                        && thirdRoomName.isNullOrBlank()
+//                        && firstRoomName.isNullOrBlank().not()
+//                        && secondRoomName.isNullOrBlank().not()
+//                ) {
+//                    shouldForceFocusOnce = false
+//                    // sad face :(
+//                    view.textInputEditText.post {
+//                        view.textInputEditText.showKeyboard(true)
+//                    }
+//                }
+//            }
         }
     }
 
     interface Listener {
-        //        fun onAvatarDelete()
-//        fun onAvatarChange()
         fun onNameChange(index: Int, newName: String)
-//        fun onTopicChange(newTopic: String)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
index 357b741ff4..96e5ec24c4 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
@@ -34,6 +34,8 @@ class SpaceDetailEpoxyController @Inject constructor(
 
     var listener: Listener? = null
 
+//    var shouldForceFocusOnce = true
+
     override fun buildModels(data: CreateSpaceState?) {
         genericFooterItem {
             id("info_help")
@@ -61,8 +63,18 @@ class SpaceDetailEpoxyController @Inject constructor(
             enabled(true)
             value(data?.name)
             hint(stringProvider.getString(R.string.create_room_name_hint))
+            singleLine(true)
             showBottomSeparator(false)
             errorMessage(data?.nameInlineError)
+//            onBind { _, view, _ ->
+//                if (shouldForceFocusOnce && data?.name.isNullOrBlank()) {
+//                    shouldForceFocusOnce = false
+//                    // sad face :(
+//                    view.textInputEditText.post {
+//                        view.textInputEditText.showKeyboard(true)
+//                    }
+//                }
+//            }
             onTextChange { text ->
                 listener?.onNameChange(text)
             }
@@ -72,9 +84,9 @@ class SpaceDetailEpoxyController @Inject constructor(
             id("topic")
             enabled(true)
             value(data?.topic)
-            hint(stringProvider.getString(R.string.create_room_topic_hint))
+            hint(stringProvider.getString(R.string.create_space_topic_hint))
             showBottomSeparator(false)
-            textSizeSp(15)
+            textSizeSp(16)
             onTextChange { text ->
                 listener?.onTopicChange(text)
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
index a6b9b1978a..ade2b4b00c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/WizardButtonView.kt
@@ -69,8 +69,8 @@ class WizardButtonView @JvmOverloads constructor(context: Context, attrs: Attrib
 //    var action: (() -> Unit)? = null
 
     init {
-        inflate(context, R.layout.view_space_type_button, this)
-        views = ViewSpaceTypeButtonBinding.bind(this)
+        val content = inflate(context, R.layout.view_space_type_button, this)
+        views = ViewSpaceTypeButtonBinding.bind(content)
 
         views.subTitle.setTextOrHide(null)
 
diff --git a/vector/src/main/res/drawable/rounded_rect_shape_16.xml b/vector/src/main/res/drawable/rounded_rect_shape_16.xml
new file mode 100644
index 0000000000..1f456e4c1f
--- /dev/null
+++ b/vector/src/main/res/drawable/rounded_rect_shape_16.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:width="40dp" android:height="40dp"/>
+
+    <solid android:color="?vctr_list_header_background_color" />
+
+    <corners android:radius="16dp" />
+
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index c8d29b2f7d..bf985dbcbb 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -14,11 +14,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="12dp"
         android:gravity="center"
         android:text="@string/invite_people_to_your_space"
         android:textColor="?riotx_text_primary"
-        android:textSize="18sp"
+        android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -26,10 +26,10 @@
         android:id="@+id/descriptionText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="20dp"
         android:gravity="center"
         android:textColor="?riotx_text_secondary"
-        android:textSize="18sp"
+        android:textSize="16sp"
         app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
         app:layout_constraintTop_toBottomOf="@id/headerText"
         app:layout_constraintVertical_bias="1"
@@ -40,40 +40,50 @@
         android:id="@+id/inviteByMailButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_mail"
         app:iconTint="?riotx_text_secondary"
         app:title="@string/invite_by_email" />
 
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="16dp" />
+
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteByMxidButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_add_people"
         app:iconTint="?riotx_text_secondary"
         app:title="@string/invite_by_mxid" />
 
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="16dp" />
+
 
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteByLinkButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
         app:icon="@drawable/ic_share_link"
         app:iconTint="?riotx_text_secondary"
         app:title="@string/invite_by_link">
 
     </im.vector.app.features.spaces.create.WizardButtonView>
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/skipButton"
-        style="@style/VectorButtonStyleOutlined"
-        android:textAllCaps="true"
+
+    <Space
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_vertical_margin"
-        android:textColor="?colorAccent"
-        android:text="@string/skip_for_now"/>
+        android:layout_height="20dp" />
+
+    <!--    <com.google.android.material.button.MaterialButton-->
+    <!--        android:id="@+id/skipButton"-->
+    <!--        style="@style/VectorButtonStyleOutlined"-->
+    <!--        android:layout_width="match_parent"-->
+    <!--        android:layout_height="wrap_content"-->
+    <!--        android:layout_marginTop="@dimen/layout_vertical_margin"-->
+    <!--        android:text="@string/skip_for_now"-->
+    <!--        android:textAllCaps="true"-->
+    <!--        android:textColor="?colorAccent" />-->
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index ddf61aabf8..73e6044a37 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -17,17 +17,17 @@
             android:gravity="center"
             android:text="@string/create_spaces_type_header"
             android:textColor="?riotx_text_secondary"
-            android:textSize="18sp"
+            android:textSize="16sp"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="2dp"
-            android:gravity="start"
+            android:layout_marginBottom="16dp"
+            android:gravity="center"
             android:text="@string/create_spaces_choose_type_label"
             android:textColor="?riotx_text_primary"
-            android:textSize="18sp"
+            android:textSize="20sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
             app:layout_constraintTop_toBottomOf="@id/headerText"
@@ -37,18 +37,18 @@
             android:id="@+id/joinInfoHelpText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:gravity="start"
+            android:layout_marginBottom="24dp"
+            android:gravity="center"
             android:text="@string/create_spaces_join_info_help"
             android:textColor="?riotx_text_secondary"
-            android:textSize="16sp"
+            android:textSize="14sp"
             app:layout_constraintBottom_toTopOf="@id/publicButton" />
 
         <im.vector.app.features.spaces.create.WizardButtonView
             android:id="@+id/publicButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
+            android:layout_marginBottom="16dp"
             app:icon="@drawable/ic_public_room"
             app:layout_constraintBottom_toTopOf="@id/privateButton"
             app:layout_constraintEnd_toEndOf="parent"
@@ -61,11 +61,23 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:icon="@drawable/ic_room_private"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toTopOf="@id/changeLaterText"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:subTitle="@string/space_type_private_desc"
             app:title="@string/space_type_private" />
 
+        <TextView
+            android:id="@+id/changeLaterText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="24dp"
+            android:gravity="center"
+            android:text="@string/create_spaces_you_can_change_later"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
index 3097664e02..7652a540dc 100644
--- a/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
+++ b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
@@ -21,7 +21,6 @@
         android:layout_height="wrap_content"
         android:background="?riotx_background"
         android:elevation="2dp"
-        android:padding="8dp"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <com.google.android.material.button.MaterialButton
@@ -29,6 +28,9 @@
             style="@style/VectorButtonStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="14dp"
+            android:layout_marginEnd="14dp"
+            android:layout_marginBottom="16dp"
             android:text="@string/next_pf" />
 
     </FrameLayout>
diff --git a/vector/src/main/res/layout/item_editable_square_avatar.xml b/vector/src/main/res/layout/item_editable_square_avatar.xml
index 3112b36a65..9fa2cdbbf1 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -13,7 +13,7 @@
         android:id="@+id/itemEditableAvatarImageContainer"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:background="@drawable/rounded_rect_shape_8"
+        android:background="@drawable/rounded_rect_shape_16"
         android:contentDescription="@string/a11y_change_avatar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index 6ddb126469..d48f123bdc 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -6,12 +6,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/rounded_rect_shape_8"
-    android:padding="4dp">
+    android:padding="8dp">
 
     <ImageView
         android:id="@+id/buttonImageView"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:minHeight="56dp"
         android:layout_margin="8dp"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_public_room"
@@ -24,9 +25,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="4dp"
-        android:layout_marginBottom="8dp"
         android:gravity="start"
         android:textColor="?riotx_text_primary"
         android:textSize="16sp"
@@ -34,6 +33,7 @@
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
         app:layout_constraintStart_toEndOf="@id/buttonImageView"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/subTitle"
         app:layout_goneMarginBottom="0dp"
         tools:text="Public" />
 
@@ -44,7 +44,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
-        android:layout_marginBottom="8dp"
         android:gravity="start"
         android:textColor="?riotx_text_secondary"
         android:textSize="12sp"
@@ -53,7 +52,6 @@
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
         app:layout_constraintStart_toEndOf="@id/buttonImageView"
         app:layout_constraintTop_toBottomOf="@id/title"
-        app:layout_goneMarginBottom="8dp"
         tools:text="Open to anyone, best for communities"
         tools:visibility="visible" />
 
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 3e357b3b89..80052f91a3 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3266,6 +3266,7 @@
     <string name="your_public_space">Your public space</string>
     <string name="create_spaces_type_header">Spaces are a new way to group rooms and people</string>
     <string name="create_spaces_choose_type_label">What type of space do you want to create?</string>
+    <string name="create_spaces_you_can_change_later">You can change this later</string>
     <string name="create_spaces_join_info_help">To join an existing space, you need an invite.</string>
     <string name="space_type_public">Public</string>
     <string name="space_type_public_desc">Open to anyone, best for communities</string>
@@ -3276,10 +3277,11 @@
     <string name="create_spaces_details_private_header">Add some details to help people identify it. You can change these at any point.</string>
     <string name="create_space_error_empty_field_space_name">Give it a name to continue.</string>
     <string name="create_spaces_room_public_header">What are some discussions you want to have in %s?</string>
-    <string name="create_spaces_room_public_header_desc">We’ll create rooms for them, and auto-join everyone. You can add more later too.</string>
+    <string name="create_spaces_room_public_header_desc">We’ll create rooms for them. You can add more later too.</string>
     <string name="create_spaces_default_public_room_name">General</string>
     <string name="create_spaces_default_public_random_room_name">Random</string>
     <string name="create_spaces_loading_message">Creating Space…</string>
+    <string name="create_space_topic_hint">Description</string>
     <string name="invite_people_to_your_space">Invite people to your space</string>
     <string name="invite_people_menu">Invite people</string>
     <string name="invite_people_to_your_space_desc">It’s just you at the moment.  %s will be even better with others.</string>
@@ -3294,6 +3296,8 @@
     <string name="room_alias_preview_not_found">This alias is not accessible at this time.\nTry again later, or ask a room admin to check if you have access.</string>
 
     <string name="suggested_rooms_pills_on_empty_text">You’re not in any rooms yet. Below are some suggested rooms, but you can see more with the green button bottom right.</string>
+    <!-- First one is the space name, and the second one is user name -->
+    <string name="suggested_rooms_pills_on_empty_header">Welcome to %1$s, %2$s.</string>
 
     <string name="space_explore_activity_title">Explore rooms</string>
     <string name="leave_space">Leave Space</string>

From 55745655db2a08098cc152588512965fa13b450d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 24 Mar 2021 15:46:25 +0100
Subject: [PATCH 129/350] cleaning

---
 .../java/im/vector/app/core/ui/list/GenericItem.kt   |  8 +++++---
 .../java/im/vector/app/features/home/HomeActivity.kt |  7 ++++++-
 .../features/spaces/SpaceSettingsMenuBottomSheet.kt  | 12 +++++++++---
 .../app/features/spaces/SpaceSummaryController.kt    |  4 ++--
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
index 65e80bf7f4..01d318a25b 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
@@ -89,9 +89,11 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
             holder.titleIcon.isVisible = false
         }
 
-        when (style) {
-            STYLE.BIG_TEXT    -> holder.titleText.textSize = 18f
-            STYLE.NORMAL_TEXT -> holder.titleText.textSize = 14f
+        holder.titleText.textSize =  when (style) {
+            STYLE.BIG_TEXT    -> 18f
+            STYLE.NORMAL_TEXT -> 14f
+            STYLE.TITLE       -> 20f
+            STYLE.SUBHEADER   -> 16f
         }
 
         holder.descriptionText.setTextOrHide(description)
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 452afd434b..6e268736e0 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -56,6 +56,7 @@ import im.vector.app.features.popup.VerificationVectorAlert
 import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
+import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
@@ -168,7 +169,11 @@ class HomeActivity :
                         is HomeActivitySharedAction.ShowSpaceSettings -> {
                             // open bottom sheet
                             SpaceSettingsMenuBottomSheet
-                                    .newInstance(sharedAction.spaceId)
+                                    .newInstance(sharedAction.spaceId, object : SpaceSettingsMenuBottomSheet.InteractionListener {
+                                        override fun onShareSpaceSelected(spaceId: String) {
+                                            ShareSpaceBottomSheet.show(supportFragmentManager, spaceId)
+                                        }
+                                    })
                                     .show(supportFragmentManager, "SPACE_SETTINGS")
                         }
                     }.exhaustive
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index 4477c048dd..29472dcf28 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -58,6 +58,12 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
 
     private val spaceArgs: SpaceBottomSheetSettingsArgs by args()
 
+    interface InteractionListener {
+        fun onShareSpaceSelected(spaceId: String)
+    }
+
+    var interactionListener : InteractionListener?  = null
+
     override fun injectWith(injector: ScreenComponent) {
         injector.inject(this)
     }
@@ -89,9 +95,8 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
                 }.disposeOnDestroyView()
 
         views.invitePeople.views.bottomSheetActionClickableZone.debouncedClicks {
-//            navigator.openInviteUsersToRoom(requireContext(), spaceArgs.spaceId)
             dismiss()
-            ShareSpaceBottomSheet.show(requireFragmentManager(), spaceArgs.spaceId)
+            interactionListener?.onShareSpaceSelected(spaceArgs.spaceId)
         }
 
         views.showMemberList.views.bottomSheetActionClickableZone.debouncedClicks {
@@ -128,8 +133,9 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
     }
 
     companion object {
-        fun newInstance(spaceId: String): SpaceSettingsMenuBottomSheet {
+        fun newInstance(spaceId: String, interactionListener: InteractionListener): SpaceSettingsMenuBottomSheet {
             return SpaceSettingsMenuBottomSheet().apply {
+                this.interactionListener = interactionListener
                 setArguments(SpaceBottomSheetSettingsArgs(spaceId))
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 0417889eaf..2a20889545 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -138,12 +138,12 @@ class SpaceSummaryController @Inject constructor(
                         // it's expanded
                             subSpaces?.forEach { child ->
                                 summaries.firstOrNull { it.roomId == child.childRoomId }?.let {  childSum ->
-                                    val isSelected = childSum.roomId == selected?.roomId
+                                    val isChildSelected = childSum.roomId == selected?.roomId
                                     spaceSummaryItem {
                                         avatarRenderer(avatarRenderer)
                                         id(child.childRoomId)
                                         hasChildren(false)
-                                        selected(isSelected)
+                                        selected(isChildSelected)
                                         matrixItem(MatrixItem.RoomItem(child.childRoomId, child.name, child.avatarUrl))
                                         listener { callback?.onSpaceSelected(childSum) }
                                         indent(1)

From 8754f7772ba110aa8984aa1bb28d43a861643429 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Mar 2021 11:13:14 +0100
Subject: [PATCH 130/350] Invite Space/Room chooser

---
 .../im/vector/app/core/di/ScreenComponent.kt  |   2 +
 .../features/navigation/DefaultNavigator.kt   |  29 ++++-
 .../InviteRoomSpaceChooserBottomSheet.kt      | 100 ++++++++++++++++++
 .../bottom_sheet_space_invite_chooser.xml     |  54 ++++++++++
 vector/src/main/res/values/strings.xml        |   4 +
 5 files changed, 187 insertions(+), 2 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/InviteRoomSpaceChooserBottomSheet.kt
 create mode 100644 vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml

diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index 59939a1318..d4b6178860 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -77,6 +77,7 @@ import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheet
 import im.vector.app.features.share.IncomingShareActivity
 import im.vector.app.features.signout.soft.SoftLogoutActivity
+import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
 import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpaceExploreActivity
@@ -181,6 +182,7 @@ interface ScreenComponent {
     fun inject(bottomSheet: MatrixToBottomSheet)
     fun inject(bottomSheet: ShareSpaceBottomSheet)
     fun inject(bottomSheet: SpaceSettingsMenuBottomSheet)
+    fun inject(bottomSheet: InviteRoomSpaceChooserBottomSheet)
 
     /* ==========================================================================================
      * Others
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index c2986dfbc2..57b690bec2 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -71,6 +71,7 @@ import im.vector.app.features.roomprofile.RoomProfileActivity
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
+import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
 import im.vector.app.features.spaces.SpaceExploreActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.terms.ReviewTermsActivity
@@ -275,8 +276,32 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openInviteUsersToRoom(context: Context, roomId: String) {
-        val intent = InviteUsersToRoomActivity.getIntent(context, roomId)
-        context.startActivity(intent)
+        val selectedSpace = selectedSpaceDataSource.currentValue?.orNull()?.let {
+            sessionHolder.getSafeActiveSession()?.getRoomSummary(it.roomId)
+        }
+        if (vectorPreferences.labSpaces() && selectedSpace != null) {
+            // let user decides if he does it from space or room
+            (context as? AppCompatActivity)?.supportFragmentManager?.let { fm ->
+                InviteRoomSpaceChooserBottomSheet.newInstance(
+                        selectedSpace.roomId,
+                        roomId,
+                        object : InviteRoomSpaceChooserBottomSheet.InteractionListener {
+                            override fun inviteToSpace(spaceId: String) {
+                                val intent = InviteUsersToRoomActivity.getIntent(context, spaceId)
+                                context.startActivity(intent)
+                            }
+
+                            override fun inviteToRoom(roomId: String) {
+                                val intent = InviteUsersToRoomActivity.getIntent(context, roomId)
+                                context.startActivity(intent)
+                            }
+                        }
+                ).show(fm, InviteRoomSpaceChooserBottomSheet::class.java.name)
+            }
+        } else {
+            val intent = InviteUsersToRoomActivity.getIntent(context, roomId)
+            context.startActivity(intent)
+        }
     }
 
     override fun openRoomsFiltering(context: Context) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/InviteRoomSpaceChooserBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/InviteRoomSpaceChooserBottomSheet.kt
new file mode 100644
index 0000000000..bc2a9c604b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/InviteRoomSpaceChooserBottomSheet.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.args
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetSpaceInviteChooserBinding
+import kotlinx.parcelize.Parcelize
+import javax.inject.Inject
+
+class InviteRoomSpaceChooserBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpaceInviteChooserBinding>() {
+
+    @Parcelize
+    data class Args(
+            val spaceId: String,
+            val roomId: String
+    ) : Parcelable
+
+    override val showExpanded = true
+
+    private val inviteArgs: Args by args()
+
+    @Inject
+    lateinit var activeSessionHolder: ActiveSessionHolder
+
+    interface InteractionListener {
+        fun inviteToSpace(spaceId: String)
+        fun inviteToRoom(roomId: String)
+    }
+
+    var interactionListener: InteractionListener? = null
+
+    override fun injectWith(injector: ScreenComponent) {
+        injector.inject(this)
+    }
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetSpaceInviteChooserBinding {
+        return BottomSheetSpaceInviteChooserBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // Not going for full view model for now, as it may change
+
+        val summary = activeSessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(inviteArgs.spaceId)?.spaceSummary()
+
+        val spaceName = summary?.name
+
+        views.inviteToSpaceButton.isVisible = true
+        views.inviteToSpaceButton.title = getString(R.string.invite_to_space_with_name, spaceName)
+        views.inviteToSpaceButton.subTitle = getString(R.string.invite_to_space_with_name_desc, spaceName)
+        views.inviteToSpaceButton.debouncedClicks {
+            dismiss()
+            interactionListener?.inviteToSpace(inviteArgs.spaceId)
+        }
+
+        views.inviteToRoomOnly.isVisible = true
+        views.inviteToRoomOnly.title = getString(R.string.invite_just_to_this_room)
+        views.inviteToRoomOnly.subTitle = getString(R.string.invite_just_to_this_room_desc, spaceName)
+        views.inviteToRoomOnly.debouncedClicks {
+            dismiss()
+            interactionListener?.inviteToRoom(inviteArgs.roomId)
+        }
+    }
+
+    companion object {
+
+        fun newInstance(spaceId: String, roomId: String, interactionListener: InteractionListener)
+                : InviteRoomSpaceChooserBottomSheet {
+            return InviteRoomSpaceChooserBottomSheet().apply {
+                this.interactionListener = interactionListener
+                setArguments(Args(spaceId, roomId))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
new file mode 100644
index 0000000000..03ff7b2fa0
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/callControlsWrapper"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_bottom_sheet_background"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/headerText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:text="@string/invite_people_menu"
+        android:textColor="?riotx_text_primary"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <im.vector.app.features.spaces.create.WizardButtonView
+        android:id="@+id/inviteToSpaceButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_public_room"
+        app:title="@string/invite_to_space_with_name"
+        app:subTitle="@string/invite_to_space_with_name_desc"
+        />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="16dp" />
+
+    <im.vector.app.features.spaces.create.WizardButtonView
+        android:id="@+id/inviteToRoomOnly"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_lock"
+        app:iconTint="?riotx_text_secondary"
+        app:title="@string/invite_just_to_this_room"
+        app:subTitle="@string/invite_just_to_this_room_desc"/>
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="16dp" />
+
+
+
+</LinearLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 80052f91a3..3ec514959a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3288,6 +3288,10 @@
     <string name="invite_by_email">Invite by email</string>
     <string name="invite_by_mxid">Invite by username</string>
     <string name="invite_by_link">Share link</string>
+    <string name="invite_to_space_with_name">Invite to %s</string>
+    <string name="invite_to_space_with_name_desc">"They’ll be able to explore %s"</string>
+    <string name="invite_just_to_this_room">Just to this room</string>
+    <string name="invite_just_to_this_room_desc">"They won’t be a part of %s"</string>
     <!-- First one is the space name, and the second one is the matrix.to link -->
     <string name="share_space_link_message">Join my space %1$s %2$s</string>
     <string name="skip_for_now">Skip for now</string>

From a5af1a6ebd24797b1ef7a38c9a3354ef37cef470 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Mar 2021 16:34:42 +0100
Subject: [PATCH 131/350] Fix invite icons

---
 .../main/res/layout/bottom_sheet_space_invite_chooser.xml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index 03ff7b2fa0..8c259d13b0 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/callControlsWrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -27,7 +26,8 @@
         android:id="@+id/inviteToSpaceButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:icon="@drawable/ic_public_room"
+        app:icon="@drawable/ic_invite_people"
+        app:iconTint="?riotx_text_secondary"
         app:title="@string/invite_to_space_with_name"
         app:subTitle="@string/invite_to_space_with_name_desc"
         />
@@ -40,7 +40,7 @@
         android:id="@+id/inviteToRoomOnly"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:icon="@drawable/ic_lock"
+        app:icon="@drawable/ic_invite_people"
         app:iconTint="?riotx_text_secondary"
         app:title="@string/invite_just_to_this_room"
         app:subTitle="@string/invite_just_to_this_room_desc"/>

From 4c4f68f654797c00966a5178c2aa5cb8c4289f3a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Mar 2021 16:34:50 +0100
Subject: [PATCH 132/350] Fix home icon dark mode

---
 .../vector/app/features/grouplist/HomeSpaceSummaryItem.kt | 4 ++++
 .../im/vector/app/features/home/HomeDetailFragment.kt     | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
index f4c95215b8..2640c03fca 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
@@ -17,6 +17,7 @@
 
 package im.vector.app.features.grouplist
 
+import android.content.res.ColorStateList
 import android.content.res.Resources
 import android.util.TypedValue
 import android.widget.ImageView
@@ -29,6 +30,7 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.features.themes.ThemeUtils
 
 @EpoxyModelClass(layout = R.layout.item_space)
 abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Holder>() {
@@ -40,6 +42,7 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         // mm.. it's reusing the same layout for basic space item
         return R.id.space_item_home
     }
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.rootView.setOnClickListener { listener?.invoke() }
@@ -48,6 +51,7 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         holder.rootView.context.resources
         holder.avatarImageView.background = ContextCompat.getDrawable(holder.view.context, R.drawable.space_home_background)
         holder.avatarImageView.setImageResource(R.drawable.ic_space_home)
+        holder.avatarImageView.imageTintList = ColorStateList.valueOf(ThemeUtils.getColor(holder.view.context, R.attr.riot_primary_text_color))
         holder.avatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
         holder.leaveView.isVisible = false
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index a17d5f16aa..b3aac6e401 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -258,7 +258,13 @@ class HomeDetailFragment @Inject constructor(
                 // Special case
                 views.groupToolbarAvatarImageView.background = ContextCompat.getDrawable(requireContext(), R.drawable.space_home_background)
                 views.groupToolbarAvatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
-                views.groupToolbarAvatarImageView.setImageResource(R.drawable.ic_space_home)
+                ThemeUtils.tintDrawableWithColor(
+                        ContextCompat.getDrawable(requireContext(), R.drawable.ic_space_home)!!,
+                        ThemeUtils.getColor(requireContext(), R.attr.riot_primary_text_color)
+                ).let {
+                    views.groupToolbarAvatarImageView.setImageDrawable(it)
+                }
+
                 views.groupToolbarSpaceTitleView.isVisible = false
             } else {
                 views.groupToolbarAvatarImageView.background = null

From 201b914304609c1dba52219474359c9d0e9e7cd0 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Mar 2021 16:35:05 +0100
Subject: [PATCH 133/350] Fix invite power level for public space

---
 .../sdk/internal/session/space/DefaultSpaceService.kt       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index e6d30e2712..be801cd634 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
@@ -70,6 +71,11 @@ internal class DefaultSpaceService @Inject constructor(
             this.topic = topic
             this.preset = if (isPublic) CreateRoomPreset.PRESET_PUBLIC_CHAT else CreateRoomPreset.PRESET_PRIVATE_CHAT
             this.avatarUri = avatarUri
+            if (isPublic) {
+                this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContentOverride()).copy(
+                        invite = 0
+                )
+            }
         })
     }
 

From dda45f1c2af882b4a3ce003f4e5aae674e8112b5 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 25 Mar 2021 17:12:41 +0100
Subject: [PATCH 134/350] Fix public space guest access & history visibility

---
 .../sdk/session/space/SpaceCreationTest.kt       | 14 ++++++++++++++
 .../room/model/create/CreateRoomParams.kt        |  3 +++
 .../session/room/create/CreateRoomBodyBuilder.kt | 16 +++++++++++++++-
 .../session/space/DefaultSpaceService.kt         |  4 ++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 2a99594321..4900ac9f56 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -28,8 +28,12 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
@@ -80,6 +84,16 @@ class SpaceCreationTest : InstrumentedTest {
         }
         assertEquals(100, powerLevelsContent?.eventsDefault, "Space-rooms should be created with a power level for events_default of 100")
 
+        val guestAccess =  syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_GUEST_ACCESS)?.content
+                ?.toModel<RoomGuestAccessContent>()?.guestAccess
+
+        assertEquals(GuestAccess.CanJoin, guestAccess, "Public space room should be peekable by guest")
+
+        val historyVisibility =  syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_HISTORY_VISIBILITY)?.content
+                ?.toModel<RoomHistoryVisibilityContent>()?.historyVisibility
+
+        assertEquals(RoomHistoryVisibility.WORLD_READABLE, historyVisibility, "Public space room should be world readable")
+
         commonTestHelper.signOutAndClose(session)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index d4b1a8647a..78a4fd8ca7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.api.session.room.model.create
 
 import android.net.Uri
 import org.matrix.android.sdk.api.session.identity.ThreePid
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
@@ -68,6 +69,8 @@ open class CreateRoomParams {
      */
     val invite3pids = mutableListOf<ThreePid>()
 
+    var guestAccess: GuestAccess? = null
+
     /**
      * If set to true, when the room will be created, if cross-signing is enabled and we can get keys for every invited users,
      * the encryption will be enabled on the created room
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 80be49de61..1dae5c170d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -20,8 +20,10 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.toMedium
+import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.internal.crypto.DeviceListManager
@@ -74,7 +76,8 @@ internal class CreateRoomBodyBuilder @Inject constructor(
         val initialStates = listOfNotNull(
                 buildEncryptionWithAlgorithmEvent(params),
                 buildHistoryVisibilityEvent(params),
-                buildAvatarEvent(params)
+                buildAvatarEvent(params),
+                buildGuestAccess(params)
         )
                 .takeIf { it.isNotEmpty() }
 
@@ -123,6 +126,17 @@ internal class CreateRoomBodyBuilder @Inject constructor(
                 }
     }
 
+    private fun buildGuestAccess(params: CreateRoomParams): Event? {
+        return params.guestAccess
+                ?.let {
+                    Event(
+                            type = EventType.STATE_ROOM_GUEST_ACCESS,
+                            stateKey = "",
+                            content = RoomGuestAccessContent(it).toContent()
+                    )
+                }
+    }
+
     /**
      * Add the crypto algorithm to the room creation parameters.
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index be801cd634..e53b8a1e96 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -23,9 +23,11 @@ import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
@@ -75,6 +77,8 @@ internal class DefaultSpaceService @Inject constructor(
                 this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContentOverride()).copy(
                         invite = 0
                 )
+                this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE
+                this.guestAccess = GuestAccess.CanJoin
             }
         })
     }

From 6b8b03e16276b42b32e428e7abf7ba61b8e5fb50 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 26 Mar 2021 10:55:43 +0100
Subject: [PATCH 135/350] Show people you may no in space bottomsheet

---
 .../api/session/room/peeking/PeekResult.kt    |  5 +-
 .../session/room/peeking/PeekRoomTask.kt      | 18 +++-
 .../matrixto/MatrixToBottomSheetState.kt      |  3 +-
 .../matrixto/MatrixToBottomSheetViewModel.kt  | 68 +++++++++-----
 .../matrixto/MatrixToRoomSpaceFragment.kt     | 23 +++++
 .../fragment_matrix_to_room_space_card.xml    | 91 +++++++++++++++++--
 vector/src/main/res/values/strings.xml        |  5 +
 7 files changed, 178 insertions(+), 35 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt
index c213eee08d..888950dc12 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/peeking/PeekResult.kt
@@ -16,6 +16,8 @@
 
 package org.matrix.android.sdk.api.session.room.peeking
 
+import org.matrix.android.sdk.api.util.MatrixItem
+
 sealed class PeekResult {
     data class Success(
             val roomId: String,
@@ -25,7 +27,8 @@ sealed class PeekResult {
             val avatarUrl: String?,
             val numJoinedMembers: Int?,
             val roomType: String?,
-            val viaServers: List<String>
+            val viaServers: List<String>,
+            val someMembers: List<MatrixItem.UserItem>?
     ) : PeekResult()
 
     data class PeekingNotAllowed(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt
index 5d45259304..ac37b3c812 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt
@@ -23,12 +23,14 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.RoomAvatarContent
 import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.RoomNameContent
 import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsFilter
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
+import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.internal.session.room.alias.GetRoomIdByAliasTask
 import org.matrix.android.sdk.internal.session.room.directory.GetPublicRoomTask
 import org.matrix.android.sdk.internal.session.room.directory.GetRoomDirectoryVisibilityTask
@@ -102,7 +104,8 @@ internal class DefaultPeekRoomTask @Inject constructor(
                     topic = publicRepoResult.topic,
                     numJoinedMembers = publicRepoResult.numJoinedMembers,
                     viaServers = serverList,
-                    roomType = null // would be nice to get that from directory...
+                    roomType = null, // would be nice to get that from directory...
+                    someMembers = null
             )
         }
 
@@ -127,11 +130,19 @@ internal class DefaultPeekRoomTask @Inject constructor(
                     ?.let { it.content?.toModel<RoomCanonicalAliasContent>()?.canonicalAlias }
 
             // not sure if it's the right way to do that :/
-            val memberCount = stateEvents
+            val membersEvent = stateEvents
                     .filter { it.type == EventType.STATE_ROOM_MEMBER && it.stateKey?.isNotEmpty() == true }
+
+            val memberCount = membersEvent
                     .distinctBy { it.stateKey }
                     .count()
 
+            val someMembers = membersEvent.mapNotNull { ev ->
+                ev.content?.toModel<RoomMemberContent>()?.let {
+                    MatrixItem.UserItem(ev.stateKey ?: "", it.displayName, it.avatarUrl)
+                }
+            }
+
             val roomType = stateEvents
                     .lastOrNull { it.type == EventType.STATE_ROOM_CREATE }
                     ?.let { it.content?.toModel<RoomCreateContent>()?.type }
@@ -144,7 +155,8 @@ internal class DefaultPeekRoomTask @Inject constructor(
                     topic = topic,
                     numJoinedMembers = memberCount,
                     roomType = roomType,
-                    viaServers = serverList
+                    viaServers = serverList,
+                    someMembers = someMembers
             )
         } catch (failure: Throwable) {
             // Would be M_FORBIDDEN if cannot peek :/
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt
index c0d42d60dd..2f341d48ec 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetState.kt
@@ -29,7 +29,8 @@ data class MatrixToBottomSheetState(
         val linkType: PermalinkData,
         val matrixItem: Async<MatrixItem> = Uninitialized,
         val startChattingState: Async<Unit> = Uninitialized,
-        val roomPeekResult: Async<RoomInfoResult> = Uninitialized
+        val roomPeekResult: Async<RoomInfoResult> = Uninitialized,
+        val peopleYouKnow: Async<List<MatrixItem.UserItem>> = Uninitialized
 ) : MvRxState {
 
     constructor(args: MatrixToBottomSheet.MatrixToArgs) : this(
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index 3ac5218800..55c3826ef3 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -36,7 +36,6 @@ import im.vector.app.features.createdirect.DirectRoomHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -48,7 +47,6 @@ import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
 import org.matrix.android.sdk.internal.util.awaitCallback
-import javax.net.ssl.HttpsURLConnection
 
 class MatrixToBottomSheetViewModel @AssistedInject constructor(
         @Assisted initialState: MatrixToBottomSheetState,
@@ -123,7 +121,10 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                             }
                 } else {
                     session.getRoom(permalinkData.roomIdOrAlias)
-                }?.roomSummary()
+                }
+                        ?.roomSummary()
+                        // don't take if not active, as it could be outdated
+                        ?.takeIf { it.membership.isActive() }
                 val forceRefresh = true
                 if (!forceRefresh && knownRoom != null) {
                     setState {
@@ -154,7 +155,9 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                                     membership = Membership.NONE,
                                     roomType = peekResult.roomType,
                                     viaServers = peekResult.viaServers.takeIf { it.isNotEmpty() } ?: permalinkData.viaParameters
-                            )
+                            ).also {
+                                peekResult.someMembers?.let { checkForKnownMembers(it) }
+                            }
                         }
                         is PeekResult.PeekingNotAllowed -> {
                             RoomInfoResult.PartialInfo(
@@ -190,30 +193,47 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
         }
     }
 
-    private suspend fun resolveSpace(permalinkData: PermalinkData.RoomLink) : PeekResult {
-        try {
-           return session.spaceService().querySpaceChildren(permalinkData.roomIdOrAlias).let {
-               val roomSummary = it.first
-               PeekResult.Success(
-                       roomId = roomSummary.roomId,
-                       alias = roomSummary.canonicalAlias,
-                       avatarUrl = roomSummary.avatarUrl,
-                       name = roomSummary.name,
-                       topic = roomSummary.topic,
-                       numJoinedMembers = roomSummary.joinedMembersCount,
-                       roomType = roomSummary.roomType,
-                       viaServers = emptyList()
-               )
-           }
-        } catch (failure: Throwable) {
-            if (failure is Failure.OtherServerError && failure.httpCode == HttpsURLConnection.HTTP_NOT_FOUND) {
-                return resolveRoom(permalinkData.roomIdOrAlias)
-            } else {
-                throw failure
+    private fun checkForKnownMembers(someMembers: List<MatrixItem.UserItem>) {
+        viewModelScope.launch(Dispatchers.Default) {
+            val knownMembers = someMembers.filter {
+                session.getExistingDirectRoomWithUser(it.id) != null
+            }
+            // put one with avatar first, and take 5
+            val finalRes = (knownMembers.filter { it.avatarUrl != null } + knownMembers.filter { it.avatarUrl == null })
+                    .take(5)
+            setState {
+                copy(
+                        peopleYouKnow = Success(finalRes)
+                )
             }
         }
     }
 
+    private suspend fun resolveSpace(permalinkData: PermalinkData.RoomLink): PeekResult {
+//        try {
+//            return session.spaceService().querySpaceChildren(permalinkData.roomIdOrAlias).let {
+//                val roomSummary = it.first
+//                PeekResult.Success(
+//                        roomId = roomSummary.roomId,
+//                        alias = roomSummary.canonicalAlias,
+//                        avatarUrl = roomSummary.avatarUrl,
+//                        name = roomSummary.name,
+//                        topic = roomSummary.topic,
+//                        numJoinedMembers = roomSummary.joinedMembersCount,
+//                        roomType = roomSummary.roomType,
+//                        viaServers = emptyList(),
+//                        someMembers = null
+//                )
+//            }
+//        } catch (failure: Throwable) {
+//            if (failure is Failure.OtherServerError && failure.httpCode == HttpsURLConnection.HTTP_NOT_FOUND) {
+        return resolveRoom(permalinkData.roomIdOrAlias)
+//            } else {
+//                throw failure
+//            }
+//        }
+    }
+
     private suspend fun resolveUser(userId: String): User {
         return tryOrNull { session.resolveUser(userId) }
         // Create raw user in case the user is not searchable
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index a7b5543157..7d303cfc5e 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -156,6 +156,29 @@ class MatrixToRoomSpaceFragment @Inject constructor(
             }
         }
 
+        when (state.peopleYouKnow) {
+            is Success -> {
+                views.matrixToCardPeopleYouKnowVisibility.isVisible = true
+                val images = listOf(views.knownMember1, views.knownMember2, views.knownMember3, views.knownMember4, views.knownMember5)
+                        .onEach { it.isVisible = false }
+
+                val someYouKnow = state.peopleYouKnow.invoke()
+                someYouKnow.forEachIndexed { index, item ->
+                    images[index].isVisible = true
+                    avatarRenderer.render(item, images[index])
+                }
+                views.peopleYouMayKnowText.setTextOrHide(
+                        resources.getQuantityString(R.plurals.space_people_you_know,
+                                someYouKnow.count(),
+                                someYouKnow.count()
+                        )
+                )
+            }
+            else       -> {
+                views.matrixToCardPeopleYouKnowVisibility.isVisible = false
+            }
+        }
+
         when (state.startChattingState) {
             Uninitialized -> {
                 views.matrixToCardButtonLoading.isVisible = false
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 6f49f15842..198574cab8 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -16,6 +16,7 @@
         android:elevation="4dp"
         android:transitionName="profile"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@tools:sample/avatars" />
@@ -24,10 +25,10 @@
         android:id="@+id/matrixToCardNameText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_vertical_margin_big"
+        android:layout_marginTop="@dimen/layout_vertical_margin"
         android:maxLines="1"
         android:singleLine="true"
-        android:textAlignment="center"
+        android:textAlignment="textStart"
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
@@ -41,10 +42,12 @@
         android:layout_marginTop="4dp"
         android:maxLines="1"
         android:singleLine="true"
-        android:textAlignment="center"
+        android:textAlignment="textStart"
         android:textColor="?riotx_text_secondary"
         android:textSize="15sp"
+        android:visibility="gone"
         app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
+        app:layout_goneMarginTop="0dp"
         tools:text="@sample/matrix.json/data/roomAlias" />
 
     <LinearLayout
@@ -60,6 +63,7 @@
         android:paddingEnd="12dp"
         android:paddingBottom="8dp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/matrixToCardAliasText">
 
@@ -89,12 +93,79 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:maxLines="4"
-        android:textAlignment="center"
+        android:textAlignment="textStart"
         android:textColor="?riotx_text_secondary"
         android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
         tools:text="@sample/matrix.json/data/roomTopic" />
 
+    <ImageView
+        android:id="@+id/knownMember5"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintCircle="@id/knownMember4"
+        app:layout_constraintCircleAngle="90"
+        app:layout_constraintCircleRadius="20dp"
+        tools:ignore="MissingConstraints"
+        tools:src="@tools:sample/avatars" />
+
+    <ImageView
+        android:id="@+id/knownMember4"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintCircle="@id/knownMember3"
+        app:layout_constraintCircleAngle="90"
+        app:layout_constraintCircleRadius="20dp"
+        tools:ignore="MissingConstraints"
+        tools:src="@tools:sample/avatars" />
+
+    <ImageView
+        android:id="@+id/knownMember3"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintCircle="@id/knownMember2"
+        app:layout_constraintCircleAngle="90"
+        app:layout_constraintCircleRadius="20dp"
+        tools:ignore="MissingConstraints"
+        tools:src="@tools:sample/avatars" />
+
+    <ImageView
+        android:id="@+id/knownMember2"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintCircle="@id/knownMember1"
+        app:layout_constraintCircleAngle="90"
+        app:layout_constraintCircleRadius="20dp"
+        tools:ignore="MissingConstraints"
+        tools:src="@tools:sample/avatars" />
+
+    <ImageView
+        android:id="@+id/knownMember1"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginTop="8dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/matrixToCardDescText"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/peopleYouMayKnowText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toBottomOf="@id/knownMember1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/knownMember5"
+        app:layout_constraintTop_toTopOf="@id/knownMember1"
+        tools:text="7 people you may know" />
+
     <com.google.android.material.button.MaterialButton
         android:id="@+id/matrixToCardMainButton"
         android:layout_width="0dp"
@@ -103,7 +174,7 @@
         android:layout_marginBottom="@dimen/layout_vertical_margin_big"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/matrixToCardDescText"
+        app:layout_constraintTop_toBottomOf="@id/knownMember1"
         app:layout_constraintWidth_max="400dp"
         tools:text="@string/join" />
 
@@ -134,11 +205,19 @@
         app:layout_constraintTop_toTopOf="@id/matrixToCardMainButton"
         tools:visibility="visible" />
 
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/matrixToCardPeopleYouKnowVisibility"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="knownMember1,knownMember2,knownMember3,knownMember4,knownMember5,peopleYouMayKnowText"
+        tools:visibility="visible" />
+
     <androidx.constraintlayout.widget.Group
         android:id="@+id/matrixToCardContentVisibility"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:constraint_referenced_ids="matrixToCardNameText,matrixToCardAvatar,matrixToCardNameText,matrixToCardDescText, matrixToCardMainButton, matrixToCardAliasText, matrixToCardSecondaryButton, matrixToMemberPills"
+        android:visibility="gone"
+        app:constraint_referenced_ids="matrixToCardNameText,matrixToCardAvatar,matrixToCardNameText,matrixToCardDescText, matrixToCardMainButton, matrixToCardAliasText, matrixToCardSecondaryButton, matrixToMemberPills,matrixToCardPeopleYouKnowVisibility"
         tools:visibility="visible" />
 
 
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 3ec514959a..7bda547e6c 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3303,6 +3303,11 @@
     <!-- First one is the space name, and the second one is user name -->
     <string name="suggested_rooms_pills_on_empty_header">Welcome to %1$s, %2$s.</string>
 
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d people you know have already joined</item>
+        <item quantity="other">%d people you know have already joined</item>
+    </plurals>
+
     <string name="space_explore_activity_title">Explore rooms</string>
     <string name="leave_space">Leave Space</string>
     <string name="space_leave_prompt_msg">Are you sure you want to leave the space?</string>

From 815cae4d84d37a1aeb5ae7a3770816b7e4a2737b Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 26 Mar 2021 10:56:17 +0100
Subject: [PATCH 136/350] remove enum from rest model

---
 .../api/session/room/model/RoomHistoryVisibility.kt  | 12 ++++--------
 .../room/model/RoomHistoryVisibilityContent.kt       | 11 +++++++++++
 .../sdk/internal/crypto/DefaultCryptoService.kt      |  4 ++--
 .../detail/timeline/format/NoticeEventFormatter.kt   |  2 +-
 .../roomprofile/settings/RoomSettingsViewModel.kt    |  2 +-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
index 06069f2646..e980be93ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
@@ -16,35 +16,31 @@
 
 package org.matrix.android.sdk.api.session.room.model
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#room-history-visibility
  */
-@JsonClass(generateAdapter = false)
 enum class RoomHistoryVisibility {
     /**
      * All events while this is the m.room.history_visibility value may be shared by any
      * participating homeserver with anyone, regardless of whether they have ever joined the room.
      */
-    @Json(name = "world_readable") WORLD_READABLE,
+    WORLD_READABLE,
 
     /**
      * Previous events are always accessible to newly joined members. All events in the
      * room are accessible, even those sent when the member was not a part of the room.
      */
-    @Json(name = "shared") SHARED,
+    SHARED,
 
     /**
      * Events are accessible to newly joined members from the point they were invited onwards.
      * Events stop being accessible when the member's state changes to something other than invite or join.
      */
-    @Json(name = "invited") INVITED,
+    INVITED,
 
     /**
      * Events are accessible to newly joined members from the point they joined the room onwards.
      * Events stop being accessible when the member's state changes to something other than join.
      */
-    @Json(name = "joined") JOINED
+    JOINED
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
index 3ac14e48de..0a09be23f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
@@ -35,3 +35,14 @@ data class RoomHistoryVisibilityContent(
         }
     }
 }
+
+    fun safeHistoryVisibility(): RoomHistoryVisibility? {
+        return when (historyVisibility) {
+            "world_readable" -> RoomHistoryVisibility.WORLD_READABLE
+            "shared" -> RoomHistoryVisibility.SHARED
+            "invited" -> RoomHistoryVisibility.INVITED
+            "joined" -> RoomHistoryVisibility.JOINED
+            else             -> null
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 2163b2a5e0..4a18c29544 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -894,9 +894,9 @@ internal class DefaultCryptoService @Inject constructor(
         }
     }
 
-    private fun onRoomHistoryVisibilityEvent(roomId: String, event: Event) {
+    private fun  onRoomHistoryVisibilityEvent(roomId: String, event: Event) {
         val eventContent = event.content.toModel<RoomHistoryVisibilityContent>()
-        eventContent?.historyVisibility?.let {
+        eventContent?.safeHistoryVisibility()?.let {
             cryptoStore.setShouldEncryptForInvitedMembers(roomId, it != RoomHistoryVisibility.JOINED)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 71504daeff..251d544eac 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -273,7 +273,7 @@ class NoticeEventFormatter @Inject constructor(
     }
 
     private fun formatRoomHistoryVisibilityEvent(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
-        val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.historyVisibility ?: return null
+        val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.safeHistoryVisibility() ?: return null
 
         val historyVisibilitySuffix = roomHistoryVisibilityFormatter.getNoticeSuffix(historyVisibility)
         return if (event.isSentByCurrentUser()) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index bf227ea5e8..05f78a6cef 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -136,7 +136,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                 .mapOptional { it.content.toModel<RoomHistoryVisibilityContent>() }
                 .unwrap()
                 .subscribe {
-                    it.historyVisibility?.let {
+                    it.safeHistoryVisibility()?.let {
                         setState { copy(currentHistoryVisibility = it) }
                     }
                 }

From b380fa065391fc9096e21da00a550188dedb86d5 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 26 Mar 2021 11:30:02 +0100
Subject: [PATCH 137/350] fix copy

---
 vector/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 7bda547e6c..94d6da777a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3304,7 +3304,7 @@
     <string name="suggested_rooms_pills_on_empty_header">Welcome to %1$s, %2$s.</string>
 
     <plurals name="space_people_you_know">
-        <item quantity="one">%d people you know have already joined</item>
+        <item quantity="one">%d person you know has already joined</item>
         <item quantity="other">%d people you know have already joined</item>
     </plurals>
 

From 46290f1ed490bfa1aaa1c391ef44bebb31e34e79 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 15:00:02 +0200
Subject: [PATCH 138/350] Benoit Review: cleanup

---
 .../sdk/session/space/SpaceCreationTest.kt    |  8 ++---
 .../sdk/session/space/SpaceHierarchyTest.kt   |  4 +--
 .../android/sdk/api/session/room/Room.kt      |  3 ++
 .../session/room/RoomSummaryQueryParams.kt    | 10 ++++---
 .../android/sdk/api/session/space/Space.kt    |  7 +++++
 .../sdk/internal/session/room/SpaceGetter.kt  | 10 ++-----
 .../room/summary/RoomSummaryDataSource.kt     |  5 ++--
 .../internal/session/space/DefaultSpace.kt    | 29 +++++++++++++------
 .../features/spaces/SpacesListViewModel.kt    |  2 +-
 .../spaces/create/CreateSpaceViewModelTask.kt |  2 +-
 10 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 4900ac9f56..be8bde0721 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -60,7 +60,7 @@ class SpaceCreationTest : InstrumentedTest {
         val spaceId: String
         runBlocking {
             spaceId = session.spaceService().createSpace(roomName, topic, null, true)
-            // wait a bit to let the summry update it self :/
+            // wait a bit to let the summary update it self :/
             delay(400)
         }
 
@@ -100,14 +100,14 @@ class SpaceCreationTest : InstrumentedTest {
     @Test
     fun testJoinSimplePublicSpace() {
         val aliceSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
-        val bobSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
+        val bobSession = commonTestHelper.createAccount("bob", SessionTestParams(true))
 
         val roomName = "My Space"
         val topic = "A public space for test"
         val spaceId: String
         runBlocking {
             spaceId = aliceSession.spaceService().createSpace(roomName, topic, null, true)
-            // wait a bit to let the summry update it self :/
+            // wait a bit to let the summary update it self :/
             delay(400)
         }
 
@@ -131,7 +131,7 @@ class SpaceCreationTest : InstrumentedTest {
     @Test
     fun testSimplePublicSpaceWithChildren() {
         val aliceSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
-        val bobSession = commonTestHelper.createAccount("alice", SessionTestParams(true))
+        val bobSession = commonTestHelper.createAccount("bob", SessionTestParams(true))
 
         val roomName = "My Space"
         val topic = "A public space for test"
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index b3396fed6f..4e0284469b 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -48,13 +48,13 @@ class SpaceHierarchyTest : InstrumentedTest {
 
     @Test
     fun createCanonicalChildRelation() {
-        val session = commonTestHelper.createAccount("Jhon", SessionTestParams(true))
+        val session = commonTestHelper.createAccount("John", SessionTestParams(true))
         val spaceName = "My Space"
         val topic = "A public space for test"
         val spaceId: String
         runBlocking {
             spaceId = session.spaceService().createSpace(spaceName, topic, null, true)
-            // wait a bit to let the summry update it self :/
+            // wait a bit to let the summary update it self :/
             delay(400)
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 1bbc090ef0..6784df565f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -94,5 +94,8 @@ interface Room :
                afterLimit: Int,
                includeProfile: Boolean): SearchResult
 
+    /**
+     * Use this room as a Space, if the type is correct.
+     */
     fun asSpace(): Space?
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index 47618e31c9..f50d8f76ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -31,10 +31,11 @@ fun spaceSummaryQueryParams(init: (RoomSummaryQueryParams.Builder.() -> Unit) =
     return RoomSummaryQueryParams.Builder()
             .apply(init)
             .apply {
-                this.includeType = listOf(RoomType.SPACE)
-                this.excludeType = null
-                this.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-            }.build()
+                includeType = listOf(RoomType.SPACE)
+                excludeType = null
+                roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            }
+            .build()
 }
 
 enum class RoomCategoryFilter {
@@ -42,6 +43,7 @@ enum class RoomCategoryFilter {
     ONLY_ROOMS,
     ALL
 }
+
 /**
  * This class can be used to filter room summaries to use with:
  * [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index ba76276fde..fda1465ac8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -16,13 +16,20 @@
 
 package org.matrix.android.sdk.api.session.space
 
+import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.Cancelable
 
 interface Space {
 
     fun asRoom(): Room
 
+    val spaceId: String
+
+    fun leave(reason: String? = null,
+              callback: MatrixCallback<Unit>): Cancelable
+
     /**
      * A current snapshot of [RoomSummary] associated with the space
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt
index 0f64bb60ad..fed3ff542b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/SpaceGetter.kt
@@ -16,10 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.room
 
-import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.space.Space
-import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
-import org.matrix.android.sdk.internal.session.space.DefaultSpace
 import javax.inject.Inject
 
 internal interface SpaceGetter {
@@ -27,13 +24,10 @@ internal interface SpaceGetter {
 }
 
 internal class DefaultSpaceGetter @Inject constructor(
-        private val roomGetter: RoomGetter,
-        private val spaceSummaryDataSource: RoomSummaryDataSource
+        private val roomGetter: RoomGetter
 ) : SpaceGetter {
 
     override fun get(spaceId: String): Space? {
-        return roomGetter.getRoom(spaceId)
-                ?.takeIf { it.roomSummary()?.roomType == RoomType.SPACE }
-                ?.let { DefaultSpace(it, spaceSummaryDataSource) }
+        return roomGetter.getRoom(spaceId)?.asSpace()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index c2d4e318cb..d91f3acfb1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -98,9 +98,8 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
     }
 
     fun getSpaceSummary(roomIdOrAlias: String): RoomSummary? {
-        return getRoomSummary(roomIdOrAlias).let {
-            it?.takeIf { it.roomType == RoomType.SPACE }
-        }
+        return getRoomSummary(roomIdOrAlias)
+                ?.takeIf { it.roomType == RoomType.SPACE }
     }
 
     fun getSpaceSummaryLive(roomId: String): LiveData<Optional<RoomSummary>> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 76496769ec..6bcdf63bd8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.space
 
+import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
@@ -24,23 +25,33 @@ import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 
-internal class DefaultSpace(private val room: Room, private val spaceSummaryDataSource: RoomSummaryDataSource) : Space {
+internal class DefaultSpace(
+        private val room: Room,
+        private val spaceSummaryDataSource: RoomSummaryDataSource
+) : Space {
 
     override fun asRoom(): Room {
         return room
     }
 
+    override val spaceId = room.roomId
+
+    override fun leave(reason: String?, callback: MatrixCallback<Unit>): Cancelable {
+        return room.leave(reason, callback)
+    }
+
     override fun spaceSummary(): RoomSummary? {
-        return spaceSummaryDataSource.getSpaceSummary(asRoom().roomId)
+        return spaceSummaryDataSource.getSpaceSummary(room.roomId)
     }
 
     override suspend fun addChildren(roomId: String, viaServers: List<String>,
                                      order: String?,
                                      autoJoin: Boolean,
                                      suggested: Boolean?) {
-        asRoom().sendStateEvent(
+        room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
@@ -53,14 +64,14 @@ internal class DefaultSpace(private val room: Room, private val spaceSummaryData
     }
 
     override suspend fun removeRoom(roomId: String) {
-        val existing = asRoom().getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
                 .firstOrNull()
                 ?.content.toModel<SpaceChildContent>()
                 ?: // should we throw here?
                 return
 
         // edit state event and set via to null
-        asRoom().sendStateEvent(
+        room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
@@ -72,13 +83,13 @@ internal class DefaultSpace(private val room: Room, private val spaceSummaryData
     }
 
     override suspend fun setChildrenOrder(roomId: String, order: String?) {
-        val existing = asRoom().getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
                 .firstOrNull()
                 ?.content.toModel<SpaceChildContent>()
                 ?: throw IllegalArgumentException("$roomId is not a child of this space")
 
         // edit state event and set via to null
-        asRoom().sendStateEvent(
+        room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
@@ -90,13 +101,13 @@ internal class DefaultSpace(private val room: Room, private val spaceSummaryData
     }
 
     override suspend fun setChildrenAutoJoin(roomId: String, autoJoin: Boolean) {
-        val existing = asRoom().getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
                 .firstOrNull()
                 ?.content.toModel<SpaceChildContent>()
                 ?: throw IllegalArgumentException("$roomId is not a child of this space")
 
         // edit state event and set via to null
-        asRoom().sendStateEvent(
+        room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 1f15d76a80..8c13584b43 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -176,7 +176,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         viewModelScope.launch {
             awaitCallback {
                 tryOrNull("Failed to leave space ${action.spaceSummary.roomId}") {
-                    session.spaceService().getSpace(action.spaceSummary.roomId)?.asRoom()?.leave(null, it)
+                    session.spaceService().getSpace(action.spaceSummary.roomId)?.leave(null, it)
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
index 154c75ad82..df4b8a8cfe 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -80,7 +80,7 @@ class CreateSpaceViewModelTask @Inject constructor(
                             // set canonical
                             session.spaceService().setSpaceParent(
                                     roomId,
-                                    createdSpace.asRoom().roomId,
+                                    createdSpace.spaceId,
                                     true,
                                     via
                             )

From 2cccbb3fce7dcd8e3f8b8e0ec50080e42a7ac95b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 14:46:12 +0200
Subject: [PATCH 139/350] Benoit Review: avoid duplicate (again) class
 PowerLevelsContent

---
 .../session/room/model/PowerLevelsContent.kt  | 33 +++++----
 .../room/model/PowerLevelsContentOverride.kt  | 67 -------------------
 .../room/model/create/CreateRoomParams.kt     |  4 +-
 .../room/powerlevels/PowerLevelsHelper.kt     | 28 +++++---
 .../api/session/space/CreateSpaceParams.kt    |  4 +-
 .../session/room/create/CreateRoomBody.kt     |  4 +-
 .../room/state/SafePowerLevelContent.kt       | 23 +++----
 .../session/space/DefaultSpaceService.kt      |  3 +-
 .../timeline/format/NoticeEventFormatter.kt   |  4 +-
 .../permissions/RoomPermissionsController.kt  | 25 ++++---
 .../permissions/RoomPermissionsViewModel.kt   |  4 +-
 11 files changed, 77 insertions(+), 122 deletions(-)
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContentOverride.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt
index e778f5740d..5c46db7166 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt
@@ -28,43 +28,43 @@ data class PowerLevelsContent(
         /**
          * The level required to ban a user. Defaults to 50 if unspecified.
          */
-        @Json(name = "ban") val ban: Int = Role.Moderator.value,
+        @Json(name = "ban") val ban: Int? = null,
         /**
          * The level required to kick a user. Defaults to 50 if unspecified.
          */
-        @Json(name = "kick") val kick: Int = Role.Moderator.value,
+        @Json(name = "kick") val kick: Int? = null,
         /**
          * The level required to invite a user. Defaults to 50 if unspecified.
          */
-        @Json(name = "invite") val invite: Int = Role.Moderator.value,
+        @Json(name = "invite") val invite: Int? = null,
         /**
          * The level required to redact an event. Defaults to 50 if unspecified.
          */
-        @Json(name = "redact") val redact: Int = Role.Moderator.value,
+        @Json(name = "redact") val redact: Int? = null,
         /**
          * The default level required to send message events. Can be overridden by the events key. Defaults to 0 if unspecified.
          */
-        @Json(name = "events_default") val eventsDefault: Int = Role.Default.value,
+        @Json(name = "events_default") val eventsDefault: Int? = null,
         /**
          * The level required to send specific event types. This is a mapping from event type to power level required.
          */
-        @Json(name = "events") val events: Map<String, Int> = emptyMap(),
+        @Json(name = "events") val events: Map<String, Int>? = null,
         /**
          * The default power level for every user in the room, unless their user_id is mentioned in the users key. Defaults to 0 if unspecified.
          */
-        @Json(name = "users_default") val usersDefault: Int = Role.Default.value,
+        @Json(name = "users_default") val usersDefault: Int? = null,
         /**
          * The power levels for specific users. This is a mapping from user_id to power level for that user.
          */
-        @Json(name = "users") val users: Map<String, Int> = emptyMap(),
+        @Json(name = "users") val users: Map<String, Int>? = null,
         /**
          * The default level required to send state events. Can be overridden by the events key. Defaults to 50 if unspecified.
          */
-        @Json(name = "state_default") val stateDefault: Int = Role.Moderator.value,
+        @Json(name = "state_default") val stateDefault: Int? = null,
         /**
          * The power level requirements for specific notification types. This is a mapping from key to power level for that notifications key.
          */
-        @Json(name = "notifications") val notifications: Map<String, Any> = emptyMap()
+        @Json(name = "notifications") val notifications: Map<String, Any>? = null
 ) {
     /**
      * Return a copy of this content with a new power level for the specified user
@@ -74,7 +74,7 @@ data class PowerLevelsContent(
      */
     fun setUserPowerLevel(userId: String, powerLevel: Int?): PowerLevelsContent {
         return copy(
-                users = users.toMutableMap().apply {
+                users = users.orEmpty().toMutableMap().apply {
                     if (powerLevel == null || powerLevel == usersDefault) {
                         remove(userId)
                     } else {
@@ -91,7 +91,7 @@ data class PowerLevelsContent(
      * @return the level, default to Moderator if the key is not found
      */
     fun notificationLevel(key: String): Int {
-        return when (val value = notifications[key]) {
+        return when (val value = notifications.orEmpty()[key]) {
             // the first implementation was a string value
             is String -> value.toInt()
             is Double -> value.toInt()
@@ -107,3 +107,12 @@ data class PowerLevelsContent(
         const val NOTIFICATIONS_ROOM_KEY = "room"
     }
 }
+
+// Fallback to default value, defined in the Matrix specification
+fun PowerLevelsContent.banOrDefault() = ban ?: Role.Moderator.value
+fun PowerLevelsContent.kickOrDefault() = kick ?: Role.Moderator.value
+fun PowerLevelsContent.inviteOrDefault() = invite ?: Role.Moderator.value
+fun PowerLevelsContent.redactOrDefault() = redact ?: Role.Moderator.value
+fun PowerLevelsContent.eventsDefaultOrDefault() = eventsDefault ?: Role.Default.value
+fun PowerLevelsContent.usersDefaultOrDefault() = usersDefault ?: Role.Default.value
+fun PowerLevelsContent.stateDefaultOrDefault() = stateDefault ?: Role.Moderator.value
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContentOverride.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContentOverride.kt
deleted file mode 100644
index 577228cf44..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContentOverride.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.api.session.room.model
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-/**
- * Class representing the EventType.EVENT_TYPE_STATE_ROOM_POWER_LEVELS state event content.
- */
-@JsonClass(generateAdapter = true)
-data class PowerLevelsContentOverride(
-        /**
-         * The level required to ban a user. Defaults to 50 if unspecified.
-         */
-        @Json(name = "ban") val ban: Int? = null,
-        /**
-         * The level required to kick a user. Defaults to 50 if unspecified.
-         */
-        @Json(name = "kick") val kick: Int? = null,
-        /**
-         * The level required to invite a user. Defaults to 50 if unspecified.
-         */
-        @Json(name = "invite") val invite: Int? = null,
-        /**
-         * The level required to redact an event. Defaults to 50 if unspecified.
-         */
-        @Json(name = "redact") val redact: Int? = null,
-        /**
-         * The default level required to send message events. Can be overridden by the events key. Defaults to 0 if unspecified.
-         */
-        @Json(name = "events_default") val eventsDefault: Int? = null,
-        /**
-         * The level required to send specific event types. This is a mapping from event type to power level required.
-         */
-        @Json(name = "events") val events: Map<String, Int>? = null,
-        /**
-         * The default power level for every user in the room, unless their user_id is mentioned in the users key. Defaults to 0 if unspecified.
-         */
-        @Json(name = "users_default") val usersDefault: Int? = null,
-        /**
-         * The power levels for specific users. This is a mapping from user_id to power level for that user.
-         */
-        @Json(name = "users") val users: Map<String, Int>? = null,
-        /**
-         * The default level required to send state events. Can be overridden by the events key. Defaults to 50 if unspecified.
-         */
-        @Json(name = "state_default") val stateDefault: Int? = null,
-        /**
-         * The power level requirements for specific notification types. This is a mapping from key to power level for that notifications key.
-         */
-        @Json(name = "notifications") val notifications: Map<String, Any>? = null
-)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index 78a4fd8ca7..24e4fe36d2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.session.room.model.create
 import android.net.Uri
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
-import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
@@ -128,7 +128,7 @@ open class CreateRoomParams {
     /**
      * The power level content to override in the default power level event
      */
-    var powerLevelContentOverride: PowerLevelsContentOverride? = null
+    var powerLevelContentOverride: PowerLevelsContent? = null
 
     /**
      * Mark as a direct message room.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
index eb8dabb48e..99139723a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
@@ -18,6 +18,13 @@
 package org.matrix.android.sdk.api.session.room.powerlevels
 
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.banOrDefault
+import org.matrix.android.sdk.api.session.room.model.eventsDefaultOrDefault
+import org.matrix.android.sdk.api.session.room.model.inviteOrDefault
+import org.matrix.android.sdk.api.session.room.model.kickOrDefault
+import org.matrix.android.sdk.api.session.room.model.redactOrDefault
+import org.matrix.android.sdk.api.session.room.model.stateDefaultOrDefault
+import org.matrix.android.sdk.api.session.room.model.usersDefaultOrDefault
 
 /**
  * This class is an helper around PowerLevelsContent.
@@ -31,8 +38,9 @@ class PowerLevelsHelper(private val powerLevelsContent: PowerLevelsContent) {
      * @return the power level
      */
     fun getUserPowerLevelValue(userId: String): Int {
-        return powerLevelsContent.users.get(userId)
-                ?: powerLevelsContent.usersDefault
+        return powerLevelsContent.users
+                ?.get(userId)
+                ?: powerLevelsContent.usersDefaultOrDefault()
     }
 
     /**
@@ -44,7 +52,7 @@ class PowerLevelsHelper(private val powerLevelsContent: PowerLevelsContent) {
     fun getUserRole(userId: String): Role {
         val value = getUserPowerLevelValue(userId)
         // I think we should use powerLevelsContent.usersDefault, but Ganfra told me that it was like that on riot-Web
-        return Role.fromValue(value, powerLevelsContent.eventsDefault)
+        return Role.fromValue(value, powerLevelsContent.eventsDefaultOrDefault())
     }
 
     /**
@@ -58,11 +66,11 @@ class PowerLevelsHelper(private val powerLevelsContent: PowerLevelsContent) {
     fun isUserAllowedToSend(userId: String, isState: Boolean, eventType: String?): Boolean {
         return if (userId.isNotEmpty()) {
             val powerLevel = getUserPowerLevelValue(userId)
-            val minimumPowerLevel = powerLevelsContent.events[eventType]
+            val minimumPowerLevel = powerLevelsContent.events?.get(eventType)
                     ?: if (isState) {
-                        powerLevelsContent.stateDefault
+                        powerLevelsContent.stateDefaultOrDefault()
                     } else {
-                        powerLevelsContent.eventsDefault
+                        powerLevelsContent.eventsDefaultOrDefault()
                     }
             powerLevel >= minimumPowerLevel
         } else false
@@ -75,7 +83,7 @@ class PowerLevelsHelper(private val powerLevelsContent: PowerLevelsContent) {
      */
     fun isUserAbleToInvite(userId: String): Boolean {
         val powerLevel = getUserPowerLevelValue(userId)
-        return powerLevel >= powerLevelsContent.invite
+        return powerLevel >= powerLevelsContent.inviteOrDefault()
     }
 
     /**
@@ -85,7 +93,7 @@ class PowerLevelsHelper(private val powerLevelsContent: PowerLevelsContent) {
      */
     fun isUserAbleToBan(userId: String): Boolean {
         val powerLevel = getUserPowerLevelValue(userId)
-        return powerLevel >= powerLevelsContent.ban
+        return powerLevel >= powerLevelsContent.banOrDefault()
     }
 
     /**
@@ -95,7 +103,7 @@ class PowerLevelsHelper(private val powerLevelsContent: PowerLevelsContent) {
      */
     fun isUserAbleToKick(userId: String): Boolean {
         val powerLevel = getUserPowerLevelValue(userId)
-        return powerLevel >= powerLevelsContent.kick
+        return powerLevel >= powerLevelsContent.kickOrDefault()
     }
 
     /**
@@ -105,6 +113,6 @@ class PowerLevelsHelper(private val powerLevelsContent: PowerLevelsContent) {
      */
     fun isUserAbleToRedact(userId: String): Boolean {
         val powerLevel = getUserPowerLevelValue(userId)
-        return powerLevel >= powerLevelsContent.redact
+        return powerLevel >= powerLevelsContent.redactOrDefault()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt
index 9776baf567..42e6584838 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/CreateSpaceParams.kt
@@ -16,7 +16,7 @@
 
 package org.matrix.android.sdk.api.session.space
 
-import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 
@@ -28,7 +28,7 @@ class CreateSpaceParams : CreateRoomParams() {
 
         // Space-rooms should be created with a power level for events_default of 100,
         // to prevent the rooms accidentally/maliciously clogging up with messages from random members of the space.
-        powerLevelContentOverride = PowerLevelsContentOverride(
+        powerLevelContentOverride = PowerLevelsContent(
                 eventsDefault = 100
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
index a3f6cd53cd..13d403e2e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.internal.session.room.create
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
+import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
@@ -111,5 +111,5 @@ internal data class CreateRoomBody(
          * The power level content to override in the default power level event
          */
         @Json(name = "power_level_content_override")
-        val powerLevelContentOverride: PowerLevelsContentOverride?
+        val powerLevelContentOverride: PowerLevelsContent?
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
index a97709e38b..197b4f8688 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SafePowerLevelContent.kt
@@ -21,22 +21,21 @@ import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
-import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import org.matrix.android.sdk.api.util.JsonDict
 
 @JsonClass(generateAdapter = true)
 internal data class SerializablePowerLevelsContent(
-        @Json(name = "ban") val ban: Int = Role.Moderator.value,
-        @Json(name = "kick") val kick: Int = Role.Moderator.value,
-        @Json(name = "invite") val invite: Int = Role.Moderator.value,
-        @Json(name = "redact") val redact: Int = Role.Moderator.value,
-        @Json(name = "events_default") val eventsDefault: Int = Role.Default.value,
-        @Json(name = "events") val events: Map<String, Int> = emptyMap(),
-        @Json(name = "users_default") val usersDefault: Int = Role.Default.value,
-        @Json(name = "users") val users: Map<String, Int> = emptyMap(),
-        @Json(name = "state_default") val stateDefault: Int = Role.Moderator.value,
+        @Json(name = "ban") val ban: Int?,
+        @Json(name = "kick") val kick: Int?,
+        @Json(name = "invite") val invite: Int?,
+        @Json(name = "redact") val redact: Int?,
+        @Json(name = "events_default") val eventsDefault: Int?,
+        @Json(name = "events") val events: Map<String, Int>?,
+        @Json(name = "users_default") val usersDefault: Int?,
+        @Json(name = "users") val users: Map<String, Int>?,
+        @Json(name = "state_default") val stateDefault: Int?,
         // `Int` is the diff here (instead of `Any`)
-        @Json(name = "notifications") val notifications: Map<String, Int> = emptyMap()
+        @Json(name = "notifications") val notifications: Map<String, Int>?
 )
 
 internal fun JsonDict.toSafePowerLevelsContentDict(): JsonDict {
@@ -52,7 +51,7 @@ internal fun JsonDict.toSafePowerLevelsContentDict(): JsonDict {
                         usersDefault = content.usersDefault,
                         users = content.users,
                         stateDefault = content.stateDefault,
-                        notifications = content.notifications.mapValues { content.notificationLevel(it.key)  }
+                        notifications = content.notifications?.mapValues { content.notificationLevel(it.key)  }
                 )
             }
             ?.toContent()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index e53b8a1e96..1dd49ae6ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -26,7 +26,6 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
-import org.matrix.android.sdk.api.session.room.model.PowerLevelsContentOverride
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
@@ -74,7 +73,7 @@ internal class DefaultSpaceService @Inject constructor(
             this.preset = if (isPublic) CreateRoomPreset.PRESET_PUBLIC_CHAT else CreateRoomPreset.PRESET_PRIVATE_CHAT
             this.avatarUri = avatarUri
             if (isPublic) {
-                this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContentOverride()).copy(
+                this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy(
                         invite = 0
                 )
                 this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 251d544eac..c58658c019 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -121,8 +121,8 @@ class NoticeEventFormatter @Inject constructor(
         val powerLevelsContent: PowerLevelsContent = event.getClearContent().toModel() ?: return null
         val previousPowerLevelsContent: PowerLevelsContent = event.resolvedPrevContent().toModel() ?: return null
         val userIds = HashSet<String>()
-        userIds.addAll(powerLevelsContent.users.keys)
-        userIds.addAll(previousPowerLevelsContent.users.keys)
+        userIds.addAll(powerLevelsContent.users.orEmpty().keys)
+        userIds.addAll(previousPowerLevelsContent.users.orEmpty().keys)
         val diffs = ArrayList<String>()
         userIds.forEach { userId ->
             val from = PowerLevelsHelper(previousPowerLevelsContent).getUserRole(userId)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
index 8f99132bc9..fcc1354542 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsController.kt
@@ -27,6 +27,13 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.discovery.settingsInfoItem
 import im.vector.app.features.form.formAdvancedToggleItem
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.banOrDefault
+import org.matrix.android.sdk.api.session.room.model.eventsDefaultOrDefault
+import org.matrix.android.sdk.api.session.room.model.inviteOrDefault
+import org.matrix.android.sdk.api.session.room.model.kickOrDefault
+import org.matrix.android.sdk.api.session.room.model.redactOrDefault
+import org.matrix.android.sdk.api.session.room.model.stateDefaultOrDefault
+import org.matrix.android.sdk.api.session.room.model.usersDefaultOrDefault
 import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import javax.inject.Inject
 
@@ -139,21 +146,21 @@ class RoomPermissionsController @Inject constructor(
 
     private fun getCurrentRole(editablePermission: EditablePermission, content: PowerLevelsContent): Role {
         val value = when (editablePermission) {
-            is EditablePermission.EventTypeEditablePermission -> content.events[editablePermission.eventType] ?: content.stateDefault
-            is EditablePermission.DefaultRole                 -> content.usersDefault
-            is EditablePermission.SendMessages                -> content.eventsDefault
-            is EditablePermission.InviteUsers                 -> content.invite
-            is EditablePermission.ChangeSettings              -> content.stateDefault
-            is EditablePermission.KickUsers                   -> content.kick
-            is EditablePermission.BanUsers                    -> content.ban
-            is EditablePermission.RemoveMessagesSentByOthers  -> content.redact
+            is EditablePermission.EventTypeEditablePermission -> content.events?.get(editablePermission.eventType) ?: content.stateDefaultOrDefault()
+            is EditablePermission.DefaultRole                 -> content.usersDefaultOrDefault()
+            is EditablePermission.SendMessages                -> content.eventsDefaultOrDefault()
+            is EditablePermission.InviteUsers                 -> content.inviteOrDefault()
+            is EditablePermission.ChangeSettings              -> content.stateDefaultOrDefault()
+            is EditablePermission.KickUsers                   -> content.kickOrDefault()
+            is EditablePermission.BanUsers                    -> content.banOrDefault()
+            is EditablePermission.RemoveMessagesSentByOthers  -> content.redactOrDefault()
             is EditablePermission.NotifyEveryone              -> content.notificationLevel(PowerLevelsContent.NOTIFICATIONS_ROOM_KEY)
         }
 
         return Role.fromValue(
                 value,
                 when (editablePermission) {
-                    is EditablePermission.EventTypeEditablePermission -> content.stateDefault
+                    is EditablePermission.EventTypeEditablePermission -> content.stateDefaultOrDefault()
                     is EditablePermission.DefaultRole                 -> Role.Default.value
                     is EditablePermission.SendMessages                -> Role.Default.value
                     is EditablePermission.InviteUsers                 -> Role.Moderator.value
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
index 626c20010c..f8d2f8315f 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/permissions/RoomPermissionsViewModel.kt
@@ -114,7 +114,7 @@ class RoomPermissionsViewModel @AssistedInject constructor(@Assisted initialStat
                 try {
                     val newPowerLevelsContent = when (action.editablePermission) {
                         is EditablePermission.EventTypeEditablePermission -> currentPowerLevel.copy(
-                                events = currentPowerLevel.events.toMutableMap().apply {
+                                events = currentPowerLevel.events.orEmpty().toMutableMap().apply {
                                     put(action.editablePermission.eventType, action.powerLevel)
                                 }
                         )
@@ -126,7 +126,7 @@ class RoomPermissionsViewModel @AssistedInject constructor(@Assisted initialStat
                         is EditablePermission.BanUsers                    -> currentPowerLevel.copy(ban = action.powerLevel)
                         is EditablePermission.RemoveMessagesSentByOthers  -> currentPowerLevel.copy(redact = action.powerLevel)
                         is EditablePermission.NotifyEveryone              -> currentPowerLevel.copy(
-                                notifications = currentPowerLevel.notifications.toMutableMap().apply {
+                                notifications = currentPowerLevel.notifications.orEmpty().toMutableMap().apply {
                                     put(PowerLevelsContent.NOTIFICATIONS_ROOM_KEY, action.powerLevel)
                                 }
                         )

From 66ac298e9529edcc84bcf129ea808d0a3fe9623c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 26 Mar 2021 19:23:13 +0100
Subject: [PATCH 140/350] Benoit Review: cleanup 2

---
 .../java/org/matrix/android/sdk/rx/RxSession.kt   |  4 ++--
 .../sdk/session/space/SpaceHierarchyTest.kt       | 10 +++++-----
 .../android/sdk/api/session/room/RoomService.kt   |  6 +++++-
 .../room/model/RoomThirdPartyInviteContent.kt     |  2 +-
 .../session/room/model/create/CreateRoomParams.kt |  3 +++
 .../matrix/android/sdk/api/session/space/Space.kt |  5 +++--
 .../android/sdk/api/session/space/SpaceService.kt | 12 +++++++-----
 .../api/session/space/model/SpaceChildContent.kt  |  6 ++----
 .../sdk/internal/crypto/DefaultCryptoService.kt   |  2 +-
 .../sdk/internal/database/RealmQueryLatch.kt      |  2 --
 .../sdk/internal/session/DefaultSession.kt        |  4 ++--
 .../internal/session/room/DefaultRoomService.kt   |  4 ++--
 .../internal/session/room/peeking/PeekRoomTask.kt |  4 +++-
 .../room/relationship/RoomChildRelationInfo.kt    |  7 ++++---
 .../room/summary/HierarchyLiveDataHelper.kt       |  2 +-
 .../session/room/summary/RoomSummaryDataSource.kt | 14 +++++---------
 .../sdk/internal/session/space/DefaultSpace.kt    |  5 +++--
 .../internal/session/space/DefaultSpaceService.kt | 10 +++++-----
 .../sdk/internal/session/space/JoinSpaceTask.kt   |  6 ++----
 .../session/space/ResolveSpaceInfoTask.kt         | 15 ++++++++++++---
 .../sdk/internal/session/space/SpaceApi.kt        |  3 +--
 .../sdk/internal/session/space/SpaceModule.kt     |  4 ++--
 .../session/space/peeking/PeekSpaceTask.kt        |  4 +++-
 .../session/space/peeking/SpacePeekResult.kt      |  1 +
 .../sdk/internal/session/sync/RoomSyncHandler.kt  |  2 +-
 .../session/sync/model/RoomSyncAccountData.kt     |  2 +-
 .../session/sync/model/RoomSyncEphemeral.kt       |  2 +-
 .../internal/session/sync/model/RoomSyncState.kt  |  2 +-
 .../session/sync/model/RoomSyncTimeline.kt        |  2 +-
 29 files changed, 80 insertions(+), 65 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 38b0a3a343..7f794be399 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -75,9 +75,9 @@ class RxSession(private val session: Session) {
     }
 
     fun liveFlattenRoomSummaryChildOf(spaceId: String?): Observable<List<RoomSummary>> {
-        return session.getFlattenRoomSummaryChildOfLive(spaceId).asObservable()
+        return session.getFlattenRoomSummaryChildrenOfLive(spaceId).asObservable()
                 .startWithCallable {
-                    session.getFlattenRoomSummaryChildOf(spaceId)
+                    session.getFlattenRoomSummaryChildrenOf(spaceId)
                 }
     }
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index 4e0284469b..e3b4fba901 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -180,13 +180,13 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         assertEquals(9, allRooms.size, "Unexpected number of rooms")
 
-        val orphans = session.getFlattenRoomSummaryChildOf(null)
+        val orphans = session.getFlattenRoomSummaryChildrenOf(null)
 
         assertEquals(2, orphans.size, "Unexpected number of orphan rooms")
         assertTrue(orphans.indexOfFirst { it.roomId == orphan1 } != -1, "O1 should be an orphan")
         assertTrue(orphans.indexOfFirst { it.roomId == orphan2 } != -1, "O2 should be an orphan ${orphans.map { it.name }}")
 
-        val aChildren = session.getFlattenRoomSummaryChildOf(spaceAInfo.spaceId)
+        val aChildren = session.getFlattenRoomSummaryChildrenOf(spaceAInfo.spaceId)
 
         assertEquals(4, aChildren.size, "Unexpected number of flatten child rooms")
         assertTrue(aChildren.indexOfFirst { it.name == "A1" } != -1, "A1 should be a child of A")
@@ -204,7 +204,7 @@ class SpaceHierarchyTest : InstrumentedTest {
             // here we do not set the parent!!
         }
 
-        val orphansUpdate = session.getFlattenRoomSummaryChildOf(null)
+        val orphansUpdate = session.getFlattenRoomSummaryChildrenOf(null)
         assertEquals(2, orphansUpdate.size, "Unexpected number of orphan rooms ${orphansUpdate.map { it.name }}")
     }
 
@@ -240,7 +240,7 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         // A -> C -> A
 
-        val aChildren = session.getFlattenRoomSummaryChildOf(spaceAInfo.spaceId)
+        val aChildren = session.getFlattenRoomSummaryChildrenOf(spaceAInfo.spaceId)
 
         assertEquals(4, aChildren.size, "Unexpected number of flatten child rooms ${aChildren.map { it.name }}")
         assertTrue(aChildren.indexOfFirst { it.name == "A1" } != -1, "A1 should be a child of A")
@@ -273,7 +273,7 @@ class SpaceHierarchyTest : InstrumentedTest {
         }
 
         val flatAChildren = runBlocking(Dispatchers.Main) {
-            session.getFlattenRoomSummaryChildOfLive(spaceAInfo.spaceId)
+            session.getFlattenRoomSummaryChildrenOfLive(spaceAInfo.spaceId)
         }
 
         commonTestHelper.waitWithLatch { latch ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 5296ad58b0..982a67c4c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -201,5 +201,9 @@ interface RoomService {
 
     fun getFlattenRoomSummaryChildOf(spaceId: String?, memberships: List<Membership> = Membership.activeMemberships()) : List<RoomSummary>
 
-    fun getFlattenRoomSummaryChildOfLive(spaceId: String?, memberships: List<Membership> = Membership.activeMemberships()): LiveData<List<RoomSummary>>
+    /**
+     * Returns all the children of this space, as LiveData
+     */
+    fun getFlattenRoomSummaryChildrenOfLive(spaceId: String?,
+                                            memberships: List<Membership> = Membership.activeMemberships()): LiveData<List<RoomSummary>>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt
index 56503e3e35..a8a2cfb68b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt
@@ -47,7 +47,7 @@ data class RoomThirdPartyInviteContent(
         /**
          * Keys with which the token may be signed.
          */
-        @Json(name = "public_keys") val publicKeys: List<PublicKeys>? = emptyList()
+        @Json(name = "public_keys") val publicKeys: List<PublicKeys>?
 )
 
 @JsonClass(generateAdapter = true)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index 24e4fe36d2..82c6e187f8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -69,6 +69,9 @@ open class CreateRoomParams {
      */
     val invite3pids = mutableListOf<ThreePid>()
 
+    /**
+     * Initial Guest Access
+     */
     var guestAccess: GuestAccess? = null
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index fda1465ac8..7de40b0019 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -35,12 +35,13 @@ interface Space {
      */
     fun spaceSummary(): RoomSummary?
 
-    suspend fun addChildren(roomId: String, viaServers: List<String>,
+    suspend fun addChildren(roomId: String,
+                            viaServers: List<String>,
                             order: String?,
                             autoJoin: Boolean = false,
                             suggested: Boolean? = false)
 
-    suspend fun removeRoom(roomId: String)
+    suspend fun removeChildren(roomId: String)
 
     @Throws
     suspend fun setChildrenOrder(roomId: String, order: String?)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index 604d06d9ff..1f88403eab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -28,7 +28,8 @@ typealias SpaceSummaryQueryParams = RoomSummaryQueryParams
 interface SpaceService {
 
     /**
-     * Create a room asynchronously
+     * Create a space asynchronously
+     * @return the spaceId of the created space
      */
     suspend fun createSpace(params: CreateSpaceParams): String
 
@@ -39,8 +40,8 @@ interface SpaceService {
 
     /**
      * Get a space from a roomId
-     * @param roomId the roomId to look for.
-     * @return a room with roomId or null if room type is not space
+     * @param spaceId the roomId to look for.
+     * @return a space with spaceId or null if room type is not space
      */
     fun getSpace(spaceId: String): Space?
 
@@ -54,8 +55,9 @@ interface SpaceService {
     /**
      * Get's information of a space by querying the server
      */
-    suspend fun querySpaceChildren(spaceId: String, suggestedOnly: Boolean? = null, autoJoinedOnly: Boolean? = null)
-            : Pair<RoomSummary, List<SpaceChildInfo>>
+    suspend fun querySpaceChildren(spaceId: String,
+                                   suggestedOnly: Boolean? = null,
+                                   autoJoinedOnly: Boolean? = null): Pair<RoomSummary, List<SpaceChildInfo>>
 
     /**
      * Get a live list of space summaries. This list is refreshed as soon as the data changes.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
index f84d781eb6..e7936d00e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
@@ -60,11 +60,9 @@ data class SpaceChildContent(
      * or consist of more than 50 characters, are forbidden and should be ignored if received.)
      */
     fun validOrder(): String? {
-        order?.let {
-            if (order.length > 50) return null
-            if (!ORDER_VALID_CHAR_REGEX.matches(it)) return null
-        }
         return order
+                ?.takeIf { it.length <= 50 }
+                ?.takeIf { ORDER_VALID_CHAR_REGEX.matches(it) }
     }
 
     companion object {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 4a18c29544..fac4e0d0b6 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -894,7 +894,7 @@ internal class DefaultCryptoService @Inject constructor(
         }
     }
 
-    private fun  onRoomHistoryVisibilityEvent(roomId: String, event: Event) {
+    private fun onRoomHistoryVisibilityEvent(roomId: String, event: Event) {
         val eventContent = event.content.toModel<RoomHistoryVisibilityContent>()
         eventContent?.safeHistoryVisibility()?.let {
             cryptoStore.setShouldEncryptForInvitedMembers(roomId, it != RoomHistoryVisibility.JOINED)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
index 04f47bfccd..c9c797304a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
@@ -26,7 +26,6 @@ import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
-import timber.log.Timber
 
 internal suspend fun <T> awaitNotEmptyResult(realmConfiguration: RealmConfiguration,
                                              timeoutMillis: Long,
@@ -41,7 +40,6 @@ internal suspend fun <T> awaitNotEmptyResult(realmConfiguration: RealmConfigurat
 
                 val listener = object : RealmChangeListener<RealmResults<T>> {
                     override fun onChange(it: RealmResults<T>) {
-                        Timber.v("## Space: $it")
                         if (it.isNotEmpty()) {
                             result.removeChangeListener(this)
                             latch.complete(Unit)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index ecb680c691..6c574be826 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -121,9 +121,9 @@ internal class DefaultSession @Inject constructor(
         private val integrationManagerService: IntegrationManagerService,
         private val thirdPartyService: Lazy<ThirdPartyService>,
         private val callSignalingService: Lazy<CallSignalingService>,
+        private val spaceService: Lazy<SpaceService>,
         @UnauthenticatedWithCertificate
-        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>,
-        private val spaceService: Lazy<SpaceService>
+        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>
 ) : Session,
         RoomService by roomService.get(),
         RoomDirectoryService by roomDirectoryService.get(),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index cd39e633dd..070270aac9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -173,14 +173,14 @@ internal class DefaultRoomService @Inject constructor(
         return peekRoomTask.execute(PeekRoomTask.Params(roomIdOrAlias))
     }
 
-    override fun getFlattenRoomSummaryChildOf(spaceId: String?, memberships: List<Membership>): List<RoomSummary> {
+    override fun getFlattenRoomSummaryChildrenOf(spaceId: String?, memberships: List<Membership>): List<RoomSummary> {
         if (spaceId == null) {
             return roomSummaryDataSource.getFlattenOrphanRooms()
         }
         return roomSummaryDataSource.getAllRoomSummaryChildOf(spaceId, memberships)
     }
 
-    override fun getFlattenRoomSummaryChildOfLive(spaceId: String?, memberships: List<Membership>): LiveData<List<RoomSummary>> {
+    override fun getFlattenRoomSummaryChildrenOfLive(spaceId: String?, memberships: List<Membership>): LiveData<List<RoomSummary>> {
         if (spaceId == null) {
             return roomSummaryDataSource.getFlattenOrphanRoomsLive()
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt
index ac37b3c812..c6f4bbb4e1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/peeking/PeekRoomTask.kt
@@ -145,7 +145,9 @@ internal class DefaultPeekRoomTask @Inject constructor(
 
             val roomType = stateEvents
                     .lastOrNull { it.type == EventType.STATE_ROOM_CREATE }
-                    ?.let { it.content?.toModel<RoomCreateContent>()?.type }
+                    ?.content
+                    ?.toModel<RoomCreateContent>()
+                    ?.type
 
             return PeekResult.Success(
                     roomId = roomId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
index 5c478c9b25..cff1019893 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
@@ -34,10 +34,11 @@ import timber.log.Timber
  *  The state_key is the ID of a child room or space, and the content should contain a via key which gives
  *  a list of candidate servers that can be used to join the room. present: true key is included to distinguish from a deleted state event.
  *
- *  - Separately, rooms can claim parents via the m.room.parent state event:
+ *  - Separately, rooms can claim parents via the m.room.parent state event.
  */
-internal class RoomChildRelationInfo(private val realm: Realm,
-                                     private val roomId: String
+internal class RoomChildRelationInfo(
+        private val realm: Realm,
+        private val roomId: String
 ) {
 
     data class SpaceChildInfo(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt
index ced1ad963e..29db8431fd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/HierarchyLiveDataHelper.kt
@@ -29,7 +29,7 @@ internal class HierarchyLiveDataHelper(
     private val sources = HashMap<String, LiveData<Optional<RoomSummary>>>()
     private val mediatorLiveData = MediatorLiveData<List<String>>()
 
-    fun liveData() = mediatorLiveData
+    fun liveData(): LiveData<List<String>> = mediatorLiveData
 
     init {
         onChange()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index d91f3acfb1..335198af68 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -251,14 +251,10 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         queryParams.includeType?.forEach {
             query.equalTo(RoomSummaryEntityFields.ROOM_TYPE, it)
         }
-        queryParams.roomCategoryFilter?.let {
-            when (it) {
-                RoomCategoryFilter.ONLY_DM -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
-                RoomCategoryFilter.ONLY_ROOMS -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
-                RoomCategoryFilter.ALL -> {
-                    // nop
-                }
-            }
+        when (queryParams.roomCategoryFilter) {
+            RoomCategoryFilter.ONLY_DM    -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+            RoomCategoryFilter.ONLY_ROOMS -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
+            RoomCategoryFilter.ALL        -> Unit // nop
         }
         return query
     }
@@ -272,7 +268,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
 
     fun getAllRoomSummaryChildOfLive(spaceId: String, memberShips: List<Membership>): LiveData<List<RoomSummary>> {
         // we want to listen to all spaces in hierarchy and on change compute back all childs
-        // and switch map to listen thoose?
+        // and switch map to listen those?
         val mediatorLiveData = HierarchyLiveDataHelper(spaceId, memberShips, this).liveData()
 
         return Transformations.switchMap(mediatorLiveData) { allIds ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 6bcdf63bd8..cfd88c8ec6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -47,7 +47,8 @@ internal class DefaultSpace(
         return spaceSummaryDataSource.getSpaceSummary(room.roomId)
     }
 
-    override suspend fun addChildren(roomId: String, viaServers: List<String>,
+    override suspend fun addChildren(roomId: String,
+                                     viaServers: List<String>,
                                      order: String?,
                                      autoJoin: Boolean,
                                      suggested: Boolean?) {
@@ -63,7 +64,7 @@ internal class DefaultSpace(
         )
     }
 
-    override suspend fun removeRoom(roomId: String) {
+    override suspend fun removeChildren(roomId: String) {
         val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
                 .firstOrNull()
                 ?.content.toModel<SpaceChildContent>()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 1dd49ae6ba..a116d4fe15 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.internal.session.space
 
 import android.net.Uri
 import androidx.lifecycle.LiveData
-import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
@@ -37,7 +36,6 @@ import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
 import org.matrix.android.sdk.api.session.space.model.SpaceParentContent
-import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.room.RoomGetter
 import org.matrix.android.sdk.internal.session.room.SpaceGetter
@@ -49,7 +47,6 @@ import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
 import javax.inject.Inject
 
 internal class DefaultSpaceService @Inject constructor(
-        @SessionDatabase private val monarchy: Monarchy,
         @UserId private val userId: String,
         private val createSpaceTask: CreateSpaceTask,
         private val joinSpaceTask: JoinSpaceTask,
@@ -97,11 +94,14 @@ internal class DefaultSpaceService @Inject constructor(
     override fun getRootSpaceSummaries(): List<RoomSummary> {
         return roomSummaryDataSource.getRootSpaceSummaries()
     }
+
     override suspend fun peekSpace(spaceId: String): SpacePeekResult {
         return peekSpaceTask.execute(PeekSpaceTask.Params(spaceId))
     }
 
-    override suspend fun querySpaceChildren(spaceId: String, suggestedOnly: Boolean?, autoJoinedOnly: Boolean?): Pair<RoomSummary, List<SpaceChildInfo>> {
+    override suspend fun querySpaceChildren(spaceId: String,
+                                            suggestedOnly: Boolean?,
+                                            autoJoinedOnly: Boolean?): Pair<RoomSummary, List<SpaceChildInfo>> {
         return resolveSpaceInfoTask.execute(ResolveSpaceInfoTask.Params.withId(spaceId, suggestedOnly, autoJoinedOnly)).let { response ->
             val spaceDesc = response.rooms?.firstOrNull { it.roomId == spaceId }
             Pair(
@@ -136,7 +136,7 @@ internal class DefaultSpaceService @Inject constructor(
                                         activeMemberCount = childSummary.numJoinedMembers,
                                         parentRoomId = childStateEv?.roomId
                                 )
-                            } ?: emptyList()
+                            }.orEmpty()
             )
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index 9379c0d650..7e9f2235b9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -25,7 +25,6 @@ import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.membership.joining.JoinRoomTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.task.Task
@@ -42,7 +41,6 @@ internal interface JoinSpaceTask : Task<JoinSpaceTask.Params, SpaceService.JoinS
 }
 
 internal class DefaultJoinSpaceTask @Inject constructor(
-        private val roomAPI: RoomAPI,
         private val joinRoomTask: JoinRoomTask,
         @SessionDatabase
         private val realmConfiguration: RealmConfiguration,
@@ -81,7 +79,7 @@ internal class DefaultJoinSpaceTask @Inject constructor(
             return SpaceService.JoinSpaceResult.PartialSuccess(emptyMap())
         }
 
-        val errors = HashMap<String, Throwable>()
+        val errors = mutableMapOf<String, Throwable>()
         Timber.v("## Space: > Sync done ...")
         // after that i should have the children (? do I need to paginate to get state)
         val summary = roomSummaryDataSource.getSpaceSummary(params.roomIdOrAlias)
@@ -93,7 +91,7 @@ internal class DefaultJoinSpaceTask @Inject constructor(
                 // I should try to join as well
                 if (it.roomType == RoomType.SPACE) {
                     // recursively join auto-joined child of this space?
-                    when (val subspaceJoinResult = this.execute(JoinSpaceTask.Params(it.childRoomId, null, it.viaServers))) {
+                    when (val subspaceJoinResult = execute(JoinSpaceTask.Params(it.childRoomId, null, it.viaServers))) {
                         SpaceService.JoinSpaceResult.Success -> {
                             // nop
                         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
index 4326b1934e..9bf6fa0256 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.space
 
+import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
@@ -31,13 +32,21 @@ internal interface ResolveSpaceInfoTask : Task<ResolveSpaceInfoTask.Params, Spac
     ) {
         companion object {
             fun withId(spaceId: String, suggestedOnly: Boolean?, autoJoinOnly: Boolean?) =
-                    Params(spaceId, 10, 20, null, suggestedOnly, autoJoinOnly)
+                    Params(
+                            spaceId = spaceId,
+                            maxRoomPerSpace = 10,
+                            limit = 20,
+                            batchToken = null,
+                            suggestedOnly = suggestedOnly,
+                            autoJoinOnly = autoJoinOnly
+                    )
         }
     }
 }
 
 internal class DefaultResolveSpaceInfoTask @Inject constructor(
-        private val spaceApi: SpaceApi
+        private val spaceApi: SpaceApi,
+        private val globalErrorReceiver: GlobalErrorReceiver
 ) : ResolveSpaceInfoTask {
     override suspend fun execute(params: ResolveSpaceInfoTask.Params): SpacesResponse {
         val body = SpaceSummaryParams(
@@ -47,7 +56,7 @@ internal class DefaultResolveSpaceInfoTask @Inject constructor(
                 autoJoinedOnly = params.autoJoinOnly,
                 suggestedOnly = params.suggestedOnly
         )
-        return executeRequest<SpacesResponse>(null) {
+        return executeRequest(globalErrorReceiver) {
             apiCall = spaceApi.getSpaces(params.spaceId, body)
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
index 3a63cd0c01..8e64e89da7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
@@ -38,6 +38,5 @@ internal interface SpaceApi {
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc2946/rooms/{roomId}/spaces")
     fun getSpaces(@Path("roomId") spaceId: String,
-                  @Body params: SpaceSummaryParams
-    ): Call<SpacesResponse>
+                  @Body params: SpaceSummaryParams): Call<SpacesResponse>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
index 84a2d5267f..34bc66baa0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
@@ -49,8 +49,8 @@ internal abstract class SpaceModule {
     abstract fun bindJoinSpaceTask(task: DefaultJoinSpaceTask): JoinSpaceTask
 
     @Binds
-    abstract fun bindSpaceGetter(getter: DefaultSpaceGetter): SpaceGetter
+    abstract fun bindCreateSpaceTask(task: DefaultCreateSpaceTask): CreateSpaceTask
 
     @Binds
-    abstract fun bindCreateSpaceTask(getter: DefaultCreateSpaceTask): CreateSpaceTask
+    abstract fun bindSpaceGetter(getter: DefaultSpaceGetter): SpaceGetter
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
index 8faed5f784..f6b156a6fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/PeekSpaceTask.kt
@@ -55,7 +55,9 @@ internal class DefaultPeekSpaceTask @Inject constructor(
         }
         val isSpace = stateEvents
                 .lastOrNull { it.type == EventType.STATE_ROOM_CREATE && it.stateKey == "" }
-                ?.let { it.content?.toModel<RoomCreateContent>()?.type } == RoomType.SPACE
+                ?.content
+                ?.toModel<RoomCreateContent>()
+                ?.type == RoomType.SPACE
 
         if (!isSpace) return SpacePeekResult.NotSpaceType(params.roomIdOrAlias)
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
index a854dd25d3..1df62e94e8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/peeking/SpacePeekResult.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.session.space.peeking
 
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 
+// TODO Move to api package
 data class SpacePeekSummary(
         val idOrAlias: String,
         val roomPeekResult: PeekResult.Success,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 5a1de41b95..acba679ad3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -215,7 +215,7 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
                 val ageLocalTs = event.unsignedData?.age?.let { syncLocalTimestampMillis - it }
                 val eventEntity = event.toEntity(roomId, SendState.SYNCED, ageLocalTs).copyToRealmOrIgnore(realm, insertType)
                 CurrentStateEventEntity.getOrCreate(realm, roomId, event.stateKey, event.type).apply {
-                    Timber.v("## Space state event: $eventEntity")
+                    // Timber.v("## Space state event: $eventEntity")
                     eventId = event.eventId
                     root = eventEntity
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
index 9e0ccde16b..a2375507d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
@@ -25,5 +25,5 @@ internal data class RoomSyncAccountData(
         /**
          * List of account data events (array of Event).
          */
-        @Json(name = "events") val events: List<Event>? = emptyList()
+        @Json(name = "events") val events: List<Event>? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
index a2e044d947..f2135db6b7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
@@ -26,5 +26,5 @@ internal data class RoomSyncEphemeral(
         /**
          * List of ephemeral events (array of Event).
          */
-        @Json(name = "events") val events: List<Event>? = emptyList()
+        @Json(name = "events") val events: List<Event>? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
index c825cbf31c..f86f05d000 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
@@ -27,5 +27,5 @@ internal data class RoomSyncState(
         /**
          * List of state events (array of Event). The resulting state corresponds to the *start* of the timeline.
          */
-        @Json(name = "events") val events: List<Event>? = emptyList()
+        @Json(name = "events") val events: List<Event>? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
index ce51958f73..27bbc4343f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
@@ -27,7 +27,7 @@ internal data class RoomSyncTimeline(
         /**
          * List of events (array of Event).
          */
-        @Json(name = "events") val events: List<Event>? = emptyList(),
+        @Json(name = "events") val events: List<Event>? = null,
 
         /**
          * Boolean which tells whether there are more events on the server

From eac893818626a8fa2efc497e341662e7ac1b2d27 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 14:25:38 +0200
Subject: [PATCH 141/350] Cleanup

---
 vector/src/main/AndroidManifest.xml                       | 8 ++++----
 .../src/main/java/im/vector/app/core/di/FragmentModule.kt | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 205669fb8a..accf3d89ad 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -271,10 +271,10 @@
             <!--            </intent-filter>-->
         </activity>
 
-        <activity android:name=".features.devtools.RoomDevToolActivity"/>
-        <activity android:name=".features.spaces.SpacePreviewActivity"/>
-        <activity android:name=".features.spaces.SpaceExploreActivity"/>
-        <activity android:name=".features.spaces.SpaceCreationActivity"/>
+        <activity android:name=".features.devtools.RoomDevToolActivity" />
+        <activity android:name=".features.spaces.SpacePreviewActivity" />
+        <activity android:name=".features.spaces.SpaceExploreActivity" />
+        <activity android:name=".features.spaces.SpaceCreationActivity" />
         <!-- Services -->
 
         <service
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 9e2d249bbe..ea7835cc28 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -646,7 +646,7 @@ interface FragmentModule {
     @Binds
     @IntoMap
     @FragmentKey(ChooseSpaceTypeFragment::class)
-    fun bindCreateSpaceFragment(fragment: ChooseSpaceTypeFragment): Fragment
+    fun bindChooseSpaceTypeFragment(fragment: ChooseSpaceTypeFragment): Fragment
 
     @Binds
     @IntoMap

From 7aa4066a25b69f91f88d4be0932ff8c0e668c9fe Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 14:34:56 +0200
Subject: [PATCH 142/350] Avoid code duplication. Move ItemStyle to its own
 file.

---
 .../app/core/ui/list/GenericFooterItem.kt     | 14 ++----
 .../im/vector/app/core/ui/list/GenericItem.kt | 16 +------
 .../im/vector/app/core/ui/list/ItemStyle.kt   | 43 +++++++++++++++++++
 ...eysBackupSettingsRecyclerViewController.kt | 10 ++---
 .../devices/DeviceListEpoxyController.kt      |  6 +--
 .../devices/DeviceTrustInfoEpoxyController.kt |  4 +-
 ...ceVerificationInfoBottomSheetController.kt | 14 +++---
 .../create/SpaceDefaultRoomEpoxyController.kt |  4 +-
 8 files changed, 67 insertions(+), 44 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/ui/list/ItemStyle.kt

diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
index c0d309fe5b..1bde66f6d1 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
@@ -40,7 +40,7 @@ abstract class GenericFooterItem : VectorEpoxyModel<GenericFooterItem.Holder>()
     var text: CharSequence? = null
 
     @EpoxyAttribute
-    var style: GenericItem.STYLE = GenericItem.STYLE.NORMAL_TEXT
+    var style: ItemStyle = ItemStyle.NORMAL_TEXT
 
     @EpoxyAttribute
     var itemClickAction: GenericItem.Action? = null
@@ -56,16 +56,8 @@ abstract class GenericFooterItem : VectorEpoxyModel<GenericFooterItem.Holder>()
         super.bind(holder)
 
         holder.text.setTextOrHide(text)
-        holder.text.typeface = Typeface.DEFAULT
-        when (style) {
-            GenericItem.STYLE.BIG_TEXT    -> holder.text.textSize = 18f
-            GenericItem.STYLE.NORMAL_TEXT -> holder.text.textSize = 14f
-            GenericItem.STYLE.SUBHEADER -> holder.text.textSize = 16f
-            GenericItem.STYLE.TITLE -> {
-                holder.text.textSize = 20f
-                holder.text.typeface = Typeface.DEFAULT_BOLD
-            }
-        }
+        holder.text.typeface = style.toTypeFace()
+        holder.text.textSize = style.toTextSize()
         holder.text.gravity = if (centered) Gravity.CENTER_HORIZONTAL else Gravity.START
 
         if (textColor != null) {
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
index 01d318a25b..8a01183915 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt
@@ -38,13 +38,6 @@ import im.vector.app.core.extensions.setTextOrHide
 @EpoxyModelClass(layout = R.layout.item_generic_list)
 abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
 
-    enum class STYLE {
-        BIG_TEXT,
-        NORMAL_TEXT,
-        TITLE,
-        SUBHEADER
-    }
-
     class Action(var title: String) {
         var perform: Runnable? = null
     }
@@ -56,7 +49,7 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
     var description: CharSequence? = null
 
     @EpoxyAttribute
-    var style: STYLE = STYLE.NORMAL_TEXT
+    var style: ItemStyle = ItemStyle.NORMAL_TEXT
 
     @EpoxyAttribute
     @DrawableRes
@@ -89,12 +82,7 @@ abstract class GenericItem : VectorEpoxyModel<GenericItem.Holder>() {
             holder.titleIcon.isVisible = false
         }
 
-        holder.titleText.textSize =  when (style) {
-            STYLE.BIG_TEXT    -> 18f
-            STYLE.NORMAL_TEXT -> 14f
-            STYLE.TITLE       -> 20f
-            STYLE.SUBHEADER   -> 16f
-        }
+        holder.titleText.textSize = style.toTextSize()
 
         holder.descriptionText.setTextOrHide(description)
 
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/ItemStyle.kt b/vector/src/main/java/im/vector/app/core/ui/list/ItemStyle.kt
new file mode 100644
index 0000000000..b98d29040d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/list/ItemStyle.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.ui.list
+
+import android.graphics.Typeface
+
+enum class ItemStyle {
+    BIG_TEXT,
+    NORMAL_TEXT,
+    TITLE,
+    SUBHEADER;
+
+    fun toTypeFace(): Typeface {
+        return if (this == TITLE) {
+            Typeface.DEFAULT_BOLD
+        } else {
+            Typeface.DEFAULT
+        }
+    }
+
+    fun toTextSize(): Float {
+        return when (this) {
+            BIG_TEXT    -> 18f
+            NORMAL_TEXT -> 14f
+            TITLE       -> 20f
+            SUBHEADER   -> 16f
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
index bfdb297b23..ca5f88968a 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt
@@ -26,7 +26,7 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.errorWithRetryItem
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.ItemStyle
 import im.vector.app.core.ui.list.genericItem
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.Session
@@ -72,7 +72,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(private val s
                 genericItem {
                     id("summary")
                     title(stringProvider.getString(R.string.keys_backup_settings_status_not_setup))
-                    style(GenericItem.STYLE.BIG_TEXT)
+                    style(ItemStyle.BIG_TEXT)
 
                     if (data.keysBackupVersionTrust()?.usable == false) {
                         description(stringProvider.getString(R.string.keys_backup_settings_untrusted_backup))
@@ -87,7 +87,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(private val s
                 genericItem {
                     id("summary")
                     title(stringProvider.getString(R.string.keys_backup_settings_status_ko))
-                    style(GenericItem.STYLE.BIG_TEXT)
+                    style(ItemStyle.BIG_TEXT)
                     if (data.keysBackupVersionTrust()?.usable == false) {
                         description(stringProvider.getString(R.string.keys_backup_settings_untrusted_backup))
                     } else {
@@ -102,7 +102,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(private val s
                 genericItem {
                     id("summary")
                     title(stringProvider.getString(R.string.keys_backup_settings_status_ok))
-                    style(GenericItem.STYLE.BIG_TEXT)
+                    style(ItemStyle.BIG_TEXT)
                     if (data.keysBackupVersionTrust()?.usable == false) {
                         description(stringProvider.getString(R.string.keys_backup_settings_untrusted_backup))
                     } else {
@@ -118,7 +118,7 @@ class KeysBackupSettingsRecyclerViewController @Inject constructor(private val s
                 genericItem {
                     id("summary")
                     title(stringProvider.getString(R.string.keys_backup_settings_status_ok))
-                    style(GenericItem.STYLE.BIG_TEXT)
+                    style(ItemStyle.BIG_TEXT)
                     hasIndeterminateProcess(true)
 
                     val totalKeys = session.cryptoService().inboundGroupSessionsCount(false)
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
index 035df8caa2..e0730d55f1 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
@@ -27,7 +27,7 @@ import im.vector.app.core.epoxy.errorWithRetryItem
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.ItemStyle
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItem
 import im.vector.app.core.ui.list.genericItemWithValue
@@ -74,7 +74,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
 
                 genericItem {
                     id("title")
-                    style(GenericItem.STYLE.BIG_TEXT)
+                    style(ItemStyle.BIG_TEXT)
                     titleIconResourceId(if (allGreen) R.drawable.ic_shield_trusted else R.drawable.ic_shield_warning)
                     title(
                             stringProvider.getString(
@@ -91,7 +91,7 @@ class DeviceListEpoxyController @Inject constructor(private val stringProvider:
 
                 genericItem {
                     id("sessions")
-                    style(GenericItem.STYLE.BIG_TEXT)
+                    style(ItemStyle.BIG_TEXT)
                     title(stringProvider.getString(R.string.room_member_profile_sessions_section_title))
                 }
                 if (deviceList.isEmpty()) {
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
index 200d268b27..4c28acd904 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
@@ -20,7 +20,7 @@ import com.airbnb.epoxy.TypedEpoxyController
 import im.vector.app.R
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.ItemStyle
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItem
 import im.vector.app.core.ui.list.genericItemWithValue
@@ -48,7 +48,7 @@ class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvi
             val isVerified = it.trustLevel?.isVerified() == true
             genericItem {
                 id("title")
-                style(GenericItem.STYLE.BIG_TEXT)
+                style(ItemStyle.BIG_TEXT)
                 titleIconResourceId(if (isVerified) R.drawable.ic_shield_trusted else R.drawable.ic_shield_warning)
                 title(
                         stringProvider.getString(
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
index 100d4c97c5..b66204a9a4 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt
@@ -21,7 +21,7 @@ import im.vector.app.core.epoxy.dividerItem
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.ItemStyle
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItem
 import im.vector.app.core.ui.views.toDrawableRes
@@ -85,7 +85,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
             if (currentSessionIsTrusted) {
                 genericItem {
                     id("trust${cryptoDeviceInfo.deviceId}")
-                    style(GenericItem.STYLE.BIG_TEXT)
+                    style(ItemStyle.BIG_TEXT)
                     titleIconResourceId(shield)
                     title(stringProvider.getString(R.string.encryption_information_verified))
                     description(stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
@@ -94,7 +94,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
                 // You need to complete security, only if there are other session(s) available, or if 4S contains secrets
                 genericItem {
                     id("trust${cryptoDeviceInfo.deviceId}")
-                    style(GenericItem.STYLE.BIG_TEXT)
+                    style(ItemStyle.BIG_TEXT)
                     titleIconResourceId(shield)
                     title(stringProvider.getString(R.string.crosssigning_verify_this_session))
                     if (data.hasOtherSessions) {
@@ -114,7 +114,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
                 if (trust) {
                     genericItem {
                         id("trust${cryptoDeviceInfo.deviceId}")
-                        style(GenericItem.STYLE.BIG_TEXT)
+                        style(ItemStyle.BIG_TEXT)
                         titleIconResourceId(shield)
                         title(stringProvider.getString(R.string.encryption_information_verified))
                         description(stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
@@ -123,7 +123,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
                     genericItem {
                         id("trust${cryptoDeviceInfo.deviceId}")
                         titleIconResourceId(shield)
-                        style(GenericItem.STYLE.BIG_TEXT)
+                        style(ItemStyle.BIG_TEXT)
                         title(stringProvider.getString(R.string.encryption_information_not_verified))
                         description(stringProvider.getString(R.string.settings_active_sessions_unverified_device_desc))
                     }
@@ -172,7 +172,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
         if (cryptoDeviceInfo.trustLevel?.isLocallyVerified() == true) {
             genericItem {
                 id("trust${cryptoDeviceInfo.deviceId}")
-                style(GenericItem.STYLE.BIG_TEXT)
+                style(ItemStyle.BIG_TEXT)
                 titleIconResourceId(shield)
                 title(stringProvider.getString(R.string.encryption_information_verified))
                 description(stringProvider.getString(R.string.settings_active_sessions_verified_device_desc))
@@ -181,7 +181,7 @@ class DeviceVerificationInfoBottomSheetController @Inject constructor(
             genericItem {
                 id("trust${cryptoDeviceInfo.deviceId}")
                 titleIconResourceId(shield)
-                style(GenericItem.STYLE.BIG_TEXT)
+                style(ItemStyle.BIG_TEXT)
                 title(stringProvider.getString(R.string.encryption_information_not_verified))
                 description(stringProvider.getString(R.string.settings_active_sessions_unverified_device_desc))
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
index aa4b2beae4..9a17a8272e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
@@ -21,7 +21,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.ItemStyle
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.features.form.formEditTextItem
 import javax.inject.Inject
@@ -38,7 +38,7 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
     override fun buildModels(data: CreateSpaceState?) {
         genericFooterItem {
             id("info_help_header")
-            style(GenericItem.STYLE.TITLE)
+            style(ItemStyle.TITLE)
             text(stringProvider.getString(R.string.create_spaces_room_public_header, data?.name))
             textColor(colorProvider.getColorFromAttribute(R.attr.riot_primary_text_color))
         }

From 7c348959cfd3afb1eaf2dff24fc1529e685aa5e7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 15:35:23 +0200
Subject: [PATCH 143/350] Cleanup and fix bugs

---
 .../command/AutocompleteCommandPresenter.kt   |   7 +-
 .../app/features/form/FormEditTextItem.kt     |   5 +-
 .../grouplist/HomeSpaceSummaryItem.kt         |  10 --
 .../app/features/home/AvatarRenderer.kt       |   4 +-
 .../vector/app/features/home/HomeActivity.kt  |   6 +-
 .../app/features/home/HomeDetailFragment.kt   |  44 +++---
 .../home/room/detail/RoomDetailFragment.kt    | 149 +++++++++---------
 .../action/MessageActionsViewModel.kt         |   3 +-
 .../home/room/list/RoomListViewModel.kt       |   2 +-
 .../app/features/matrixto/MatrixToAction.kt   |   1 -
 .../matrixto/MatrixToBottomSheetViewModel.kt  |  24 +--
 .../RoomMemberProfileViewModel.kt             |  22 +--
 .../banned/RoomBannedMemberListViewModel.kt   |  10 +-
 .../members/RoomMemberListViewModel.kt        |   3 +-
 .../features/spaces/SpaceCreationActivity.kt  |  13 +-
 .../app/features/widgets/WidgetViewModel.kt   |   6 +-
 .../layout/item_editable_square_avatar.xml    |   8 +-
 .../main/res/layout/item_suggested_room.xml   |  10 +-
 18 files changed, 163 insertions(+), 164 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
index aabf15aebe..5ad31aeaa6 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt
@@ -44,10 +44,9 @@ class AutocompleteCommandPresenter @Inject constructor(context: Context,
     override fun onQuery(query: CharSequence?) {
         val data = Command.values()
                 .filter {
-                    if (it.isDevCommand && !vectorPreferences.developerMode()) {
-                        return@filter false
-                    }
-
+                    !it.isDevCommand || vectorPreferences.developerMode()
+                }
+                .filter {
                     if (query.isNullOrEmpty()) {
                         true
                     } else {
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index 42ce6d68a8..fdac8afaed 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -74,10 +74,7 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.hint = hint
         holder.textInputLayout.error = errorMessage
-
-        endIconMode?.let { mode ->
-            holder.textInputLayout.endIconMode = mode
-        }
+        holder.textInputLayout.endIconMode = endIconMode ?: TextInputLayout.END_ICON_NONE
 
         // Update only if text is different and value is not null
         holder.textInputEditText.setTextSafe(value)
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
index 2640c03fca..9912564720 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
@@ -18,8 +18,6 @@
 package im.vector.app.features.grouplist
 
 import android.content.res.ColorStateList
-import android.content.res.Resources
-import android.util.TypedValue
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
@@ -62,12 +60,4 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
         val leaveView by bind<ImageView>(R.id.groupTmpLeave)
     }
-
-    fun dpToPx(resources: Resources, dp: Int): Int {
-        return TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP,
-                dp.toFloat(),
-                resources.displayMetrics
-        ).toInt()
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
index f9a68ba465..23ca5eee9c 100644
--- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
@@ -79,7 +79,9 @@ class AvatarRenderer @Inject constructor(private val activeSessionHolder: Active
     fun renderSpace(matrixItem: MatrixItem, imageView: ImageView) {
         renderSpace(
                 matrixItem,
-                imageView, GlideApp.with(imageView))
+                imageView,
+                GlideApp.with(imageView)
+        )
     }
 
     fun clear(imageView: ImageView) {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 6e268736e0..ab0c6e45fe 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -109,13 +109,13 @@ class HomeActivity :
 
     private val createSpaceResultLauncher = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
-            val spaceId = activityResult.data?.extras?.getString(SpaceCreationActivity.RESULT_DATA_CREATED_SPACE_ID)
-            val defaultRoomsId = activityResult.data?.extras?.getString(SpaceCreationActivity.RESULT_DATA_DEFAULT_ROOM_ID)
+            val spaceId = SpaceCreationActivity.getCreatedSpaceId(activityResult.data)
+            val defaultRoomId = SpaceCreationActivity.getDefaultRoomId(activityResult.data)
             views.drawerLayout.closeDrawer(GravityCompat.START)
 
             // Here we want to change current space to the newly created one, and then immediately open the default room
             if (spaceId != null) {
-                navigator.switchToSpace(this, spaceId, defaultRoomsId, true)
+                navigator.switchToSpace(this, spaceId, defaultRoomId, true)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index b3aac6e401..572a13a084 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -252,26 +252,26 @@ class HomeDetailFragment @Inject constructor(
     }
 
     private fun onSpaceChange(spaceSummary: RoomSummary?) {
-        spaceSummary?.let {
-            // Use GlideApp with activity context to avoid the glideRequests to be paused
-            if (spaceSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
-                // Special case
-                views.groupToolbarAvatarImageView.background = ContextCompat.getDrawable(requireContext(), R.drawable.space_home_background)
-                views.groupToolbarAvatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
-                ThemeUtils.tintDrawableWithColor(
-                        ContextCompat.getDrawable(requireContext(), R.drawable.ic_space_home)!!,
-                        ThemeUtils.getColor(requireContext(), R.attr.riot_primary_text_color)
-                ).let {
-                    views.groupToolbarAvatarImageView.setImageDrawable(it)
-                }
+        spaceSummary ?: return
 
-                views.groupToolbarSpaceTitleView.isVisible = false
-            } else {
-                views.groupToolbarAvatarImageView.background = null
-                avatarRenderer.renderSpace(it.toMatrixItem(), views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
-                views.groupToolbarSpaceTitleView.isVisible = true
-                views.groupToolbarSpaceTitleView.text = spaceSummary.displayName
+        // Use GlideApp with activity context to avoid the glideRequests to be paused
+        if (spaceSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
+            // Special case
+            views.groupToolbarAvatarImageView.background = ContextCompat.getDrawable(requireContext(), R.drawable.space_home_background)
+            views.groupToolbarAvatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
+            ThemeUtils.tintDrawableWithColor(
+                    ContextCompat.getDrawable(requireContext(), R.drawable.ic_space_home)!!,
+                    ThemeUtils.getColor(requireContext(), R.attr.riot_primary_text_color)
+            ).let {
+                views.groupToolbarAvatarImageView.setImageDrawable(it)
             }
+
+            views.groupToolbarSpaceTitleView.isVisible = false
+        } else {
+            views.groupToolbarAvatarImageView.background = null
+            avatarRenderer.renderSpace(spaceSummary.toMatrixItem(), views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
+            views.groupToolbarSpaceTitleView.isVisible = true
+            views.groupToolbarSpaceTitleView.text = spaceSummary.displayName
         }
     }
 
@@ -279,10 +279,10 @@ class HomeDetailFragment @Inject constructor(
         serverBackupStatusViewModel
                 .subscribe(this) {
                     when (val banState = it.bannerState.invoke()) {
-                        is BannerState.Setup -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Setup(banState.numberOfKeys), false)
+                        is BannerState.Setup  -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Setup(banState.numberOfKeys), false)
                         BannerState.BackingUp -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.BackingUp, false)
                         null,
-                        BannerState.Hidden -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Hidden, false)
+                        BannerState.Hidden    -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Hidden, false)
                     }
                 }
         views.homeKeysBackupBanner.delegate = this
@@ -323,7 +323,7 @@ class HomeDetailFragment @Inject constructor(
         views.bottomNavigationView.setOnNavigationItemSelectedListener {
             val displayMode = when (it.itemId) {
                 R.id.bottom_action_people -> RoomListDisplayMode.PEOPLE
-                R.id.bottom_action_rooms -> RoomListDisplayMode.ROOMS
+                R.id.bottom_action_rooms  -> RoomListDisplayMode.ROOMS
                 else                      -> RoomListDisplayMode.NOTIFICATIONS
             }
             viewModel.handle(HomeDetailAction.SwitchDisplayMode(displayMode))
@@ -401,7 +401,7 @@ class HomeDetailFragment @Inject constructor(
 
     private fun RoomListDisplayMode.toMenuId() = when (this) {
         RoomListDisplayMode.PEOPLE -> R.id.bottom_action_people
-        RoomListDisplayMode.ROOMS -> R.id.bottom_action_rooms
+        RoomListDisplayMode.ROOMS  -> R.id.bottom_action_rooms
         else                       -> R.id.bottom_action_notification
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index df38511b70..1cac86fef5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -360,9 +360,9 @@ class RoomDetailFragment @Inject constructor(
             }
             when (mode) {
                 is SendMode.REGULAR -> renderRegularMode(mode.text)
-                is SendMode.EDIT -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_edit, R.string.edit, mode.text)
-                is SendMode.QUOTE -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.quote, mode.text)
-                is SendMode.REPLY -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_reply, R.string.reply, mode.text)
+                is SendMode.EDIT    -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_edit, R.string.edit, mode.text)
+                is SendMode.QUOTE   -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_quote, R.string.quote, mode.text)
+                is SendMode.REPLY   -> renderSpecialMode(mode.timelineEvent, R.drawable.ic_reply, R.string.reply, mode.text)
             }
         }
 
@@ -386,24 +386,24 @@ class RoomDetailFragment @Inject constructor(
                 RoomDetailViewEvents.DisplayPromptForIntegrationManager  -> displayPromptForIntegrationManager()
                 is RoomDetailViewEvents.OpenStickerPicker                -> openStickerPicker(it)
                 is RoomDetailViewEvents.DisplayEnableIntegrationsWarning -> displayDisabledIntegrationDialog()
-                is RoomDetailViewEvents.OpenIntegrationManager -> openIntegrationManager()
-                is RoomDetailViewEvents.OpenFile -> startOpenFileIntent(it)
-                RoomDetailViewEvents.OpenActiveWidgetBottomSheet -> onViewWidgetsClicked()
-                is RoomDetailViewEvents.ShowInfoOkDialog -> showDialogWithMessage(it.message)
-                is RoomDetailViewEvents.JoinJitsiConference -> joinJitsiRoom(it.widget, it.withVideo)
-                RoomDetailViewEvents.ShowWaitingView -> vectorBaseActivity.showWaitingView()
-                RoomDetailViewEvents.HideWaitingView -> vectorBaseActivity.hideWaitingView()
-                is RoomDetailViewEvents.RequestNativeWidgetPermission -> requestNativeWidgetPermission(it)
-                is RoomDetailViewEvents.OpenRoom -> handleOpenRoom(it)
-                RoomDetailViewEvents.OpenInvitePeople -> navigator.openInviteUsersToRoom(requireContext(), roomDetailArgs.roomId)
-                RoomDetailViewEvents.OpenSetRoomAvatarDialog -> galleryOrCameraDialogHelper.show()
-                RoomDetailViewEvents.OpenRoomSettings -> handleOpenRoomSettings()
-                is RoomDetailViewEvents.ShowRoomAvatarFullScreen -> it.matrixItem?.let { item ->
+                is RoomDetailViewEvents.OpenIntegrationManager           -> openIntegrationManager()
+                is RoomDetailViewEvents.OpenFile                         -> startOpenFileIntent(it)
+                RoomDetailViewEvents.OpenActiveWidgetBottomSheet         -> onViewWidgetsClicked()
+                is RoomDetailViewEvents.ShowInfoOkDialog                 -> showDialogWithMessage(it.message)
+                is RoomDetailViewEvents.JoinJitsiConference              -> joinJitsiRoom(it.widget, it.withVideo)
+                RoomDetailViewEvents.ShowWaitingView                     -> vectorBaseActivity.showWaitingView()
+                RoomDetailViewEvents.HideWaitingView                     -> vectorBaseActivity.hideWaitingView()
+                is RoomDetailViewEvents.RequestNativeWidgetPermission    -> requestNativeWidgetPermission(it)
+                is RoomDetailViewEvents.OpenRoom                         -> handleOpenRoom(it)
+                RoomDetailViewEvents.OpenInvitePeople                    -> navigator.openInviteUsersToRoom(requireContext(), roomDetailArgs.roomId)
+                RoomDetailViewEvents.OpenSetRoomAvatarDialog             -> galleryOrCameraDialogHelper.show()
+                RoomDetailViewEvents.OpenRoomSettings                    -> handleOpenRoomSettings()
+                is RoomDetailViewEvents.ShowRoomAvatarFullScreen         -> it.matrixItem?.let { item ->
                     navigator.openBigImageViewer(requireActivity(), it.view, item)
                 }
-                is RoomDetailViewEvents.StartChatEffect -> handleChatEffect(it.type)
-                RoomDetailViewEvents.StopChatEffects -> handleStopChatEffects()
-                is RoomDetailViewEvents.DisplayAndAcceptCall -> acceptIncomingCall(it)
+                is RoomDetailViewEvents.StartChatEffect                  -> handleChatEffect(it.type)
+                RoomDetailViewEvents.StopChatEffects                     -> handleStopChatEffects()
+                is RoomDetailViewEvents.DisplayAndAcceptCall             -> acceptIncomingCall(it)
             }.exhaustive
         }
 
@@ -437,7 +437,7 @@ class RoomDetailFragment @Inject constructor(
                         .setPosition(-50f, views.viewKonfetti.width + 50f, -50f, -50f)
                         .streamFor(150, 3000L)
             }
-            ChatEffect.SNOW -> {
+            ChatEffect.SNOW     -> {
                 views.viewSnowFall.isVisible = true
                 views.viewSnowFall.restartFalling()
             }
@@ -630,23 +630,20 @@ class RoomDetailFragment @Inject constructor(
 
     private fun handleShareData() {
         when (val sharedData = roomDetailArgs.sharedData) {
-            is SharedData.Text -> {
+            is SharedData.Text        -> {
                 roomDetailViewModel.handle(RoomDetailAction.EnterRegularMode(sharedData.text, fromSharing = true))
             }
             is SharedData.Attachments -> {
                 // open share edition
                 onContentAttachmentsReady(sharedData.attachmentData)
             }
-            null -> Timber.v("No share data to process")
+            null                      -> Timber.v("No share data to process")
         }.exhaustive
     }
 
     private fun handleSpaceShare() {
         roomDetailArgs.openShareSpaceForId?.let { spaceId ->
             ShareSpaceBottomSheet.show(childFragmentManager, spaceId)
-            view?.post {
-                handleChatEffect(ChatEffect.CONFETTI)
-            }
         }
     }
 
@@ -772,8 +769,8 @@ class RoomDetailFragment @Inject constructor(
         withState(roomDetailViewModel) { state ->
             // Set the visual state of the call buttons (voice/video) to enabled/disabled according to user permissions
             val callButtonsEnabled = when (state.asyncRoomSummary.invoke()?.joinedMembersCount) {
-                1 -> false
-                2 -> state.isAllowedToStartWebRTCCall
+                1    -> false
+                2    -> state.isAllowedToStartWebRTCCall
                 else -> state.isAllowedToManageWidgets
             }
             setOf(R.id.voice_call, R.id.video_call).forEach {
@@ -803,7 +800,7 @@ class RoomDetailFragment @Inject constructor(
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.invite -> {
+            R.id.invite           -> {
                 navigator.openInviteUsersToRoom(requireActivity(), roomDetailArgs.roomId)
                 true
             }
@@ -815,23 +812,23 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.ManageIntegrations)
                 true
             }
-            R.id.voice_call -> {
+            R.id.voice_call       -> {
                 callActionsHandler.onVoiceCallClicked()
                 true
             }
-            R.id.video_call -> {
+            R.id.video_call       -> {
                 callActionsHandler.onVideoCallClicked()
                 true
             }
-            R.id.hangup_call -> {
+            R.id.hangup_call      -> {
                 roomDetailViewModel.handle(RoomDetailAction.EndCall)
                 true
             }
-            R.id.search -> {
+            R.id.search           -> {
                 handleSearchAction()
                 true
             }
-            R.id.dev_tools -> {
+            R.id.dev_tools        -> {
                 navigator.openDevTools(requireContext(), roomDetailArgs.roomId)
                 true
             }
@@ -933,9 +930,9 @@ class RoomDetailFragment @Inject constructor(
         when (roomDetailPendingAction) {
             is RoomDetailPendingAction.JumpToReadReceipt ->
                 roomDetailViewModel.handle(RoomDetailAction.JumpToReadReceipt(roomDetailPendingAction.userId))
-            is RoomDetailPendingAction.MentionUser ->
+            is RoomDetailPendingAction.MentionUser       ->
                 insertUserDisplayNameInTextEditor(roomDetailPendingAction.userId)
-            is RoomDetailPendingAction.OpenOrCreateDm ->
+            is RoomDetailPendingAction.OpenOrCreateDm    ->
                 roomDetailViewModel.handle(RoomDetailAction.OpenOrCreateDm(roomDetailPendingAction.userId))
         }.exhaustive
     }
@@ -1090,9 +1087,9 @@ class RoomDetailFragment @Inject constructor(
             withState(roomDetailViewModel) {
                 val showJumpToUnreadBanner = when (it.unreadState) {
                     UnreadState.Unknown,
-                    UnreadState.HasNoUnread -> false
+                    UnreadState.HasNoUnread            -> false
                     is UnreadState.ReadMarkerNotLoaded -> true
-                    is UnreadState.HasUnread -> {
+                    is UnreadState.HasUnread           -> {
                         if (it.canShowJumpToReadMarker) {
                             val lastVisibleItem = layoutManager.findLastVisibleItemPosition()
                             val positionOfReadMarker = timelineEventController.getPositionOfReadMarker()
@@ -1280,7 +1277,7 @@ class RoomDetailFragment @Inject constructor(
                 navigator.openRoom(vectorBaseActivity, async())
                 vectorBaseActivity.finish()
             }
-            is Fail -> {
+            is Fail    -> {
                 vectorBaseActivity.hideWaitingView()
                 vectorBaseActivity.toast(errorFormatter.toHumanReadable(async.error))
             }
@@ -1289,19 +1286,19 @@ class RoomDetailFragment @Inject constructor(
 
     private fun renderSendMessageResult(sendMessageResult: RoomDetailViewEvents.SendMessageResult) {
         when (sendMessageResult) {
-            is RoomDetailViewEvents.SlashCommandHandled -> {
+            is RoomDetailViewEvents.SlashCommandHandled        -> {
                 sendMessageResult.messageRes?.let { showSnackWithMessage(getString(it)) }
             }
-            is RoomDetailViewEvents.SlashCommandError -> {
+            is RoomDetailViewEvents.SlashCommandError          -> {
                 displayCommandError(getString(R.string.command_problem_with_parameters, sendMessageResult.command.command))
             }
-            is RoomDetailViewEvents.SlashCommandUnknown -> {
+            is RoomDetailViewEvents.SlashCommandUnknown        -> {
                 displayCommandError(getString(R.string.unrecognized_command, sendMessageResult.command))
             }
-            is RoomDetailViewEvents.SlashCommandResultOk -> {
+            is RoomDetailViewEvents.SlashCommandResultOk       -> {
                 updateComposerText("")
             }
-            is RoomDetailViewEvents.SlashCommandResultError -> {
+            is RoomDetailViewEvents.SlashCommandResultError    -> {
                 displayCommandError(errorFormatter.toHumanReadable(sendMessageResult.throwable))
             }
             is RoomDetailViewEvents.SlashCommandNotImplemented -> {
@@ -1323,7 +1320,7 @@ class RoomDetailFragment @Inject constructor(
     private fun displayE2eError(withHeldCode: WithHeldCode?) {
         val msgId = when (withHeldCode) {
             WithHeldCode.BLACKLISTED -> R.string.crypto_error_withheld_blacklisted
-            WithHeldCode.UNVERIFIED -> R.string.crypto_error_withheld_unverified
+            WithHeldCode.UNVERIFIED  -> R.string.crypto_error_withheld_unverified
             WithHeldCode.UNAUTHORISED,
             WithHeldCode.UNAVAILABLE -> R.string.crypto_error_withheld_generic
             else                     -> R.string.notice_crypto_unable_to_decrypt_friendly_desc
@@ -1374,7 +1371,7 @@ class RoomDetailFragment @Inject constructor(
 
     private fun displayRoomDetailActionSuccess(result: RoomDetailViewEvents.ActionSuccess) {
         when (val data = result.action) {
-            is RoomDetailAction.ReportContent -> {
+            is RoomDetailAction.ReportContent             -> {
                 when {
                     data.spam          -> {
                         AlertDialog.Builder(requireActivity())
@@ -1411,7 +1408,7 @@ class RoomDetailFragment @Inject constructor(
                     }
                 }
             }
-            is RoomDetailAction.RequestVerification -> {
+            is RoomDetailAction.RequestVerification       -> {
                 Timber.v("## SAS RequestVerification action")
                 VerificationBottomSheet.withArgs(
                         roomDetailArgs.roomId,
@@ -1426,7 +1423,7 @@ class RoomDetailFragment @Inject constructor(
                         data.transactionId
                 ).show(parentFragmentManager, "REQ")
             }
-            is RoomDetailAction.ResumeVerification -> {
+            is RoomDetailAction.ResumeVerification        -> {
                 val otherUserId = data.otherUserId ?: return
                 VerificationBottomSheet().apply {
                     arguments = Bundle().apply {
@@ -1569,11 +1566,11 @@ class RoomDetailFragment @Inject constructor(
             is MessageVerificationRequestContent -> {
                 roomDetailViewModel.handle(RoomDetailAction.ResumeVerification(informationData.eventId, null))
             }
-            is MessageWithAttachmentContent -> {
+            is MessageWithAttachmentContent      -> {
                 val action = RoomDetailAction.DownloadOrOpen(informationData.eventId, informationData.senderId, messageContent)
                 roomDetailViewModel.handle(action)
             }
-            is EncryptedEventContent -> {
+            is EncryptedEventContent             -> {
                 roomDetailViewModel.handle(RoomDetailAction.TapOnFailedToDecrypt(informationData.eventId))
             }
         }
@@ -1736,75 +1733,75 @@ class RoomDetailFragment @Inject constructor(
 
     private fun handleActions(action: EventSharedAction) {
         when (action) {
-            is EventSharedAction.OpenUserProfile -> {
+            is EventSharedAction.OpenUserProfile            -> {
                 openRoomMemberProfile(action.userId)
             }
-            is EventSharedAction.AddReaction -> {
+            is EventSharedAction.AddReaction                -> {
                 emojiActivityResultLauncher.launch(EmojiReactionPickerActivity.intent(requireContext(), action.eventId))
             }
-            is EventSharedAction.ViewReactions -> {
+            is EventSharedAction.ViewReactions              -> {
                 ViewReactionsBottomSheet.newInstance(roomDetailArgs.roomId, action.messageInformationData)
                         .show(requireActivity().supportFragmentManager, "DISPLAY_REACTIONS")
             }
-            is EventSharedAction.Copy -> {
+            is EventSharedAction.Copy                       -> {
                 // I need info about the current selected message :/
                 copyToClipboard(requireContext(), action.content, false)
                 showSnackWithMessage(getString(R.string.copied_to_clipboard))
             }
-            is EventSharedAction.Redact -> {
+            is EventSharedAction.Redact                     -> {
                 promptConfirmationToRedactEvent(action)
             }
-            is EventSharedAction.Share -> {
+            is EventSharedAction.Share                      -> {
                 onShareActionClicked(action)
             }
-            is EventSharedAction.Save -> {
+            is EventSharedAction.Save                       -> {
                 onSaveActionClicked(action)
             }
-            is EventSharedAction.ViewEditHistory -> {
+            is EventSharedAction.ViewEditHistory            -> {
                 onEditedDecorationClicked(action.messageInformationData)
             }
-            is EventSharedAction.ViewSource -> {
+            is EventSharedAction.ViewSource                 -> {
                 JSonViewerDialog.newInstance(
                         action.content,
                         -1,
                         createJSonViewerStyleProvider(colorProvider)
                 ).show(childFragmentManager, "JSON_VIEWER")
             }
-            is EventSharedAction.ViewDecryptedSource -> {
+            is EventSharedAction.ViewDecryptedSource        -> {
                 JSonViewerDialog.newInstance(
                         action.content,
                         -1,
                         createJSonViewerStyleProvider(colorProvider)
                 ).show(childFragmentManager, "JSON_VIEWER")
             }
-            is EventSharedAction.QuickReact -> {
+            is EventSharedAction.QuickReact                 -> {
                 // eventId,ClickedOn,Add
                 roomDetailViewModel.handle(RoomDetailAction.UpdateQuickReactAction(action.eventId, action.clickedOn, action.add))
             }
-            is EventSharedAction.Edit -> {
+            is EventSharedAction.Edit                       -> {
                 roomDetailViewModel.handle(RoomDetailAction.EnterEditMode(action.eventId, views.composerLayout.text.toString()))
             }
-            is EventSharedAction.Quote -> {
+            is EventSharedAction.Quote                      -> {
                 roomDetailViewModel.handle(RoomDetailAction.EnterQuoteMode(action.eventId, views.composerLayout.text.toString()))
             }
-            is EventSharedAction.Reply -> {
+            is EventSharedAction.Reply                      -> {
                 roomDetailViewModel.handle(RoomDetailAction.EnterReplyMode(action.eventId, views.composerLayout.text.toString()))
             }
-            is EventSharedAction.CopyPermalink -> {
+            is EventSharedAction.CopyPermalink              -> {
                 val permalink = session.permalinkService().createPermalink(roomDetailArgs.roomId, action.eventId)
                 copyToClipboard(requireContext(), permalink, false)
                 showSnackWithMessage(getString(R.string.copied_to_clipboard))
             }
-            is EventSharedAction.Resend -> {
+            is EventSharedAction.Resend                     -> {
                 roomDetailViewModel.handle(RoomDetailAction.ResendMessage(action.eventId))
             }
-            is EventSharedAction.Remove -> {
+            is EventSharedAction.Remove                     -> {
                 roomDetailViewModel.handle(RoomDetailAction.RemoveFailedEcho(action.eventId))
             }
             is EventSharedAction.Cancel                     -> {
                 handleCancelSend(action)
             }
-            is EventSharedAction.ReportContentSpam -> {
+            is EventSharedAction.ReportContentSpam          -> {
                 roomDetailViewModel.handle(RoomDetailAction.ReportContent(
                         action.eventId, action.senderId, "This message is spam", spam = true))
             }
@@ -1812,22 +1809,22 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.ReportContent(
                         action.eventId, action.senderId, "This message is inappropriate", inappropriate = true))
             }
-            is EventSharedAction.ReportContentCustom -> {
+            is EventSharedAction.ReportContentCustom        -> {
                 promptReasonToReportContent(action)
             }
-            is EventSharedAction.IgnoreUser -> {
+            is EventSharedAction.IgnoreUser                 -> {
                 action.senderId?.let { askConfirmationToIgnoreUser(it) }
             }
-            is EventSharedAction.OnUrlClicked -> {
+            is EventSharedAction.OnUrlClicked               -> {
                 onUrlClicked(action.url, action.title)
             }
-            is EventSharedAction.OnUrlLongClicked -> {
+            is EventSharedAction.OnUrlLongClicked           -> {
                 onUrlLongClicked(action.url)
             }
-            is EventSharedAction.ReRequestKey -> {
+            is EventSharedAction.ReRequestKey               -> {
                 roomDetailViewModel.handle(RoomDetailAction.ReRequestKeys(action.eventId))
             }
-            is EventSharedAction.UseKeyBackup -> {
+            is EventSharedAction.UseKeyBackup               -> {
                 context?.let {
                     startActivity(KeysBackupRestoreActivity.intent(it))
                 }
@@ -1967,10 +1964,10 @@ class RoomDetailFragment @Inject constructor(
 
     private fun launchAttachmentProcess(type: AttachmentTypeSelectorView.Type) {
         when (type) {
-            AttachmentTypeSelectorView.Type.CAMERA -> attachmentsHelper.openCamera(requireContext(), attachmentPhotoActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.FILE -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.CAMERA  -> attachmentsHelper.openCamera(requireContext(), attachmentPhotoActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.FILE    -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
             AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentImageActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.AUDIO -> attachmentsHelper.selectAudio(attachmentAudioActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.AUDIO   -> attachmentsHelper.selectAudio(attachmentAudioActivityResultLauncher)
             AttachmentTypeSelectorView.Type.CONTACT -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
             AttachmentTypeSelectorView.Type.STICKER -> roomDetailViewModel.handle(RoomDetailAction.SelectStickerAttachment)
         }.exhaustive
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index b5d3102f46..a3f647871b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -128,7 +128,8 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                     setState {
                         copy(actionPermissions = permissions)
                     }
-                }.disposeOnClear()
+                }
+                .disposeOnClear()
     }
 
     private fun observeEvent() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index b06dc8dfa6..880c3391c9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -380,7 +380,7 @@ class RoomListViewModel @Inject constructor(
 
     private fun String.otherTag(): String? {
         return when (this) {
-            RoomTag.ROOM_TAG_FAVOURITE -> RoomTag.ROOM_TAG_LOW_PRIORITY
+            RoomTag.ROOM_TAG_FAVOURITE    -> RoomTag.ROOM_TAG_LOW_PRIORITY
             RoomTag.ROOM_TAG_LOW_PRIORITY -> RoomTag.ROOM_TAG_FAVOURITE
             else                          -> null
         }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt
index 1c9d0bbb18..f38049640d 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToAction.kt
@@ -27,5 +27,4 @@ sealed class MatrixToAction : VectorViewModelAction {
     data class JoinRoom(val roomId: String, val viaServers: List<String>?) : MatrixToAction()
     data class OpenSpace(val spaceID: String) : MatrixToAction()
     data class OpenRoom(val roomId: String) : MatrixToAction()
-//    data class OpenSpace(val spaceID: String) : MatrixToAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index 55c3826ef3..18891fcd03 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -63,17 +63,17 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
 
     init {
         when (initialState.linkType) {
-            is PermalinkData.RoomLink -> {
+            is PermalinkData.RoomLink     -> {
                 setState {
                     copy(roomPeekResult = Loading())
                 }
             }
-            is PermalinkData.UserLink -> {
+            is PermalinkData.UserLink     -> {
                 setState {
                     copy(matrixItem = Loading())
                 }
             }
-            is PermalinkData.GroupLink -> {
+            is PermalinkData.GroupLink    -> {
                 // Not yet supported
             }
             is PermalinkData.FallbackLink -> {
@@ -98,7 +98,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
         }
 
         when (permalinkData) {
-            is PermalinkData.UserLink -> {
+            is PermalinkData.UserLink     -> {
                 val user = resolveUser(permalinkData.userId)
                 setState {
                     copy(
@@ -107,7 +107,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                     )
                 }
             }
-            is PermalinkData.RoomLink -> {
+            is PermalinkData.RoomLink     -> {
                 // could this room be already known
                 val knownRoom = if (permalinkData.isRoomAlias) {
                     tryOrNull {
@@ -183,7 +183,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                     }
                 }
             }
-            is PermalinkData.GroupLink -> {
+            is PermalinkData.GroupLink    -> {
                 // not yet supported
                 _viewEvents.post(MatrixToViewEvents.Dismiss)
             }
@@ -261,18 +261,18 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
     override fun handle(action: MatrixToAction) {
         when (action) {
             is MatrixToAction.StartChattingWithUser -> handleStartChatting(action)
-            MatrixToAction.FailedToResolveUser -> {
+            MatrixToAction.FailedToResolveUser      -> {
                 _viewEvents.post(MatrixToViewEvents.Dismiss)
             }
-            MatrixToAction.FailedToStartChatting -> {
+            MatrixToAction.FailedToStartChatting    -> {
                 _viewEvents.post(MatrixToViewEvents.Dismiss)
             }
-            is MatrixToAction.JoinSpace -> handleJoinSpace(action)
-            is MatrixToAction.JoinRoom -> handleJoinRoom(action)
-            is MatrixToAction.OpenSpace -> {
+            is MatrixToAction.JoinSpace             -> handleJoinSpace(action)
+            is MatrixToAction.JoinRoom              -> handleJoinRoom(action)
+            is MatrixToAction.OpenSpace             -> {
                 _viewEvents.post(MatrixToViewEvents.NavigateToSpace(action.spaceID))
             }
-            is MatrixToAction.OpenRoom -> {
+            is MatrixToAction.OpenRoom              -> {
                 _viewEvents.post(MatrixToViewEvents.NavigateToRoom(action.roomId))
             }
         }.exhaustive
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index 7b05c6c7f5..6978a24747 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -287,16 +287,18 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
         val roomSummaryLive = room.rx().liveRoomSummary().unwrap()
         val powerLevelsContentLive = PowerLevelsObservableFactory(room).createObservable()
 
-        powerLevelsContentLive.subscribe {
-            val powerLevelsHelper = PowerLevelsHelper(it)
-            val permissions = ActionPermissions(
-                    canKick = powerLevelsHelper.isUserAbleToKick(session.myUserId),
-                    canBan = powerLevelsHelper.isUserAbleToBan(session.myUserId),
-                    canInvite = powerLevelsHelper.isUserAbleToInvite(session.myUserId),
-                    canEditPowerLevel = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_POWER_LEVELS)
-            )
-            setState { copy(powerLevelsContent = it, actionPermissions = permissions) }
-        }.disposeOnClear()
+        powerLevelsContentLive
+                .subscribe {
+                    val powerLevelsHelper = PowerLevelsHelper(it)
+                    val permissions = ActionPermissions(
+                            canKick = powerLevelsHelper.isUserAbleToKick(session.myUserId),
+                            canBan = powerLevelsHelper.isUserAbleToBan(session.myUserId),
+                            canInvite = powerLevelsHelper.isUserAbleToInvite(session.myUserId),
+                            canEditPowerLevel = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_POWER_LEVELS)
+                    )
+                    setState { copy(powerLevelsContent = it, actionPermissions = permissions) }
+                }
+                .disposeOnClear()
 
         roomSummaryLive.execute {
             copy(isRoomEncrypted = it.invoke()?.isEncrypted == true)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
index 9e12e30399..1b64261fcb 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewModel.kt
@@ -72,10 +72,12 @@ class RoomBannedMemberListViewModel @AssistedInject constructor(@Assisted initia
 
         val powerLevelsContentLive = PowerLevelsObservableFactory(room).createObservable()
 
-        powerLevelsContentLive.subscribe {
-            val powerLevelsHelper = PowerLevelsHelper(it)
-            setState { copy(canUserBan = powerLevelsHelper.isUserAbleToBan(session.myUserId)) }
-        }.disposeOnClear()
+        powerLevelsContentLive
+                .subscribe {
+                    val powerLevelsHelper = PowerLevelsHelper(it)
+                    setState { copy(canUserBan = powerLevelsHelper.isUserAbleToBan(session.myUserId)) }
+                }
+                .disposeOnClear()
     }
 
     companion object : MvRxViewModelFactory<RoomBannedMemberListViewModel, RoomBannedMemberListViewState> {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index f08f8906b8..270b3cb408 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -138,7 +138,8 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
                     setState {
                         copy(actionsPermissions = permissions)
                     }
-                }.disposeOnClear()
+                }
+                .disposeOnClear()
     }
 
     private fun observeRoomSummary() {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 682813dfd9..608c9b5d58 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -139,15 +139,22 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
     }
 
     companion object {
-
-        const val RESULT_DATA_CREATED_SPACE_ID = "RESULT_DATA_CREATED_SPACE_ID"
-        const val RESULT_DATA_DEFAULT_ROOM_ID = "RESULT_DATA_DEFAULT_ROOM_ID"
+        private const val RESULT_DATA_CREATED_SPACE_ID = "RESULT_DATA_CREATED_SPACE_ID"
+        private const val RESULT_DATA_DEFAULT_ROOM_ID = "RESULT_DATA_DEFAULT_ROOM_ID"
 
         fun newIntent(context: Context): Intent {
             return Intent(context, SpaceCreationActivity::class.java).apply {
                 // putExtra(MvRx.KEY_ARG, SpaceDirectoryArgs(spaceId))
             }
         }
+
+        fun getCreatedSpaceId(data: Intent?): String? {
+            return data?.extras?.getString(RESULT_DATA_CREATED_SPACE_ID)
+        }
+
+        fun getDefaultRoomId(data: Intent?): String? {
+            return data?.extras?.getString(RESULT_DATA_DEFAULT_ROOM_ID)
+        }
     }
 
     override fun create(initialState: CreateSpaceState): CreateSpaceViewModel = viewModelFactory.create(initialState)
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
index b6548a6542..bf27173d83 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
@@ -123,9 +123,11 @@ class WidgetViewModel @AssistedInject constructor(@Assisted val initialState: Wi
                 .unwrap()
                 .map {
                     PowerLevelsHelper(it).isUserAllowedToSend(session.myUserId, true, null)
-                }.subscribe {
+                }
+                .subscribe {
                     setState { copy(canManageWidgets = it) }
-                }.disposeOnClear()
+                }
+                .disposeOnClear()
     }
 
     private fun observeWidgetIfNeeded() {
diff --git a/vector/src/main/res/layout/item_editable_square_avatar.xml b/vector/src/main/res/layout/item_editable_square_avatar.xml
index 9fa2cdbbf1..04bf95e983 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -45,7 +45,7 @@
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="48dp"
         app:tint="@color/riotx_destructive_accent"
-        tools:ignore="MissingConstraints"
+        tools:ignore="MissingConstraints,MissingPrefix"
         tools:visibility="visible" />
 
 
@@ -55,14 +55,14 @@
         android:layout_gravity="center"
         android:background="@drawable/circle"
         android:backgroundTint="?riotx_background"
+        android:contentDescription="@string/a11y_change_avatar"
         android:padding="8dp"
         android:src="@drawable/ic_camera_plain"
-        android:contentDescription="@string/a11y_change_avatar"
-        app:tint="?riotx_text_secondary"
         app:layout_constraintCircle="@+id/itemEditableAvatarImageContainer"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="48dp"
-        tools:ignore="MissingConstraints" />
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingConstraints,MissingPrefix" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index 7a3b73487c..60b791b5e6 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -5,8 +5,8 @@
     android:id="@+id/itemRoomLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:foreground="?attr/selectableItemBackground"
-    android:background="?riotx_background">
+    android:background="?riotx_background"
+    android:foreground="?attr/selectableItemBackground">
 
     <FrameLayout
         android:id="@+id/roomAvatarContainer"
@@ -95,14 +95,14 @@
 
     <ProgressBar
         android:id="@+id/joinSuggestedLoading"
-        android:visibility="gone"
-        tools:visibility="visible"
         android:layout_width="20dp"
         android:layout_height="20dp"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/joinSuggestedRoomButton"
         app:layout_constraintEnd_toEndOf="@id/joinSuggestedRoomButton"
         app:layout_constraintStart_toStartOf="@id/joinSuggestedRoomButton"
-        app:layout_constraintTop_toTopOf="@id/joinSuggestedRoomButton" />
+        app:layout_constraintTop_toTopOf="@id/joinSuggestedRoomButton"
+        tools:visibility="visible" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/roomBottomBarrier"

From 3c64f78159aa7d964b157fd31e5889d7476c6b8b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 15:37:07 +0200
Subject: [PATCH 144/350] Fix issue in layout

---
 vector/src/main/res/layout/item_suggested_room.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml
index 60b791b5e6..e694e34c13 100644
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@@ -72,15 +72,6 @@
         app:layout_constraintTop_toBottomOf="@+id/roomNameView"
         tools:text="@sample/matrix.json/data/message" />
 
-    <!-- Margin bottom does not work, so I use space -->
-    <Space
-        android:id="@+id/roomLastEventBottomSpace"
-        android:layout_width="0dp"
-        android:layout_height="7dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomLastEventView"
-        tools:layout_marginStart="120dp" />
-
     <com.google.android.material.button.MaterialButton
         android:id="@+id/joinSuggestedRoomButton"
         style="@style/VectorButtonStyleOutlined"
@@ -109,7 +100,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:barrierDirection="bottom"
-        app:constraint_referenced_ids="roomAvatarBottomSpace,roomLastEventBottomSpace" />
+        app:constraint_referenced_ids="roomAvatarBottomSpace" />
 
     <View
         android:id="@+id/roomDividerView"

From fa489c459aaf43a32245d95108aae6be68ac2da7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 15:39:37 +0200
Subject: [PATCH 145/350] Move SharedPreferenceLiveData to another package

---
 .../platform/livedata}/SharedPreferenceLiveData.kt              | 2 +-
 .../java/im/vector/app/features/settings/VectorPreferences.kt   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename vector/src/main/java/im/vector/app/{features/settings => core/platform/livedata}/SharedPreferenceLiveData.kt (97%)

diff --git a/vector/src/main/java/im/vector/app/features/settings/SharedPreferenceLiveData.kt b/vector/src/main/java/im/vector/app/core/platform/livedata/SharedPreferenceLiveData.kt
similarity index 97%
rename from vector/src/main/java/im/vector/app/features/settings/SharedPreferenceLiveData.kt
rename to vector/src/main/java/im/vector/app/core/platform/livedata/SharedPreferenceLiveData.kt
index 08e83258a1..3e0733b35d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/SharedPreferenceLiveData.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/livedata/SharedPreferenceLiveData.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.settings
+package im.vector.app.core.platform.livedata
 
 import android.content.SharedPreferences
 import androidx.lifecycle.LiveData
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 4d1c9b5728..b2b609d714 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -25,6 +25,7 @@ import com.squareup.seismic.ShakeDetector
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.platform.livedata.SharedPreferenceLiveData
 import im.vector.app.features.disclaimer.SHARED_PREF_KEY
 import im.vector.app.features.homeserver.ServerUrlsRepository
 import im.vector.app.features.themes.ThemeUtils

From a211cc1780ebdbc1037f06bc090f5f215fb6e83c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 15:50:37 +0200
Subject: [PATCH 146/350] Explode into several files

---
 .../app/features/spaces/SpaceListAction.kt    | 27 ++++++++++
 .../features/spaces/SpaceListViewEvents.kt    | 28 ++++++++++
 .../app/features/spaces/SpaceListViewState.kt | 29 +++++++++++
 .../features/spaces/SpacesListViewModel.kt    | 28 ----------
 .../spaces/create/CreateSpaceAction.kt        | 31 +++++++++++
 .../spaces/create/CreateSpaceEvents.kt        | 29 +++++++++++
 .../spaces/create/CreateSpaceState.kt         | 40 ++++++++++++++
 .../spaces/create/CreateSpaceViewModel.kt     | 52 -------------------
 .../app/features/spaces/create/SpaceType.kt   | 22 ++++++++
 .../spaces/explore/SpaceDirectoryState.kt     | 44 ++++++++++++++++
 .../explore/SpaceDirectoryViewAction.kt       | 26 ++++++++++
 .../explore/SpaceDirectoryViewEvents.kt       | 24 +++++++++
 .../spaces/explore/SpaceDirectoryViewModel.kt | 38 --------------
 13 files changed, 300 insertions(+), 118 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/SpaceType.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
new file mode 100644
index 0000000000..8adfbae3bd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+sealed class SpaceListAction : VectorViewModelAction {
+    data class SelectSpace(val spaceSummary: RoomSummary) : SpaceListAction()
+    data class LeaveSpace(val spaceSummary: RoomSummary) : SpaceListAction()
+    data class ToggleExpand(val spaceSummary: RoomSummary) : SpaceListAction()
+    object AddSpace : SpaceListAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt
new file mode 100644
index 0000000000..7f05172cd1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import im.vector.app.core.platform.VectorViewEvents
+
+/**
+ * Transient events for group list screen
+ */
+sealed class SpaceListViewEvents : VectorViewEvents {
+    object OpenSpace : SpaceListViewEvents()
+    data class OpenSpaceSummary(val id: String) : SpaceListViewEvents()
+    object AddSpace : SpaceListViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
new file mode 100644
index 0000000000..cd578bce11
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+data class SpaceListViewState(
+        val asyncSpaces: Async<List<RoomSummary>> = Uninitialized,
+        val selectedSpace: RoomSummary? = null,
+        val rootSpaces: List<RoomSummary>? = null,
+        val expandedStates: Map<String, Boolean> = emptyMap()
+) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 8c13584b43..f21f51a57e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -18,19 +18,14 @@ package im.vector.app.features.spaces
 
 import androidx.lifecycle.viewModelScope
 import arrow.core.Option
-import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.FragmentViewModelContext
-import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
-import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.R
-import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.features.ui.UiStateRepository
@@ -48,29 +43,6 @@ import org.matrix.android.sdk.rx.rx
 
 const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
 
-sealed class SpaceListAction : VectorViewModelAction {
-    data class SelectSpace(val spaceSummary: RoomSummary) : SpaceListAction()
-    data class LeaveSpace(val spaceSummary: RoomSummary) : SpaceListAction()
-    data class ToggleExpand(val spaceSummary: RoomSummary) : SpaceListAction()
-    object AddSpace : SpaceListAction()
-}
-
-/**
- * Transient events for group list screen
- */
-sealed class SpaceListViewEvents : VectorViewEvents {
-    object OpenSpace : SpaceListViewEvents()
-    data class OpenSpaceSummary(val id: String) : SpaceListViewEvents()
-    object AddSpace : SpaceListViewEvents()
-}
-
-data class SpaceListViewState(
-        val asyncSpaces: Async<List<RoomSummary>> = Uninitialized,
-        val selectedSpace: RoomSummary? = null,
-        val rootSpaces: List<RoomSummary>? = null,
-        val expandedStates: Map<String, Boolean> = emptyMap()
-) : MvRxState
-
 class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
                                                       private val selectedSpaceDataSource: SelectedSpaceDataSource,
                                                       private val session: Session,
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
new file mode 100644
index 0000000000..14f219ffc4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.net.Uri
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class CreateSpaceAction : VectorViewModelAction {
+    data class SetRoomType(val type: SpaceType) : CreateSpaceAction()
+    data class NameChanged(val name: String) : CreateSpaceAction()
+    data class TopicChanged(val topic: String) : CreateSpaceAction()
+    data class SetAvatar(val uri: Uri?) : CreateSpaceAction()
+    object OnBackPressed : CreateSpaceAction()
+    object NextFromDetails : CreateSpaceAction()
+    object NextFromDefaultRooms : CreateSpaceAction()
+    data class DefaultRoomNameChanged(val index: Int, val name: String) : CreateSpaceAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
new file mode 100644
index 0000000000..d89c24e5d0
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class CreateSpaceEvents : VectorViewEvents {
+    object NavigateToDetails : CreateSpaceEvents()
+    object NavigateToChooseType : CreateSpaceEvents()
+    object NavigateToAddRooms : CreateSpaceEvents()
+    object Dismiss : CreateSpaceEvents()
+    data class FinishSuccess(val spaceId: String, val defaultRoomId: String?) : CreateSpaceEvents()
+    data class ShowModalError(val errorMessage: String) : CreateSpaceEvents()
+    object HideModalLoading : CreateSpaceEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
new file mode 100644
index 0000000000..5449385610
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.net.Uri
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+
+data class CreateSpaceState(
+        val name: String? = null,
+        val avatarUri: Uri? = null,
+        val topic: String = "",
+        val step: Step = Step.ChooseType,
+        val spaceType: SpaceType? = null,
+        val nameInlineError: String? = null,
+        val defaultRooms: Map<Int, String?>? = null,
+        val creationResult: Async<String> = Uninitialized
+) : MvRxState {
+
+    enum class Step {
+        ChooseType,
+        SetDetails,
+        AddRooms
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index 9988bbe003..18cccbe62a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -16,17 +16,13 @@
 
 package im.vector.app.features.spaces.create
 
-import android.net.Uri
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
-import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -34,61 +30,13 @@ import dagger.assisted.AssistedInject
 import im.vector.app.R
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.core.resources.StringProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.session.Session
-
-data class CreateSpaceState(
-        val name: String? = null,
-        val avatarUri: Uri? = null,
-        val topic: String = "",
-        val step: Step = Step.ChooseType,
-        val spaceType: SpaceType? = null,
-        val nameInlineError: String? = null,
-        val defaultRooms: Map<Int, String?>? = null,
-        val creationResult: Async<String> = Uninitialized
-) : MvRxState {
-
-    enum class Step {
-        ChooseType,
-        SetDetails,
-        AddRooms
-    }
-}
-
-enum class SpaceType {
-    Public,
-    Private
-}
-
-sealed class CreateSpaceAction : VectorViewModelAction {
-    data class SetRoomType(val type: SpaceType) : CreateSpaceAction()
-    data class NameChanged(val name: String) : CreateSpaceAction()
-    data class TopicChanged(val topic: String) : CreateSpaceAction()
-    data class SetAvatar(val uri: Uri?) : CreateSpaceAction()
-    object OnBackPressed : CreateSpaceAction()
-    object NextFromDetails : CreateSpaceAction()
-    object NextFromDefaultRooms : CreateSpaceAction()
-    data class DefaultRoomNameChanged(val index: Int, val name: String) : CreateSpaceAction()
-}
-
-sealed class CreateSpaceEvents : VectorViewEvents {
-    object NavigateToDetails : CreateSpaceEvents()
-    object NavigateToChooseType : CreateSpaceEvents()
-    object NavigateToAddRooms : CreateSpaceEvents()
-    object Dismiss : CreateSpaceEvents()
-    data class FinishSuccess(val spaceId: String, val defaultRoomId: String?) : CreateSpaceEvents()
-    data class ShowModalError(val errorMessage: String) : CreateSpaceEvents()
-    object HideModalLoading : CreateSpaceEvents()
-}
 
 class CreateSpaceViewModel @AssistedInject constructor(
         @Assisted initialState: CreateSpaceState,
-        private val session: Session,
         private val stringProvider: StringProvider,
         private val createSpaceViewModelTask: CreateSpaceViewModelTask,
         private val errorFormatter: ErrorFormatter
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceType.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceType.kt
new file mode 100644
index 0000000000..7df036de46
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceType.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+enum class SpaceType {
+    Public,
+    Private
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt
new file mode 100644
index 0000000000..75adc659d5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryState.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.explore
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+
+data class SpaceDirectoryState(
+        // The current filter
+        val spaceId: String,
+        val currentFilter: String = "",
+        val spaceSummary: Async<RoomSummary> = Uninitialized,
+        val spaceSummaryApiResult: Async<List<SpaceChildInfo>> = Uninitialized,
+        val childList: List<SpaceChildInfo> = emptyList(),
+        val hierarchyStack: List<String> = emptyList(),
+        // True if more result are available server side
+        val hasMore: Boolean = false,
+        // Set of joined roomId / spaces,
+        val joinedRoomsIds: Set<String> = emptySet(),
+        // keys are room alias or roomId
+        val changeMembershipStates: Map<String, ChangeMembershipState> = emptyMap()
+) : MvRxState {
+    constructor(args: SpaceDirectoryArgs) : this(
+            spaceId = args.spaceId
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
new file mode 100644
index 0000000000..a74662759e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.explore
+
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+
+sealed class SpaceDirectoryViewAction : VectorViewModelAction {
+    data class ExploreSubSpace(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
+    data class JoinOrOpen(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
+    object HandleBack : SpaceDirectoryViewAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt
new file mode 100644
index 0000000000..ef6f5385d3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.explore
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SpaceDirectoryViewEvents : VectorViewEvents {
+    object Dismiss : SpaceDirectoryViewEvents()
+    data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index 107ce9ee19..2ba4d4101a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -18,27 +18,20 @@ package im.vector.app.features.spaces.explore
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
-import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.platform.VectorViewModelAction
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
@@ -46,37 +39,6 @@ import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
-data class SpaceDirectoryState(
-        // The current filter
-        val spaceId: String,
-        val currentFilter: String = "",
-        val spaceSummary: Async<RoomSummary> = Uninitialized,
-        val spaceSummaryApiResult: Async<List<SpaceChildInfo>> = Uninitialized,
-        val childList: List<SpaceChildInfo> = emptyList(),
-        val hierarchyStack: List<String> = emptyList(),
-        // True if more result are available server side
-        val hasMore: Boolean = false,
-        // Set of joined roomId / spaces,
-        val joinedRoomsIds: Set<String> = emptySet(),
-        // keys are room alias or roomId
-        val changeMembershipStates: Map<String, ChangeMembershipState> = emptyMap()
-) : MvRxState {
-    constructor(args: SpaceDirectoryArgs) : this(
-            spaceId = args.spaceId
-    )
-}
-
-sealed class SpaceDirectoryViewAction : VectorViewModelAction {
-    data class ExploreSubSpace(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
-    data class JoinOrOpen(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
-    object HandleBack : SpaceDirectoryViewAction()
-}
-
-sealed class SpaceDirectoryViewEvents : VectorViewEvents {
-    object Dismiss : SpaceDirectoryViewEvents()
-    data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewEvents()
-}
-
 class SpaceDirectoryViewModel @AssistedInject constructor(
         @Assisted initialState: SpaceDirectoryState,
         private val session: Session

From 4fb248cd9fd1dd86823b8605c886fc28a24d66ce Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 16:08:22 +0200
Subject: [PATCH 147/350] rename parameter

---
 .../app/features/ui/SharedPreferencesUiStateRepository.kt     | 4 ++--
 .../main/java/im/vector/app/features/ui/UiStateRepository.kt  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index 781f3f8cb6..696a8c69cb 100644
--- a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -59,9 +59,9 @@ class SharedPreferencesUiStateRepository @Inject constructor(
         }
     }
 
-    override fun storeSelectedSpace(roomId: String?, sessionId: String) {
+    override fun storeSelectedSpace(spaceId: String?, sessionId: String) {
         sharedPreferences.edit {
-            putString("$KEY_SELECTED_SPACE@$sessionId", roomId)
+            putString("$KEY_SELECTED_SPACE@$sessionId", spaceId)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
index e247b2f1d1..25e81efa83 100644
--- a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
@@ -32,7 +32,7 @@ interface UiStateRepository {
 
     fun storeDisplayMode(displayMode: RoomListDisplayMode)
 
-    fun storeSelectedSpace(roomId: String?, sessionId: String)
+    fun storeSelectedSpace(spaceId: String?, sessionId: String)
 
     fun getSelectedSpace(sessionId: String): String?
 }

From dfae42c912b9000ee97a3cb31a4a0cce9204af7b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Mar 2021 16:08:30 +0200
Subject: [PATCH 148/350] Cleanup layout

---
 .../res/layout/bottom_sheet_space_invite.xml  | 22 ++++---------------
 .../bottom_sheet_space_invite_chooser.xml     | 20 +++++------------
 .../fragment_matrix_to_room_space_card.xml    |  4 ++--
 .../fragment_space_create_choose_type.xml     |  5 +++--
 ...agment_space_create_generic_epoxy_form.xml |  1 +
 .../res/layout/fragment_space_preview.xml     |  3 ++-
 .../main/res/layout/item_space_subspace.xml   | 13 ++++-------
 vector/src/main/res/layout/item_space_tab.xml |  7 +++---
 .../res/layout/item_space_top_summary.xml     | 10 +++++----
 .../res/layout/view_space_type_button.xml     |  8 +++----
 10 files changed, 35 insertions(+), 58 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index bf985dbcbb..125335e8af 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -35,46 +35,32 @@
         app:layout_constraintVertical_bias="1"
         tools:text="@string/invite_people_to_your_space_desc" />
 
-
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteByMailButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_mail"
         app:iconTint="?riotx_text_secondary"
         app:title="@string/invite_by_email" />
 
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
-
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteByMxidButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_add_people"
         app:iconTint="?riotx_text_secondary"
         app:title="@string/invite_by_mxid" />
 
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
-
-
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteByLinkButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
         app:icon="@drawable/ic_share_link"
         app:iconTint="?riotx_text_secondary"
-        app:title="@string/invite_by_link">
-
-    </im.vector.app.features.spaces.create.WizardButtonView>
-
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="20dp" />
+        app:title="@string/invite_by_link" />
 
     <!--    <com.google.android.material.button.MaterialButton-->
     <!--        android:id="@+id/skipButton"-->
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index 8c259d13b0..78fc07885c 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -21,34 +21,24 @@
         android:textStyle="bold"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteToSpaceButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_invite_people"
         app:iconTint="?riotx_text_secondary"
-        app:title="@string/invite_to_space_with_name"
         app:subTitle="@string/invite_to_space_with_name_desc"
-        />
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
+        app:title="@string/invite_to_space_with_name" />
 
     <im.vector.app.features.spaces.create.WizardButtonView
         android:id="@+id/inviteToRoomOnly"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
         app:icon="@drawable/ic_invite_people"
         app:iconTint="?riotx_text_secondary"
-        app:title="@string/invite_just_to_this_room"
-        app:subTitle="@string/invite_just_to_this_room_desc"/>
-
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="16dp" />
-
-
+        app:subTitle="@string/invite_just_to_this_room_desc"
+        app:title="@string/invite_just_to_this_room" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 198574cab8..c87a0d9e4b 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -75,7 +75,8 @@
             android:layout_marginEnd="4dp"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_room_profile_member_list"
-            app:tint="?riotx_text_primary" />
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/spaceChildMemberCountText"
@@ -220,5 +221,4 @@
         app:constraint_referenced_ids="matrixToCardNameText,matrixToCardAvatar,matrixToCardNameText,matrixToCardDescText, matrixToCardMainButton, matrixToCardAliasText, matrixToCardSecondaryButton, matrixToMemberPills,matrixToCardPeopleYouKnowVisibility"
         tools:visibility="visible" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_type.xml b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
index 73e6044a37..b668fd2f37 100644
--- a/vector/src/main/res/layout/fragment_space_create_choose_type.xml
+++ b/vector/src/main/res/layout/fragment_space_create_choose_type.xml
@@ -60,8 +60,8 @@
             android:id="@+id/privateButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:icon="@drawable/ic_room_private"
             android:layout_marginBottom="16dp"
+            app:icon="@drawable/ic_room_private"
             app:layout_constraintBottom_toTopOf="@id/changeLaterText"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -77,7 +77,8 @@
             android:text="@string/create_spaces_you_can_change_later"
             android:textColor="?riotx_text_secondary"
             android:textSize="14sp"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
index 7652a540dc..aea5000274 100644
--- a/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
+++ b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
@@ -34,4 +34,5 @@
             android:text="@string/next_pf" />
 
     </FrameLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml
index 5781ddb570..7e89ab9070 100644
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@@ -93,7 +93,6 @@
             app:layout_constraintTop_toBottomOf="@+id/spacePreviewPeekingProgress"
             tools:listitem="@layout/item_space_subspace" />
 
-
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
@@ -122,7 +121,9 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:text="@string/accept" />
+
         </LinearLayout>
+
     </LinearLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index d3b243132e..5dcf2fa4c6 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -26,10 +24,10 @@
         android:id="@+id/childSpaceAvatar"
         android:layout_width="24dp"
         android:layout_height="24dp"
+        android:layout_marginStart="8dp"
+        android:contentDescription="@string/a11y_image"
         android:scaleType="centerInside"
         android:visibility="visible"
-        android:contentDescription="@string/a11y_image"
-        android:layout_marginStart="8dp"
         app:layout_constraintBottom_toBottomOf="@id/childSpaceName"
         app:layout_constraintStart_toEndOf="@id/childSpaceTab"
         app:layout_constraintTop_toTopOf="@id/childSpaceName"
@@ -39,14 +37,12 @@
     <View
         android:layout_width="2dp"
         android:layout_height="0dp"
+        android:layout_marginStart="15dp"
         android:layout_marginTop="2dp"
         android:background="?riotx_list_bottom_sheet_divider_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginStart="15dp"
-        app:layout_constraintTop_toBottomOf="@id/childSpaceAvatar">
-
-    </View>
+        app:layout_constraintTop_toBottomOf="@id/childSpaceAvatar" />
 
     <TextView
         android:id="@+id/childSpaceName"
@@ -68,5 +64,4 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_tab.xml b/vector/src/main/res/layout/item_space_tab.xml
index ea08fabea3..ae0b62fe46 100644
--- a/vector/src/main/res/layout/item_space_tab.xml
+++ b/vector/src/main/res/layout/item_space_tab.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="16dp"
     android:layout_height="match_parent">
 
     <View
         android:layout_width="2dp"
         android:layout_height="match_parent"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center"
         android:background="?riotx_list_bottom_sheet_divider_color" />
-</RelativeLayout>
+
+</FrameLayout>
diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml
index 35ca5ebf34..27b21ece9b 100644
--- a/vector/src/main/res/layout/item_space_top_summary.xml
+++ b/vector/src/main/res/layout/item_space_top_summary.xml
@@ -10,21 +10,22 @@
         android:id="@+id/spaceSummaryMemberCountIcon"
         android:layout_width="16dp"
         android:layout_height="16dp"
-        android:src="@drawable/ic_room_profile_member_list"
         android:importantForAccessibility="no"
+        android:src="@drawable/ic_room_profile_member_list"
         app:layout_constraintBottom_toBottomOf="@+id/spaceSummaryMemberCountText"
         app:layout_constraintStart_toEndOf="@+id/spaceSummaryMemberCountText"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?riotx_text_secondary" />
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/spaceSummaryMemberCountText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:maxLines="1"
         android:ellipsize="end"
+        android:maxLines="1"
         android:textColor="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="@+id/spaceSummaryMemberCountIcon"
         app:layout_constraintEnd_toEndOf="parent"
@@ -37,11 +38,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textColor="?riotx_text_primary"
         android:autoLink="all"
+        android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/spaceSummaryMemberCountIcon"
         tools:text="@sample/matrix.json/data/roomTopic" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_space_type_button.xml b/vector/src/main/res/layout/view_space_type_button.xml
index d48f123bdc..1f73caad13 100644
--- a/vector/src/main/res/layout/view_space_type_button.xml
+++ b/vector/src/main/res/layout/view_space_type_button.xml
@@ -12,9 +12,9 @@
         android:id="@+id/buttonImageView"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:minHeight="56dp"
         android:layout_margin="8dp"
         android:importantForAccessibility="no"
+        android:minHeight="56dp"
         android:src="@drawable/ic_public_room"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -30,14 +30,13 @@
         android:textColor="?riotx_text_primary"
         android:textSize="16sp"
         android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/subTitle"
         app:layout_constraintEnd_toStartOf="@id/rightChevron"
         app:layout_constraintStart_toEndOf="@id/buttonImageView"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/subTitle"
         app:layout_goneMarginBottom="0dp"
         tools:text="Public" />
 
-
     <TextView
         android:id="@+id/subTitle"
         android:layout_width="0dp"
@@ -64,6 +63,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="?riotx_text_secondary" />
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 386e06d675cf11903e33f9e40ecb665494e735a4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 29 Mar 2021 16:10:21 +0200
Subject: [PATCH 149/350] XML standart

---
 vector/src/main/res/values/ids.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values/ids.xml b/vector/src/main/res/values/ids.xml
index 099d6f4279..c0c87cac0d 100644
--- a/vector/src/main/res/values/ids.xml
+++ b/vector/src/main/res/values/ids.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item type="id" name="space_item_home" />
+    <item name="space_item_home" type="id" />
 </resources>

From 0dbd856ac57428c18e76ac5f97956dbc32cefcef Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 30 Mar 2021 14:54:19 +0200
Subject: [PATCH 150/350] UI polishing And cleanup

---
 .../features/spaces/SpacePreviewActivity.kt   |  3 +-
 .../spaces/SpacePreviewSharedAction.kt        | 26 ++++++++++++++++
 .../SpacePreviewSharedActionViewModel.kt      |  8 -----
 .../spaces/SpaceSettingsMenuBottomSheet.kt    |  9 +++---
 .../spaces/create/ChooseSpaceTypeFragment.kt  |  3 +-
 .../create/CreateSpaceDefaultRoomsFragment.kt |  2 ++
 .../create/CreateSpaceDetailsFragment.kt      |  2 +-
 .../spaces/create/CreateSpaceViewModel.kt     |  5 ++-
 .../res/layout/bottom_sheet_call_controls.xml |  1 -
 .../bottom_sheet_call_dialer_choice.xml       |  1 -
 .../res/layout/bottom_sheet_space_invite.xml  |  1 -
 .../bottom_sheet_space_invite_chooser.xml     |  1 -
 .../layout/bottom_sheet_space_settings.xml    | 31 ++++++++++---------
 ...agment_space_create_generic_epoxy_form.xml |  9 +++---
 vector/src/main/res/values/strings.xml        |  1 +
 15 files changed, 65 insertions(+), 38 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedAction.kt

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt
index dacde8846c..0dcaf9d754 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewActivity.kt
@@ -45,7 +45,8 @@ class SpacePreviewActivity : VectorBaseActivity<ActivitySimpleBinding>() {
                         SpacePreviewSharedAction.HideModalLoading -> hideWaitingView()
                         is SpacePreviewSharedAction.ShowErrorMessage -> action.error?.let { showSnackbar(it) }
                     }
-                }.disposeOnDestroy()
+                }
+                .disposeOnDestroy()
 
         if (isFirstCreation()) {
             val simpleName = SpacePreviewFragment::class.java.simpleName
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedAction.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedAction.kt
new file mode 100644
index 0000000000..3d5ce26cb2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedAction.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import im.vector.app.core.platform.VectorSharedAction
+
+sealed class SpacePreviewSharedAction : VectorSharedAction {
+    object DismissAction : SpacePreviewSharedAction()
+    object ShowModalLoading : SpacePreviewSharedAction()
+    object HideModalLoading : SpacePreviewSharedAction()
+    data class ShowErrorMessage(val error: String? = null) : SpacePreviewSharedAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedActionViewModel.kt
index 058b1a275b..dec88fe38a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacePreviewSharedActionViewModel.kt
@@ -16,15 +16,7 @@
 
 package im.vector.app.features.spaces
 
-import im.vector.app.core.platform.VectorSharedAction
 import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
-sealed class SpacePreviewSharedAction : VectorSharedAction {
-    object DismissAction : SpacePreviewSharedAction()
-    object ShowModalLoading : SpacePreviewSharedAction()
-    object HideModalLoading : SpacePreviewSharedAction()
-    data class ShowErrorMessage(val error: String? = null) : SpacePreviewSharedAction()
-}
-
 class SpacePreviewSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<SpacePreviewSharedAction>()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index 29472dcf28..ca4de04502 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -27,6 +27,7 @@ import com.airbnb.mvrx.args
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetSpaceSettingsBinding
 import im.vector.app.features.home.AvatarRenderer
@@ -62,7 +63,7 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
         fun onShareSpaceSelected(spaceId: String)
     }
 
-    var interactionListener : InteractionListener?  = null
+    var interactionListener: InteractionListener? = null
 
     override fun injectWith(injector: ScreenComponent) {
         injector.inject(this)
@@ -78,10 +79,10 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         val roomSummary = session.getRoomSummary(spaceArgs.spaceId)
         roomSummary?.toMatrixItem()?.let {
-            avatarRenderer.renderSpace(it, views.roomAvatarImageView)
+            avatarRenderer.renderSpace(it, views.spaceAvatarImageView)
         }
-        views.roomNameView.text = roomSummary?.displayName
-        views.roomDescription.text = roomSummary?.topic
+        views.spaceNameView.text = roomSummary?.displayName
+        views.spaceDescription.setTextOrHide(roomSummary?.topic?.takeIf { it.isNotEmpty() })
 
         val room = session.getRoom(spaceArgs.spaceId) ?: return
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
index b174952ec6..ab71b41c54 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
@@ -27,7 +27,6 @@ import im.vector.app.databinding.FragmentSpaceCreateChooseTypeBinding
 import javax.inject.Inject
 
 class ChooseSpaceTypeFragment @Inject constructor(
-       // private val viewModelFactory: CreateSpaceViewModel.Factory,
 ) : VectorBaseFragment<FragmentSpaceCreateChooseTypeBinding>() {
 
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
@@ -43,7 +42,9 @@ class ChooseSpaceTypeFragment @Inject constructor(
         }))
 
         views.privateButton.setOnClickListener(DebouncedClickListener({
+            vectorBaseActivity.notImplemented("Creating private space")
             // sharedViewModel.handle(CreateSpaceAction.SetRoomType(SpaceType.Private))
         }))
     }
 }
+
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
index 4fe4c6e82a..53a4ee689b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDefaultRoomsFragment.kt
@@ -21,6 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
+import im.vector.app.R
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.platform.OnBackPressed
@@ -49,6 +50,7 @@ class CreateSpaceDefaultRoomsFragment @Inject constructor(
             epoxyController.setData(it)
         }
 
+        views.nextButton.setText(R.string.create_space)
         views.nextButton.debouncedClicks {
             view.hideKeyboard()
             sharedViewModel.handle(CreateSpaceAction.NextFromDefaultRooms)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
index 3e420ee632..b5925eec59 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceDetailsFragment.kt
@@ -33,7 +33,7 @@ import javax.inject.Inject
 
 class CreateSpaceDetailsFragment @Inject constructor(
         private val epoxyController: SpaceDetailEpoxyController,
-        private val colorProvider: ColorProvider
+        colorProvider: ColorProvider
 ) : VectorBaseFragment<FragmentSpaceCreateGenericEpoxyFormBinding>(), SpaceDetailEpoxyController.Listener,
         GalleryOrCameraDialogHelper.Listener, OnBackPressed {
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index 18cccbe62a..ed16829c06 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -23,6 +23,7 @@ import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -125,7 +126,9 @@ class CreateSpaceViewModel @AssistedInject constructor(
             CreateSpaceState.Step.SetDetails -> {
                 setState {
                     copy(
-                            step = CreateSpaceState.Step.ChooseType
+                            step = CreateSpaceState.Step.ChooseType,
+                            nameInlineError = null,
+                            creationResult = Uninitialized
                     )
                 }
                 _viewEvents.post(CreateSpaceEvents.NavigateToChooseType)
diff --git a/vector/src/main/res/layout/bottom_sheet_call_controls.xml b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
index f30d44b731..52874f4e8c 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_controls.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_controls.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/callControlsWrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_bottom_sheet_background"
diff --git a/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml b/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
index 23c1397159..bd717e54b2 100644
--- a/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
+++ b/vector/src/main/res/layout/bottom_sheet_call_dialer_choice.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/callControlsWrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_bottom_sheet_background"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite.xml b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
index 125335e8af..e1538d9567 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/callControlsWrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?riotx_bottom_sheet_background"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
index 78fc07885c..8fd3284574 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/callControlsWrapper"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?riotx_bottom_sheet_background"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 65d87257c6..35e631326f 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -2,13 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/callControlsWrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_bottom_sheet_background"
     android:orientation="vertical">
 
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -18,7 +16,7 @@
         android:paddingEnd="8dp">
 
         <ImageView
-            android:id="@+id/roomAvatarImageView"
+            android:id="@+id/spaceAvatarImageView"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:contentDescription="@string/avatar"
@@ -28,8 +26,8 @@
             tools:src="@tools:sample/avatars" />
 
         <TextView
-            android:id="@+id/roomNameView"
-            android:layout_width="wrap_content"
+            android:id="@+id/spaceNameView"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:layout_marginEnd="8dp"
@@ -40,15 +38,15 @@
             android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constrainedWidth="true"
+            app:layout_constraintBottom_toTopOf="@+id/spaceDescription"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toEndOf="@id/roomAvatarImageView"
+            app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
             tools:text="@sample/matrix.json/data/displayName" />
 
         <TextView
-            android:id="@+id/roomDescription"
+            android:id="@+id/spaceDescription"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
@@ -58,10 +56,13 @@
             android:maxLines="1"
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/roomAvatarImageView"
-            app:layout_constraintTop_toBottomOf="@+id/roomNameView"
-            tools:text="@sample/matrix.json/data/message" />
+            app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
+            app:layout_constraintTop_toBottomOf="@+id/spaceNameView"
+            tools:text="@sample/matrix.json/data/message"
+            tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -88,15 +89,17 @@
         app:tint="?attr/riotx_text_primary"
         app:titleTextColor="?attr/riotx_text_primary" />
 
-
+    <!-- Only visible when in developer mode -->
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/spaceSettings"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:visibility="gone"
         app:actionTitle="@string/settings"
         app:leftIcon="@drawable/ic_settings_root_general"
         app:tint="?attr/riotx_text_primary"
-        app:titleTextColor="?attr/riotx_text_primary" />
+        app:titleTextColor="?attr/riotx_text_primary"
+        tools:visibility="visible" />
 
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/exploreRooms"
diff --git a/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
index aea5000274..662cdfd575 100644
--- a/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
+++ b/vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
@@ -17,17 +17,18 @@
 
     <FrameLayout
         android:id="@+id/buttonBar"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="?riotx_background"
         android:elevation="2dp"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/nextButton"
             style="@style/VectorButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_gravity="end"
             android:layout_marginStart="14dp"
             android:layout_marginEnd="14dp"
             android:layout_marginBottom="16dp"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 94d6da777a..f8e0621a5d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3295,6 +3295,7 @@
     <!-- First one is the space name, and the second one is the matrix.to link -->
     <string name="share_space_link_message">Join my space %1$s %2$s</string>
     <string name="skip_for_now">Skip for now</string>
+    <string name="create_space">Create Space</string>
     <string name="join_space">Join Space</string>
     <string name="join_anyway">Join Anyway</string>
     <string name="room_alias_preview_not_found">This alias is not accessible at this time.\nTry again later, or ask a room admin to check if you have access.</string>

From 715bd29c7544769f421a23920576cd5c20368df2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 31 Mar 2021 09:21:43 +0200
Subject: [PATCH 151/350] Cleanup and add URL

---
 .../android/sdk/internal/session/space/SpaceApi.kt     | 10 ++++++----
 .../sdk/internal/session/space/SpaceSummaryParams.kt   |  9 ++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
index 8e64e89da7..3f8da574fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
@@ -28,13 +28,15 @@ internal interface SpaceApi {
      *
      * POST /_matrix/client/r0/rooms/{roomID}/spaces
      *  {
-     *  "max_rooms_per_space": 5,      // The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1.
+     *    "max_rooms_per_space": 5,      // The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1.
      *    "auto_join_only": true,        // If true, only return m.space.child events with auto_join:true, default: false, which returns all events.
-     *  "limit": 100,                  // The maximum number of rooms/subspaces to return, server can override this, default: 100.
-     *  "batch": "opaque_string"       // A token to use if this is a subsequent HTTP hit, default: "".
+     *    "limit": 100,                  // The maximum number of rooms/subspaces to return, server can override this, default: 100.
+     *    "batch": "opaque_string"       // A token to use if this is a subsequent HTTP hit, default: "".
      *  }
      *
-     *  MSC 2946 https://github.com/matrix-org/matrix-doc/blob/kegan/spaces-summary/proposals/2946-spaces-summary.md
+     * Ref:
+     * - MSC 2946 https://github.com/matrix-org/matrix-doc/blob/kegan/spaces-summary/proposals/2946-spaces-summary.md
+     * - https://hackmd.io/fNYh4tjUT5mQfR1uuRzWDA
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc2946/rooms/{roomId}/spaces")
     fun getSpaces(@Path("roomId") spaceId: String,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
index c76987e66d..013db1c286 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceSummaryParams.kt
@@ -21,15 +21,14 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 internal data class SpaceSummaryParams(
-        /**  The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1*/
+        /**  The maximum number of rooms/subspaces to return for a given space, if negative unbounded. default: -1 */
         @Json(name = "max_rooms_per_space") val maxRoomPerSpace: Int?,
         /** The maximum number of rooms/subspaces to return, server can override this, default: 100 */
         @Json(name = "limit") val limit: Int?,
-        /** A token to use if this is a subsequent HTTP hit, default: "".*/
+        /** A token to use if this is a subsequent HTTP hit, default: "". */
         @Json(name = "batch") val batch: String = "",
-        /** whether we should only return children with the "suggested" flag set.*/
+        /** whether we should only return children with the "suggested" flag set. */
         @Json(name = "suggested_only") val suggestedOnly: Boolean?,
-        /** whether we should only return children with the "suggested" flag set.*/
+        /** whether we should only return children with the "suggested" flag set. */
         @Json(name = "auto_join_only") val autoJoinedOnly: Boolean?
-
 )

From 8a35a786b401de6c56197d1dbed9b31dae28e766 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 2 Apr 2021 10:59:02 +0200
Subject: [PATCH 152/350] Post rebase fixes

---
 .../sdk/session/space/SpaceCreationTest.kt    |   9 +-
 .../sdk/session/space/SpaceHierarchyTest.kt   |   5 +-
 .../model/RoomHistoryVisibilityContent.kt     |  11 --
 .../android/sdk/api/session/space/Space.kt    |   3 +-
 .../internal/crypto/DefaultCryptoService.kt   |   2 +-
 .../SessionRealmConfigurationFactory.kt       |   3 +-
 .../room/create/CreateRoomBodyBuilder.kt      |   2 +-
 .../internal/session/space/DefaultSpace.kt    |   4 +-
 .../home/room/detail/RoomDetailViewModel.kt   | 137 +++++++++---------
 .../timeline/factory/TimelineItemFactory.kt   |   8 +-
 .../timeline/format/NoticeEventFormatter.kt   |   2 +-
 .../settings/RoomSettingsViewModel.kt         |   2 +-
 .../spaces/SpaceSettingsMenuBottomSheet.kt    |   5 +-
 .../features/spaces/SpacesListViewModel.kt    |   7 +-
 14 files changed, 89 insertions(+), 111 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index be8bde0721..49d67428d9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -135,15 +135,12 @@ class SpaceCreationTest : InstrumentedTest {
 
         val roomName = "My Space"
         val topic = "A public space for test"
-        val spaceId: String
-        val firstChild: String
-        val secondChild: String
 
-        spaceId = runBlocking { aliceSession.spaceService().createSpace(roomName, topic, null, true) }
+        val spaceId: String = runBlocking { aliceSession.spaceService().createSpace(roomName, topic, null, true) }
         val syncedSpace = aliceSession.spaceService().getSpace(spaceId)
 
         // create a room
-        firstChild = runBlocking {
+        val firstChild: String = runBlocking {
             awaitCallback<String> {
                 aliceSession.createRoom(CreateRoomParams().apply {
                     this.name = "FirstRoom"
@@ -157,7 +154,7 @@ class SpaceCreationTest : InstrumentedTest {
             syncedSpace?.addChildren(firstChild, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "a", true)
         }
 
-        secondChild = runBlocking {
+        val secondChild: String = runBlocking {
             awaitCallback {
                 aliceSession.createRoom(CreateRoomParams().apply {
                     this.name = "SecondRoom"
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index e3b4fba901..42ad653443 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -327,8 +327,8 @@ class SpaceHierarchyTest : InstrumentedTest {
             }
 
             // part from b room
-            commonTestHelper.doSync<Unit> {
-                bRoom!!.leave(null, it)
+            runBlocking {
+                bRoom!!.leave(null)
             }
             // The room should have disapear from flat children
             GlobalScope.launch(Dispatchers.Main) { flatAChildren.observeForever(childObserver) }
@@ -399,6 +399,7 @@ class SpaceHierarchyTest : InstrumentedTest {
             spaceB!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
         }
 
+        Thread.sleep(2000)
         // + A
         //   a1, a2
         // + B
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
index 0a09be23f9..3ac14e48de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
@@ -35,14 +35,3 @@ data class RoomHistoryVisibilityContent(
         }
     }
 }
-
-    fun safeHistoryVisibility(): RoomHistoryVisibility? {
-        return when (historyVisibility) {
-            "world_readable" -> RoomHistoryVisibility.WORLD_READABLE
-            "shared" -> RoomHistoryVisibility.SHARED
-            "invited" -> RoomHistoryVisibility.INVITED
-            "joined" -> RoomHistoryVisibility.JOINED
-            else             -> null
-        }
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 7de40b0019..8180189079 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -27,8 +27,7 @@ interface Space {
 
     val spaceId: String
 
-    fun leave(reason: String? = null,
-              callback: MatrixCallback<Unit>): Cancelable
+    suspend fun leave(reason: String? = null)
 
     /**
      * A current snapshot of [RoomSummary] associated with the space
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index fac4e0d0b6..2163b2a5e0 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -896,7 +896,7 @@ internal class DefaultCryptoService @Inject constructor(
 
     private fun onRoomHistoryVisibilityEvent(roomId: String, event: Event) {
         val eventContent = event.content.toModel<RoomHistoryVisibilityContent>()
-        eventContent?.safeHistoryVisibility()?.let {
+        eventContent?.historyVisibility?.let {
             cryptoStore.setShouldEncryptForInvitedMembers(roomId, it != RoomHistoryVisibility.JOINED)
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 244fe3432a..4cce93f9f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -72,7 +72,8 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
                 .allowWritesOnUiThread(true)
                 .modules(SessionRealmModule())
                 .schemaVersion(RealmSessionStoreMigration.SESSION_STORE_SCHEMA_VERSION)
-                .migration(migration)
+                .deleteRealmIfMigrationNeeded()
+//                .migration(migration)
                 .build()
 
         // Try creating a realm instance and if it succeeds we can clear the flag
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 1dae5c170d..6332af932d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -132,7 +132,7 @@ internal class CreateRoomBodyBuilder @Inject constructor(
                     Event(
                             type = EventType.STATE_ROOM_GUEST_ACCESS,
                             stateKey = "",
-                            content = RoomGuestAccessContent(it).toContent()
+                            content = RoomGuestAccessContent(it.name).toContent()
                     )
                 }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index cfd88c8ec6..c41ccc7af4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -39,8 +39,8 @@ internal class DefaultSpace(
 
     override val spaceId = room.roomId
 
-    override fun leave(reason: String?, callback: MatrixCallback<Unit>): Cancelable {
-        return room.leave(reason, callback)
+    override suspend fun leave(reason: String?) {
+        return room.leave(reason)
     }
 
     override fun spaceSummary(): RoomSummary? {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 8bd0c60c40..c7d18f1da7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -42,8 +42,8 @@ import im.vector.app.features.call.dialpad.DialPadLookup
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.command.CommandParser
 import im.vector.app.features.command.ParsedCommand
-import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
 import im.vector.app.features.createdirect.DirectRoomHelper
+import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
 import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider
 import im.vector.app.features.home.room.detail.composer.rainbow.RainbowGenerator
 import im.vector.app.features.home.room.detail.sticker.StickerPickerActionHandler
@@ -98,7 +98,6 @@ import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.getRelationContent
 import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
 import org.matrix.android.sdk.api.session.space.CreateSpaceParams
-import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.api.util.appendParamToUrl
 import org.matrix.android.sdk.api.util.toOptional
@@ -268,68 +267,68 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     override fun handle(action: RoomDetailAction) {
         when (action) {
-            is RoomDetailAction.UserIsTyping                     -> handleUserIsTyping(action)
-            is RoomDetailAction.ComposerFocusChange              -> handleComposerFocusChange(action)
-            is RoomDetailAction.SaveDraft                        -> handleSaveDraft(action)
-            is RoomDetailAction.SendMessage                      -> handleSendMessage(action)
-            is RoomDetailAction.SendMedia                        -> handleSendMedia(action)
-            is RoomDetailAction.SendSticker                      -> handleSendSticker(action)
-            is RoomDetailAction.TimelineEventTurnsVisible        -> handleEventVisible(action)
-            is RoomDetailAction.TimelineEventTurnsInvisible      -> handleEventInvisible(action)
-            is RoomDetailAction.LoadMoreTimelineEvents           -> handleLoadMore(action)
-            is RoomDetailAction.SendReaction                     -> handleSendReaction(action)
-            is RoomDetailAction.AcceptInvite                     -> handleAcceptInvite()
-            is RoomDetailAction.RejectInvite                     -> handleRejectInvite()
-            is RoomDetailAction.RedactAction                     -> handleRedactEvent(action)
-            is RoomDetailAction.UndoReaction                     -> handleUndoReact(action)
-            is RoomDetailAction.UpdateQuickReactAction           -> handleUpdateQuickReaction(action)
-            is RoomDetailAction.EnterRegularMode                 -> handleEnterRegularMode(action)
-            is RoomDetailAction.EnterEditMode                    -> handleEditAction(action)
-            is RoomDetailAction.EnterQuoteMode                   -> handleQuoteAction(action)
-            is RoomDetailAction.EnterReplyMode                   -> handleReplyAction(action)
-            is RoomDetailAction.DownloadOrOpen                   -> handleOpenOrDownloadFile(action)
-            is RoomDetailAction.NavigateToEvent                  -> handleNavigateToEvent(action)
-            is RoomDetailAction.HandleTombstoneEvent             -> handleTombstoneEvent(action)
-            is RoomDetailAction.ResendMessage                    -> handleResendEvent(action)
-            is RoomDetailAction.RemoveFailedEcho                 -> handleRemove(action)
-            is RoomDetailAction.ResendAll                        -> handleResendAll()
-            is RoomDetailAction.MarkAllAsRead                    -> handleMarkAllAsRead()
-            is RoomDetailAction.ReportContent                    -> handleReportContent(action)
-            is RoomDetailAction.IgnoreUser                       -> handleIgnoreUser(action)
+            is RoomDetailAction.UserIsTyping -> handleUserIsTyping(action)
+            is RoomDetailAction.ComposerFocusChange -> handleComposerFocusChange(action)
+            is RoomDetailAction.SaveDraft -> handleSaveDraft(action)
+            is RoomDetailAction.SendMessage -> handleSendMessage(action)
+            is RoomDetailAction.SendMedia -> handleSendMedia(action)
+            is RoomDetailAction.SendSticker -> handleSendSticker(action)
+            is RoomDetailAction.TimelineEventTurnsVisible -> handleEventVisible(action)
+            is RoomDetailAction.TimelineEventTurnsInvisible -> handleEventInvisible(action)
+            is RoomDetailAction.LoadMoreTimelineEvents -> handleLoadMore(action)
+            is RoomDetailAction.SendReaction -> handleSendReaction(action)
+            is RoomDetailAction.AcceptInvite -> handleAcceptInvite()
+            is RoomDetailAction.RejectInvite -> handleRejectInvite()
+            is RoomDetailAction.RedactAction -> handleRedactEvent(action)
+            is RoomDetailAction.UndoReaction -> handleUndoReact(action)
+            is RoomDetailAction.UpdateQuickReactAction -> handleUpdateQuickReaction(action)
+            is RoomDetailAction.EnterRegularMode -> handleEnterRegularMode(action)
+            is RoomDetailAction.EnterEditMode -> handleEditAction(action)
+            is RoomDetailAction.EnterQuoteMode -> handleQuoteAction(action)
+            is RoomDetailAction.EnterReplyMode -> handleReplyAction(action)
+            is RoomDetailAction.DownloadOrOpen -> handleOpenOrDownloadFile(action)
+            is RoomDetailAction.NavigateToEvent -> handleNavigateToEvent(action)
+            is RoomDetailAction.HandleTombstoneEvent -> handleTombstoneEvent(action)
+            is RoomDetailAction.ResendMessage -> handleResendEvent(action)
+            is RoomDetailAction.RemoveFailedEcho -> handleRemove(action)
+            is RoomDetailAction.ResendAll -> handleResendAll()
+            is RoomDetailAction.MarkAllAsRead -> handleMarkAllAsRead()
+            is RoomDetailAction.ReportContent -> handleReportContent(action)
+            is RoomDetailAction.IgnoreUser -> handleIgnoreUser(action)
             is RoomDetailAction.EnterTrackingUnreadMessagesState -> startTrackingUnreadMessages()
-            is RoomDetailAction.ExitTrackingUnreadMessagesState  -> stopTrackingUnreadMessages()
-            is RoomDetailAction.ReplyToOptions                   -> handleReplyToOptions(action)
-            is RoomDetailAction.AcceptVerificationRequest        -> handleAcceptVerification(action)
-            is RoomDetailAction.DeclineVerificationRequest       -> handleDeclineVerification(action)
-            is RoomDetailAction.RequestVerification              -> handleRequestVerification(action)
-            is RoomDetailAction.ResumeVerification               -> handleResumeRequestVerification(action)
-            is RoomDetailAction.ReRequestKeys                    -> handleReRequestKeys(action)
-            is RoomDetailAction.TapOnFailedToDecrypt             -> handleTapOnFailedToDecrypt(action)
-            is RoomDetailAction.SelectStickerAttachment          -> handleSelectStickerAttachment()
-            is RoomDetailAction.OpenIntegrationManager           -> handleOpenIntegrationManager()
-            is RoomDetailAction.StartCallWithPhoneNumber         -> handleStartCallWithPhoneNumber(action)
-            is RoomDetailAction.StartCall                        -> handleStartCall(action)
-            is RoomDetailAction.AcceptCall                       -> handleAcceptCall(action)
-            is RoomDetailAction.EndCall                          -> handleEndCall()
-            is RoomDetailAction.ManageIntegrations               -> handleManageIntegrations()
-            is RoomDetailAction.AddJitsiWidget                   -> handleAddJitsiConference(action)
-            is RoomDetailAction.RemoveWidget                     -> handleDeleteWidget(action.widgetId)
-            is RoomDetailAction.EnsureNativeWidgetAllowed        -> handleCheckWidgetAllowed(action)
-            is RoomDetailAction.CancelSend                       -> handleCancel(action)
-            is RoomDetailAction.OpenOrCreateDm                   -> handleOpenOrCreateDm(action)
-            is RoomDetailAction.JumpToReadReceipt                -> handleJumpToReadReceipt(action)
-            RoomDetailAction.QuickActionInvitePeople             -> handleInvitePeople()
-            RoomDetailAction.QuickActionSetAvatar                -> handleQuickSetAvatar()
-            is RoomDetailAction.SetAvatarAction                  -> handleSetNewAvatar(action)
-            RoomDetailAction.QuickActionSetTopic                 -> _viewEvents.post(RoomDetailViewEvents.OpenRoomSettings)
-            is RoomDetailAction.ShowRoomAvatarFullScreen         -> {
+            is RoomDetailAction.ExitTrackingUnreadMessagesState -> stopTrackingUnreadMessages()
+            is RoomDetailAction.ReplyToOptions -> handleReplyToOptions(action)
+            is RoomDetailAction.AcceptVerificationRequest -> handleAcceptVerification(action)
+            is RoomDetailAction.DeclineVerificationRequest -> handleDeclineVerification(action)
+            is RoomDetailAction.RequestVerification -> handleRequestVerification(action)
+            is RoomDetailAction.ResumeVerification -> handleResumeRequestVerification(action)
+            is RoomDetailAction.ReRequestKeys -> handleReRequestKeys(action)
+            is RoomDetailAction.TapOnFailedToDecrypt -> handleTapOnFailedToDecrypt(action)
+            is RoomDetailAction.SelectStickerAttachment -> handleSelectStickerAttachment()
+            is RoomDetailAction.OpenIntegrationManager -> handleOpenIntegrationManager()
+            is RoomDetailAction.StartCallWithPhoneNumber -> handleStartCallWithPhoneNumber(action)
+            is RoomDetailAction.StartCall -> handleStartCall(action)
+            is RoomDetailAction.AcceptCall -> handleAcceptCall(action)
+            is RoomDetailAction.EndCall -> handleEndCall()
+            is RoomDetailAction.ManageIntegrations -> handleManageIntegrations()
+            is RoomDetailAction.AddJitsiWidget -> handleAddJitsiConference(action)
+            is RoomDetailAction.RemoveWidget -> handleDeleteWidget(action.widgetId)
+            is RoomDetailAction.EnsureNativeWidgetAllowed -> handleCheckWidgetAllowed(action)
+            is RoomDetailAction.CancelSend -> handleCancel(action)
+            is RoomDetailAction.OpenOrCreateDm -> handleOpenOrCreateDm(action)
+            is RoomDetailAction.JumpToReadReceipt -> handleJumpToReadReceipt(action)
+            RoomDetailAction.QuickActionInvitePeople -> handleInvitePeople()
+            RoomDetailAction.QuickActionSetAvatar -> handleQuickSetAvatar()
+            is RoomDetailAction.SetAvatarAction -> handleSetNewAvatar(action)
+            RoomDetailAction.QuickActionSetTopic -> _viewEvents.post(RoomDetailViewEvents.OpenRoomSettings)
+            is RoomDetailAction.ShowRoomAvatarFullScreen -> {
                 _viewEvents.post(
                         RoomDetailViewEvents.ShowRoomAvatarFullScreen(action.matrixItem, action.transitionView)
                 )
             }
-            is RoomDetailAction.DoNotShowPreviewUrlFor           -> handleDoNotShowPreviewUrlFor(action)
-            RoomDetailAction.RemoveAllFailedMessages             -> handleRemoveAllFailedMessages()
-            RoomDetailAction.ResendAll                           -> handleResendAll()
+            is RoomDetailAction.DoNotShowPreviewUrlFor -> handleDoNotShowPreviewUrlFor(action)
+            RoomDetailAction.RemoveAllFailedMessages -> handleRemoveAllFailedMessages()
+            RoomDetailAction.ResendAll -> handleResendAll()
         }.exhaustive
     }
 
@@ -672,13 +671,13 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
         when (itemId) {
             R.id.timeline_setting -> true
-            R.id.invite           -> state.canInvite
+            R.id.invite -> state.canInvite
             R.id.open_matrix_apps -> true
             R.id.voice_call,
-            R.id.video_call       -> callManager.getCallsByRoomId(state.roomId).isEmpty()
-            R.id.hangup_call      -> callManager.getCallsByRoomId(state.roomId).isNotEmpty()
-            R.id.search           -> true
-            R.id.dev_tools        -> vectorPreferences.developerMode()
+            R.id.video_call -> callManager.getCallsByRoomId(state.roomId).isEmpty()
+            R.id.hangup_call -> callManager.getCallsByRoomId(state.roomId).isNotEmpty()
+            R.id.search -> true
+            R.id.dev_tools -> vectorPreferences.developerMode()
             else                  -> false
         }
     }
@@ -845,7 +844,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
                             popDraft()
                         }
-                        is ParsedCommand.AddToSpace            -> {
+                        is ParsedCommand.AddToSpace               -> {
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
                                     session.spaceService().getSpace(slashCommandResult.spaceId)
@@ -862,7 +861,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
                             popDraft()
                         }
-                        is ParsedCommand.JoinSpace -> {
+                        is ParsedCommand.JoinSpace                -> {
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
                                     session.spaceService().joinSpace(slashCommandResult.spaceIdOrAlias)
@@ -873,12 +872,10 @@ class RoomDetailViewModel @AssistedInject constructor(
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
                             popDraft()
                         }
-                        is ParsedCommand.LeaveRoom -> {
+                        is ParsedCommand.LeaveRoom                -> {
                             viewModelScope.launch(Dispatchers.IO) {
                                 try {
-                                    awaitCallback {
-                                        session.getRoom(slashCommandResult.roomId)?.leave(null, it)
-                                    }
+                                    session.getRoom(slashCommandResult.roomId)?.leave(null)
                                 } catch (failure: Throwable) {
                                     _viewEvents.post(RoomDetailViewEvents.SlashCommandResultError(failure))
                                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 06541c1fc3..c21fe935bb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -60,21 +60,21 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.STATE_ROOM_HISTORY_VISIBILITY,
                 EventType.STATE_ROOM_SERVER_ACL,
                 EventType.STATE_ROOM_GUEST_ACCESS,
+                EventType.REDACTION,
                 EventType.STATE_ROOM_ALIASES,
-                EventType.KEY_VERIFICATION_START,
                 EventType.KEY_VERIFICATION_ACCEPT,
+                EventType.KEY_VERIFICATION_START,
                 EventType.KEY_VERIFICATION_KEY,
                 EventType.KEY_VERIFICATION_READY,
-                EventType.CALL_CANDIDATES,
                 EventType.KEY_VERIFICATION_MAC,
+                EventType.CALL_CANDIDATES,
                 EventType.CALL_REPLACES,
                 EventType.CALL_SELECT_ANSWER,
                 EventType.CALL_NEGOTIATE,
                 EventType.REACTION,
-                EventType.STATE_ROOM_POWER_LEVELS,
                 EventType.STATE_SPACE_CHILD,
                 EventType.STATE_SPACE_PARENT,
-                EventType.REDACTION             -> noticeItemFactory.create(event, highlight, callback)
+                EventType.STATE_ROOM_POWER_LEVELS -> noticeItemFactory.create(params)
                 EventType.STATE_ROOM_WIDGET_LEGACY,
                 EventType.STATE_ROOM_WIDGET     -> widgetItemFactory.create(params)
                 EventType.STATE_ROOM_ENCRYPTION -> encryptionItemFactory.create(params)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index c58658c019..b1b96df9ea 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -273,7 +273,7 @@ class NoticeEventFormatter @Inject constructor(
     }
 
     private fun formatRoomHistoryVisibilityEvent(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
-        val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.safeHistoryVisibility() ?: return null
+        val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.historyVisibility ?: return null
 
         val historyVisibilitySuffix = roomHistoryVisibilityFormatter.getNoticeSuffix(historyVisibility)
         return if (event.isSentByCurrentUser()) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index 05f78a6cef..bf227ea5e8 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -136,7 +136,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                 .mapOptional { it.content.toModel<RoomHistoryVisibilityContent>() }
                 .unwrap()
                 .subscribe {
-                    it.safeHistoryVisibility()?.let {
+                    it.historyVisibility?.let {
                         setState { copy(currentHistoryVisibility = it) }
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index ca4de04502..765fc730ff 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -41,7 +41,6 @@ import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.util.toMatrixItem
-import org.matrix.android.sdk.internal.util.awaitCallback
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -119,9 +118,7 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
                     .setPositiveButton(R.string.leave) { _, _ ->
                         GlobalScope.launch {
                             try {
-                                awaitCallback {
-                                    session.getRoom(spaceArgs.spaceId)?.leave(null, it)
-                                }
+                                session.getRoom(spaceArgs.spaceId)?.leave(null)
                             } catch (failure: Throwable) {
                                 Timber.e(failure, "Failed to leave space")
                             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index f21f51a57e..f0e338f6ad 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -38,7 +38,6 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 
 const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
@@ -146,10 +145,8 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
 
     private fun handleLeaveSpace(action: SpaceListAction.LeaveSpace) {
         viewModelScope.launch {
-            awaitCallback {
-                tryOrNull("Failed to leave space ${action.spaceSummary.roomId}") {
-                    session.spaceService().getSpace(action.spaceSummary.roomId)?.leave(null, it)
-                }
+            tryOrNull("Failed to leave space ${action.spaceSummary.roomId}") {
+                session.spaceService().getSpace(action.spaceSummary.roomId)?.leave(null)
             }
         }
     }

From 0d3c2b4bef7888c8f6da909d03208d8661794fc0 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Sun, 11 Apr 2021 23:17:45 +0200
Subject: [PATCH 153/350] Fix space filtering

---
 .../sdk/api/query/ActiveSpaceFilter.kt        |  18 +-
 .../android/sdk/api/session/room/Room.kt      |   1 -
 .../sdk/api/session/room/RoomService.kt       |   4 +-
 .../session/room/RoomSummaryQueryParams.kt    |  12 +-
 ...geResult.kt => UpdatableLivePageResult.kt} |   4 +-
 .../android/sdk/api/session/space/Space.kt    |   2 -
 .../database/RealmSessionStoreMigration.kt    |   2 +
 .../database/model/RoomSummaryEntity.kt       |   7 +-
 .../sdk/internal/session/room/DefaultRoom.kt  |   3 -
 .../session/room/DefaultRoomService.kt        |   6 +-
 .../session/room/summary/GrapUtils.kt         | 166 +++++++++++++
 .../room/summary/RoomSummaryDataSource.kt     |  48 ++--
 .../room/summary/RoomSummaryUpdater.kt        | 167 ++++++++++---
 .../internal/session/space/DefaultSpace.kt    |   2 -
 .../session/space/DefaultSpaceService.kt      |   2 +-
 .../session/space/ResolveSpaceInfoTask.kt     |   2 +-
 .../sdk/internal/session/space/SpaceApi.kt    |   5 +-
 .../internal/session/sync/RoomSyncHandler.kt  |   5 +-
 .../session/sync/SyncResponseHandler.kt       |   5 +
 .../sdk/internal/util/GraphUtilsTest.kt       | 111 +++++++++
 vector/build.gradle                           |   1 +
 .../java/im/vector/app/AppStateHandler.kt     |  18 +-
 .../im/vector/app/core/di/VectorComponent.kt  |   5 +-
 .../app/core/ui/list/GenericFooterItem.kt     |   1 -
 .../vector/app/features/home/HomeActivity.kt  |   8 +-
 .../app/features/home/HomeDetailViewModel.kt  |   7 +-
 .../home/room/list/RoomListListener.kt        |   2 +
 .../home/room/list/RoomListViewModel.kt       | 220 ++++++++++++++++--
 .../room/list/RoomListViewModelFactory.kt     |   5 +-
 .../home/room/list/RoomListViewState.kt       |  10 +-
 .../features/navigation/DefaultNavigator.kt   |  10 +-
 .../features/spaces/SpacesListViewModel.kt    |   8 +-
 .../spaces/create/ChooseSpaceTypeFragment.kt  |   4 +-
 33 files changed, 739 insertions(+), 132 deletions(-)
 rename vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt => matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt (54%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/{UpdatableFilterLivePageResult.kt => UpdatableLivePageResult.kt} (88%)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt
 create mode 100644 matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/GraphUtilsTest.kt

diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt
similarity index 54%
rename from vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt
index e8293d7e99..3c716fe0fe 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/SelectedSpaceDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt
@@ -1,11 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,13 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.grouplist
+package org.matrix.android.sdk.api.query
 
-import arrow.core.Option
-import im.vector.app.core.utils.BehaviorDataSource
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SelectedSpaceDataSource @Inject constructor() : BehaviorDataSource<Option<RoomSummary>>(Option.empty())
+sealed class ActiveSpaceFilter {
+    object None : ActiveSpaceFilter()
+    data class ActiveSpace(val currentSpaceId: String?) : ActiveSpaceFilter()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 6784df565f..f3eeb902a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -35,7 +35,6 @@ import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
 import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.session.space.Space
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 
 /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 982a67c4c2..092c31de1d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -184,7 +184,7 @@ interface RoomService {
      * TODO Doc
      */
     fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                          pagedListConfig: PagedList.Config = defaultPagedListConfig): UpdatableFilterLivePageResult
+                                          pagedListConfig: PagedList.Config = defaultPagedListConfig): UpdatableLivePageResult
 
     /**
      * TODO Doc
@@ -199,7 +199,7 @@ interface RoomService {
                 .setPrefetchDistance(10)
                 .build()
 
-    fun getFlattenRoomSummaryChildOf(spaceId: String?, memberships: List<Membership> = Membership.activeMemberships()) : List<RoomSummary>
+    fun getFlattenRoomSummaryChildrenOf(spaceId: String?, memberships: List<Membership> = Membership.activeMemberships()) : List<RoomSummary>
 
     /**
      * Returns all the children of this space, as LiveData
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index f50d8f76ee..0b1db09773 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.api.session.room
 
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
@@ -54,9 +55,10 @@ data class RoomSummaryQueryParams(
         val canonicalAlias: QueryStringValue,
         val memberships: List<Membership>,
         val roomCategoryFilter: RoomCategoryFilter?,
-        val roomTagQueryFilter: RoomTagQueryFilter?
+        val roomTagQueryFilter: RoomTagQueryFilter?,
         val excludeType: List<String?>?,
-        val includeType: List<String?>?
+        val includeType: List<String?>?,
+        val activeSpaceId: ActiveSpaceFilter?
 ) {
 
     class Builder {
@@ -67,8 +69,9 @@ data class RoomSummaryQueryParams(
         var memberships: List<Membership> = Membership.all()
         var roomCategoryFilter: RoomCategoryFilter? = RoomCategoryFilter.ALL
         var roomTagQueryFilter: RoomTagQueryFilter? = null
-        var excludeType: List<String?> = listOf(RoomType.SPACE)
+        var excludeType: List<String?>? = listOf(RoomType.SPACE)
         var includeType: List<String?>? = null
+        var activeSpaceId: ActiveSpaceFilter = ActiveSpaceFilter.None
 
         fun build() = RoomSummaryQueryParams(
                 roomId = roomId,
@@ -78,7 +81,8 @@ data class RoomSummaryQueryParams(
                 roomCategoryFilter = roomCategoryFilter,
                 roomTagQueryFilter = roomTagQueryFilter,
                 excludeType = excludeType,
-                includeType = includeType
+                includeType = includeType,
+                activeSpaceId = activeSpaceId
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableLivePageResult.kt
similarity index 88%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableLivePageResult.kt
index 71b3c665e7..3bcca0c241 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableFilterLivePageResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableLivePageResult.kt
@@ -20,8 +20,8 @@ import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
-interface UpdatableFilterLivePageResult {
+interface UpdatableLivePageResult {
     val livePagedList: LiveData<PagedList<RoomSummary>>
 
-    fun updateQuery(queryParams: RoomSummaryQueryParams)
+    fun updateQuery(builder: (RoomSummaryQueryParams) -> RoomSummaryQueryParams)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 8180189079..9dba4f90af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -16,10 +16,8 @@
 
 package org.matrix.android.sdk.api.session.space
 
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.util.Cancelable
 
 interface Space {
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 48479fd746..5e126a1536 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -17,6 +17,7 @@
 package org.matrix.android.sdk.internal.database
 
 import io.realm.DynamicRealm
+import io.realm.FieldAttribute
 import io.realm.RealmMigration
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntityFields
@@ -216,6 +217,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
         realm.schema.get("RoomSummaryEntity")
                 ?.addField(RoomSummaryEntityFields.ROOM_TYPE, String::class.java)
+                ?.addField(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, String::class.java)
                 ?.transform { obj ->
                     // Should I put messaging type here?
                     obj.setString(RoomSummaryEntityFields.ROOM_TYPE, null)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index 85e4595da5..0adcec067e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -27,7 +27,7 @@ import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 
 internal open class RoomSummaryEntity(
-        @PrimaryKey var roomId: String = ""
+        @PrimaryKey var roomId: String = "",
         var roomType: String? = null,
         var parents: RealmList<SpaceParentSummaryEntity> = RealmList(),
         var children: RealmList<SpaceChildSummaryEntity> = RealmList()
@@ -207,6 +207,11 @@ internal open class RoomSummaryEntity(
             if (value != field) field = value
         }
 
+    var flattenParentIds: String? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
     @Index
     private var membershipStr: String = Membership.NONE.name
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index 1c22faa7b8..c6059f84ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -38,15 +38,12 @@ import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
 import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.session.space.Space
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.search.SearchTask
 import org.matrix.android.sdk.internal.session.space.DefaultSpace
-import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.util.awaitCallback
 import java.security.InvalidParameterException
 import javax.inject.Inject
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 070270aac9..77469ddb40 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -24,7 +24,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.RoomService
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
-import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
+import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
@@ -105,8 +105,8 @@ internal class DefaultRoomService @Inject constructor(
     }
 
     override fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config)
-            : UpdatableFilterLivePageResult {
-        return roomSummaryDataSource.getFilteredPagedRoomSummariesLive(queryParams, pagedListConfig)
+            : UpdatableLivePageResult {
+        return roomSummaryDataSource.getUpdatablePagedRoomSummariesLive(queryParams, pagedListConfig)
     }
 
     override fun getNotificationCountForRooms(queryParams: RoomSummaryQueryParams): RoomAggregateNotificationCount {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt
new file mode 100644
index 0000000000..c1c40c1be1
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.summary
+
+import java.util.LinkedList
+
+data class GraphNode(
+        val name: String
+)
+
+data class GraphEdge(
+        val source: GraphNode,
+        val destination: GraphNode
+)
+
+class Graph {
+
+    private val adjacencyList: HashMap<GraphNode, ArrayList<GraphEdge>> = HashMap()
+
+    fun getOrCreateNode(name: String): GraphNode {
+        return adjacencyList.entries.firstOrNull { it.key.name == name }?.key
+                ?: GraphNode(name).also {
+                    adjacencyList[it] = ArrayList()
+                }
+    }
+
+    fun addEdge(sourceName: String, destinationName: String) {
+        val source = getOrCreateNode(sourceName)
+        val destination = getOrCreateNode(destinationName)
+        adjacencyList.getOrPut(source) { ArrayList() }.add(
+                GraphEdge(source, destination)
+        )
+    }
+
+    fun addEdge(source: GraphNode, destination: GraphNode) {
+        adjacencyList.getOrPut(source) { ArrayList() }.add(
+                GraphEdge(source, destination)
+        )
+    }
+
+    fun edgesOf(node: GraphNode): List<GraphEdge> {
+        return adjacencyList[node]?.toList() ?: emptyList()
+    }
+
+    fun withoutEdges(edgesToPrune: List<GraphEdge>): Graph {
+        val output = Graph()
+        this.adjacencyList.forEach { (vertex, edges) ->
+            output.getOrCreateNode(vertex.name)
+            edges.forEach {
+                if (!edgesToPrune.contains(it)) {
+                    // add it
+                    output.addEdge(it.source, it.destination)
+                }
+            }
+        }
+        return output
+    }
+
+    /**
+     * Depending on the chosen starting point the background edge might change
+     */
+    fun findBackwardEdges(startFrom: GraphNode? = null): List<GraphEdge> {
+        val backwardEdges = mutableSetOf<GraphEdge>()
+        val visited = mutableMapOf<GraphNode, Int>()
+        val notVisited = -1
+        val inPath = 0
+        val completed = 1
+        adjacencyList.keys.forEach {
+            visited[it] = notVisited
+        }
+        val stack = LinkedList<GraphNode>()
+
+        (startFrom ?: adjacencyList.entries.firstOrNull { visited[it.key] == notVisited }?.key)
+                ?.let {
+                    stack.push(it)
+                    visited[it] = inPath
+                }
+
+        while (stack.isNotEmpty()) {
+//            Timber.w("VAL: current stack: ${stack.reversed().joinToString { it.name }}")
+            val vertex = stack.peek()
+            // peek a path to follow
+            var destination: GraphNode? = null
+            edgesOf(vertex).forEach {
+                when (visited[it.destination]) {
+                    notVisited -> {
+                        // it's a candidate
+                        destination = it.destination
+                    }
+                    inPath -> {
+                        // Cycle!!
+                        backwardEdges.add(it)
+                    }
+                    completed -> {
+                        // dead end
+                    }
+                }
+            }
+            if (destination == null) {
+                // dead end, pop
+                stack.pop().let {
+                    visited[it] = completed
+                }
+            } else {
+                // go down this path
+                stack.push(destination)
+                visited[destination!!] = inPath
+            }
+
+            if (stack.isEmpty()) {
+                // try to get another graph of forest?
+                adjacencyList.entries.firstOrNull { visited[it.key] == notVisited }?.key?.let {
+                    stack.push(it)
+                    visited[it] = inPath
+                }
+            }
+        }
+
+        return backwardEdges.toList()
+    }
+
+    /**
+     * Only call that on acyclic graph!
+     */
+    fun flattenDestination(): Map<GraphNode, Set<GraphNode>> {
+        val result = HashMap<GraphNode, Set<GraphNode>>()
+        adjacencyList.keys.forEach { vertex ->
+            result[vertex] = flattenOf(vertex)
+        }
+        return result
+    }
+
+    private fun flattenOf(node: GraphNode): Set<GraphNode> {
+        val result = mutableSetOf<GraphNode>()
+        val edgesOf = edgesOf(node)
+        result.addAll(edgesOf.map { it.destination })
+        edgesOf.forEach {
+            result.addAll(flattenOf(it.destination))
+        }
+        return result
+    }
+
+    override fun toString(): String {
+        return buildString {
+            adjacencyList.forEach { (node, edges) ->
+                append("${node.name} : [")
+                append(edges.joinToString(" ") { it.destination.name })
+                append("]\n")
+            }
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 335198af68..9e2ca600dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -25,19 +25,18 @@ import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
 import io.realm.RealmQuery
 import io.realm.Sort
+import io.realm.kotlin.where
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
-import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
-import io.realm.kotlin.where
-import org.matrix.android.sdk.api.session.room.RoomCategoryFilter
-import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.VersioningState
-import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.spaceSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
@@ -174,8 +173,8 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         )
     }
 
-    fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                          pagedListConfig: PagedList.Config): UpdatableFilterLivePageResult {
+    fun getUpdatablePagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
+                                           pagedListConfig: PagedList.Config): UpdatableLivePageResult {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
             roomSummariesQuery(realm, queryParams)
                     .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
@@ -189,13 +188,12 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                 LivePagedListBuilder(dataSourceFactory, pagedListConfig)
         )
 
-        return object : UpdatableFilterLivePageResult {
+        return object : UpdatableLivePageResult {
             override val livePagedList: LiveData<PagedList<RoomSummary>> = mapped
 
-            override fun updateQuery(queryParams: RoomSummaryQueryParams) {
+            override fun updateQuery(builder: (RoomSummaryQueryParams) -> RoomSummaryQueryParams) {
                 realmDataSourceFactory.updateQuery {
-                    roomSummariesQuery(it, queryParams)
-                            .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+                    roomSummariesQuery(it, builder.invoke(queryParams))
                 }
             }
         }
@@ -225,10 +223,10 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
 
         queryParams.roomCategoryFilter?.let {
             when (it) {
-                RoomCategoryFilter.ONLY_DM                 -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
-                RoomCategoryFilter.ONLY_ROOMS              -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
+                RoomCategoryFilter.ONLY_DM -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+                RoomCategoryFilter.ONLY_ROOMS -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
                 RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS -> query.greaterThan(RoomSummaryEntityFields.NOTIFICATION_COUNT, 0)
-                RoomCategoryFilter.ALL                     -> {
+                RoomCategoryFilter.ALL -> {
                     // nop
                 }
             }
@@ -252,9 +250,27 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
             query.equalTo(RoomSummaryEntityFields.ROOM_TYPE, it)
         }
         when (queryParams.roomCategoryFilter) {
-            RoomCategoryFilter.ONLY_DM    -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+            RoomCategoryFilter.ONLY_DM -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
             RoomCategoryFilter.ONLY_ROOMS -> query.equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
-            RoomCategoryFilter.ALL        -> Unit // nop
+            RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS -> query.greaterThan(RoomSummaryEntityFields.NOTIFICATION_COUNT, 0)
+            RoomCategoryFilter.ALL -> Unit // nop
+        }
+
+        // Timber.w("VAL: activeSpaceId : ${queryParams.activeSpaceId}")
+        when (queryParams.activeSpaceId) {
+            is ActiveSpaceFilter.ActiveSpace -> {
+                // It's annoying but for now realm java does not support querying in primitive list :/
+                // https://github.com/realm/realm-java/issues/5361
+                if (queryParams.activeSpaceId.currentSpaceId == null) {
+                    // orphan rooms
+                    query.isNull(RoomSummaryEntityFields.FLATTEN_PARENT_IDS)
+                } else {
+                    query.contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.activeSpaceId.currentSpaceId)
+                }
+            }
+            else                             -> {
+                // nop
+            }
         }
         return query
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index e7cb9688dd..72bac7c12b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -39,6 +39,7 @@ import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.EventEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntity
 import org.matrix.android.sdk.internal.database.model.SpaceParentSummaryEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
@@ -50,6 +51,7 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.database.query.whereType
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.extensions.clearWith
+import org.matrix.android.sdk.internal.query.process
 import org.matrix.android.sdk.internal.session.room.RoomAvatarResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomDisplayNameResolver
 import org.matrix.android.sdk.internal.session.room.membership.RoomMemberHelper
@@ -59,6 +61,7 @@ import org.matrix.android.sdk.internal.session.sync.model.RoomSyncSummary
 import org.matrix.android.sdk.internal.session.sync.model.RoomSyncUnreadNotifications
 import timber.log.Timber
 import javax.inject.Inject
+import kotlin.system.measureTimeMillis
 
 internal class RoomSummaryUpdater @Inject constructor(
         @UserId private val userId: String,
@@ -183,46 +186,144 @@ internal class RoomSummaryUpdater @Inject constructor(
      * Should be called at the end of the room sync, to check and validate all parent/child relations
      */
     fun validateSpaceRelationship(realm: Realm) {
-        // Do level 0 stuffs
+        measureTimeMillis {
+            val lookupMap = realm.where(RoomSummaryEntity::class.java)
+                    .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
+                    .equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
+                    // we order by roomID to be consistent when breaking parent/child cycles
+                    .sort(RoomSummaryEntityFields.ROOM_ID)
+                    .findAll().map {
+                        it.flattenParentIds = null
+                        it to emptyList<RoomSummaryEntity>().toMutableSet()
+                    }
+                    .toMap()
 
-        realm.where(RoomSummaryEntity::class.java).findAll().forEach { roomSummary ->
-            if (roomSummary.roomType == RoomType.SPACE) {
-                roomSummary.children.clearWith { it.deleteFromRealm() }
-                roomSummary.children.addAll(
-                        RoomChildRelationInfo(realm, roomSummary.roomId).getDirectChildrenDescriptions()
-                                .map {
-                                    Timber.v("## Space: Updating summary for room ${roomSummary.roomId} with info $it")
-                                    realm.createObject<SpaceChildSummaryEntity>().apply {
-                                        this.childRoomId = it.roomId
-                                        this.childSummaryEntity = RoomSummaryEntity.where(realm, it.roomId).findFirst()
-                                        this.order = it.order
-                                        this.autoJoin = it.autoJoin
-                                        this.viaServers.addAll(it.viaServers)
-//                                        this.level = 0
-                                    }.also {
-                                        Timber.v("## Space: Updating summary for room ${roomSummary.roomId} with children $it")
+            lookupMap.keys.forEach { lookedUp ->
+                if (lookedUp.roomType == RoomType.SPACE) {
+                    // get childrens
+
+                    lookedUp.children.clearWith { it.deleteFromRealm() }
+
+                    RoomChildRelationInfo(realm, lookedUp.roomId).getDirectChildrenDescriptions().forEach { child ->
+
+                        lookedUp.children.add(
+                                realm.createObject<SpaceChildSummaryEntity>().apply {
+                                    this.childRoomId = child.roomId
+                                    this.childSummaryEntity = RoomSummaryEntity.where(realm, child.roomId).findFirst()
+                                    this.order = child.order
+                                    this.autoJoin = child.autoJoin
+                                    this.viaServers.addAll(child.viaServers)
+                                }
+                        )
+
+                        RoomSummaryEntity.where(realm, child.roomId)
+                                .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
+                                .findFirst()
+                                ?.let { childSum ->
+                                    lookupMap.entries.firstOrNull { it.key.roomId == lookedUp.roomId }?.let { entry ->
+                                        if (entry.value.indexOfFirst { it.roomId == childSum.roomId } == -1) {
+                                            // add looked up as a parent
+                                            entry.value.add(childSum)
+                                        }
                                     }
                                 }
-                )
+                    }
+                } else {
+                    lookedUp.parents.clearWith { it.deleteFromRealm() }
+                    // can we check parent relations here??
+                    RoomChildRelationInfo(realm, lookedUp.roomId).getParentDescriptions()
+                            .map { parentInfo ->
+
+                                lookedUp.parents.add(
+                                        realm.createObject<SpaceParentSummaryEntity>().apply {
+                                            this.parentRoomId = parentInfo.roomId
+                                            this.parentSummaryEntity = RoomSummaryEntity.where(realm, parentInfo.roomId).findFirst()
+                                            this.canonical = parentInfo.canonical
+                                            this.viaServers.addAll(parentInfo.viaServers)
+                                        }
+                                )
+
+                                RoomSummaryEntity.where(realm, parentInfo.roomId)
+                                        .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
+                                        .findFirst()
+                                        ?.let { parentSum ->
+                                            if (lookupMap[parentSum]?.indexOfFirst { it.roomId == lookedUp.roomId } == -1) {
+                                                // add lookedup as a parent
+                                                lookupMap[parentSum]?.add(lookedUp)
+                                            }
+                                        }
+                            }
+                }
             }
 
-            // check parents
-            roomSummary.parents.clearWith { it.deleteFromRealm() }
-            roomSummary.parents.addAll(
-                    RoomChildRelationInfo(realm, roomSummary.roomId).getParentDescriptions()
-                            .map { parentInfo ->
-                                Timber.v("## Space: Updating summary for room ${roomSummary.roomId} with parent info $parentInfo")
-                                realm.createObject<SpaceParentSummaryEntity>().apply {
-                                    this.parentRoomId = parentInfo.roomId
-                                    this.parentSummaryEntity = RoomSummaryEntity.where(realm, parentInfo.roomId).findFirst()
-                                    this.canonical = parentInfo.canonical
-                                    this.viaServers.addAll(parentInfo.viaServers)
-//                            this.level = 0
-                                }.also {
-                                    Timber.v("## Space: Updating summary for room ${roomSummary.roomId} with parent $it")
+            // Simple algorithm to break cycles
+            // Need more work to decide how to break, probably need to be as consistent as possible
+            // and also find best way to root the tree
+
+            val graph = Graph()
+            lookupMap
+                    // focus only on spaces, as room are just leaf
+                    .filter { it.key.roomType == RoomType.SPACE }
+                    .forEach { (sum, children) ->
+                        graph.getOrCreateNode(sum.roomId)
+                        children.forEach {
+                            graph.addEdge(it.roomId, sum.roomId)
+                        }
+                    }
+
+            val backEdges = graph.findBackwardEdges()
+            Timber.v("## SPACES: Cycle detected = ${backEdges.isNotEmpty()}")
+
+            // break cycles
+            backEdges.forEach { edge ->
+                lookupMap.entries.find { it.key.roomId == edge.source.name }?.let {
+                    it.value.removeAll { it.roomId == edge.destination.name }
+                }
+            }
+
+            val acyclicGraph = graph.withoutEdges(backEdges)
+//            Timber.v("## SPACES: acyclicGraph $acyclicGraph")
+            val flattenSpaceParents = acyclicGraph.flattenDestination().map {
+                it.key.name to it.value.map { it.name }
+            }.toMap()
+//            Timber.v("## SPACES: flattenSpaceParents ${flattenSpaceParents.map { it.key.name to it.value.map { it.name } }.joinToString("\n") {
+//                it.first + ": [" + it.second.joinToString(",") + "]"
+//            }}")
+
+//            Timber.v("## SPACES: lookup map ${lookupMap.map { it.key.name to it.value.map { it.name } }.toMap()}")
+
+            lookupMap.entries
+                    .filter { it.key.roomType == RoomType.SPACE }
+                    .forEach { entry ->
+                        val parent = RoomSummaryEntity.where(realm, entry.key.roomId).findFirst()
+                        if (parent != null) {
+//                            Timber.v("## SPACES: check hierarchy of ${parent.name} id ${parent.roomId}")
+//                            Timber.v("## SPACES: flat known parents of ${parent.name} are ${flattenSpaceParents[parent.roomId]}")
+                            val flattenParentsIds = (flattenSpaceParents[parent.roomId] ?: emptyList()) + listOf(parent.roomId)
+//                            Timber.v("## SPACES: flatten known parents of children of ${parent.name} are ${flattenParentsIds}")
+                            entry.value.forEach { child ->
+                                RoomSummaryEntity.where(realm, child.roomId).findFirst()?.let { childSum ->
+
+                                    Timber.w("## SPACES: ${childSum.name} is ${childSum.roomId} fc: ${childSum.flattenParentIds}")
+//                                    var allParents = childSum.flattenParentIds ?: ""
+                                    if (childSum.flattenParentIds == null) childSum.flattenParentIds = ""
+                                    flattenParentsIds.forEach {
+                                        if (childSum.flattenParentIds?.contains(it) != true) {
+                                            childSum.flattenParentIds += "|$it"
+                                        }
+                                    }
+//                                    childSum.flattenParentIds = "$allParents|"
+
+//                                    Timber.v("## SPACES: flatten of ${childSum.name} is ${childSum.flattenParentIds}")
                                 }
                             }
-            )
+                        }
+                    }
+
+            // we need also to filter DMs...
+            // it's more annoying as based on if the other members belong the space or not
+        }.also {
+            Timber.v("## SPACES: Finish checking room hierarchy in $it ms")
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index c41ccc7af4..93cb9d9d34 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.session.space
 
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
@@ -25,7 +24,6 @@ import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
-import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 
 internal class DefaultSpace(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index a116d4fe15..892cfbbd0e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -169,7 +169,7 @@ internal class DefaultSpaceService @Inject constructor(
                     stateKey = QueryStringValue.NoCondition
             )
             val powerLevelsContent = powerLevelsEvent?.content?.toModel<PowerLevelsContent>()
-                    ?: throw UnsupportedOperationException("Cannot add canonical child, not enough power level")
+                    ?: throw UnsupportedOperationException("Cannot add canonical child, missing powerlevel")
             val powerLevelsHelper = PowerLevelsHelper(powerLevelsContent)
             if (!powerLevelsHelper.isUserAllowedToSend(userId, true, EventType.STATE_SPACE_CHILD)) {
                 throw UnsupportedOperationException("Cannot add canonical child, not enough power level")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
index 9bf6fa0256..d2be49b70b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/ResolveSpaceInfoTask.kt
@@ -57,7 +57,7 @@ internal class DefaultResolveSpaceInfoTask @Inject constructor(
                 suggestedOnly = params.suggestedOnly
         )
         return executeRequest(globalErrorReceiver) {
-            apiCall = spaceApi.getSpaces(params.spaceId, body)
+            spaceApi.getSpaces(params.spaceId, body)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
index 3f8da574fe..0fcc95fdb3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceApi.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.internal.session.space
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
 import retrofit2.http.Path
@@ -39,6 +38,6 @@ internal interface SpaceApi {
      * - https://hackmd.io/fNYh4tjUT5mQfR1uuRzWDA
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_UNSTABLE + "org.matrix.msc2946/rooms/{roomId}/spaces")
-    fun getSpaces(@Path("roomId") spaceId: String,
-                  @Body params: SpaceSummaryParams): Call<SpacesResponse>
+    suspend fun getSpaces(@Path("roomId") spaceId: String,
+                  @Body params: SpaceSummaryParams): SpacesResponse
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index acba679ad3..7cebbb0192 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -97,9 +97,12 @@ internal class RoomSyncHandler @Inject constructor(private val readReceiptHandle
         handleRoomSync(realm, HandlingStrategy.LEFT(roomsSyncResponse.leave), isInitialSync, aggregator, reporter)
 
         // post room sync validation
-        roomSummaryUpdater.validateSpaceRelationship(realm)
+//        roomSummaryUpdater.validateSpaceRelationship(realm)
     }
 
+    fun postSyncSpaceHierarchyHandle(realm: Realm) {
+        roomSummaryUpdater.validateSpaceRelationship(realm)
+    }
     // PRIVATE METHODS *****************************************************************************
 
     private fun handleRoomSync(realm: Realm,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index 8e243c3443..157787c8cf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -132,6 +132,11 @@ internal class SyncResponseHandler @Inject constructor(
 
         Timber.v("On sync completed")
         cryptoSyncHandler.onSyncCompleted(syncResponse)
+
+        // post sync stuffs
+        monarchy.writeAsync {
+            roomSyncHandler.postSyncSpaceHierarchyHandle(it)
+        }
     }
 
     /**
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/GraphUtilsTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/GraphUtilsTest.kt
new file mode 100644
index 0000000000..618f6f4714
--- /dev/null
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/GraphUtilsTest.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.util
+
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.MatrixTest
+import org.matrix.android.sdk.internal.session.room.summary.Graph
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+@FixMethodOrder(MethodSorters.JVM)
+class GraphUtilsTest : MatrixTest {
+
+    @Test
+    fun testCreateGraph() {
+        val graph = Graph()
+
+        graph.addEdge("E", "C")
+        graph.addEdge("B", "A")
+        graph.addEdge("C", "A")
+        graph.addEdge("D", "C")
+        graph.addEdge("E", "D")
+
+        graph.getOrCreateNode("F")
+
+        System.out.println(graph.toString())
+
+        val backEdges = graph.findBackwardEdges(graph.getOrCreateNode("E"))
+
+        assertTrue(backEdges.isEmpty(), "There should not be any cycle in this graphs")
+    }
+
+    @Test
+    fun testCycleGraph() {
+        val graph = Graph()
+
+        graph.addEdge("E", "C")
+        graph.addEdge("B", "A")
+        graph.addEdge("C", "A")
+        graph.addEdge("D", "C")
+        graph.addEdge("E", "D")
+
+        graph.getOrCreateNode("F")
+
+        // adding loops
+        graph.addEdge("C", "E")
+        graph.addEdge("B", "B")
+
+        System.out.println(graph.toString())
+
+        val backEdges = graph.findBackwardEdges(graph.getOrCreateNode("E"))
+        System.out.println(backEdges.joinToString(" | ") { "${it.source.name} -> ${it.destination.name}" })
+
+        assertTrue(backEdges.size == 2, "There should be 2 backward edges not ${backEdges.size}")
+
+        val edge1 = backEdges.find { it.source.name == "C" }
+        assertNotNull(edge1, "There should be a back edge from C")
+        assertEquals("E", edge1.destination.name, "There should be a back edge C -> E")
+
+        val edge2 = backEdges.find { it.source.name == "B" }
+        assertNotNull(edge2, "There should be a back edge from B")
+        assertEquals("B", edge2.destination.name, "There should be a back edge C -> C")
+
+        // clean the graph
+        val acyclicGraph = graph.withoutEdges(backEdges)
+        System.out.println(acyclicGraph.toString())
+
+        assertTrue(acyclicGraph.findBackwardEdges(acyclicGraph.getOrCreateNode("E")).isEmpty(), "There should be no backward edges")
+
+        val flatten = acyclicGraph.flattenDestination()
+
+        assertTrue(flatten[acyclicGraph.getOrCreateNode("A")]!!.isEmpty())
+
+        val flattenParentsB = flatten[acyclicGraph.getOrCreateNode("B")]
+        assertTrue(flattenParentsB!!.size == 1)
+        assertTrue(flattenParentsB.contains(acyclicGraph.getOrCreateNode("A")))
+
+        val flattenParentsE = flatten[acyclicGraph.getOrCreateNode("E")]
+        assertTrue(flattenParentsE!!.size == 3)
+        assertTrue(flattenParentsE.contains(acyclicGraph.getOrCreateNode("A")))
+        assertTrue(flattenParentsE.contains(acyclicGraph.getOrCreateNode("C")))
+        assertTrue(flattenParentsE.contains(acyclicGraph.getOrCreateNode("D")))
+
+//        System.out.println(
+//                buildString {
+//                    flatten.entries.forEach {
+//                        append("${it.key.name}: [")
+//                        append(it.value.joinToString(",") { it.name })
+//                        append("]\n")
+//                    }
+//                }
+//        )
+    }
+}
diff --git a/vector/build.gradle b/vector/build.gradle
index e09c7dc6f2..589844029d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -333,6 +333,7 @@ dependencies {
 
     implementation "com.squareup.moshi:moshi-adapters:$moshi_version"
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
 
     // Log
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 22816085fb..bb45e97776 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -19,7 +19,12 @@ package im.vector.app
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
+import arrow.core.Option
+import im.vector.app.core.utils.BehaviorDataSource
+import im.vector.app.features.ui.UiStateRepository
 import io.reactivex.disposables.CompositeDisposable
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -29,10 +34,15 @@ import javax.inject.Singleton
  */
 // TODO Keep this class for now, will maybe be used fro Space
 @Singleton
-class AppStateHandler @Inject constructor() : LifecycleObserver {
+class AppStateHandler @Inject constructor(
+        private val sessionDataSource: ActiveSessionDataSource,
+        private val uiStateRepository: UiStateRepository
+) : LifecycleObserver {
 
     private val compositeDisposable = CompositeDisposable()
 
+    val selectedSpaceDataSource = BehaviorDataSource<Option<RoomSummary>>(Option.empty())
+
     init {
         // restore current space from ui state
         sessionDataSource.currentValue?.orNull()?.let { session ->
@@ -44,6 +54,12 @@ class AppStateHandler @Inject constructor() : LifecycleObserver {
         }
     }
 
+    fun safeActiveSpaceId() : String? {
+        return selectedSpaceDataSource.currentValue?.orNull()?.roomId?.takeIf {
+            MatrixPatterns.isRoomId(it)
+        }
+    }
+
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun entersForeground() {
     }
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
index e75f2416eb..c8d5f6dd20 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
@@ -21,6 +21,7 @@ import android.content.res.Resources
 import dagger.BindsInstance
 import dagger.Component
 import im.vector.app.ActiveSessionDataSource
+import im.vector.app.AppStateHandler
 import im.vector.app.EmojiCompatFontProvider
 import im.vector.app.EmojiCompatWrapper
 import im.vector.app.VectorApplication
@@ -35,10 +36,8 @@ import im.vector.app.features.configuration.VectorConfiguration
 import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
 import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
 import im.vector.app.features.grouplist.SelectedGroupDataSource
-import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.CurrentSpaceSuggestedRoomListDataSource
-import im.vector.app.features.home.HomeRoomListDataSource
 import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
 import im.vector.app.features.home.room.detail.timeline.helper.RoomSummariesHolder
@@ -118,7 +117,7 @@ interface VectorComponent {
 
     fun selectedGroupStore(): SelectedGroupDataSource
 
-    fun selectedSpaceStore(): SelectedSpaceDataSource
+    fun appStateHandler(): AppStateHandler
 
     fun currentSpaceSuggestedRoomListDataSource(): CurrentSpaceSuggestedRoomListDataSource
 
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
index 1bde66f6d1..e185a4dbc4 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt
@@ -15,7 +15,6 @@
  */
 package im.vector.app.core.ui.list
 
-import android.graphics.Typeface
 import android.view.Gravity
 import android.widget.TextView
 import androidx.annotation.ColorInt
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index ab0c6e45fe..cfdcc40a37 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -158,7 +158,13 @@ class HomeActivity :
                         is HomeActivitySharedAction.CloseDrawer -> views.drawerLayout.closeDrawer(GravityCompat.START)
                         is HomeActivitySharedAction.OpenGroup -> {
                             views.drawerLayout.closeDrawer(GravityCompat.START)
-                            replaceFragment(R.id.homeDetailFragmentContainer, HomeDetailFragment::class.java, allowStateLoss = true)
+                            // Temporary
+                            // we might want to delay that to avoid having the drawer animation lagging
+                            // would be probably better to let the drawer do that? in the on closed callback?
+                            views.coordinatorLayout.postDelayed({
+                                replaceFragment(R.id.homeDetailFragmentContainer, HomeDetailFragment::class.java, allowStateLoss = true)
+                            }, 200)
+                            Unit
                         }
                         is HomeActivitySharedAction.OpenSpacePreview -> {
                             startActivity(SpacePreviewActivity.newIntent(this, sharedAction.spaceId))
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index a07a329a57..b2fadae0fb 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -23,12 +23,12 @@ import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.AppStateHandler
 import im.vector.app.core.di.HasScreenInjector
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.grouplist.SelectedGroupDataSource
-import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.features.ui.UiStateRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -49,6 +49,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                                                       private val session: Session,
                                                       private val uiStateRepository: UiStateRepository,
                                                       private val selectedGroupStore: SelectedGroupDataSource,
+                                                      private val appStateHandler: AppStateHandler,
                                                       private val stringProvider: StringProvider)
     : VectorViewModel<HomeDetailViewState, HomeDetailAction, EmptyViewEvents>(initialState) {
 
@@ -83,7 +84,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     override fun handle(action: HomeDetailAction) {
         when (action) {
             is HomeDetailAction.SwitchDisplayMode -> handleSwitchDisplayMode(action)
-            HomeDetailAction.MarkAllRoomsRead     -> handleMarkAllRoomsRead()
+            HomeDetailAction.MarkAllRoomsRead -> handleMarkAllRoomsRead()
         }
     }
 
@@ -140,7 +141,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     }
 
     private fun observeSelectedSpaceStore() {
-        selectedSpaceStore
+        appStateHandler.selectedSpaceDataSource
                 .observe()
                 .subscribe {
                     setState {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListListener.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListListener.kt
index e9833d1560..0ba265f841 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListListener.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListListener.kt
@@ -18,10 +18,12 @@ package im.vector.app.features.home.room.list
 
 import im.vector.app.features.home.room.filtered.FilteredRoomFooterItem
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 
 interface RoomListListener : FilteredRoomFooterItem.FilteredRoomFooterItemListener {
     fun onRoomClicked(room: RoomSummary)
     fun onRoomLongClicked(room: RoomSummary): Boolean
     fun onRejectRoomInvitation(room: RoomSummary)
     fun onAcceptRoomInvitation(room: RoomSummary)
+    fun onJoinSuggestedRoom(room: SpaceChildInfo)
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 880c3391c9..c171dea863 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.home.room.list
 
 import androidx.annotation.StringRes
+import androidx.lifecycle.liveData
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
@@ -24,28 +25,31 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
+import im.vector.app.AppStateHandler
 import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.utils.DataSource
-import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.RoomListDisplayMode
+import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
-import org.matrix.android.sdk.api.session.room.UpdatableFilterLivePageResult
+import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
-import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.state.isPublic
+import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
@@ -54,17 +58,79 @@ import javax.inject.Inject
 class RoomListViewModel @Inject constructor(
         initialState: RoomListViewState,
         private val session: Session,
-        private val stringProvider: StringProvider
+        private val stringProvider: StringProvider,
+        private val appStateHandler: AppStateHandler
 ) : VectorViewModel<RoomListViewState, RoomListAction, RoomListViewEvents>(initialState) {
 
     interface Factory {
         fun create(initialState: RoomListViewState): RoomListViewModel
     }
 
-    private var updatableQuery: UpdatableFilterLivePageResult? = null
+    private var updatableQuery: UpdatableLivePageResult? = null
+
+    private var activeSpaceAwareQueries: List<ActiveSpaceQueryUpdater>? = null
+
+    interface ActiveSpaceQueryUpdater {
+        fun updateForSpaceId(roomId: String?)
+    }
+
+    enum class SpaceFilterStrategy {
+        NORMAL,
+        NOT_IF_ALL,
+        NONE
+    }
 
     init {
         observeMembershipChanges()
+
+        appStateHandler.selectedSpaceDataSource.observe()
+//                .observeOn(Schedulers.computation())
+                .distinctUntilChanged()
+                .switchMap { activeSpaceOption ->
+                    val selectedSpace = activeSpaceOption.orNull()
+                    activeSpaceAwareQueries?.onEach { updater ->
+                        updater.updateForSpaceId(selectedSpace?.roomId?.takeIf { MatrixPatterns.isRoomId(it) })
+                    }
+//                    activeSpaceAwareQueries?.forEach {
+//                        it.updateQuery {
+//                            it.copy(
+//                                    activeSpaceId = ActiveSpaceFilter.ActiveSpace(selectedSpace?.roomId?.takeIf { MatrixPatterns.isRoomId(it) })
+//                            )
+//                        }
+//                    }
+                    if (selectedSpace == null) {
+                        Observable.just(emptyList())
+                    } else {
+                        liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
+                            val spaceSum = tryOrNull { session.spaceService().querySpaceChildren(selectedSpace.roomId, suggestedOnly = true) }
+                            val value = spaceSum?.second ?: emptyList()
+                            emit(value)
+                        }.asObservable()
+                    }
+                }
+                .execute { info ->
+                    copy(asyncSuggestedRooms = info)
+                }
+
+        appStateHandler.selectedSpaceDataSource.observe()
+//                .observeOn(Schedulers.computation())
+                .distinctUntilChanged()
+                .map { it.orNull() }
+                .distinctUntilChanged()
+                .execute {
+                    copy(
+                            currentSpace = it
+                    )
+                }
+
+        session.rx().liveUser(session.myUserId)
+                .map { it.getOrNull()?.getBestName() }
+                .distinctUntilChanged()
+                .execute {
+                    copy(
+                            currentUserName = it.invoke() ?: session.myUserId
+                    )
+                }
     }
 
     private fun observeMembershipChanges() {
@@ -87,47 +153,93 @@ class RoomListViewModel @Inject constructor(
 
     val sections: List<RoomsSection> by lazy {
         val sections = mutableListOf<RoomsSection>()
+        val activeSpaceAwareQueries = mutableListOf<ActiveSpaceQueryUpdater>()
         if (initialState.displayMode == RoomListDisplayMode.PEOPLE) {
-            addSection(sections, R.string.invitations_header, true) {
+            addSection(sections,
+                    activeSpaceAwareQueries,
+                    R.string.invitations_header,
+                    true,
+                    SpaceFilterStrategy.NOT_IF_ALL
+            ) {
                 it.memberships = listOf(Membership.INVITE)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
             }
 
-            addSection(sections, R.string.bottom_action_favourites) {
+            addSection(sections,
+                    activeSpaceAwareQueries,
+                    R.string.bottom_action_favourites,
+                    false,
+                    SpaceFilterStrategy.NOT_IF_ALL
+            ) {
                 it.memberships = listOf(Membership.JOIN)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
                 it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
             }
 
-            addSection(sections, R.string.bottom_action_people_x) {
+            addSection(
+                    sections,
+                    activeSpaceAwareQueries,
+                    R.string.bottom_action_people_x,
+                    false,
+                    SpaceFilterStrategy.NORMAL
+            ) {
                 it.memberships = listOf(Membership.JOIN)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
             }
         } else if (initialState.displayMode == RoomListDisplayMode.ROOMS) {
-            addSection(sections, R.string.invitations_header, true) {
+            addSection(
+                    sections, activeSpaceAwareQueries,
+                    R.string.invitations_header,
+                    true,
+                    SpaceFilterStrategy.NONE
+            ) {
                 it.memberships = listOf(Membership.INVITE)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
             }
 
-            addSection(sections, R.string.bottom_action_favourites) {
+            addSection(
+                    sections,
+                    activeSpaceAwareQueries,
+                    R.string.bottom_action_favourites,
+                    false,
+                    SpaceFilterStrategy.NOT_IF_ALL
+            ) {
                 it.memberships = listOf(Membership.JOIN)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
                 it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
             }
 
-            addSection(sections, R.string.bottom_action_rooms) {
+            addSection(
+                    sections,
+                    activeSpaceAwareQueries,
+                    R.string.bottom_action_rooms,
+                    false,
+                    SpaceFilterStrategy.NORMAL
+            ) {
                 it.memberships = listOf(Membership.JOIN)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
                 it.roomTagQueryFilter = RoomTagQueryFilter(false, false, false)
             }
 
-            addSection(sections, R.string.low_priority_header) {
+            addSection(
+                    sections,
+                    activeSpaceAwareQueries,
+                    R.string.low_priority_header,
+                    false,
+                    SpaceFilterStrategy.NORMAL
+            ) {
                 it.memberships = listOf(Membership.JOIN)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
                 it.roomTagQueryFilter = RoomTagQueryFilter(null, true, null)
             }
 
-            addSection(sections, R.string.system_alerts_header) {
+            addSection(
+                    sections,
+                    activeSpaceAwareQueries,
+                    R.string.system_alerts_header,
+                    false,
+                    SpaceFilterStrategy.NORMAL
+            ) {
                 it.memberships = listOf(Membership.JOIN)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
                 it.roomTagQueryFilter = RoomTagQueryFilter(null, null, true)
@@ -147,12 +259,24 @@ class RoomListViewModel @Inject constructor(
                     }
             )
         } else if (initialState.displayMode == RoomListDisplayMode.NOTIFICATIONS) {
-            addSection(sections, R.string.invitations_header, true) {
+            addSection(
+                    sections,
+                    activeSpaceAwareQueries,
+                    R.string.invitations_header,
+                    true,
+                    SpaceFilterStrategy.NORMAL
+            ) {
                 it.memberships = listOf(Membership.INVITE)
                 it.roomCategoryFilter = RoomCategoryFilter.ALL
             }
 
-            addSection(sections, R.string.bottom_action_rooms, true) {
+            addSection(
+                    sections,
+                    activeSpaceAwareQueries,
+                    R.string.bottom_action_rooms,
+                    false,
+                    SpaceFilterStrategy.NORMAL
+            ) {
                 it.memberships = listOf(Membership.JOIN)
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
             }
@@ -176,15 +300,67 @@ class RoomListViewModel @Inject constructor(
     }
 
     private fun addSection(sections: MutableList<RoomsSection>,
+                           activeSpaceUpdaters: MutableList<ActiveSpaceQueryUpdater>,
                            @StringRes nameRes: Int,
                            notifyOfLocalEcho: Boolean = false,
+                           spaceFilterStrategy: SpaceFilterStrategy = SpaceFilterStrategy.NONE,
                            query: (RoomSummaryQueryParams.Builder) -> Unit) {
         withQueryParams(
                 { query.invoke(it) },
                 { roomQueryParams ->
 
                     val name = stringProvider.getString(nameRes)
-                    session.getPagedRoomSummariesLive(roomQueryParams)
+//                    if (activeSpaceAwareQueries != null) {
+                    session.getFilteredPagedRoomSummariesLive(
+                            when (spaceFilterStrategy) {
+                                SpaceFilterStrategy.NORMAL     -> {
+                                    roomQueryParams.copy(
+                                            activeSpaceId = ActiveSpaceFilter.ActiveSpace(appStateHandler.safeActiveSpaceId())
+                                    )
+                                }
+                                SpaceFilterStrategy.NOT_IF_ALL -> {
+                                    if (appStateHandler.safeActiveSpaceId() == null) {
+                                        roomQueryParams
+                                    } else {
+                                        roomQueryParams.copy(
+                                                activeSpaceId = ActiveSpaceFilter.ActiveSpace(appStateHandler.safeActiveSpaceId())
+                                        )
+                                    }
+                                }
+                                SpaceFilterStrategy.NONE       -> roomQueryParams
+                            }
+
+                    ).also {
+                        when (spaceFilterStrategy) {
+                            SpaceFilterStrategy.NORMAL     -> {
+                                activeSpaceUpdaters.add(object : ActiveSpaceQueryUpdater {
+                                    override fun updateForSpaceId(roomId: String?) {
+                                        it.updateQuery {
+                                            it.copy(
+                                                    activeSpaceId = ActiveSpaceFilter.ActiveSpace(roomId)
+                                            )
+                                        }
+                                    }
+                                })
+                            }
+                            SpaceFilterStrategy.NOT_IF_ALL -> {
+                                activeSpaceUpdaters.add(object : ActiveSpaceQueryUpdater {
+                                    override fun updateForSpaceId(roomId: String?) {
+                                        if (roomId != null) {
+                                            it.updateQuery {
+                                                it.copy(
+                                                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(roomId)
+                                                )
+                                            }
+                                        }
+                                    }
+                                })
+                            }
+                            SpaceFilterStrategy.NONE       -> {
+                                // we ignore current space for this one
+                            }
+                        }
+                    }.livePagedList
                             .let { livePagedList ->
 
                                 // use it also as a source to update count
@@ -206,6 +382,7 @@ class RoomListViewModel @Inject constructor(
                                 )
                             }
                 }
+
         )
     }
 
@@ -242,12 +419,11 @@ class RoomListViewModel @Inject constructor(
                     roomFilter = action.filter
             )
         }
-        updatableQuery?.updateQuery(
-                roomSummaryQueryParams {
-                    memberships = Membership.activeMemberships()
+        updatableQuery?.updateQuery {
+            it.copy(
                     displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
-                }
-        )
+            )
+        }
     }
 
     private fun handleAcceptInvitation(action: RoomListAction.AcceptInvitation) = withState { state ->
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
index d36bc45ab6..8377f222bf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
@@ -16,12 +16,14 @@
 
 package im.vector.app.features.home.room.list
 
+import im.vector.app.AppStateHandler
 import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 import javax.inject.Provider
 
 class RoomListViewModelFactory @Inject constructor(private val session: Provider<Session>,
+                                                   private val appStateHandler: AppStateHandler,
                                                    private val stringProvider: StringProvider)
     : RoomListViewModel.Factory {
 
@@ -29,7 +31,8 @@ class RoomListViewModelFactory @Inject constructor(private val session: Provider
         return RoomListViewModel(
                 initialState,
                 session.get(),
-                stringProvider
+                stringProvider,
+                appStateHandler
         )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index e53c3e6bde..6fb7bd05be 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -16,16 +16,22 @@
 
 package im.vector.app.features.home.room.list
 
+import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
 import im.vector.app.features.home.RoomListDisplayMode
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 
 data class RoomListViewState(
         val displayMode: RoomListDisplayMode,
         val roomFilter: String = "",
-        val roomMembershipChanges: Map<String, ChangeMembershipState> = emptyMap()
+        val roomMembershipChanges: Map<String, ChangeMembershipState> = emptyMap(),
         val asyncSuggestedRooms: Async<List<SpaceChildInfo>> = Uninitialized,
-        val suggestedRoomJoiningState: Map<String, Async<Unit>> = emptyMap()
+        val suggestedRoomJoiningState: Map<String, Async<Unit>> = emptyMap(),
+        val currentUserName: String? = null,
+        val currentSpace: Async<RoomSummary?> = Uninitialized
 ) : MvRxState {
 
     constructor(args: RoomListParams) : this(displayMode = args.displayMode)
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 57b690bec2..ce178a1358 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -30,6 +30,7 @@ import androidx.core.app.TaskStackBuilder
 import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
 import arrow.core.Option
+import im.vector.app.AppStateHandler
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.fatalError
@@ -47,7 +48,6 @@ import im.vector.app.features.crypto.verification.SupportedVerificationMethodsPr
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.debug.DebugMenuActivity
 import im.vector.app.features.devtools.RoomDevToolActivity
-import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.RoomDetailArgs
 import im.vector.app.features.home.room.detail.search.SearchActivity
@@ -92,7 +92,7 @@ class DefaultNavigator @Inject constructor(
         private val sessionHolder: ActiveSessionHolder,
         private val vectorPreferences: VectorPreferences,
         private val widgetArgsBuilder: WidgetArgsBuilder,
-        private val selectedSpaceDataSource: SelectedSpaceDataSource,
+        private val appStateHandler: AppStateHandler,
         private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider
 ) : Navigator {
 
@@ -114,7 +114,7 @@ class DefaultNavigator @Inject constructor(
 
         sessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(spaceId)?.spaceSummary()?.let {
             Timber.d("## Nav: Switching to space $spaceId / ${it.name}")
-            selectedSpaceDataSource.post(Option.just(it))
+            appStateHandler.selectedSpaceDataSource.post(Option.just(it))
         } ?: kotlin.run {
             Timber.d("## Nav: Failed to switch to space $spaceId")
         }
@@ -252,7 +252,7 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openRoomDirectory(context: Context, initialFilter: String) {
-        val selectedSpace = selectedSpaceDataSource.currentValue?.orNull()?.let {
+        val selectedSpace = appStateHandler.selectedSpaceDataSource.currentValue?.orNull()?.let {
             sessionHolder.getSafeActiveSession()?.getRoomSummary(it.roomId)
         }
         if (selectedSpace == null) {
@@ -276,7 +276,7 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openInviteUsersToRoom(context: Context, roomId: String) {
-        val selectedSpace = selectedSpaceDataSource.currentValue?.orNull()?.let {
+        val selectedSpace = appStateHandler.selectedSpaceDataSource.currentValue?.orNull()?.let {
             sessionHolder.getSafeActiveSession()?.getRoomSummary(it.roomId)
         }
         if (vectorPreferences.labSpaces() && selectedSpace != null) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index f0e338f6ad..f82923b570 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -24,10 +24,10 @@ import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.AppStateHandler
 import im.vector.app.R
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.grouplist.SelectedSpaceDataSource
 import im.vector.app.features.ui.UiStateRepository
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
@@ -43,7 +43,7 @@ import org.matrix.android.sdk.rx.rx
 const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
 
 class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
-                                                      private val selectedSpaceDataSource: SelectedSpaceDataSource,
+                                                      private val appStateHandler: AppStateHandler,
                                                       private val session: Session,
                                                       private val stringProvider: StringProvider,
                                                       private val uiStateRepository: UiStateRepository
@@ -68,7 +68,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     init {
         observeSpaceSummaries()
         observeSelectionState()
-        selectedSpaceDataSource
+        appStateHandler.selectedSpaceDataSource
                 .observe()
                 .subscribe {
                     if (currentGroupId != it.orNull()?.roomId) {
@@ -91,7 +91,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                     _viewEvents.post(SpaceListViewEvents.OpenSpace)
                 }
                 val optionGroup = Option.just(spaceSummary)
-                selectedSpaceDataSource.post(optionGroup)
+                appStateHandler.selectedSpaceDataSource.post(optionGroup)
             } else {
                 // If selected group is null we force to default. It can happens when leaving the selected group.
                 setState {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
index ab71b41c54..7ff13c06fd 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
@@ -26,8 +26,7 @@ import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.databinding.FragmentSpaceCreateChooseTypeBinding
 import javax.inject.Inject
 
-class ChooseSpaceTypeFragment @Inject constructor(
-) : VectorBaseFragment<FragmentSpaceCreateChooseTypeBinding>() {
+class ChooseSpaceTypeFragment @Inject constructor() : VectorBaseFragment<FragmentSpaceCreateChooseTypeBinding>() {
 
     private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
 
@@ -47,4 +46,3 @@ class ChooseSpaceTypeFragment @Inject constructor(
         }))
     }
 }
-

From b635663ae35cc821c3a19f3dbc858abb9346903a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 12 Apr 2021 09:31:35 +0200
Subject: [PATCH 154/350] Fix suggested rooms

---
 .../home/room/list/RoomListFragment.kt        |  86 +++++++++++----
 .../home/room/list/RoomListViewModel.kt       | 104 +++++++++++-------
 .../home/room/list/RoomListViewState.kt       |   1 -
 .../room/list/RoomSummaryListController.kt    |  33 ++++++
 .../room/list/RoomSummaryPagedController.kt   |   8 ++
 .../features/home/room/list/RoomsSection.kt   |   5 +-
 .../home/room/list/SuggestedRoomInfo.kt       |  25 +++++
 .../room/list/SuggestedRoomListController.kt  |  36 ++++++
 8 files changed, 231 insertions(+), 67 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomInfo.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomListController.kt

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index edc3de58e0..6147be462a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -28,6 +28,7 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.airbnb.epoxy.EpoxyController
 import com.airbnb.epoxy.OnModelBuildFinishedListener
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
@@ -92,11 +93,11 @@ class RoomListFragment @Inject constructor(
     data class SectionAdapterInfo(
             var section: SectionKey,
             val headerHeaderAdapter: SectionHeaderAdapter,
-            val contentAdapter: RoomSummaryPagedController
+            val contentAdapter: EpoxyController
     )
 
     private val adapterInfosList = mutableListOf<SectionAdapterInfo>()
-    private var concatAdapter : ConcatAdapter? = null
+    private var concatAdapter: ConcatAdapter? = null
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -125,7 +126,7 @@ class RoomListFragment @Inject constructor(
             // it's for invites local echo
             adapterInfosList.filter { it.section.notifyOfLocalEcho }
                     .onEach {
-                        it.contentAdapter.roomChangeMembershipStates = ms
+                        (it.contentAdapter as? RoomSummaryPagedController)?.roomChangeMembershipStates = ms
                     }
         }
     }
@@ -180,8 +181,8 @@ class RoomListFragment @Inject constructor(
     private fun setupCreateRoomButton() {
         when (roomListParams.displayMode) {
             RoomListDisplayMode.NOTIFICATIONS -> views.createChatFabMenu.isVisible = true
-            RoomListDisplayMode.PEOPLE        -> views.createChatRoomButton.isVisible = true
-            RoomListDisplayMode.ROOMS         -> views.createGroupRoomButton.isVisible = true
+            RoomListDisplayMode.PEOPLE -> views.createChatRoomButton.isVisible = true
+            RoomListDisplayMode.ROOMS -> views.createGroupRoomButton.isVisible = true
             else                              -> Unit // No button in this mode
         }
 
@@ -249,23 +250,62 @@ class RoomListFragment @Inject constructor(
                 it.updateSection(SectionHeaderAdapter.RoomsSectionData(section.sectionName))
             }
 
-            val contentAdapter = pagedControllerFactory.createRoomSummaryPagedController()
-                    .also { controller ->
-                        section.livePages.observe(viewLifecycleOwner) { pl ->
-                            controller.submitList(pl)
-                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = pl.isEmpty()))
-                            checkEmptyState()
+            val contentAdapter =
+                    when {
+                        section.livePages != null     -> {
+                            pagedControllerFactory.createRoomSummaryPagedController()
+                                    .also { controller ->
+                                        section.livePages.observe(viewLifecycleOwner) { pl ->
+                                            controller.submitList(pl)
+                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = pl.isEmpty()))
+                                            checkEmptyState()
+                                        }
+                                        section.notificationCount.observe(viewLifecycleOwner) { counts ->
+                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
+                                                    notificationCount = counts.totalCount,
+                                                    isHighlighted = counts.isHighlight
+                                            ))
+                                        }
+                                        section.isExpanded.observe(viewLifecycleOwner) { _ ->
+                                            refreshCollapseStates()
+                                        }
+                                        controller.listener = this
+                                    }
                         }
-                        section.notificationCount.observe(viewLifecycleOwner) { counts ->
-                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
-                                    notificationCount = counts.totalCount,
-                                    isHighlighted = counts.isHighlight
-                            ))
+                        section.liveSuggested != null -> {
+                            pagedControllerFactory.createSuggestedRoomListController()
+                                    .also { controller ->
+                                        section.liveSuggested.observe(viewLifecycleOwner) { info ->
+                                            controller.setData(info)
+                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = info.rooms.isEmpty()))
+                                            checkEmptyState()
+                                        }
+                                        section.isExpanded.observe(viewLifecycleOwner) { _ ->
+                                            refreshCollapseStates()
+                                        }
+                                        controller.listener = this
+                                    }
                         }
-                        section.isExpanded.observe(viewLifecycleOwner) { _ ->
-                            refreshCollapseStates()
+                        else                          -> {
+                            pagedControllerFactory.createRoomSummaryListController()
+                                    .also { controller ->
+                                        section.liveList?.observe(viewLifecycleOwner) { list ->
+                                            controller.setData(list)
+                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = list.isEmpty()))
+                                            checkEmptyState()
+                                        }
+                                        section.notificationCount.observe(viewLifecycleOwner) { counts ->
+                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
+                                                    notificationCount = counts.totalCount,
+                                                    isHighlighted = counts.isHighlight
+                                            ))
+                                        }
+                                        section.isExpanded.observe(viewLifecycleOwner) { _ ->
+                                            refreshCollapseStates()
+                                        }
+                                        controller.listener = this
+                                    }
                         }
-                        controller.listener = this
                     }
             adapterInfosList.add(
                     SectionAdapterInfo(
@@ -294,8 +334,8 @@ class RoomListFragment @Inject constructor(
         if (isAdded) {
             when (roomListParams.displayMode) {
                 RoomListDisplayMode.NOTIFICATIONS -> views.createChatFabMenu.show()
-                RoomListDisplayMode.PEOPLE        -> views.createChatRoomButton.show()
-                RoomListDisplayMode.ROOMS         -> views.createGroupRoomButton.show()
+                RoomListDisplayMode.PEOPLE -> views.createChatRoomButton.show()
+                RoomListDisplayMode.ROOMS -> views.createGroupRoomButton.show()
                 else                              -> Unit
             }
         }
@@ -368,14 +408,14 @@ class RoomListFragment @Inject constructor(
                             image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_noun_party_popper),
                             message = getString(R.string.room_list_catchup_empty_body))
                 }
-                RoomListDisplayMode.PEOPLE        ->
+                RoomListDisplayMode.PEOPLE ->
                     StateView.State.Empty(
                             title = getString(R.string.room_list_people_empty_title),
                             image = ContextCompat.getDrawable(requireContext(), R.drawable.empty_state_dm),
                             isBigImage = true,
                             message = getString(R.string.room_list_people_empty_body)
                     )
-                RoomListDisplayMode.ROOMS         ->
+                RoomListDisplayMode.ROOMS ->
                     StateView.State.Empty(
                             title = getString(R.string.room_list_rooms_empty_title),
                             image = ContextCompat.getDrawable(requireContext(), R.drawable.empty_state_room),
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index c171dea863..3e34444a4e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -17,8 +17,10 @@
 package im.vector.app.features.home.room.list
 
 import androidx.annotation.StringRes
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.liveData
 import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
@@ -32,6 +34,7 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.RoomListDisplayMode
 import io.reactivex.Observable
+import io.reactivex.rxkotlin.Observables
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -70,6 +73,8 @@ class RoomListViewModel @Inject constructor(
 
     private var activeSpaceAwareQueries: List<ActiveSpaceQueryUpdater>? = null
 
+    val suggestedRoomJoiningState: MutableLiveData<Map<String, Async<Unit>>> = MutableLiveData(emptyMap())
+
     interface ActiveSpaceQueryUpdater {
         fun updateForSpaceId(roomId: String?)
     }
@@ -86,31 +91,12 @@ class RoomListViewModel @Inject constructor(
         appStateHandler.selectedSpaceDataSource.observe()
 //                .observeOn(Schedulers.computation())
                 .distinctUntilChanged()
-                .switchMap { activeSpaceOption ->
+                .subscribe { activeSpaceOption ->
                     val selectedSpace = activeSpaceOption.orNull()
                     activeSpaceAwareQueries?.onEach { updater ->
                         updater.updateForSpaceId(selectedSpace?.roomId?.takeIf { MatrixPatterns.isRoomId(it) })
                     }
-//                    activeSpaceAwareQueries?.forEach {
-//                        it.updateQuery {
-//                            it.copy(
-//                                    activeSpaceId = ActiveSpaceFilter.ActiveSpace(selectedSpace?.roomId?.takeIf { MatrixPatterns.isRoomId(it) })
-//                            )
-//                        }
-//                    }
-                    if (selectedSpace == null) {
-                        Observable.just(emptyList())
-                    } else {
-                        liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
-                            val spaceSum = tryOrNull { session.spaceService().querySpaceChildren(selectedSpace.roomId, suggestedOnly = true) }
-                            val value = spaceSum?.second ?: emptyList()
-                            emit(value)
-                        }.asObservable()
-                    }
-                }
-                .execute { info ->
-                    copy(asyncSuggestedRooms = info)
-                }
+                }.disposeOnClear()
 
         appStateHandler.selectedSpaceDataSource.observe()
 //                .observeOn(Schedulers.computation())
@@ -244,6 +230,51 @@ class RoomListViewModel @Inject constructor(
                 it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
                 it.roomTagQueryFilter = RoomTagQueryFilter(null, null, true)
             }
+
+            // add suggested rooms
+            val suggestedRoomsObservable = // MutableLiveData<List<SpaceChildInfo>>()
+                    appStateHandler.selectedSpaceDataSource.observe()
+                    .distinctUntilChanged()
+                    .switchMap { activeSpaceOption ->
+                        val selectedSpace = activeSpaceOption.orNull()
+                        if (selectedSpace == null) {
+                            Observable.just(emptyList())
+                        } else {
+                            liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
+                                val spaceSum = tryOrNull { session.spaceService().querySpaceChildren(selectedSpace.roomId, suggestedOnly = true) }
+                                val value = spaceSum?.second ?: emptyList()
+                                // i need to check if it's already joined.
+                                val filtered = value.filter {
+                                    session.getRoomSummary(it.childRoomId)?.membership?.isActive() != true
+                                }
+                                emit(filtered)
+                            }.asObservable()
+                        }
+                    }
+//                            .subscribe {
+//                                Timber.w("VAL: Suggested rooms is ${it}")
+//                        liveSuggestedRooms.postValue(it)
+//                    }.disposeOnClear()
+
+            val liveSuggestedRooms = MutableLiveData<SuggestedRoomInfo>()
+            Observables.combineLatest(
+                    suggestedRoomsObservable,
+                    suggestedRoomJoiningState.asObservable()
+            ) { rooms, joinStates ->
+                SuggestedRoomInfo(
+                        rooms,
+                        joinStates
+                )
+            }.subscribe {
+                liveSuggestedRooms.postValue(it)
+            }.disposeOnClear()
+            sections.add(
+                    RoomsSection(
+                            sectionName = stringProvider.getString(R.string.suggested_header),
+                            liveSuggested = liveSuggestedRooms,
+                            notifyOfLocalEcho = false
+                    )
+            )
         } else if (initialState.displayMode == RoomListDisplayMode.FILTERED) {
             withQueryParams(
                     {
@@ -499,33 +530,22 @@ class RoomListViewModel @Inject constructor(
     }
 
     private fun handleJoinSuggestedRoom(action: RoomListAction.JoinSuggestedRoom) {
-        setState {
-            copy(
-                    suggestedRoomJoiningState = this.suggestedRoomJoiningState.toMutableMap().apply {
-                        this[action.roomId] = Loading()
-                    }.toMap()
-            )
-        }
+        suggestedRoomJoiningState.postValue(suggestedRoomJoiningState.value.orEmpty().toMutableMap().apply {
+            this[action.roomId] = Loading()
+        }.toMap())
+
         viewModelScope.launch {
             try {
                 awaitCallback<Unit> {
                     session.joinRoom(action.roomId, null, action.viaServers ?: emptyList(), it)
                 }
-                setState {
-                    copy(
-                            suggestedRoomJoiningState = this.suggestedRoomJoiningState.toMutableMap().apply {
-                                this[action.roomId] = Success(Unit)
-                            }.toMap()
-                    )
-                }
+                suggestedRoomJoiningState.postValue(suggestedRoomJoiningState.value.orEmpty().toMutableMap().apply {
+                    this[action.roomId] = Success(Unit)
+                }.toMap())
             } catch (failure: Throwable) {
-                setState {
-                    copy(
-                            suggestedRoomJoiningState = this.suggestedRoomJoiningState.toMutableMap().apply {
-                                this[action.roomId] = Fail(failure)
-                            }.toMap()
-                    )
-                }
+                suggestedRoomJoiningState.postValue(suggestedRoomJoiningState.value.orEmpty().toMutableMap().apply {
+                    this[action.roomId] = Fail(failure)
+                }.toMap())
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index 6fb7bd05be..d18574d75b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -29,7 +29,6 @@ data class RoomListViewState(
         val roomFilter: String = "",
         val roomMembershipChanges: Map<String, ChangeMembershipState> = emptyMap(),
         val asyncSuggestedRooms: Async<List<SpaceChildInfo>> = Uninitialized,
-        val suggestedRoomJoiningState: Map<String, Async<Unit>> = emptyMap(),
         val currentUserName: String? = null,
         val currentSpace: Async<RoomSummary?> = Uninitialized
 ) : MvRxState {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
new file mode 100644
index 0000000000..330dffcced
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.epoxy.TypedEpoxyController
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+class RoomSummaryListController(
+        private val roomSummaryItemFactory: RoomSummaryItemFactory
+) : TypedEpoxyController<List<RoomSummary>>() {
+
+    var listener: RoomListListener? = null
+
+    override fun buildModels(data: List<RoomSummary>?) {
+        data?.forEach {
+            add(roomSummaryItemFactory.create(it, emptyMap(), emptySet(), listener))
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
index 20386d739a..57ee83141f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
@@ -30,6 +30,14 @@ class RoomSummaryPagedControllerFactory @Inject constructor(
     fun createRoomSummaryPagedController(): RoomSummaryPagedController {
         return RoomSummaryPagedController(roomSummaryItemFactory)
     }
+
+    fun createRoomSummaryListController(): RoomSummaryListController {
+        return RoomSummaryListController(roomSummaryItemFactory)
+    }
+
+    fun createSuggestedRoomListController(): SuggestedRoomListController {
+        return SuggestedRoomListController(roomSummaryItemFactory)
+    }
 }
 
 class RoomSummaryPagedController(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
index 71b7169814..5eaae262a6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
@@ -24,7 +24,10 @@ import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotification
 
 data class RoomsSection(
         val sectionName: String,
-        val livePages: LiveData<PagedList<RoomSummary>>,
+        // can be a paged list or a regular list
+        val livePages: LiveData<PagedList<RoomSummary>>? = null,
+        val liveList: LiveData<List<RoomSummary>>? = null,
+        val liveSuggested: LiveData<SuggestedRoomInfo>? = null,
         val isExpanded: MutableLiveData<Boolean> = MutableLiveData(true),
         val notificationCount: MutableLiveData<RoomAggregateNotificationCount> = MutableLiveData(RoomAggregateNotificationCount(0, 0)),
         val notifyOfLocalEcho: Boolean = false
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomInfo.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomInfo.kt
new file mode 100644
index 0000000000..615907e6bc
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomInfo.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.mvrx.Async
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+
+class SuggestedRoomInfo(
+        val rooms: List<SpaceChildInfo>,
+        val joinEcho: Map<String, Async<Unit>>
+)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomListController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomListController.kt
new file mode 100644
index 0000000000..621e5c6799
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomListController.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.epoxy.TypedEpoxyController
+
+class SuggestedRoomListController(
+        private val roomSummaryItemFactory: RoomSummaryItemFactory
+) : TypedEpoxyController<SuggestedRoomInfo>() {
+
+    var listener: RoomListListener? = null
+
+    override fun buildModels(data: SuggestedRoomInfo?) {
+        data?.rooms?.forEach { info ->
+            roomSummaryItemFactory.createSuggestion(info, data.joinEcho) {
+                listener?.onJoinSuggestedRoom(info)
+            }.let {
+                add(it)
+            }
+        }
+    }
+}

From a3b9d187ce9a0f5ecc8ec65d783ce7ff46ce464c Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 12 Apr 2021 10:01:57 +0200
Subject: [PATCH 155/350] Fix dm filtering

---
 .../home/room/list/RoomListViewModel.kt       | 50 +++++++++++++++----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 3e34444a4e..dfd1a6502e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -50,7 +50,9 @@ import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.state.isPublic
 import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.asObservable
@@ -162,16 +164,44 @@ class RoomListViewModel @Inject constructor(
                 it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
             }
 
-            addSection(
-                    sections,
-                    activeSpaceAwareQueries,
-                    R.string.bottom_action_people_x,
-                    false,
-                    SpaceFilterStrategy.NORMAL
-            ) {
-                it.memberships = listOf(Membership.JOIN)
-                it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-            }
+            // For DMs we still need some post query filter :/
+            // It's probably less important as home is not filtering at all
+            val dmList = MutableLiveData<List<RoomSummary>>()
+            Observables.combineLatest(
+                    session.getRoomSummariesLive(
+                            roomSummaryQueryParams {
+                                memberships = listOf(Membership.JOIN)
+                                roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                            }
+                    ).asObservable(),
+                    appStateHandler.selectedSpaceDataSource.observe()
+
+            ) { rooms, currentSpaceOption ->
+                val currentSpace = currentSpaceOption.orNull()
+                        .takeIf {
+                            // the +ALL trick is annoying, should find a way to fix that at the source!
+                            MatrixPatterns.isRoomId(it?.roomId)
+                        }
+                if (currentSpace == null) {
+                    rooms
+                } else {
+                    rooms.filter {
+                        it.otherMemberIds
+                                .intersect(currentSpace.otherMemberIds)
+                                .isNotEmpty()
+                    }
+                }
+            }.subscribe {
+                dmList.postValue(it)
+            }.disposeOnClear()
+
+            sections.add(
+                    RoomsSection(
+                            sectionName = stringProvider.getString(R.string.bottom_action_people_x),
+                            liveList = dmList,
+                            notifyOfLocalEcho = false
+                    )
+            )
         } else if (initialState.displayMode == RoomListDisplayMode.ROOMS) {
             addSection(
                     sections, activeSpaceAwareQueries,

From 886cc7fb5bb3ad71a3e7860ab93035c487a3d750 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 12 Apr 2021 10:14:26 +0200
Subject: [PATCH 156/350] Sort summaries by default

---
 .../internal/session/room/summary/RoomSummaryDataSource.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 9e2ca600dc..24f52380f4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -87,7 +87,10 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
 
     fun getRoomSummariesLive(queryParams: RoomSummaryQueryParams): LiveData<List<RoomSummary>> {
         return monarchy.findAllMappedWithChanges(
-                { roomSummariesQuery(it, queryParams) },
+                {
+                    roomSummariesQuery(it, queryParams)
+                            .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+                },
                 { roomSummaryMapper.map(it) }
         )
     }

From 02c2fea99e6ab93a99de8258f7cfa0f07944164b Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 12 Apr 2021 11:41:15 +0200
Subject: [PATCH 157/350] cleaning

---
 .../android/sdk/internal/session/room/summary/GrapUtils.kt      | 2 +-
 .../sdk/internal/session/room/summary/RoomSummaryUpdater.kt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt
index c1c40c1be1..b7e6548b54 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt
@@ -92,7 +92,7 @@ class Graph {
 
         while (stack.isNotEmpty()) {
 //            Timber.w("VAL: current stack: ${stack.reversed().joinToString { it.name }}")
-            val vertex = stack.peek()
+            val vertex = stack.peek() ?: break
             // peek a path to follow
             var destination: GraphNode? = null
             edgesOf(vertex).forEach {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 72bac7c12b..25dd6a214e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -304,7 +304,7 @@ internal class RoomSummaryUpdater @Inject constructor(
                             entry.value.forEach { child ->
                                 RoomSummaryEntity.where(realm, child.roomId).findFirst()?.let { childSum ->
 
-                                    Timber.w("## SPACES: ${childSum.name} is ${childSum.roomId} fc: ${childSum.flattenParentIds}")
+//                                    Timber.w("## SPACES: ${childSum.name} is ${childSum.roomId} fc: ${childSum.flattenParentIds}")
 //                                    var allParents = childSum.flattenParentIds ?: ""
                                     if (childSum.flattenParentIds == null) childSum.flattenParentIds = ""
                                     flattenParentsIds.forEach {

From bfbd37074e4a1a092b63c372e3116fc88d55c20e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 12 Apr 2021 16:31:25 +0200
Subject: [PATCH 158/350] Better tab notification count -incomplete-

---
 .../app/features/home/HomeDetailViewModel.kt   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index b2fadae0fb..1f12f22b97 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -32,6 +32,7 @@ import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.ui.UiStateRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -152,14 +153,18 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     }
 
     private fun observeRoomSummaries() {
-        session.getPagedRoomSummariesLive(
-                roomSummaryQueryParams {
-                    memberships = Membership.activeMemberships()
-                }
-        )
-                .asObservable()
+        appStateHandler.selectedSpaceDataSource.observe().distinctUntilChanged().switchMap {
+            session.getPagedRoomSummariesLive(
+                    roomSummaryQueryParams {
+                        memberships = Membership.activeMemberships()
+                    }
+            ).asObservable()
+        }
+
+//                .asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
                 .subscribe {
+                    val activeSpace = appStateHandler.safeActiveSpaceId()
                     val dmInvites = session.getRoomSummaries(
                             roomSummaryQueryParams {
                                 memberships = listOf(Membership.INVITE)
@@ -185,6 +190,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                             roomSummaryQueryParams {
                                 memberships = listOf(Membership.JOIN)
                                 roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                                activeSpaceId = ActiveSpaceFilter.ActiveSpace(activeSpace)
                             }
                     )
 

From 79bde6ee912be443fa8afb5e76906e9f8e8bdbe3 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 6 Apr 2021 15:26:43 +0200
Subject: [PATCH 159/350] Private (me and teamates) space support

---
 .../room/model/RoomGuestAccessContent.kt      |  6 +-
 .../api/session/room/model/RoomJoinRules.kt   | 11 ++--
 .../room/model/RoomJoinRulesAllowEntry.kt     | 33 ++++++++++
 .../room/model/RoomJoinRulesContent.kt        | 17 +++--
 .../room/model/create/CreateRoomParams.kt     |  8 +++
 .../session/room/create/CreateRoomBody.kt     | 10 ++-
 .../room/create/CreateRoomBodyBuilder.kt      | 32 +++++++++-
 .../session/space/DefaultSpaceService.kt      |  7 +-
 .../im/vector/app/core/di/FragmentModule.kt   |  6 ++
 .../settings/RoomSettingsController.kt        | 42 +++++++++---
 .../joinrule/RoomJoinRuleController.kt        |  7 ++
 .../features/spaces/SpaceCreationActivity.kt  | 13 +++-
 .../create/ChoosePrivateSpaceTypeFragment.kt  | 63 ++++++++++++++++++
 .../spaces/create/ChooseSpaceTypeFragment.kt  |  3 +-
 .../spaces/create/CreateSpaceAction.kt        |  2 +
 .../spaces/create/CreateSpaceEvents.kt        |  1 +
 .../spaces/create/CreateSpaceState.kt         |  5 +-
 .../spaces/create/CreateSpaceViewModel.kt     | 64 +++++++++++++++++--
 .../spaces/create/CreateSpaceViewModelTask.kt | 62 +++++++++++-------
 .../create/SpaceDefaultRoomEpoxyController.kt | 18 +++++-
 .../features/spaces/create/SpaceTopology.kt   | 22 +++++++
 .../src/main/res/drawable/ic_user_round.xml   | 18 ++++++
 ...ment_space_create_choose_private_model.xml | 64 +++++++++++++++++++
 vector/src/main/res/values/strings.xml        | 12 ++++
 24 files changed, 461 insertions(+), 65 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesAllowEntry.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/create/SpaceTopology.kt
 create mode 100644 vector/src/main/res/drawable/ic_user_round.xml
 create mode 100644 vector/src/main/res/layout/fragment_space_create_choose_private_model.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
index 0760c6f1b4..020e7ed39e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
@@ -40,7 +40,7 @@ data class RoomGuestAccessContent(
 }
 
 @JsonClass(generateAdapter = false)
-enum class GuestAccess {
-    @Json(name = "can_join") CanJoin,
-    @Json(name = "forbidden") Forbidden
+enum class GuestAccess(val value: String) {
+    @Json(name = "can_join") CanJoin("can_join"),
+    @Json(name = "forbidden") Forbidden("forbidden")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
index f3e8d357f3..a86301a276 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
@@ -24,9 +24,10 @@ import com.squareup.moshi.JsonClass
  * Enum for [RoomJoinRulesContent] : https://matrix.org/docs/spec/client_server/r0.4.0#m-room-join-rules
  */
 @JsonClass(generateAdapter = false)
-enum class RoomJoinRules {
-    @Json(name = "public") PUBLIC,
-    @Json(name = "invite") INVITE,
-    @Json(name = "knock") KNOCK,
-    @Json(name = "private") PRIVATE
+enum class RoomJoinRules(val value: String) {
+    @Json(name = "public") PUBLIC("public"),
+    @Json(name = "invite") INVITE("invite"),
+    @Json(name = "knock") KNOCK("knock"),
+    @Json(name = "private") PRIVATE("private"),
+    @Json(name = "restricted") RESTRICTED("restricted")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesAllowEntry.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesAllowEntry.kt
new file mode 100644
index 0000000000..7b87bc34d2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesAllowEntry.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.matrix.android.sdk.api.session.room.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class RoomJoinRulesAllowEntry(
+        /**
+         * space: The room ID of the space to check the membership of.
+         */
+        @Json(name = "space") val spaceID: String,
+        /**
+         * via: A list of servers which may be used to peek for membership of the space.
+         */
+        @Json(name = "via") val via: List<String>
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
index 8082486b22..145e6039f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
@@ -1,5 +1,6 @@
 /*
  * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,16 +27,22 @@ import timber.log.Timber
  */
 @JsonClass(generateAdapter = true)
 data class RoomJoinRulesContent(
-        @Json(name = "join_rule") val _joinRules: String? = null
+        @Json(name = "join_rule") val _joinRules: String? = null,
+        /**
+         * If the allow key is an empty list (or not a list at all), then the room reverts to standard public join rules
+         */
+        @Json(name = "allow") val allowList:List<RoomJoinRulesAllowEntry>? = null
 ) {
     val joinRules: RoomJoinRules? = when (_joinRules) {
-        "public"  -> RoomJoinRules.PUBLIC
-        "invite"  -> RoomJoinRules.INVITE
-        "knock"   -> RoomJoinRules.KNOCK
+        "public" -> RoomJoinRules.PUBLIC
+        "invite" -> RoomJoinRules.INVITE
+        "knock" -> RoomJoinRules.KNOCK
         "private" -> RoomJoinRules.PRIVATE
-        else      -> {
+        "restricted" -> RoomJoinRules.RESTRICTED
+        else         -> {
             Timber.w("Invalid value for RoomJoinRules: `$_joinRules`")
             null
         }
     }
 }
+
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index 82c6e187f8..9ac7d412af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -22,6 +22,8 @@ import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 
 // TODO Give a way to include other initial states
@@ -153,8 +155,14 @@ open class CreateRoomParams {
         algorithm = MXCRYPTO_ALGORITHM_MEGOLM
     }
 
+
+    var roomVersion: String? = null
+
+    var joinRuleRestricted: List<RoomJoinRulesAllowEntry>? = null
+
     companion object {
         private const val CREATION_CONTENT_KEY_M_FEDERATE = "m.federate"
         private const val CREATION_CONTENT_KEY_ROOM_TYPE = "org.matrix.msc1772.type"
     }
 }
+
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
index 13d403e2e4..7d80284f70 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
@@ -111,5 +111,13 @@ internal data class CreateRoomBody(
          * The power level content to override in the default power level event
          */
         @Json(name = "power_level_content_override")
-        val powerLevelContentOverride: PowerLevelsContent?
+        val powerLevelContentOverride: PowerLevelsContent?,
+
+        /**
+         * The room version to set for the room. If not provided, the homeserver is to use its configured default.
+         * If provided, the homeserver will return a 400 error with the errcode M_UNSUPPORTED_ROOM_VERSION if it does not support the room version.
+         */
+        @Json(name = "room_version")
+        val roomVersion: String?
 )
+
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 6332af932d..49a3ffac5a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -23,7 +23,11 @@ import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.toMedium
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.internal.crypto.DeviceListManager
@@ -73,11 +77,17 @@ internal class CreateRoomBodyBuilder @Inject constructor(
                     }
                 }
 
+        if (params.joinRuleRestricted != null) {
+            params.roomVersion = "org.matrix.msc3083"
+            params.historyVisibility = params.historyVisibility ?: RoomHistoryVisibility.SHARED
+            params.guestAccess = params.guestAccess ?: GuestAccess.Forbidden
+        }
         val initialStates = listOfNotNull(
                 buildEncryptionWithAlgorithmEvent(params),
                 buildHistoryVisibilityEvent(params),
                 buildAvatarEvent(params),
-                buildGuestAccess(params)
+                buildGuestAccess(params),
+                buildJoinRulesRestricted(params)
         )
                 .takeIf { it.isNotEmpty() }
 
@@ -92,7 +102,9 @@ internal class CreateRoomBodyBuilder @Inject constructor(
                 initialStates = initialStates,
                 preset = params.preset,
                 isDirect = params.isDirect,
-                powerLevelContentOverride = params.powerLevelContentOverride
+                powerLevelContentOverride = params.powerLevelContentOverride,
+                roomVersion = params.roomVersion
+
         )
     }
 
@@ -132,7 +144,21 @@ internal class CreateRoomBodyBuilder @Inject constructor(
                     Event(
                             type = EventType.STATE_ROOM_GUEST_ACCESS,
                             stateKey = "",
-                            content = RoomGuestAccessContent(it.name).toContent()
+                            content = RoomGuestAccessContent(it.value).toContent()
+                    )
+                }
+    }
+
+    private fun buildJoinRulesRestricted(params: CreateRoomParams): Event? {
+        return params.joinRuleRestricted
+                ?.let { allowList ->
+                    Event(
+                            type = EventType.STATE_ROOM_JOIN_RULES,
+                            stateKey = "",
+                            content = RoomJoinRulesContent(
+                                    _joinRules = RoomJoinRules.RESTRICTED.value,
+                                    allowList = allowList
+                            ).toContent()
                     )
                 }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 892cfbbd0e..ba063df375 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
+import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
@@ -67,14 +68,18 @@ internal class DefaultSpaceService @Inject constructor(
         return createSpace(CreateSpaceParams().apply {
             this.name = name
             this.topic = topic
-            this.preset = if (isPublic) CreateRoomPreset.PRESET_PUBLIC_CHAT else CreateRoomPreset.PRESET_PRIVATE_CHAT
             this.avatarUri = avatarUri
             if (isPublic) {
                 this.powerLevelContentOverride = (powerLevelContentOverride ?: PowerLevelsContent()).copy(
                         invite = 0
                 )
+                this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
                 this.historyVisibility = RoomHistoryVisibility.WORLD_READABLE
                 this.guestAccess = GuestAccess.CanJoin
+            } else {
+                this.preset = CreateRoomPreset.PRESET_PRIVATE_CHAT
+                visibility = RoomDirectoryVisibility.PRIVATE
+                enableEncryption()
             }
         })
     }
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index ea7835cc28..8900241b88 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -120,6 +120,7 @@ import im.vector.app.features.settings.threepids.ThreePidsSettingsFragment
 import im.vector.app.features.share.IncomingShareFragment
 import im.vector.app.features.signout.soft.SoftLogoutFragment
 import im.vector.app.features.spaces.SpaceListFragment
+import im.vector.app.features.spaces.create.ChoosePrivateSpaceTypeFragment
 import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
 import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
 import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
@@ -672,4 +673,9 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(SpaceDirectoryFragment::class)
     fun bindSpaceDirectoryFragment(fragment: SpaceDirectoryFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(ChoosePrivateSpaceTypeFragment::class)
+    fun bindChoosePrivateSpaceTypeFragment(fragment: ChoosePrivateSpaceTypeFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index 6e77ceaa36..755dcc4a25 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -63,13 +63,13 @@ class RoomSettingsController @Inject constructor(
             id("avatar")
             enabled(data.actionPermissions.canChangeAvatar)
             when (val avatarAction = data.avatarAction) {
-                RoomSettingsViewState.AvatarAction.None            -> {
+                RoomSettingsViewState.AvatarAction.None -> {
                     // Use the current value
                     avatarRenderer(avatarRenderer)
                     // We do not want to use the fallback avatar url, which can be the other user avatar, or the current user avatar.
                     matrixItem(roomSummary.toMatrixItem().copy(avatarUrl = data.currentRoomAvatarUrl))
                 }
-                RoomSettingsViewState.AvatarAction.DeleteAvatar    ->
+                RoomSettingsViewState.AvatarAction.DeleteAvatar ->
                     imageUri(null)
                 is RoomSettingsViewState.AvatarAction.UpdateAvatar ->
                     imageUri(avatarAction.newAvatarUri)
@@ -128,14 +128,36 @@ class RoomSettingsController @Inject constructor(
     private fun RoomSettingsViewState.getJoinRuleWording(): String {
         val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules
         val guestAccess = newRoomJoinRules.newGuestAccess ?: currentGuestAccess
-        return stringProvider.getString(if (joinRule == RoomJoinRules.INVITE) {
-            R.string.room_settings_room_access_entry_only_invited
-        } else {
-            if (guestAccess == GuestAccess.CanJoin) {
-                R.string.room_settings_room_access_entry_anyone_with_link_including_guest
-            } else {
-                R.string.room_settings_room_access_entry_anyone_with_link_apart_guest
+        val resId = when (joinRule) {
+            RoomJoinRules.INVITE     -> {
+                R.string.room_settings_room_access_entry_only_invited to null
             }
-        })
+            RoomJoinRules.PRIVATE    -> {
+                R.string.room_settings_room_access_entry_unknown to joinRule.value
+            }
+            RoomJoinRules.PUBLIC     -> {
+                if (guestAccess == GuestAccess.CanJoin) {
+                    R.string.room_settings_room_access_entry_anyone_with_link_including_guest to null
+                } else {
+                    R.string.room_settings_room_access_entry_anyone_with_link_apart_guest to null
+                }
+            }
+            RoomJoinRules.KNOCK      -> {
+                R.string.room_settings_room_access_entry_knock to null
+            }
+            RoomJoinRules.RESTRICTED -> {
+                R.string.room_settings_room_access_entry_restricted to null
+            }
+        }
+        return if (resId.second == null) stringProvider.getString(resId.first) else stringProvider.getString(resId.first, resId.second)
+//        return stringProvider.getString(if (joinRule == RoomJoinRules.INVITE) {
+//            R.string.room_settings_room_access_entry_only_invited
+//        } else {
+//            if (guestAccess == GuestAccess.CanJoin) {
+//                R.string.room_settings_room_access_entry_anyone_with_link_including_guest
+//            } else {
+//                R.string.room_settings_room_access_entry_anyone_with_link_apart_guest
+//            }
+//        })
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt
index ab00396dbe..4e94fa426b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt
@@ -51,6 +51,13 @@ class RoomJoinRuleController @Inject constructor(
                         title = stringProvider.getString(R.string.room_settings_room_access_entry_anyone_with_link_including_guest),
                         iconResId = 0,
                         isSelected = state.currentRoomJoinRule == RoomJoinRules.PUBLIC && state.currentGuestAccess == GuestAccess.CanJoin
+                ),
+                RoomJoinRuleAction(
+                        roomJoinRule = RoomJoinRules.RESTRICTED,
+                        roomGuestAccess = null,
+                        title = stringProvider.getString(R.string.room_settings_room_access_entry_restricted),
+                        iconResId = 0,
+                        isSelected = state.currentRoomJoinRule == RoomJoinRules.RESTRICTED
                 )
         )
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 608c9b5d58..47083aa12b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -28,6 +28,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.features.spaces.create.ChoosePrivateSpaceTypeFragment
 import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
 import im.vector.app.features.spaces.create.CreateSpaceAction
 import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
@@ -35,6 +36,7 @@ import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
 import im.vector.app.features.spaces.create.CreateSpaceEvents
 import im.vector.app.features.spaces.create.CreateSpaceState
 import im.vector.app.features.spaces.create.CreateSpaceViewModel
+import im.vector.app.features.spaces.create.SpaceType
 import javax.inject.Inject
 
 class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Factory {
@@ -85,6 +87,9 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
                 CreateSpaceEvents.NavigateToAddRooms -> {
                     navigateToFragment(CreateSpaceDefaultRoomsFragment::class.java)
                 }
+                CreateSpaceEvents.NavigateToChoosePrivateType -> {
+                    navigateToFragment(ChoosePrivateSpaceTypeFragment::class.java)
+                }
                 is CreateSpaceEvents.ShowModalError -> {
                     hideWaitingView()
                     AlertDialog.Builder(this)
@@ -124,8 +129,12 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
     private fun renderState(state: CreateSpaceState) {
         val titleRes = when (state.step) {
             CreateSpaceState.Step.ChooseType -> R.string.activity_create_space_title
-            CreateSpaceState.Step.SetDetails -> R.string.your_public_space
-            CreateSpaceState.Step.AddRooms -> R.string.your_public_space
+            CreateSpaceState.Step.SetDetails,
+            CreateSpaceState.Step.AddRooms -> {
+                if (state.spaceType == SpaceType.Public) R.string.your_public_space
+                else R.string.your_private_space
+            }
+            CreateSpaceState.Step.ChoosePrivateType -> R.string.your_private_space
         }
         supportActionBar?.let {
             it.title = getString(titleRes)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
new file mode 100644
index 0000000000..23a8ce1a57
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.activityViewModel
+import im.vector.app.R
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.databinding.FragmentSpaceCreateChoosePrivateModelBinding
+import javax.inject.Inject
+
+class ChoosePrivateSpaceTypeFragment @Inject constructor(
+        private val stringProvider: StringProvider
+) : VectorBaseFragment<FragmentSpaceCreateChoosePrivateModelBinding>(), OnBackPressed {
+
+    private val sharedViewModel: CreateSpaceViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
+            FragmentSpaceCreateChoosePrivateModelBinding.inflate(layoutInflater, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        views.justMeButton.setOnClickListener(DebouncedClickListener({
+            vectorBaseActivity.notImplemented("Organize room as space is not yet implemented")
+//            sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.JustMe))
+        }))
+
+        views.teammatesButton.setOnClickListener(DebouncedClickListener({
+            sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.MeAndTeammates))
+        }))
+
+        sharedViewModel.subscribe { state ->
+            views.accessInfoHelpText.text = stringProvider.getString(R.string.create_spaces_make_sure_access, state.name ?: "")
+        }
+    }
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        sharedViewModel.handle(CreateSpaceAction.OnBackPressed)
+        return true
+    }
+}
+
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
index 7ff13c06fd..51f1821b38 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChooseSpaceTypeFragment.kt
@@ -41,8 +41,7 @@ class ChooseSpaceTypeFragment @Inject constructor() : VectorBaseFragment<Fragmen
         }))
 
         views.privateButton.setOnClickListener(DebouncedClickListener({
-            vectorBaseActivity.notImplemented("Creating private space")
-            // sharedViewModel.handle(CreateSpaceAction.SetRoomType(SpaceType.Private))
+             sharedViewModel.handle(CreateSpaceAction.SetRoomType(SpaceType.Private))
         }))
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
index 14f219ffc4..9626b58d76 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
@@ -28,4 +28,6 @@ sealed class CreateSpaceAction : VectorViewModelAction {
     object NextFromDetails : CreateSpaceAction()
     object NextFromDefaultRooms : CreateSpaceAction()
     data class DefaultRoomNameChanged(val index: Int, val name: String) : CreateSpaceAction()
+    data class SetSpaceTopology(val topology: SpaceTopology) : CreateSpaceAction()
+
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
index d89c24e5d0..0023399612 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
@@ -22,6 +22,7 @@ sealed class CreateSpaceEvents : VectorViewEvents {
     object NavigateToDetails : CreateSpaceEvents()
     object NavigateToChooseType : CreateSpaceEvents()
     object NavigateToAddRooms : CreateSpaceEvents()
+    object NavigateToChoosePrivateType : CreateSpaceEvents()
     object Dismiss : CreateSpaceEvents()
     data class FinishSuccess(val spaceId: String, val defaultRoomId: String?) : CreateSpaceEvents()
     data class ShowModalError(val errorMessage: String) : CreateSpaceEvents()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
index 5449385610..b554392026 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
@@ -27,6 +27,7 @@ data class CreateSpaceState(
         val topic: String = "",
         val step: Step = Step.ChooseType,
         val spaceType: SpaceType? = null,
+        val spaceTopology: SpaceTopology? = null,
         val nameInlineError: String? = null,
         val defaultRooms: Map<Int, String?>? = null,
         val creationResult: Async<String> = Uninitialized
@@ -35,6 +36,8 @@ data class CreateSpaceState(
     enum class Step {
         ChooseType,
         SetDetails,
-        AddRooms
+        AddRooms,
+        ChoosePrivateType
     }
+
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index ed16829c06..e61707e6a2 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -115,9 +115,34 @@ class CreateSpaceViewModel @AssistedInject constructor(
             is CreateSpaceAction.SetAvatar -> {
                 setState { copy(avatarUri = action.uri) }
             }
+            is CreateSpaceAction.SetSpaceTopology -> {
+                handleSetTopology(action)
+            }
         }.exhaustive
     }
 
+    private fun handleSetTopology(action: CreateSpaceAction.SetSpaceTopology) {
+        when (action.topology) {
+            SpaceTopology.JustMe -> {
+                setState {
+                    copy(
+                            spaceTopology = SpaceTopology.JustMe
+                    )
+                }
+                // XXX finish and open the add rooms directly
+            }
+            SpaceTopology.MeAndTeammates -> {
+                setState {
+                    copy(
+                            spaceTopology = SpaceTopology.MeAndTeammates,
+                            step = CreateSpaceState.Step.AddRooms
+                    )
+                }
+                _viewEvents.post(CreateSpaceEvents.NavigateToAddRooms)
+            }
+        }
+    }
+
     private fun handleBackNavigation() = withState { state ->
         when (state.step) {
             CreateSpaceState.Step.ChooseType -> {
@@ -134,6 +159,24 @@ class CreateSpaceViewModel @AssistedInject constructor(
                 _viewEvents.post(CreateSpaceEvents.NavigateToChooseType)
             }
             CreateSpaceState.Step.AddRooms -> {
+                if (state.spaceType == SpaceType.Private && state.spaceTopology == SpaceTopology.MeAndTeammates) {
+                    setState {
+                        copy(
+                                spaceTopology = null,
+                                step = CreateSpaceState.Step.ChoosePrivateType
+                        )
+                    }
+                    _viewEvents.post(CreateSpaceEvents.NavigateToChoosePrivateType)
+                } else {
+                    setState {
+                        copy(
+                                step = CreateSpaceState.Step.SetDetails
+                        )
+                    }
+                    _viewEvents.post(CreateSpaceEvents.NavigateToDetails)
+                }
+            }
+            CreateSpaceState.Step.ChoosePrivateType -> {
                 setState {
                     copy(
                             step = CreateSpaceState.Step.SetDetails
@@ -152,12 +195,21 @@ class CreateSpaceViewModel @AssistedInject constructor(
                 )
             }
         } else {
-            setState {
-                copy(
-                        step = CreateSpaceState.Step.AddRooms
-                )
+            if (state.spaceType == SpaceType.Private) {
+                setState {
+                    copy(
+                            step = CreateSpaceState.Step.ChoosePrivateType
+                    )
+                }
+                _viewEvents.post(CreateSpaceEvents.NavigateToChoosePrivateType)
+            } else {
+                setState {
+                    copy(
+                            step = CreateSpaceState.Step.AddRooms
+                    )
+                }
+                _viewEvents.post(CreateSpaceEvents.NavigateToAddRooms)
             }
-            _viewEvents.post(CreateSpaceEvents.NavigateToAddRooms)
         }
     }
 
@@ -187,7 +239,7 @@ class CreateSpaceViewModel @AssistedInject constructor(
                         }
                         _viewEvents.post(CreateSpaceEvents.FinishSuccess(result.spaceId, result.childIds.firstOrNull()))
                     }
-                    is CreateSpaceTaskResult.PartialSuccess      -> {
+                    is CreateSpaceTaskResult.PartialSuccess -> {
                         // XXX what can we do here?
                         setState {
                             copy(creationResult = Success(result.spaceId))
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
index df4b8a8cfe..35bec2b571 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -20,6 +20,7 @@ import android.net.Uri
 import im.vector.app.core.platform.ViewModelTask
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
 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.internal.util.awaitCallback
@@ -59,38 +60,51 @@ class CreateSpaceViewModelTask @Inject constructor(
 
         val childErrors = mutableMapOf<String, Throwable>()
         val childIds = mutableListOf<String>()
-        if (params.isPublic) {
-            params.defaultRooms
-                    .filter { it.isNotBlank() }
-                    .forEach { roomName ->
-                        try {
-                            val roomId = try {
-                                awaitCallback<String> {
+        params.defaultRooms
+                .filter { it.isNotBlank() }
+                .forEach { roomName ->
+                    try {
+
+                        val roomId = try {
+                            if (params.isPublic) {
+                                awaitCallback {
                                     session.createRoom(CreateRoomParams().apply {
                                         this.name = roomName
                                         this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
                                     }, it)
                                 }
-                            } catch (timeout: CreateRoomFailure.CreatedWithTimeout) {
-                                // we ignore that?
-                                timeout.roomID
+                            } else {
+                                awaitCallback { callback ->
+                                    session.createRoom(CreateRoomParams().apply {
+                                        this.name = roomName
+                                        this.joinRuleRestricted = listOf(
+                                                RoomJoinRulesAllowEntry(
+                                                        spaceID = spaceID,
+                                                        via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
+                                                )
+                                        )
+                                    }, callback)
+                                }
                             }
-                            val via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
-                            createdSpace!!.addChildren(roomId, via, null, autoJoin = false, suggested = true)
-                            // set canonical
-                            session.spaceService().setSpaceParent(
-                                    roomId,
-                                    createdSpace.spaceId,
-                                    true,
-                                    via
-                            )
-                            childIds.add(roomId)
-                        } catch (failure: Throwable) {
-                            Timber.d("Space: Failed to create child room in $spaceID")
-                            childErrors[roomName] = failure
+                        } catch (timeout: CreateRoomFailure.CreatedWithTimeout) {
+                            // we ignore that?
+                            timeout.roomID
                         }
+                        val via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
+                        createdSpace!!.addChildren(roomId, via, null, autoJoin = false, suggested = true)
+                        // set canonical
+                        session.spaceService().setSpaceParent(
+                                roomId,
+                                createdSpace.spaceId,
+                                true,
+                                via
+                        )
+                        childIds.add(roomId)
+                    } catch (failure: Throwable) {
+                        Timber.d("Space: Failed to create child room in $spaceID")
+                        childErrors[roomName] = failure
                     }
-        }
+                }
 
         return if (childErrors.isEmpty()) {
             CreateSpaceTaskResult.Success(spaceID, childIds)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
index 9a17a8272e..8a87ff3473 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
@@ -39,13 +39,27 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
         genericFooterItem {
             id("info_help_header")
             style(ItemStyle.TITLE)
-            text(stringProvider.getString(R.string.create_spaces_room_public_header, data?.name))
+            text(
+                    if (data?.spaceType == SpaceType.Public) {
+                        stringProvider.getString(R.string.create_spaces_room_public_header, data.name)
+                    } else {
+                        stringProvider.getString(R.string.create_spaces_room_private_header)
+                    }
+            )
             textColor(colorProvider.getColorFromAttribute(R.attr.riot_primary_text_color))
         }
 
         genericFooterItem {
             id("info_help")
-            text(stringProvider.getString(R.string.create_spaces_room_public_header_desc))
+            text(
+                    stringProvider.getString(
+                            if (data?.spaceType == SpaceType.Public) {
+                                R.string.create_spaces_room_public_header_desc
+                            } else {
+                                R.string.create_spaces_room_private_header_desc
+                            }
+                    )
+            )
             textColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary))
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceTopology.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceTopology.kt
new file mode 100644
index 0000000000..800630b52e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceTopology.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.create
+
+enum class SpaceTopology {
+    JustMe,
+    MeAndTeammates
+}
diff --git a/vector/src/main/res/drawable/ic_user_round.xml b/vector/src/main/res/drawable/ic_user_round.xml
new file mode 100644
index 0000000000..721f3aa81c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_user_round.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17.5911,20.2922C15.9951,21.3704 14.0711,22 12,22C9.7488,22 7.6713,21.2561 6,20.0007C3.5711,18.1763 2,15.2716 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12C22,15.4518 20.2511,18.4951 17.5911,20.2922ZM12,12.5C13.6569,12.5 15,11.0449 15,9.25C15,7.4551 13.6569,6 12,6C10.3431,6 9,7.4551 9,9.25C9,11.0449 10.3431,12.5 12,12.5ZM12,20C14.162,20 16.1236,19.1424 17.5634,17.7488C16.673,15.5506 14.5176,14 12,14C9.4824,14 7.327,15.5506 6.4366,17.7488C7.8763,19.1424 9.838,20 12,20Z"
+      android:fillColor="#C1C6CD"
+      android:fillType="evenOdd"/>
+  <group>
+    <clip-path
+        android:pathData="M17.5911,20.2922C15.9951,21.3704 14.0711,22 12,22C9.7488,22 7.6713,21.2561 6,20.0007C3.5711,18.1763 2,15.2716 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12C22,15.4518 20.2511,18.4951 17.5911,20.2922ZM12,12.5C13.6569,12.5 15,11.0449 15,9.25C15,7.4551 13.6569,6 12,6C10.3431,6 9,7.4551 9,9.25C9,11.0449 10.3431,12.5 12,12.5ZM12,20C14.162,20 16.1236,19.1424 17.5634,17.7488C16.673,15.5506 14.5176,14 12,14C9.4824,14 7.327,15.5506 6.4366,17.7488C7.8763,19.1424 9.838,20 12,20Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M17.5911,20.2922L16.4715,18.6349L17.5911,20.2922ZM6,20.0007L4.7989,21.5999L4.7989,21.5999L6,20.0007ZM17.5634,17.7488L18.9544,19.1859L19.9234,18.2479L19.4171,16.998L17.5634,17.7488ZM6.4366,17.7488L4.5829,16.998L4.0766,18.2479L5.0456,19.1859L6.4366,17.7488ZM12,24C14.4825,24 16.7945,23.244 18.7107,21.9494L16.4715,18.6349C15.1957,19.4968 13.6596,20 12,20V24ZM4.7989,21.5999C6.8046,23.1065 9.3008,24 12,24V20C10.1967,20 8.538,19.4058 7.2011,18.4016L4.7989,21.5999ZM0,12C0,15.9273 1.8887,19.414 4.7989,21.5999L7.2011,18.4016C5.2535,16.9387 4,14.616 4,12H0ZM12,0C5.3726,0 0,5.3726 0,12H4C4,7.5817 7.5817,4 12,4V0ZM24,12C24,5.3726 18.6274,0 12,0V4C16.4183,4 20,7.5817 20,12H24ZM18.7107,21.9494C21.8977,19.7963 24,16.144 24,12H20C20,14.7596 18.6045,17.1939 16.4715,18.6349L18.7107,21.9494ZM13,9.25C13,10.0941 12.4046,10.5 12,10.5V14.5C14.9091,14.5 17,11.9958 17,9.25H13ZM12,8C12.4046,8 13,8.4059 13,9.25H17C17,6.5043 14.9091,4 12,4V8ZM11,9.25C11,8.4059 11.5954,8 12,8V4C9.0909,4 7,6.5043 7,9.25H11ZM12,10.5C11.5954,10.5 11,10.0941 11,9.25H7C7,11.9958 9.0909,14.5 12,14.5V10.5ZM16.1724,16.3118C15.0906,17.3588 13.6223,18 12,18V22C14.7017,22 17.1567,20.926 18.9544,19.1859L16.1724,16.3118ZM12,16C13.6752,16 15.1146,17.0305 15.7097,18.4996L19.4171,16.998C18.2314,14.0707 15.3599,12 12,12V16ZM8.2903,18.4996C8.8854,17.0305 10.3248,16 12,16V12C8.6401,12 5.7686,14.0707 4.5829,16.998L8.2903,18.4996ZM12,18C10.3777,18 8.9094,17.3588 7.8276,16.3118L5.0456,19.1859C6.8433,20.926 9.2983,22 12,22V18Z"
+        android:fillColor="#C1C6CD"/>
+  </group>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
new file mode 100644
index 0000000000..1da9d1951d
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp">
+
+        <TextView
+            android:id="@+id/headerText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/create_spaces_who_are_you_working_with"
+            android:textColor="?riotx_text_primary"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/accessInfoHelpText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="14sp"
+            app:layout_constraintTop_toBottomOf="@id/headerText"
+            tools:text="@string/create_spaces_make_sure_access" />
+
+        <im.vector.app.features.spaces.create.WizardButtonView
+            android:id="@+id/justMeButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            app:icon="@drawable/ic_user_round"
+            app:iconTint="?riotx_text_secondary"
+            app:layout_constraintBottom_toTopOf="@id/teammatesButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:subTitle="@string/create_spaces_organise_rooms"
+            app:title="@string/create_spaces_just_me" />
+
+        <im.vector.app.features.spaces.create.WizardButtonView
+            android:id="@+id/teammatesButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            app:icon="@drawable/ic_member_small"
+            app:iconTint="?riotx_text_secondary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:subTitle="@string/create_spaces_private_teammates"
+            app:title="@string/create_spaces_me_and_teammates" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index f8e0621a5d..0566fbbacb 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1451,6 +1451,9 @@
     <string name="room_settings_room_access_entry_only_invited">Only people who have been invited</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Anyone who knows the room’s link, apart from guests</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Anyone who knows the room’s link, including guests</string>
+    <string name="room_settings_room_access_entry_restricted">Restricted to members of a parent space</string>
+    <string name="room_settings_room_access_entry_knock">Anyone can knock on the room, members can then accept or reject</string>
+    <string name="room_settings_room_access_entry_unknown">Unknown access setting (%s)</string>
 
     <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Banned users</string>
@@ -3264,10 +3267,17 @@
 
     <string name="add_space">Add Space</string>
     <string name="your_public_space">Your public space</string>
+    <string name="your_private_space">Your private space</string>
     <string name="create_spaces_type_header">Spaces are a new way to group rooms and people</string>
     <string name="create_spaces_choose_type_label">What type of space do you want to create?</string>
     <string name="create_spaces_you_can_change_later">You can change this later</string>
     <string name="create_spaces_join_info_help">To join an existing space, you need an invite.</string>
+    <string name="create_spaces_who_are_you_working_with">Who are you working with?</string>
+    <string name="create_spaces_make_sure_access">Make sure the right people have access to %s. You can change this later.</string>
+    <string name="create_spaces_just_me">Just me</string>
+    <string name="create_spaces_organise_rooms">A private space to organise your rooms</string>
+    <string name="create_spaces_me_and_teammates">Me and teammates</string>
+    <string name="create_spaces_private_teammates">A private space for you &amp; your teammates</string>
     <string name="space_type_public">Public</string>
     <string name="space_type_public_desc">Open to anyone, best for communities</string>
     <string name="space_type_private">Private</string>
@@ -3278,6 +3288,8 @@
     <string name="create_space_error_empty_field_space_name">Give it a name to continue.</string>
     <string name="create_spaces_room_public_header">What are some discussions you want to have in %s?</string>
     <string name="create_spaces_room_public_header_desc">We’ll create rooms for them. You can add more later too.</string>
+    <string name="create_spaces_room_private_header">What things are you working on?</string>
+    <string name="create_spaces_room_private_header_desc">Let’s create a room for each of them. You can add more later too, including already existing ones.</string>
     <string name="create_spaces_default_public_room_name">General</string>
     <string name="create_spaces_default_public_random_room_name">Random</string>
     <string name="create_spaces_loading_message">Creating Space…</string>

From 643e7ad3cb7b916f8f6f557e2cc06c54ee585a02 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 12 Apr 2021 16:35:53 +0200
Subject: [PATCH 160/350] Fix initial navigation

---
 .../im/vector/app/features/spaces/SpaceCreationActivity.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 47083aa12b..3e48a3dee3 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -61,7 +61,12 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
                 CreateSpaceState.Step.SetDetails -> {
                     navigateToFragment(ChooseSpaceTypeFragment::class.java)
                 }
-                CreateSpaceState.Step.AddRooms -> TODO()
+                CreateSpaceState.Step.AddRooms ->  {
+                    navigateToFragment(CreateSpaceDefaultRoomsFragment::class.java)
+                }
+                CreateSpaceState.Step.ChoosePrivateType -> {
+                    navigateToFragment(ChoosePrivateSpaceTypeFragment::class.java)
+                }
             }
         }
     }

From 49381db2e36317149d9bcb7ce9ad75e9ad4e24e7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 13 Apr 2021 10:18:52 +0200
Subject: [PATCH 161/350] cleaning

---
 .../android/sdk/api/session/room/model/RoomJoinRulesContent.kt | 1 -
 .../sdk/api/session/room/model/create/CreateRoomParams.kt      | 3 ---
 .../android/sdk/internal/session/room/create/CreateRoomBody.kt | 1 -
 tools/check/forbidden_strings_in_code.txt                      | 2 +-
 .../features/spaces/create/ChoosePrivateSpaceTypeFragment.kt   | 1 -
 .../im/vector/app/features/spaces/create/CreateSpaceAction.kt  | 1 -
 .../im/vector/app/features/spaces/create/CreateSpaceState.kt   | 1 -
 .../app/features/spaces/create/CreateSpaceViewModelTask.kt     | 1 -
 8 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
index 145e6039f9..6892cac001 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
@@ -45,4 +45,3 @@ data class RoomJoinRulesContent(
         }
     }
 }
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index 9ac7d412af..cd729832eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
-import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 
@@ -155,7 +154,6 @@ open class CreateRoomParams {
         algorithm = MXCRYPTO_ALGORITHM_MEGOLM
     }
 
-
     var roomVersion: String? = null
 
     var joinRuleRestricted: List<RoomJoinRulesAllowEntry>? = null
@@ -165,4 +163,3 @@ open class CreateRoomParams {
         private const val CREATION_CONTENT_KEY_ROOM_TYPE = "org.matrix.msc1772.type"
     }
 }
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
index 7d80284f70..69352688e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
@@ -120,4 +120,3 @@ internal data class CreateRoomBody(
         @Json(name = "room_version")
         val roomVersion: String?
 )
-
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index a4ec75e19f..8695dafb17 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===97
+enum class===98
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
index 23a8ce1a57..26661b623f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
@@ -60,4 +60,3 @@ class ChoosePrivateSpaceTypeFragment @Inject constructor(
         return true
     }
 }
-
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
index 9626b58d76..cd31b40354 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceAction.kt
@@ -29,5 +29,4 @@ sealed class CreateSpaceAction : VectorViewModelAction {
     object NextFromDefaultRooms : CreateSpaceAction()
     data class DefaultRoomNameChanged(val index: Int, val name: String) : CreateSpaceAction()
     data class SetSpaceTopology(val topology: SpaceTopology) : CreateSpaceAction()
-
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
index b554392026..7bad36ced2 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
@@ -39,5 +39,4 @@ data class CreateSpaceState(
         AddRooms,
         ChoosePrivateType
     }
-
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
index 35bec2b571..d64eba8835 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -64,7 +64,6 @@ class CreateSpaceViewModelTask @Inject constructor(
                 .filter { it.isNotBlank() }
                 .forEach { roomName ->
                     try {
-
                         val roomId = try {
                             if (params.isPublic) {
                                 awaitCallback {

From 6aaf6bdf9b4e888293fbc9947e14704d0dd900dc Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 13 Apr 2021 14:45:43 +0200
Subject: [PATCH 162/350] Fix rebase

---
 .../internal/session/room/DefaultRoomService.kt   | 14 +++-----------
 .../sdk/internal/session/room/RoomModule.kt       |  6 ------
 .../features/home/room/list/RoomListViewModel.kt  |  6 ++----
 .../matrixto/MatrixToBottomSheetViewModel.kt      | 15 +++------------
 .../spaces/create/CreateSpaceViewModelTask.kt     | 10 ++--------
 .../spaces/explore/SpaceDirectoryViewModel.kt     |  7 ++-----
 6 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 77469ddb40..a871c53eed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -34,7 +34,6 @@ import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
-import org.matrix.android.sdk.internal.database.mapper.RoomSummaryMapper
 import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.di.SessionDatabase
@@ -65,18 +64,11 @@ internal class DefaultRoomService @Inject constructor(
         private val peekRoomTask: PeekRoomTask,
         private val roomGetter: RoomGetter,
         private val roomSummaryDataSource: RoomSummaryDataSource,
-        private val roomSummaryMapper: RoomSummaryMapper,
-        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource,
-        private val taskExecutor: TaskExecutor
+        private val roomChangeMembershipStateDataSource: RoomChangeMembershipStateDataSource
 ) : RoomService {
 
-    override fun createRoom(createRoomParams: CreateRoomParams, callback: MatrixCallback<String>): Cancelable {
-        return createRoomTask
-                .configureWith(createRoomParams) {
-                    this.callback = callback
-                    this.retryCount = 3
-                }
-                .executeBy(taskExecutor)
+    override suspend fun createRoom(createRoomParams: CreateRoomParams): String {
+        return createRoomTask.executeRetry(createRoomParams, 3)
     }
 
     override fun getRoom(roomId: String): Room? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index c19c59e6db..8f3445bec3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -236,12 +236,6 @@ internal abstract class RoomModule {
     @Binds
     abstract fun bindPeekRoomTask(task: DefaultPeekRoomTask): PeekRoomTask
 
-    @Binds
-    abstract fun bindPeekSpaceTask(task: DefaultPeekSpaceTask): PeekSpaceTask
-
-    @Binds
-    abstract fun bindJoinSpaceTask(task: DefaultJoinSpaceTask): JoinSpaceTask
-
     @Binds
     abstract fun bindGetEventTask(task: DefaultGetEventTask): GetEventTask
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index dfd1a6502e..373bf80136 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -54,7 +54,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.state.isPublic
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
@@ -566,9 +565,8 @@ class RoomListViewModel @Inject constructor(
 
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> {
-                    session.joinRoom(action.roomId, null, action.viaServers ?: emptyList(), it)
-                }
+                session.joinRoom(action.roomId, null, action.viaServers ?: emptyList())
+
                 suggestedRoomJoiningState.postValue(suggestedRoomJoiningState.value.orEmpty().toMutableMap().apply {
                     this[action.roomId] = Success(Unit)
                 }.toMap())
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index 18891fcd03..b641779ed5 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -43,10 +43,7 @@ import org.matrix.android.sdk.api.session.room.peeking.PeekResult
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.MatrixItem
-import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toMatrixItem
-import org.matrix.android.sdk.internal.session.room.alias.RoomAliasDescription
-import org.matrix.android.sdk.internal.util.awaitCallback
 
 class MatrixToBottomSheetViewModel @AssistedInject constructor(
         @Assisted initialState: MatrixToBottomSheetState,
@@ -111,9 +108,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                 // could this room be already known
                 val knownRoom = if (permalinkData.isRoomAlias) {
                     tryOrNull {
-                        awaitCallback<Optional<RoomAliasDescription>> {
-                            session.getRoomIdByAlias(permalinkData.roomIdOrAlias, false, it)
-                        }
+                        session.getRoomIdByAlias(permalinkData.roomIdOrAlias, false)
                     }
                             ?.getOrNull()
                             ?.roomId?.let {
@@ -245,9 +240,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
      * main thing is trying to see if it's a space or a room
      */
     private suspend fun resolveRoom(roomIdOrAlias: String): PeekResult {
-        return awaitCallback {
-            session.peekRoom(roomIdOrAlias, it)
-        }
+        return session.peekRoom(roomIdOrAlias)
     }
 
     companion object : MvRxViewModelFactory<MatrixToBottomSheetViewModel, MatrixToBottomSheetState> {
@@ -308,9 +301,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
         }
         viewModelScope.launch {
             try {
-                awaitCallback<Unit> {
-                    session.joinRoom(action.roomId, null, action.viaServers?.take(3) ?: emptyList(), it)
-                }
+                session.joinRoom(action.roomId, null, action.viaServers?.take(3) ?: emptyList())
                 _viewEvents.post(MatrixToViewEvents.NavigateToRoom(action.roomId))
             } catch (failure: Throwable) {
                 _viewEvents.post(MatrixToViewEvents.ShowModalError(errorFormatter.toHumanReadable(failure)))
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
index d64eba8835..38bc645aa2 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -23,7 +23,6 @@ import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
 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.internal.util.awaitCallback
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -66,14 +65,10 @@ class CreateSpaceViewModelTask @Inject constructor(
                     try {
                         val roomId = try {
                             if (params.isPublic) {
-                                awaitCallback {
                                     session.createRoom(CreateRoomParams().apply {
                                         this.name = roomName
-                                        this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
-                                    }, it)
-                                }
+                                        this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT })
                             } else {
-                                awaitCallback { callback ->
                                     session.createRoom(CreateRoomParams().apply {
                                         this.name = roomName
                                         this.joinRuleRestricted = listOf(
@@ -82,8 +77,7 @@ class CreateSpaceViewModelTask @Inject constructor(
                                                         via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
                                                 )
                                         )
-                                    }, callback)
-                                }
+                                    })
                             }
                         } catch (timeout: CreateRoomFailure.CreatedWithTimeout) {
                             // we ignore that?
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index 2ba4d4101a..76d62b58b6 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -35,7 +35,6 @@ import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
@@ -159,12 +158,10 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
                     if (isSpace) {
                         session.spaceService().joinSpace(spaceChildInfo.childRoomId, null, spaceChildInfo.viaServers)
                     } else {
-                        awaitCallback<Unit> {
-                            session.joinRoom(spaceChildInfo.childRoomId, null, spaceChildInfo.viaServers, it)
-                        }
+                        session.joinRoom(spaceChildInfo.childRoomId, null, spaceChildInfo.viaServers)
                     }
                 } catch (failure: Throwable) {
-                    Timber.e(failure, "## Space: Failed to join room or subsapce")
+                    Timber.e(failure, "## Space: Failed to join room or subspace")
                 }
             }
         }

From e735aee7246cd4fdb7ad83887ded3deee0855667 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 14 Apr 2021 14:43:21 +0200
Subject: [PATCH 163/350] Fix / group switch + refactoring

---
 .../session/room/RoomSummaryQueryParams.kt    |   7 +-
 .../database/RealmSessionStoreMigration.kt    |   1 +
 .../database/model/RoomSummaryEntity.kt       |   5 +
 .../room/summary/RoomSummaryDataSource.kt     |   5 +
 .../room/summary/RoomSummaryUpdater.kt        |  33 ++
 .../java/im/vector/app/AppStateHandler.kt     |   2 +-
 .../app/features/home/HomeDetailFragment.kt   |  45 ++-
 .../app/features/home/HomeDetailViewModel.kt  |   7 +
 .../app/features/home/HomeDetailViewState.kt  |   2 +
 .../room/list/GroupRoomListSectionBuilder.kt  | 261 ++++++++++++
 .../home/room/list/RoomListSectionBuilder.kt  |  23 ++
 .../home/room/list/RoomListViewModel.kt       | 358 ++--------------
 .../room/list/RoomListViewModelFactory.kt     |  10 +-
 .../room/list/SpaceRoomListSectionBuilder.kt  | 381 ++++++++++++++++++
 14 files changed, 796 insertions(+), 344 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index 0b1db09773..42dbecdaad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -58,7 +58,8 @@ data class RoomSummaryQueryParams(
         val roomTagQueryFilter: RoomTagQueryFilter?,
         val excludeType: List<String?>?,
         val includeType: List<String?>?,
-        val activeSpaceId: ActiveSpaceFilter?
+        val activeSpaceId: ActiveSpaceFilter?,
+        var activeGroupId: String? = null
 ) {
 
     class Builder {
@@ -72,6 +73,7 @@ data class RoomSummaryQueryParams(
         var excludeType: List<String?>? = listOf(RoomType.SPACE)
         var includeType: List<String?>? = null
         var activeSpaceId: ActiveSpaceFilter = ActiveSpaceFilter.None
+        var activeGroupId: String? = null
 
         fun build() = RoomSummaryQueryParams(
                 roomId = roomId,
@@ -82,7 +84,8 @@ data class RoomSummaryQueryParams(
                 roomTagQueryFilter = roomTagQueryFilter,
                 excludeType = excludeType,
                 includeType = includeType,
-                activeSpaceId = activeSpaceId
+                activeSpaceId = activeSpaceId,
+                activeGroupId = activeGroupId
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 5e126a1536..477955cbaf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -218,6 +218,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         realm.schema.get("RoomSummaryEntity")
                 ?.addField(RoomSummaryEntityFields.ROOM_TYPE, String::class.java)
                 ?.addField(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, String::class.java)
+                ?.addField(RoomSummaryEntityFields.GROUP_IDS, String::class.java)
                 ?.transform { obj ->
                     // Should I put messaging type here?
                     obj.setString(RoomSummaryEntityFields.ROOM_TYPE, null)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index 0adcec067e..4f47032c4d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -212,6 +212,11 @@ internal open class RoomSummaryEntity(
             if (value != field) field = value
         }
 
+    var groupIds: String? = null
+        set(value) {
+            if (value != field) field = value
+        }
+
     @Index
     private var membershipStr: String = Membership.NONE.name
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 24f52380f4..633706de1e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -197,6 +197,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
             override fun updateQuery(builder: (RoomSummaryQueryParams) -> RoomSummaryQueryParams) {
                 realmDataSourceFactory.updateQuery {
                     roomSummariesQuery(it, builder.invoke(queryParams))
+                            .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
                 }
             }
         }
@@ -275,6 +276,10 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                 // nop
             }
         }
+
+        if (queryParams.activeGroupId != null) {
+            query.contains(RoomSummaryEntityFields.GROUP_IDS, queryParams.activeGroupId)
+        }
         return query
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 25dd6a214e..0dce2d2c67 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -37,6 +37,7 @@ import org.matrix.android.sdk.internal.database.mapper.asDomain
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
 import org.matrix.android.sdk.internal.database.model.EventEntity
 import org.matrix.android.sdk.internal.database.model.EventEntityFields
+import org.matrix.android.sdk.internal.database.model.GroupSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomMemberSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
@@ -322,6 +323,38 @@ internal class RoomSummaryUpdater @Inject constructor(
 
             // we need also to filter DMs...
             // it's more annoying as based on if the other members belong the space or not
+
+            // LEGACY GROUPS
+            // lets mark rooms that belongs to groups
+            val existingGroups = GroupSummaryEntity.where(realm).findAll()
+
+            // For rooms
+            realm.where(RoomSummaryEntity::class.java)
+                    .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
+                    .equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
+                    .findAll().forEach { room ->
+                        val belongsTo = existingGroups.filter { it.roomIds.contains(room.roomId) }
+                        room.groupIds = if (belongsTo.isEmpty()) {
+                            null
+                        } else {
+                            "|${belongsTo.joinToString("|")}|"
+                        }
+                    }
+
+            // For DMS
+            realm.where(RoomSummaryEntity::class.java)
+                    .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
+                    .equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+                    .findAll().forEach { room ->
+                        val belongsTo = existingGroups.filter {
+                            it.userIds.intersect(room.otherMemberIds).isNotEmpty()
+                        }
+                        room.groupIds = if (belongsTo.isEmpty()) {
+                            null
+                        } else {
+                            "|${belongsTo.joinToString("|")}|"
+                        }
+                    }
         }.also {
             Timber.v("## SPACES: Finish checking room hierarchy in $it ms")
         }
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index bb45e97776..747ca62193 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -35,7 +35,7 @@ import javax.inject.Singleton
 // TODO Keep this class for now, will maybe be used fro Space
 @Singleton
 class AppStateHandler @Inject constructor(
-        private val sessionDataSource: ActiveSessionDataSource,
+        sessionDataSource: ActiveSessionDataSource,
         private val uiStateRepository: UiStateRepository
 ) : LifecycleObserver {
 
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 572a13a084..607a1aeb54 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -131,11 +131,15 @@ class HomeDetailFragment @Inject constructor(
         }
 
         viewModel.selectSubscribe(this, HomeDetailViewState::groupSummary) { groupSummary ->
-            onGroupChange(groupSummary.orNull())
+            if (!vectorPreferences.labSpaces()) {
+                onGroupChange(groupSummary.orNull())
+            }
         }
 
         viewModel.selectSubscribe(this, HomeDetailViewState::spaceSummary) { spaceSummary ->
-            onSpaceChange(spaceSummary.orNull())
+            if (vectorPreferences.labSpaces()) {
+                onSpaceChange(spaceSummary.orNull())
+            }
         }
 
         viewModel.selectSubscribe(this, HomeDetailViewState::displayMode) { displayMode ->
@@ -245,9 +249,23 @@ class HomeDetailFragment @Inject constructor(
     }
 
     private fun onGroupChange(groupSummary: GroupSummary?) {
-        groupSummary?.let {
+        groupSummary ?: return
+        if (groupSummary.groupId == ALL_COMMUNITIES_GROUP_ID) {
+            // Special case
+            avatarRenderer.clear(views.groupToolbarAvatarImageView)
+            views.groupToolbarAvatarImageView.background = null
+
+            val myMxItem = withState(viewModel) { it.myMatrixItem }
+            if (myMxItem != null) {
+                avatarRenderer.render(myMxItem, views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
+            }
+            views.groupToolbarSpaceTitleView.isVisible = false
+        } else {
+            views.groupToolbarAvatarImageView.background = null
             // Use GlideApp with activity context to avoid the glideRequests to be paused
-            avatarRenderer.render(it.toMatrixItem(), views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
+            avatarRenderer.render(groupSummary.toMatrixItem(), views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
+            views.groupToolbarSpaceTitleView.isVisible = true
+            views.groupToolbarSpaceTitleView.text = groupSummary.displayName
         }
     }
 
@@ -268,6 +286,7 @@ class HomeDetailFragment @Inject constructor(
 
             views.groupToolbarSpaceTitleView.isVisible = false
         } else {
+            avatarRenderer.clear(views.groupToolbarAvatarImageView)
             views.groupToolbarAvatarImageView.background = null
             avatarRenderer.renderSpace(spaceSummary.toMatrixItem(), views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
             views.groupToolbarSpaceTitleView.isVisible = true
@@ -279,10 +298,10 @@ class HomeDetailFragment @Inject constructor(
         serverBackupStatusViewModel
                 .subscribe(this) {
                     when (val banState = it.bannerState.invoke()) {
-                        is BannerState.Setup  -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Setup(banState.numberOfKeys), false)
+                        is BannerState.Setup -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Setup(banState.numberOfKeys), false)
                         BannerState.BackingUp -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.BackingUp, false)
                         null,
-                        BannerState.Hidden    -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Hidden, false)
+                        BannerState.Hidden -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Hidden, false)
                     }
                 }
         views.homeKeysBackupBanner.delegate = this
@@ -309,10 +328,12 @@ class HomeDetailFragment @Inject constructor(
 
         views.homeToolbarContent.debouncedClicks {
             withState(viewModel) {
-                val currentSpace = it.spaceSummary.orNull()
-                        ?.takeIf { it.roomId != ALL_COMMUNITIES_GROUP_ID }
-                if (vectorPreferences.labSpaces() && currentSpace != null) {
-                    sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(currentSpace.roomId))
+                if (vectorPreferences.labSpaces()) {
+                    val currentSpace = it.spaceSummary.orNull()
+                            ?.takeIf { it.roomId != ALL_COMMUNITIES_GROUP_ID }
+                    if (vectorPreferences.labSpaces() && currentSpace != null) {
+                        sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(currentSpace.roomId))
+                    }
                 }
             }
         }
@@ -323,7 +344,7 @@ class HomeDetailFragment @Inject constructor(
         views.bottomNavigationView.setOnNavigationItemSelectedListener {
             val displayMode = when (it.itemId) {
                 R.id.bottom_action_people -> RoomListDisplayMode.PEOPLE
-                R.id.bottom_action_rooms  -> RoomListDisplayMode.ROOMS
+                R.id.bottom_action_rooms -> RoomListDisplayMode.ROOMS
                 else                      -> RoomListDisplayMode.NOTIFICATIONS
             }
             viewModel.handle(HomeDetailAction.SwitchDisplayMode(displayMode))
@@ -401,7 +422,7 @@ class HomeDetailFragment @Inject constructor(
 
     private fun RoomListDisplayMode.toMenuId() = when (this) {
         RoomListDisplayMode.PEOPLE -> R.id.bottom_action_people
-        RoomListDisplayMode.ROOMS  -> R.id.bottom_action_rooms
+        RoomListDisplayMode.ROOMS -> R.id.bottom_action_rooms
         else                       -> R.id.bottom_action_notification
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 1f12f22b97..0cf57d272c 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -37,6 +37,7 @@ import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
@@ -80,6 +81,12 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
         observeSelectedGroupStore()
         observeSelectedSpaceStore()
         observeRoomSummaries()
+
+        session.rx().liveUser(session.myUserId).execute {
+            copy(
+                    myMatrixItem = it.invoke()?.getOrNull()?.toMatrixItem()
+            )
+        }
     }
 
     override fun handle(action: HomeDetailAction) {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
index d2ca7e9115..637182d052 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
@@ -23,10 +23,12 @@ import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.sync.SyncState
+import org.matrix.android.sdk.api.util.MatrixItem
 
 data class HomeDetailViewState(
         val groupSummary: Option<GroupSummary> = Option.empty(),
         val spaceSummary: Option<RoomSummary> = Option.empty(),
+        val myMatrixItem: MatrixItem? = null,
         val asyncRooms: Async<List<RoomSummary>> = Uninitialized,
         val displayMode: RoomListDisplayMode = RoomListDisplayMode.PEOPLE,
         val notificationCountCatchup: Int = 0,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
new file mode 100644
index 0000000000..6448705979
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import androidx.annotation.StringRes
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.grouplist.ALL_COMMUNITIES_GROUP_ID
+import im.vector.app.features.grouplist.SelectedGroupDataSource
+import im.vector.app.features.home.RoomListDisplayMode
+import io.reactivex.disposables.Disposable
+import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.CoroutineScope
+import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.query.RoomTagQueryFilter
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.rx.asObservable
+
+class GroupRoomListSectionBuilder(
+        val session: Session,
+        val stringProvider: StringProvider,
+        val viewModelScope: CoroutineScope,
+        val selectedGroupDataSource: SelectedGroupDataSource,
+        val onDisposable: (Disposable) -> Unit,
+        val onUdpatable: (UpdatableLivePageResult) -> Unit
+) : RoomListSectionBuilder {
+
+    override fun buildSections(mode: RoomListDisplayMode): List<RoomsSection> {
+        val activeSpaceAwareQueries = mutableListOf<UpdatableLivePageResult>()
+        val sections = mutableListOf<RoomsSection>()
+        val actualGroupId = selectedGroupDataSource.currentValue?.orNull()
+                ?.groupId?.takeIf { it != ALL_COMMUNITIES_GROUP_ID }
+
+        when (mode) {
+            RoomListDisplayMode.PEOPLE -> {
+                // 3 sections Invites / Fav / Dms
+                buildPeopleSections(sections, activeSpaceAwareQueries, actualGroupId)
+            }
+            RoomListDisplayMode.ROOMS -> {
+                // 5 sections invites / Fav / Rooms / Low Priority / Server notice
+                buildRoomsSections(sections, activeSpaceAwareQueries, actualGroupId)
+            }
+            RoomListDisplayMode.FILTERED -> {
+                // Used when searching for rooms
+                withQueryParams(
+                        {
+                            it.memberships = Membership.activeMemberships()
+                        },
+                        { qpm ->
+                            val name = stringProvider.getString(R.string.bottom_action_rooms)
+                            session.getFilteredPagedRoomSummariesLive(qpm)
+                                    .let { updatableFilterLivePageResult ->
+                                        onUdpatable(updatableFilterLivePageResult)
+                                        sections.add(RoomsSection(name, updatableFilterLivePageResult.livePagedList))
+                                    }
+                        }
+                )
+            }
+            RoomListDisplayMode.NOTIFICATIONS -> {
+                addSection(
+                        sections,
+                        activeSpaceAwareQueries,
+                        R.string.invitations_header,
+                        true
+                ) {
+                    it.memberships = listOf(Membership.INVITE)
+                    it.roomCategoryFilter = RoomCategoryFilter.ALL
+                    it.activeGroupId = actualGroupId
+                }
+
+                addSection(
+                        sections,
+                        activeSpaceAwareQueries,
+                        R.string.bottom_action_rooms,
+                        false
+                ) {
+                    it.memberships = listOf(Membership.JOIN)
+                    it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
+                    it.activeGroupId = actualGroupId
+                }
+            }
+        }
+
+        selectedGroupDataSource.observe()
+                .distinctUntilChanged()
+                .subscribe { activeSpaceOption ->
+                    val selectedGroupId = activeSpaceOption.orNull()?.groupId?.takeIf { it != ALL_COMMUNITIES_GROUP_ID }
+                    activeSpaceAwareQueries.onEach { updater ->
+                        updater.updateQuery { query ->
+                            query.copy(activeGroupId = selectedGroupId)
+                        }
+                    }
+                }.also {
+                    onDisposable.invoke(it)
+                }
+        return sections
+    }
+
+    private fun buildRoomsSections(sections: MutableList<RoomsSection>, activeSpaceAwareQueries: MutableList<UpdatableLivePageResult>, actualGroupId: String?) {
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.invitations_header,
+                true
+        ) {
+            it.memberships = listOf(Membership.INVITE)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            it.activeGroupId = actualGroupId
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.bottom_action_favourites,
+                false
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
+            it.activeGroupId = actualGroupId
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.bottom_action_rooms,
+                false
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            it.roomTagQueryFilter = RoomTagQueryFilter(false, false, false)
+            it.activeGroupId = actualGroupId
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.low_priority_header,
+                false
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            it.roomTagQueryFilter = RoomTagQueryFilter(null, true, null)
+            it.activeGroupId = actualGroupId
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.system_alerts_header,
+                false
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            it.roomTagQueryFilter = RoomTagQueryFilter(null, null, true)
+            it.activeGroupId = actualGroupId
+        }
+    }
+
+    private fun buildPeopleSections(
+            sections: MutableList<RoomsSection>,
+            activeSpaceAwareQueries: MutableList<UpdatableLivePageResult>,
+            actualGroupId: String?
+    ) {
+        addSection(sections,
+                activeSpaceAwareQueries,
+                R.string.invitations_header,
+                true
+        ) {
+            it.memberships = listOf(Membership.INVITE)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+            it.activeGroupId = actualGroupId
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.bottom_action_favourites,
+                false
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+            it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
+            it.activeGroupId = actualGroupId
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.bottom_action_people_x,
+                false
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+            it.roomTagQueryFilter = RoomTagQueryFilter(false, null, null)
+            it.activeGroupId = actualGroupId
+        }
+    }
+
+    private fun addSection(sections: MutableList<RoomsSection>,
+                           activeSpaceUpdaters: MutableList<UpdatableLivePageResult>,
+                           @StringRes nameRes: Int,
+                           notifyOfLocalEcho: Boolean = false,
+                           query: (RoomSummaryQueryParams.Builder) -> Unit) {
+        withQueryParams(
+                { query.invoke(it) },
+                { roomQueryParams ->
+
+                    val name = stringProvider.getString(nameRes)
+                    session.getFilteredPagedRoomSummariesLive(roomQueryParams)
+                            .also {
+                                activeSpaceUpdaters.add(it)
+                            }.livePagedList
+                            .let { livePagedList ->
+                                // use it also as a source to update count
+                                livePagedList.asObservable()
+                                        .observeOn(Schedulers.computation())
+                                        .subscribe {
+                                            sections.find { it.sectionName == name }
+                                                    ?.notificationCount
+                                                    ?.postValue(session.getNotificationCountForRooms(roomQueryParams))
+                                        }.also {
+                                            onDisposable.invoke(it)
+                                        }
+                                sections.add(
+                                        RoomsSection(
+                                                sectionName = name,
+                                                livePages = livePagedList,
+                                                notifyOfLocalEcho = notifyOfLocalEcho
+                                        )
+                                )
+                            }
+                }
+
+        )
+    }
+
+    private fun withQueryParams(builder: (RoomSummaryQueryParams.Builder) -> Unit, block: (RoomSummaryQueryParams) -> Unit) {
+        RoomSummaryQueryParams.Builder()
+                .apply { builder.invoke(this) }
+                .build()
+                .let { block(it) }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
new file mode 100644
index 0000000000..5267158000
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import im.vector.app.features.home.RoomListDisplayMode
+
+interface RoomListSectionBuilder {
+    fun buildSections(mode: RoomListDisplayMode) : List<RoomsSection>
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 373bf80136..a58bee709b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -16,9 +16,7 @@
 
 package im.vector.app.features.home.room.list
 
-import androidx.annotation.StringRes
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.liveData
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
@@ -28,33 +26,20 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import im.vector.app.AppStateHandler
-import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.home.RoomListDisplayMode
-import io.reactivex.Observable
-import io.reactivex.rxkotlin.Observables
-import io.reactivex.schedulers.Schedulers
+import im.vector.app.features.grouplist.SelectedGroupDataSource
+import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
-import org.matrix.android.sdk.api.query.RoomCategoryFilter
-import org.matrix.android.sdk.api.query.RoomTagQueryFilter
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
-import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
-import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.state.isPublic
-import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import javax.inject.Inject
@@ -63,7 +48,9 @@ class RoomListViewModel @Inject constructor(
         initialState: RoomListViewState,
         private val session: Session,
         private val stringProvider: StringProvider,
-        private val appStateHandler: AppStateHandler
+        private val appStateHandler: AppStateHandler,
+        private val selectedGroupDataSource: SelectedGroupDataSource,
+        private val vectorPreferences: VectorPreferences
 ) : VectorViewModel<RoomListViewState, RoomListAction, RoomListViewEvents>(initialState) {
 
     interface Factory {
@@ -72,9 +59,7 @@ class RoomListViewModel @Inject constructor(
 
     private var updatableQuery: UpdatableLivePageResult? = null
 
-    private var activeSpaceAwareQueries: List<ActiveSpaceQueryUpdater>? = null
-
-    val suggestedRoomJoiningState: MutableLiveData<Map<String, Async<Unit>>> = MutableLiveData(emptyMap())
+    private val suggestedRoomJoiningState: MutableLiveData<Map<String, Async<Unit>>> = MutableLiveData(emptyMap())
 
     interface ActiveSpaceQueryUpdater {
         fun updateForSpaceId(roomId: String?)
@@ -90,17 +75,6 @@ class RoomListViewModel @Inject constructor(
         observeMembershipChanges()
 
         appStateHandler.selectedSpaceDataSource.observe()
-//                .observeOn(Schedulers.computation())
-                .distinctUntilChanged()
-                .subscribe { activeSpaceOption ->
-                    val selectedSpace = activeSpaceOption.orNull()
-                    activeSpaceAwareQueries?.onEach { updater ->
-                        updater.updateForSpaceId(selectedSpace?.roomId?.takeIf { MatrixPatterns.isRoomId(it) })
-                    }
-                }.disposeOnClear()
-
-        appStateHandler.selectedSpaceDataSource.observe()
-//                .observeOn(Schedulers.computation())
                 .distinctUntilChanged()
                 .map { it.orNull() }
                 .distinctUntilChanged()
@@ -139,210 +113,34 @@ class RoomListViewModel @Inject constructor(
     }
 
     val sections: List<RoomsSection> by lazy {
-        val sections = mutableListOf<RoomsSection>()
-        val activeSpaceAwareQueries = mutableListOf<ActiveSpaceQueryUpdater>()
-        if (initialState.displayMode == RoomListDisplayMode.PEOPLE) {
-            addSection(sections,
-                    activeSpaceAwareQueries,
-                    R.string.invitations_header,
-                    true,
-                    SpaceFilterStrategy.NOT_IF_ALL
-            ) {
-                it.memberships = listOf(Membership.INVITE)
-                it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-            }
-
-            addSection(sections,
-                    activeSpaceAwareQueries,
-                    R.string.bottom_action_favourites,
-                    false,
-                    SpaceFilterStrategy.NOT_IF_ALL
-            ) {
-                it.memberships = listOf(Membership.JOIN)
-                it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
-            }
-
-            // For DMs we still need some post query filter :/
-            // It's probably less important as home is not filtering at all
-            val dmList = MutableLiveData<List<RoomSummary>>()
-            Observables.combineLatest(
-                    session.getRoomSummariesLive(
-                            roomSummaryQueryParams {
-                                memberships = listOf(Membership.JOIN)
-                                roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                            }
-                    ).asObservable(),
-                    appStateHandler.selectedSpaceDataSource.observe()
-
-            ) { rooms, currentSpaceOption ->
-                val currentSpace = currentSpaceOption.orNull()
-                        .takeIf {
-                            // the +ALL trick is annoying, should find a way to fix that at the source!
-                            MatrixPatterns.isRoomId(it?.roomId)
-                        }
-                if (currentSpace == null) {
-                    rooms
-                } else {
-                    rooms.filter {
-                        it.otherMemberIds
-                                .intersect(currentSpace.otherMemberIds)
-                                .isNotEmpty()
-                    }
-                }
-            }.subscribe {
-                dmList.postValue(it)
-            }.disposeOnClear()
-
-            sections.add(
-                    RoomsSection(
-                            sectionName = stringProvider.getString(R.string.bottom_action_people_x),
-                            liveList = dmList,
-                            notifyOfLocalEcho = false
-                    )
-            )
-        } else if (initialState.displayMode == RoomListDisplayMode.ROOMS) {
-            addSection(
-                    sections, activeSpaceAwareQueries,
-                    R.string.invitations_header,
-                    true,
-                    SpaceFilterStrategy.NONE
-            ) {
-                it.memberships = listOf(Membership.INVITE)
-                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-            }
-
-            addSection(
-                    sections,
-                    activeSpaceAwareQueries,
-                    R.string.bottom_action_favourites,
-                    false,
-                    SpaceFilterStrategy.NOT_IF_ALL
-            ) {
-                it.memberships = listOf(Membership.JOIN)
-                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
-            }
-
-            addSection(
-                    sections,
-                    activeSpaceAwareQueries,
-                    R.string.bottom_action_rooms,
-                    false,
-                    SpaceFilterStrategy.NORMAL
-            ) {
-                it.memberships = listOf(Membership.JOIN)
-                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                it.roomTagQueryFilter = RoomTagQueryFilter(false, false, false)
-            }
-
-            addSection(
-                    sections,
-                    activeSpaceAwareQueries,
-                    R.string.low_priority_header,
-                    false,
-                    SpaceFilterStrategy.NORMAL
-            ) {
-                it.memberships = listOf(Membership.JOIN)
-                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                it.roomTagQueryFilter = RoomTagQueryFilter(null, true, null)
-            }
-
-            addSection(
-                    sections,
-                    activeSpaceAwareQueries,
-                    R.string.system_alerts_header,
-                    false,
-                    SpaceFilterStrategy.NORMAL
-            ) {
-                it.memberships = listOf(Membership.JOIN)
-                it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                it.roomTagQueryFilter = RoomTagQueryFilter(null, null, true)
-            }
-
-            // add suggested rooms
-            val suggestedRoomsObservable = // MutableLiveData<List<SpaceChildInfo>>()
-                    appStateHandler.selectedSpaceDataSource.observe()
-                    .distinctUntilChanged()
-                    .switchMap { activeSpaceOption ->
-                        val selectedSpace = activeSpaceOption.orNull()
-                        if (selectedSpace == null) {
-                            Observable.just(emptyList())
-                        } else {
-                            liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
-                                val spaceSum = tryOrNull { session.spaceService().querySpaceChildren(selectedSpace.roomId, suggestedOnly = true) }
-                                val value = spaceSum?.second ?: emptyList()
-                                // i need to check if it's already joined.
-                                val filtered = value.filter {
-                                    session.getRoomSummary(it.childRoomId)?.membership?.isActive() != true
-                                }
-                                emit(filtered)
-                            }.asObservable()
-                        }
-                    }
-//                            .subscribe {
-//                                Timber.w("VAL: Suggested rooms is ${it}")
-//                        liveSuggestedRooms.postValue(it)
-//                    }.disposeOnClear()
-
-            val liveSuggestedRooms = MutableLiveData<SuggestedRoomInfo>()
-            Observables.combineLatest(
-                    suggestedRoomsObservable,
-                    suggestedRoomJoiningState.asObservable()
-            ) { rooms, joinStates ->
-                SuggestedRoomInfo(
-                        rooms,
-                        joinStates
-                )
-            }.subscribe {
-                liveSuggestedRooms.postValue(it)
-            }.disposeOnClear()
-            sections.add(
-                    RoomsSection(
-                            sectionName = stringProvider.getString(R.string.suggested_header),
-                            liveSuggested = liveSuggestedRooms,
-                            notifyOfLocalEcho = false
-                    )
-            )
-        } else if (initialState.displayMode == RoomListDisplayMode.FILTERED) {
-            withQueryParams(
+        if (vectorPreferences.labSpaces()) {
+            SpaceRoomListSectionBuilder(
+                    session,
+                    stringProvider,
+                    appStateHandler,
+                    viewModelScope,
+                    suggestedRoomJoiningState,
                     {
-                        it.memberships = Membership.activeMemberships()
+                        it.disposeOnClear()
                     },
-                    { qpm ->
-                        val name = stringProvider.getString(R.string.bottom_action_rooms)
-                        session.getFilteredPagedRoomSummariesLive(qpm)
-                                .let { updatableFilterLivePageResult ->
-                                    updatableQuery = updatableFilterLivePageResult
-                                    sections.add(RoomsSection(name, updatableFilterLivePageResult.livePagedList))
-                                }
+                    {
+                        updatableQuery = it
                     }
-            )
-        } else if (initialState.displayMode == RoomListDisplayMode.NOTIFICATIONS) {
-            addSection(
-                    sections,
-                    activeSpaceAwareQueries,
-                    R.string.invitations_header,
-                    true,
-                    SpaceFilterStrategy.NORMAL
-            ) {
-                it.memberships = listOf(Membership.INVITE)
-                it.roomCategoryFilter = RoomCategoryFilter.ALL
-            }
-
-            addSection(
-                    sections,
-                    activeSpaceAwareQueries,
-                    R.string.bottom_action_rooms,
-                    false,
-                    SpaceFilterStrategy.NORMAL
-            ) {
-                it.memberships = listOf(Membership.JOIN)
-                it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
-            }
+            ).buildSections(initialState.displayMode)
+        } else {
+            GroupRoomListSectionBuilder(
+                    session,
+                    stringProvider,
+                    viewModelScope,
+                    selectedGroupDataSource,
+                    {
+                        it.disposeOnClear()
+                    },
+                    {
+                        updatableQuery = it
+                    }
+            ).buildSections(initialState.displayMode)
         }
-
-        sections
     }
 
     override fun handle(action: RoomListAction) {
@@ -359,100 +157,6 @@ class RoomListViewModel @Inject constructor(
         }.exhaustive
     }
 
-    private fun addSection(sections: MutableList<RoomsSection>,
-                           activeSpaceUpdaters: MutableList<ActiveSpaceQueryUpdater>,
-                           @StringRes nameRes: Int,
-                           notifyOfLocalEcho: Boolean = false,
-                           spaceFilterStrategy: SpaceFilterStrategy = SpaceFilterStrategy.NONE,
-                           query: (RoomSummaryQueryParams.Builder) -> Unit) {
-        withQueryParams(
-                { query.invoke(it) },
-                { roomQueryParams ->
-
-                    val name = stringProvider.getString(nameRes)
-//                    if (activeSpaceAwareQueries != null) {
-                    session.getFilteredPagedRoomSummariesLive(
-                            when (spaceFilterStrategy) {
-                                SpaceFilterStrategy.NORMAL     -> {
-                                    roomQueryParams.copy(
-                                            activeSpaceId = ActiveSpaceFilter.ActiveSpace(appStateHandler.safeActiveSpaceId())
-                                    )
-                                }
-                                SpaceFilterStrategy.NOT_IF_ALL -> {
-                                    if (appStateHandler.safeActiveSpaceId() == null) {
-                                        roomQueryParams
-                                    } else {
-                                        roomQueryParams.copy(
-                                                activeSpaceId = ActiveSpaceFilter.ActiveSpace(appStateHandler.safeActiveSpaceId())
-                                        )
-                                    }
-                                }
-                                SpaceFilterStrategy.NONE       -> roomQueryParams
-                            }
-
-                    ).also {
-                        when (spaceFilterStrategy) {
-                            SpaceFilterStrategy.NORMAL     -> {
-                                activeSpaceUpdaters.add(object : ActiveSpaceQueryUpdater {
-                                    override fun updateForSpaceId(roomId: String?) {
-                                        it.updateQuery {
-                                            it.copy(
-                                                    activeSpaceId = ActiveSpaceFilter.ActiveSpace(roomId)
-                                            )
-                                        }
-                                    }
-                                })
-                            }
-                            SpaceFilterStrategy.NOT_IF_ALL -> {
-                                activeSpaceUpdaters.add(object : ActiveSpaceQueryUpdater {
-                                    override fun updateForSpaceId(roomId: String?) {
-                                        if (roomId != null) {
-                                            it.updateQuery {
-                                                it.copy(
-                                                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(roomId)
-                                                )
-                                            }
-                                        }
-                                    }
-                                })
-                            }
-                            SpaceFilterStrategy.NONE       -> {
-                                // we ignore current space for this one
-                            }
-                        }
-                    }.livePagedList
-                            .let { livePagedList ->
-
-                                // use it also as a source to update count
-                                livePagedList.asObservable()
-                                        .observeOn(Schedulers.computation())
-                                        .subscribe {
-                                            sections.find { it.sectionName == name }
-                                                    ?.notificationCount
-                                                    ?.postValue(session.getNotificationCountForRooms(roomQueryParams))
-                                        }
-                                        .disposeOnClear()
-
-                                sections.add(
-                                        RoomsSection(
-                                                sectionName = name,
-                                                livePages = livePagedList,
-                                                notifyOfLocalEcho = notifyOfLocalEcho
-                                        )
-                                )
-                            }
-                }
-
-        )
-    }
-
-    private fun withQueryParams(builder: (RoomSummaryQueryParams.Builder) -> Unit, block: (RoomSummaryQueryParams) -> Unit) {
-        RoomSummaryQueryParams.Builder()
-                .apply { builder.invoke(this) }
-                .build()
-                .let { block(it) }
-    }
-
     fun isPublicRoom(roomId: String): Boolean {
         return session.getRoom(roomId)?.isPublic().orFalse()
     }
@@ -604,7 +308,7 @@ class RoomListViewModel @Inject constructor(
 
     private fun String.otherTag(): String? {
         return when (this) {
-            RoomTag.ROOM_TAG_FAVOURITE    -> RoomTag.ROOM_TAG_LOW_PRIORITY
+            RoomTag.ROOM_TAG_FAVOURITE -> RoomTag.ROOM_TAG_LOW_PRIORITY
             RoomTag.ROOM_TAG_LOW_PRIORITY -> RoomTag.ROOM_TAG_FAVOURITE
             else                          -> null
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
index 8377f222bf..0a142304a0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
@@ -18,13 +18,17 @@ package im.vector.app.features.home.room.list
 
 import im.vector.app.AppStateHandler
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.grouplist.SelectedGroupDataSource
+import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 import javax.inject.Provider
 
 class RoomListViewModelFactory @Inject constructor(private val session: Provider<Session>,
                                                    private val appStateHandler: AppStateHandler,
-                                                   private val stringProvider: StringProvider)
+                                                   private val stringProvider: StringProvider,
+                                                   private val vectorPreferences: VectorPreferences,
+                                                   private val selectedGroupDataSource: SelectedGroupDataSource)
     : RoomListViewModel.Factory {
 
     override fun create(initialState: RoomListViewState): RoomListViewModel {
@@ -32,7 +36,9 @@ class RoomListViewModelFactory @Inject constructor(private val session: Provider
                 initialState,
                 session.get(),
                 stringProvider,
-                appStateHandler
+                appStateHandler,
+                selectedGroupDataSource,
+                vectorPreferences
         )
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
new file mode 100644
index 0000000000..49be503c80
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import androidx.annotation.StringRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.liveData
+import com.airbnb.mvrx.Async
+import im.vector.app.AppStateHandler
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.RoomListDisplayMode
+import io.reactivex.Observable
+import io.reactivex.disposables.Disposable
+import io.reactivex.rxkotlin.Observables
+import io.reactivex.schedulers.Schedulers
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
+import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.query.RoomTagQueryFilter
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.rx.asObservable
+
+class SpaceRoomListSectionBuilder(
+        val session: Session,
+        val stringProvider: StringProvider,
+        val appStateHandler: AppStateHandler,
+        val viewModelScope: CoroutineScope,
+        private val suggestedRoomJoiningState: LiveData<Map<String, Async<Unit>>>,
+        val onDisposable: (Disposable) -> Unit,
+        val onUdpatable: (UpdatableLivePageResult) -> Unit
+) : RoomListSectionBuilder {
+
+    override fun buildSections(mode: RoomListDisplayMode): List<RoomsSection> {
+        val sections = mutableListOf<RoomsSection>()
+        val activeSpaceAwareQueries = mutableListOf<RoomListViewModel.ActiveSpaceQueryUpdater>()
+        when (mode) {
+            RoomListDisplayMode.PEOPLE -> {
+                buildDmSections(sections, activeSpaceAwareQueries)
+            }
+            RoomListDisplayMode.ROOMS -> {
+                buildRoomsSections(sections, activeSpaceAwareQueries)
+            }
+            RoomListDisplayMode.FILTERED -> {
+                withQueryParams(
+                        {
+                            it.memberships = Membership.activeMemberships()
+                        },
+                        { qpm ->
+                            val name = stringProvider.getString(R.string.bottom_action_rooms)
+                            session.getFilteredPagedRoomSummariesLive(qpm)
+                                    .let { updatableFilterLivePageResult ->
+                                        onUdpatable(updatableFilterLivePageResult)
+                                        sections.add(RoomsSection(name, updatableFilterLivePageResult.livePagedList))
+                                    }
+                        }
+                )
+            }
+            RoomListDisplayMode.NOTIFICATIONS -> {
+                addSection(
+                        sections,
+                        activeSpaceAwareQueries,
+                        R.string.invitations_header,
+                        true,
+                        RoomListViewModel.SpaceFilterStrategy.NORMAL
+                ) {
+                    it.memberships = listOf(Membership.INVITE)
+                    it.roomCategoryFilter = RoomCategoryFilter.ALL
+                }
+
+                addSection(
+                        sections,
+                        activeSpaceAwareQueries,
+                        R.string.bottom_action_rooms,
+                        false,
+                        RoomListViewModel.SpaceFilterStrategy.NORMAL
+                ) {
+                    it.memberships = listOf(Membership.JOIN)
+                    it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
+                }
+            }
+        }
+
+        appStateHandler.selectedSpaceDataSource.observe()
+                .distinctUntilChanged()
+                .subscribe { activeSpaceOption ->
+                    val selectedSpace = activeSpaceOption.orNull()
+                    activeSpaceAwareQueries.onEach { updater ->
+                        updater.updateForSpaceId(selectedSpace?.roomId?.takeIf { MatrixPatterns.isRoomId(it) })
+                    }
+                }.also {
+                    onDisposable.invoke(it)
+                }
+
+        return sections
+    }
+
+    private fun buildRoomsSections(sections: MutableList<RoomsSection>, activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>) {
+        addSection(
+                sections, activeSpaceAwareQueries,
+                R.string.invitations_header,
+                true,
+                RoomListViewModel.SpaceFilterStrategy.NONE
+        ) {
+            it.memberships = listOf(Membership.INVITE)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.bottom_action_favourites,
+                false,
+                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.bottom_action_rooms,
+                false,
+                RoomListViewModel.SpaceFilterStrategy.NORMAL
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            it.roomTagQueryFilter = RoomTagQueryFilter(false, false, false)
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.low_priority_header,
+                false,
+                RoomListViewModel.SpaceFilterStrategy.NORMAL
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            it.roomTagQueryFilter = RoomTagQueryFilter(null, true, null)
+        }
+
+        addSection(
+                sections,
+                activeSpaceAwareQueries,
+                R.string.system_alerts_header,
+                false,
+                RoomListViewModel.SpaceFilterStrategy.NORMAL
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+            it.roomTagQueryFilter = RoomTagQueryFilter(null, null, true)
+        }
+
+        // add suggested rooms
+        val suggestedRoomsObservable = // MutableLiveData<List<SpaceChildInfo>>()
+                appStateHandler.selectedSpaceDataSource.observe()
+                        .distinctUntilChanged()
+                        .switchMap { activeSpaceOption ->
+                            val selectedSpace = activeSpaceOption.orNull()
+                            if (selectedSpace == null) {
+                                Observable.just(emptyList())
+                            } else {
+                                liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
+                                    val spaceSum = tryOrNull { session.spaceService().querySpaceChildren(selectedSpace.roomId, suggestedOnly = true) }
+                                    val value = spaceSum?.second ?: emptyList()
+                                    // i need to check if it's already joined.
+                                    val filtered = value.filter {
+                                        session.getRoomSummary(it.childRoomId)?.membership?.isActive() != true
+                                    }
+                                    emit(filtered)
+                                }.asObservable()
+                            }
+                        }
+
+        val liveSuggestedRooms = MutableLiveData<SuggestedRoomInfo>()
+        Observables.combineLatest(
+                suggestedRoomsObservable,
+                suggestedRoomJoiningState.asObservable()
+        ) { rooms, joinStates ->
+            SuggestedRoomInfo(
+                    rooms,
+                    joinStates
+            )
+        }.subscribe {
+            liveSuggestedRooms.postValue(it)
+        }.also {
+            onDisposable.invoke(it)
+        }
+        sections.add(
+                RoomsSection(
+                        sectionName = stringProvider.getString(R.string.suggested_header),
+                        liveSuggested = liveSuggestedRooms,
+                        notifyOfLocalEcho = false
+                )
+        )
+    }
+
+    private fun buildDmSections(sections: MutableList<RoomsSection>, activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>) {
+        addSection(sections,
+                activeSpaceAwareQueries,
+                R.string.invitations_header,
+                true,
+                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+        ) {
+            it.memberships = listOf(Membership.INVITE)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+        }
+
+        addSection(sections,
+                activeSpaceAwareQueries,
+                R.string.bottom_action_favourites,
+                false,
+                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+            it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
+        }
+
+        // For DMs we still need some post query filter :/
+        // It's probably less important as home is not filtering at all
+        val dmList = MutableLiveData<List<RoomSummary>>()
+        Observables.combineLatest(
+                session.getRoomSummariesLive(
+                        roomSummaryQueryParams {
+                            memberships = listOf(Membership.JOIN)
+                            roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                        }
+                ).asObservable(),
+                appStateHandler.selectedSpaceDataSource.observe()
+
+        ) { rooms, currentSpaceOption ->
+            val currentSpace = currentSpaceOption.orNull()
+                    .takeIf {
+                        // the +ALL trick is annoying, should find a way to fix that at the source!
+                        MatrixPatterns.isRoomId(it?.roomId)
+                    }
+            if (currentSpace == null) {
+                rooms
+            } else {
+                rooms.filter {
+                    it.otherMemberIds
+                            .intersect(currentSpace.otherMemberIds)
+                            .isNotEmpty()
+                }
+            }
+        }.subscribe {
+            dmList.postValue(it)
+        }.also {
+            onDisposable.invoke(it)
+        }
+
+        sections.add(
+                RoomsSection(
+                        sectionName = stringProvider.getString(R.string.bottom_action_people_x),
+                        liveList = dmList,
+                        notifyOfLocalEcho = false
+                )
+        )
+    }
+
+    private fun addSection(sections: MutableList<RoomsSection>,
+                           activeSpaceUpdaters: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>,
+                           @StringRes nameRes: Int,
+                           notifyOfLocalEcho: Boolean = false,
+                           spaceFilterStrategy: RoomListViewModel.SpaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.NONE,
+                           query: (RoomSummaryQueryParams.Builder) -> Unit) {
+        withQueryParams(
+                { query.invoke(it) },
+                { roomQueryParams ->
+
+                    val name = stringProvider.getString(nameRes)
+                    session.getFilteredPagedRoomSummariesLive(
+                            when (spaceFilterStrategy) {
+                                RoomListViewModel.SpaceFilterStrategy.NORMAL     -> {
+                                    roomQueryParams.copy(
+                                            activeSpaceId = ActiveSpaceFilter.ActiveSpace(appStateHandler.safeActiveSpaceId())
+                                    )
+                                }
+                                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL -> {
+                                    if (appStateHandler.safeActiveSpaceId() == null) {
+                                        roomQueryParams
+                                    } else {
+                                        roomQueryParams.copy(
+                                                activeSpaceId = ActiveSpaceFilter.ActiveSpace(appStateHandler.safeActiveSpaceId())
+                                        )
+                                    }
+                                }
+                                RoomListViewModel.SpaceFilterStrategy.NONE       -> roomQueryParams
+                            }
+
+                    ).also {
+                        when (spaceFilterStrategy) {
+                            RoomListViewModel.SpaceFilterStrategy.NORMAL     -> {
+                                activeSpaceUpdaters.add(object : RoomListViewModel.ActiveSpaceQueryUpdater {
+                                    override fun updateForSpaceId(roomId: String?) {
+                                        it.updateQuery {
+                                            it.copy(
+                                                    activeSpaceId = ActiveSpaceFilter.ActiveSpace(roomId)
+                                            )
+                                        }
+                                    }
+                                })
+                            }
+                            RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL -> {
+                                activeSpaceUpdaters.add(object : RoomListViewModel.ActiveSpaceQueryUpdater {
+                                    override fun updateForSpaceId(roomId: String?) {
+                                        if (roomId != null) {
+                                            it.updateQuery {
+                                                it.copy(
+                                                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(roomId)
+                                                )
+                                            }
+                                        }
+                                    }
+                                })
+                            }
+                            RoomListViewModel.SpaceFilterStrategy.NONE       -> {
+                                // we ignore current space for this one
+                            }
+                        }
+                    }.livePagedList
+                            .let { livePagedList ->
+
+                                // use it also as a source to update count
+                                livePagedList.asObservable()
+                                        .observeOn(Schedulers.computation())
+                                        .subscribe {
+                                            sections.find { it.sectionName == name }
+                                                    ?.notificationCount
+                                                    ?.postValue(session.getNotificationCountForRooms(roomQueryParams))
+                                        }.also {
+                                            onDisposable.invoke(it)
+                                        }
+
+                                sections.add(
+                                        RoomsSection(
+                                                sectionName = name,
+                                                livePages = livePagedList,
+                                                notifyOfLocalEcho = notifyOfLocalEcho
+                                        )
+                                )
+                            }
+                }
+
+        )
+    }
+
+    private fun withQueryParams(builder: (RoomSummaryQueryParams.Builder) -> Unit, block: (RoomSummaryQueryParams) -> Unit) {
+        RoomSummaryQueryParams.Builder()
+                .apply { builder.invoke(this) }
+                .build()
+                .let { block(it) }
+    }
+}

From 57e9e4474e6ea88dc0403e105418f86e771696c9 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 14 Apr 2021 15:27:00 +0200
Subject: [PATCH 164/350] fix warning

---
 .../sdk/internal/session/room/summary/RoomSummaryDataSource.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 633706de1e..ea4d2df473 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -278,7 +278,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         }
 
         if (queryParams.activeGroupId != null) {
-            query.contains(RoomSummaryEntityFields.GROUP_IDS, queryParams.activeGroupId)
+            query.contains(RoomSummaryEntityFields.GROUP_IDS, queryParams.activeGroupId!!)
         }
         return query
     }

From 7910e84d8e85a7ca979dc154b7c78cd04147283a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 14 Apr 2021 18:15:50 +0200
Subject: [PATCH 165/350] Fix test compilation

---
 .../sdk/session/space/SpaceCreationTest.kt    | 29 ++++++++-----------
 .../sdk/session/space/SpaceHierarchyTest.kt   | 24 +++++++--------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 49d67428d9..6f7a2e1f17 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -42,7 +42,6 @@ import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.SessionTestParams
-import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
@@ -84,12 +83,12 @@ class SpaceCreationTest : InstrumentedTest {
         }
         assertEquals(100, powerLevelsContent?.eventsDefault, "Space-rooms should be created with a power level for events_default of 100")
 
-        val guestAccess =  syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_GUEST_ACCESS)?.content
+        val guestAccess = syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_GUEST_ACCESS)?.content
                 ?.toModel<RoomGuestAccessContent>()?.guestAccess
 
         assertEquals(GuestAccess.CanJoin, guestAccess, "Public space room should be peekable by guest")
 
-        val historyVisibility =  syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_HISTORY_VISIBILITY)?.content
+        val historyVisibility = syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_HISTORY_VISIBILITY)?.content
                 ?.toModel<RoomHistoryVisibilityContent>()?.historyVisibility
 
         assertEquals(RoomHistoryVisibility.WORLD_READABLE, historyVisibility, "Public space room should be world readable")
@@ -141,13 +140,11 @@ class SpaceCreationTest : InstrumentedTest {
 
         // create a room
         val firstChild: String = runBlocking {
-            awaitCallback<String> {
-                aliceSession.createRoom(CreateRoomParams().apply {
-                    this.name = "FirstRoom"
-                    this.topic = "Description of first room"
-                    this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
-                }, it)
-            }
+            aliceSession.createRoom(CreateRoomParams().apply {
+                this.name = "FirstRoom"
+                this.topic = "Description of first room"
+                this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+            })
         }
 
         runBlocking {
@@ -155,13 +152,11 @@ class SpaceCreationTest : InstrumentedTest {
         }
 
         val secondChild: String = runBlocking {
-            awaitCallback {
-                aliceSession.createRoom(CreateRoomParams().apply {
-                    this.name = "SecondRoom"
-                    this.topic = "Description of second room"
-                    this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
-                }, it)
-            }
+            aliceSession.createRoom(CreateRoomParams().apply {
+                this.name = "SecondRoom"
+                this.topic = "Description of second room"
+                this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+            })
         }
 
         runBlocking {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index 42ad653443..2fed7e338e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -60,8 +60,8 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         val syncedSpace = session.spaceService().getSpace(spaceId)
 
-        val roomId = commonTestHelper.doSync<String> {
-            session.createRoom(CreateRoomParams().apply { name = "General" }, it)
+        val roomId = runBlocking {
+            session.createRoom(CreateRoomParams().apply { name = "General" })
         }
 
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
@@ -108,8 +108,8 @@ class SpaceHierarchyTest : InstrumentedTest {
         val children = listOf("General" to true /*canonical*/, "Random" to false)
 
         val roomIdList = children.map {
-            commonTestHelper.doSync<String> { cb ->
-                session.createRoom(CreateRoomParams().apply { name = it.first }, cb)
+            runBlocking {
+                session.createRoom(CreateRoomParams().apply { name = it.first })
             } to it.second
         }
 
@@ -169,11 +169,11 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         // Create orphan rooms
 
-        val orphan1 = commonTestHelper.doSync<String> { cb ->
-            session.createRoom(CreateRoomParams().apply { name = "O1" }, cb)
+        val orphan1 = runBlocking {
+            session.createRoom(CreateRoomParams().apply { name = "O1" })
         }
-        val orphan2 = commonTestHelper.doSync<String> { cb ->
-            session.createRoom(CreateRoomParams().apply { name = "O2" }, cb)
+        val orphan2 = runBlocking {
+            session.createRoom(CreateRoomParams().apply { name = "O2" })
         }
 
         val allRooms = session.getRoomSummaries(roomSummaryQueryParams { excludeType = listOf(RoomType.SPACE) })
@@ -195,8 +195,8 @@ class SpaceHierarchyTest : InstrumentedTest {
         assertTrue(aChildren.indexOfFirst { it.name == "C2" } != -1, "A1 should be a grand child of A")
 
         // Add a non canonical child and check that it does not appear as orphan
-        val a3 = commonTestHelper.doSync<String> { cb ->
-            session.createRoom(CreateRoomParams().apply { name = "A3" }, cb)
+        val a3 = runBlocking {
+            session.createRoom(CreateRoomParams().apply { name = "A3" })
         }
         runBlocking {
             spaceA!!.addChildren(a3, viaServers, null, false)
@@ -354,8 +354,8 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         val roomIds =
                 childInfo.map { entry ->
-                    commonTestHelper.doSync<String> { cb ->
-                        session.createRoom(CreateRoomParams().apply { name = entry.first }, cb)
+                    runBlocking {
+                        session.createRoom(CreateRoomParams().apply { name = entry.first })
                     }
                 }
 

From 1deb44f91f6535150cf5723355fb0eff8a4347ff Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 14 Apr 2021 18:16:52 +0200
Subject: [PATCH 166/350] Better DM filtering + fix space member loading

---
 .../session/space/model/SpaceChildContent.kt  |  1 -
 .../room/summary/RoomSummaryUpdater.kt        | 25 +++++
 .../java/im/vector/app/AppStateHandler.kt     | 34 ++++++-
 .../app/features/home/HomeDetailViewModel.kt  |  5 +-
 .../room/list/GroupRoomListSectionBuilder.kt  |  4 +-
 .../home/room/list/RoomListViewModel.kt       |  2 +-
 .../room/list/SpaceRoomListSectionBuilder.kt  | 93 ++++++++++---------
 .../features/media/BaseAttachmentProvider.kt  |  2 +-
 .../features/navigation/DefaultNavigator.kt   |  9 +-
 .../features/spaces/SpacesListViewModel.kt    |  7 +-
 10 files changed, 118 insertions(+), 64 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
index e7936d00e5..0c33cfa1e6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/model/SpaceChildContent.kt
@@ -22,7 +22,6 @@ import com.squareup.moshi.JsonClass
 /**
  *  "content": {
  *      "via": ["example.com"],
- *      "present": true,
  *      "order": "abcd",
  *      "default": true
  *  }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 0dce2d2c67..dae2c0838e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -323,6 +323,31 @@ internal class RoomSummaryUpdater @Inject constructor(
 
             // we need also to filter DMs...
             // it's more annoying as based on if the other members belong the space or not
+            RoomSummaryEntity.where(realm)
+                    .equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+                    .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
+                    .findAll()
+                    .forEach { dmRoom ->
+                        val relatedSpaces = lookupMap.keys
+                                .filter { it.roomType == RoomType.SPACE }
+                                .filter {
+                                    dmRoom.otherMemberIds.toList().intersect(it.otherMemberIds.toList()).isNotEmpty()
+                                }
+                                .map { it.roomId }
+                                .distinct()
+                        val flattenRelated = mutableListOf<String>().apply {
+                            addAll(relatedSpaces)
+                            relatedSpaces.map { flattenSpaceParents[it] }.forEach {
+                                if (it != null) addAll(it)
+                            }
+                        }.distinct()
+                        if (flattenRelated.isEmpty()) {
+                            dmRoom.flattenParentIds = null
+                        } else {
+                            dmRoom.flattenParentIds = "|${flattenRelated.joinToString("|")}|"
+                        }
+//                        Timber.v("## SPACES: flatten of ${dmRoom.otherMemberIds.joinToString(",")} is ${dmRoom.flattenParentIds}")
+                    }
 
             // LEGACY GROUPS
             // lets mark rooms that belongs to groups
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 747ca62193..1f090c89ab 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -20,10 +20,15 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import arrow.core.Option
+import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.BehaviorDataSource
+import im.vector.app.features.spaces.ALL_COMMUNITIES_GROUP_ID
 import im.vector.app.features.ui.UiStateRepository
 import io.reactivex.disposables.CompositeDisposable
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -36,30 +41,51 @@ import javax.inject.Singleton
 @Singleton
 class AppStateHandler @Inject constructor(
         sessionDataSource: ActiveSessionDataSource,
-        private val uiStateRepository: UiStateRepository
+        private val uiStateRepository: UiStateRepository,
+        private val activeSessionHolder: ActiveSessionHolder
 ) : LifecycleObserver {
 
     private val compositeDisposable = CompositeDisposable()
 
-    val selectedSpaceDataSource = BehaviorDataSource<Option<RoomSummary>>(Option.empty())
+    private val selectedSpaceDataSource = BehaviorDataSource<Option<RoomSummary>>(Option.empty())
+
+    val selectedSpaceObservable = selectedSpaceDataSource.observe()
+
+    fun setCurrentSpace(space: RoomSummary?) {
+        if (space == selectedSpaceDataSource.currentValue?.orNull()) return
+        selectedSpaceDataSource.post(space?.let { Option.just(it) } ?: Option.empty())
+        if (space != null && space.roomId != ALL_COMMUNITIES_GROUP_ID) {
+            GlobalScope.launch {
+                tryOrNull {
+                    activeSessionHolder.getSafeActiveSession()?.getRoom(space.roomId)?.loadRoomMembersIfNeeded()
+                }
+            }
+        }
+    }
 
     init {
         // restore current space from ui state
         sessionDataSource.currentValue?.orNull()?.let { session ->
             uiStateRepository.getSelectedSpace(session.sessionId)?.let { selectedSpaceId ->
                 session.getRoomSummary(selectedSpaceId)?.let {
-                    selectedSpaceDataSource.post(Option.just(it))
+                    setCurrentSpace(it)
                 }
             }
         }
     }
 
-    fun safeActiveSpaceId() : String? {
+    fun safeActiveSpaceId(): String? {
         return selectedSpaceDataSource.currentValue?.orNull()?.roomId?.takeIf {
             MatrixPatterns.isRoomId(it)
         }
     }
 
+    fun safeActiveSpace(): RoomSummary? {
+        return selectedSpaceDataSource.currentValue?.orNull()?.takeIf {
+            MatrixPatterns.isRoomId(it.roomId)
+        }
+    }
+
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun entersForeground() {
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 0cf57d272c..8aa58632b3 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -149,8 +149,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     }
 
     private fun observeSelectedSpaceStore() {
-        appStateHandler.selectedSpaceDataSource
-                .observe()
+        appStateHandler.selectedSpaceObservable
                 .subscribe {
                     setState {
                         copy(spaceSummary = it)
@@ -160,7 +159,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
     }
 
     private fun observeRoomSummaries() {
-        appStateHandler.selectedSpaceDataSource.observe().distinctUntilChanged().switchMap {
+        appStateHandler.selectedSpaceObservable.distinctUntilChanged().switchMap {
             session.getPagedRoomSummariesLive(
                     roomSummaryQueryParams {
                         memberships = Membership.activeMemberships()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
index 6448705979..7c994666a9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
@@ -113,7 +113,9 @@ class GroupRoomListSectionBuilder(
         return sections
     }
 
-    private fun buildRoomsSections(sections: MutableList<RoomsSection>, activeSpaceAwareQueries: MutableList<UpdatableLivePageResult>, actualGroupId: String?) {
+    private fun buildRoomsSections(sections: MutableList<RoomsSection>,
+                                   activeSpaceAwareQueries: MutableList<UpdatableLivePageResult>,
+                                   actualGroupId: String?) {
         addSection(
                 sections,
                 activeSpaceAwareQueries,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index a58bee709b..7f213336f8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -74,7 +74,7 @@ class RoomListViewModel @Inject constructor(
     init {
         observeMembershipChanges()
 
-        appStateHandler.selectedSpaceDataSource.observe()
+        appStateHandler.selectedSpaceObservable
                 .distinctUntilChanged()
                 .map { it.orNull() }
                 .distinctUntilChanged()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 49be503c80..426c29a622 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -40,8 +40,6 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.rx.asObservable
 
 class SpaceRoomListSectionBuilder(
@@ -104,7 +102,7 @@ class SpaceRoomListSectionBuilder(
             }
         }
 
-        appStateHandler.selectedSpaceDataSource.observe()
+        appStateHandler.selectedSpaceObservable
                 .distinctUntilChanged()
                 .subscribe { activeSpaceOption ->
                     val selectedSpace = activeSpaceOption.orNull()
@@ -179,7 +177,7 @@ class SpaceRoomListSectionBuilder(
 
         // add suggested rooms
         val suggestedRoomsObservable = // MutableLiveData<List<SpaceChildInfo>>()
-                appStateHandler.selectedSpaceDataSource.observe()
+                appStateHandler.selectedSpaceObservable
                         .distinctUntilChanged()
                         .switchMap { activeSpaceOption ->
                             val selectedSpace = activeSpaceOption.orNull()
@@ -243,46 +241,57 @@ class SpaceRoomListSectionBuilder(
             it.roomTagQueryFilter = RoomTagQueryFilter(true, null, null)
         }
 
-        // For DMs we still need some post query filter :/
-        // It's probably less important as home is not filtering at all
-        val dmList = MutableLiveData<List<RoomSummary>>()
-        Observables.combineLatest(
-                session.getRoomSummariesLive(
-                        roomSummaryQueryParams {
-                            memberships = listOf(Membership.JOIN)
-                            roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                        }
-                ).asObservable(),
-                appStateHandler.selectedSpaceDataSource.observe()
-
-        ) { rooms, currentSpaceOption ->
-            val currentSpace = currentSpaceOption.orNull()
-                    .takeIf {
-                        // the +ALL trick is annoying, should find a way to fix that at the source!
-                        MatrixPatterns.isRoomId(it?.roomId)
-                    }
-            if (currentSpace == null) {
-                rooms
-            } else {
-                rooms.filter {
-                    it.otherMemberIds
-                            .intersect(currentSpace.otherMemberIds)
-                            .isNotEmpty()
-                }
-            }
-        }.subscribe {
-            dmList.postValue(it)
-        }.also {
-            onDisposable.invoke(it)
+        addSection(sections,
+                activeSpaceAwareQueries,
+                R.string.bottom_action_people_x,
+                false,
+                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+        ) {
+            it.memberships = listOf(Membership.JOIN)
+            it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+            it.roomTagQueryFilter = RoomTagQueryFilter(false, null, null)
         }
 
-        sections.add(
-                RoomsSection(
-                        sectionName = stringProvider.getString(R.string.bottom_action_people_x),
-                        liveList = dmList,
-                        notifyOfLocalEcho = false
-                )
-        )
+//        // For DMs we still need some post query filter :/
+//        // It's probably less important as home is not filtering at all
+//        val dmList = MutableLiveData<List<RoomSummary>>()
+//        Observables.combineLatest(
+//                session.getRoomSummariesLive(
+//                        roomSummaryQueryParams {
+//                            memberships = listOf(Membership.JOIN)
+//                            roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+//                        }
+//                ).asObservable(),
+//                appStateHandler.selectedSpaceDataSource.observe()
+//
+//        ) { rooms, currentSpaceOption ->
+//            val currentSpace = currentSpaceOption.orNull()
+//                    .takeIf {
+//                        // the +ALL trick is annoying, should find a way to fix that at the source!
+//                        MatrixPatterns.isRoomId(it?.roomId)
+//                    }
+//            if (currentSpace == null) {
+//                rooms
+//            } else {
+//                rooms.filter {
+//                    it.otherMemberIds
+//                            .intersect(currentSpace.otherMemberIds)
+//                            .isNotEmpty()
+//                }
+//            }
+//        }.subscribe {
+//            dmList.postValue(it)
+//        }.also {
+//            onDisposable.invoke(it)
+//        }
+//
+//        sections.add(
+//                RoomsSection(
+//                        sectionName = stringProvider.getString(R.string.bottom_action_people_x),
+//                        liveList = dmList,
+//                        notifyOfLocalEcho = false
+//                )
+//        )
     }
 
     private fun addSection(sections: MutableList<RoomsSection>,
diff --git a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
index d3ab39abef..53996171a5 100644
--- a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
@@ -155,7 +155,7 @@ abstract class BaseAttachmentProvider<Type>(
             target.onVideoURLReady(info.uid, data.url)
         } else {
             target.onVideoFileLoading(info.uid)
-            GlobalScope.launch {
+            GlobalScope.launch(Dispatchers.Main) {
                 val result = runCatching {
                     fileService.downloadFile(
                             fileName = data.filename,
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index ce178a1358..c033cc40fa 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -29,7 +29,6 @@ import androidx.core.app.ActivityOptionsCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
-import arrow.core.Option
 import im.vector.app.AppStateHandler
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
@@ -114,7 +113,7 @@ class DefaultNavigator @Inject constructor(
 
         sessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(spaceId)?.spaceSummary()?.let {
             Timber.d("## Nav: Switching to space $spaceId / ${it.name}")
-            appStateHandler.selectedSpaceDataSource.post(Option.just(it))
+            appStateHandler.setCurrentSpace(it)
         } ?: kotlin.run {
             Timber.d("## Nav: Failed to switch to space $spaceId")
         }
@@ -252,7 +251,7 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openRoomDirectory(context: Context, initialFilter: String) {
-        val selectedSpace = appStateHandler.selectedSpaceDataSource.currentValue?.orNull()?.let {
+        val selectedSpace = appStateHandler.safeActiveSpace()?.let {
             sessionHolder.getSafeActiveSession()?.getRoomSummary(it.roomId)
         }
         if (selectedSpace == null) {
@@ -276,9 +275,7 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openInviteUsersToRoom(context: Context, roomId: String) {
-        val selectedSpace = appStateHandler.selectedSpaceDataSource.currentValue?.orNull()?.let {
-            sessionHolder.getSafeActiveSession()?.getRoomSummary(it.roomId)
-        }
+        val selectedSpace = appStateHandler.safeActiveSpace()
         if (vectorPreferences.labSpaces() && selectedSpace != null) {
             // let user decides if he does it from space or room
             (context as? AppCompatActivity)?.supportFragmentManager?.let { fm ->
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index f82923b570..8889a76f9b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -17,7 +17,6 @@
 package im.vector.app.features.spaces
 
 import androidx.lifecycle.viewModelScope
-import arrow.core.Option
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
@@ -68,8 +67,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     init {
         observeSpaceSummaries()
         observeSelectionState()
-        appStateHandler.selectedSpaceDataSource
-                .observe()
+        appStateHandler.selectedSpaceObservable
                 .subscribe {
                     if (currentGroupId != it.orNull()?.roomId) {
                         setState {
@@ -90,8 +88,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                     currentGroupId = spaceSummary.roomId
                     _viewEvents.post(SpaceListViewEvents.OpenSpace)
                 }
-                val optionGroup = Option.just(spaceSummary)
-                appStateHandler.selectedSpaceDataSource.post(optionGroup)
+                appStateHandler.setCurrentSpace(spaceSummary)
             } else {
                 // If selected group is null we force to default. It can happens when leaving the selected group.
                 setState {

From 14103b1e7c899f36110df11636d4d31eadee8cfa Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 13 Apr 2021 14:54:49 +0200
Subject: [PATCH 167/350] Radio settings bottomsheet

---
 .../bottomsheet/BottomSheetRadioActionItem.kt | 80 +++++++++++++++++++
 .../core/ui/bottomsheet/BottomSheetGeneric.kt |  2 +-
 .../BottomSheetGenericController.kt           | 13 ++-
 ...on.kt => BottomSheetGenericRadioAction.kt} | 25 +++---
 .../settings/RoomSettingsAction.kt            |  3 +-
 .../settings/RoomSettingsController.kt        | 33 +++-----
 .../settings/RoomSettingsFragment.kt          |  5 +-
 .../settings/RoomSettingsViewModel.kt         |  3 +-
 .../RoomHistoryVisibilityBottomSheet.kt       |  6 +-
 .../RoomHistoryVisibilityController.kt        |  7 +-
 ...kt => RoomHistoryVisibilityRadioAction.kt} | 14 ++--
 ...mHistoryVisibilitySharedActionViewModel.kt |  2 +-
 .../joinrule/RoomJoinRuleBottomSheet.kt       | 14 ++--
 .../joinrule/RoomJoinRuleController.kt        | 48 +++++------
 ...leAction.kt => RoomJoinRuleRadioAction.kt} | 16 ++--
 .../RoomJoinRuleSharedActionViewModel.kt      |  2 +-
 .../settings/joinrule/RoomJoinRuleState.kt    |  3 +-
 vector/src/main/res/drawable/ic_beta_pill.xml | 12 +++
 vector/src/main/res/drawable/ic_radio_off.xml | 10 +++
 vector/src/main/res/drawable/ic_radio_on.xml  | 14 ++++
 .../res/layout/item_bottom_sheet_radio.xml    | 56 +++++++++++++
 .../res/layout/item_bottom_sheet_title.xml    |  1 +
 vector/src/main/res/values/strings.xml        |  8 +-
 23 files changed, 260 insertions(+), 117 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRadioActionItem.kt
 rename vector/src/main/java/im/vector/app/core/ui/bottomsheet/{BottomSheetGenericAction.kt => BottomSheetGenericRadioAction.kt} (56%)
 rename vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/{RoomHistoryVisibilityAction.kt => RoomHistoryVisibilityRadioAction.kt} (72%)
 rename vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/{RoomJoinRuleAction.kt => RoomJoinRuleRadioAction.kt} (68%)
 create mode 100644 vector/src/main/res/drawable/ic_beta_pill.xml
 create mode 100644 vector/src/main/res/drawable/ic_radio_off.xml
 create mode 100644 vector/src/main/res/drawable/ic_radio_on.xml
 create mode 100644 vector/src/main/res/layout/item_bottom_sheet_radio.xml

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRadioActionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRadioActionItem.kt
new file mode 100644
index 0000000000..6ca1182cce
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRadioActionItem.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package im.vector.app.core.epoxy.bottomsheet
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+
+/**
+ * A action for bottom sheet.
+ */
+@EpoxyModelClass(layout = R.layout.item_bottom_sheet_radio)
+abstract class BottomSheetRadioActionItem : VectorEpoxyModel<BottomSheetRadioActionItem.Holder>() {
+
+    @EpoxyAttribute
+    var title: CharSequence? = null
+
+    @StringRes
+    @EpoxyAttribute
+    var titleRes: Int? = null
+
+    @EpoxyAttribute
+    var selected = false
+
+    @EpoxyAttribute
+    var description: CharSequence? = null
+
+    @EpoxyAttribute
+    lateinit var listener: View.OnClickListener
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.view.setOnClickListener {
+            listener.onClick(it)
+        }
+
+        if (titleRes != null) {
+            holder.titleText.setText(titleRes!!)
+        } else {
+            holder.titleText.text = title
+        }
+        holder.descriptionText.setTextOrHide(description)
+
+        if (selected) {
+            holder.radioImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_radio_on))
+            holder.radioImage.contentDescription = holder.view.context.getString(R.string.a11y_checked)
+        } else {
+            holder.radioImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_radio_off))
+            holder.radioImage.contentDescription = holder.view.context.getString(R.string.a11y_unchecked)
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val titleText by bind<TextView>(R.id.actionTitle)
+        val descriptionText by bind<TextView>(R.id.actionDescription)
+        val radioImage by bind<ImageView>(R.id.radioIcon)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGeneric.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGeneric.kt
index f8f345f09d..e773993b21 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGeneric.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGeneric.kt
@@ -32,7 +32,7 @@ import javax.inject.Inject
 /**
  * Generic Bottom sheet with actions
  */
-abstract class BottomSheetGeneric<STATE : BottomSheetGenericState, ACTION : BottomSheetGenericAction> :
+abstract class BottomSheetGeneric<STATE : BottomSheetGenericState, ACTION : BottomSheetGenericRadioAction> :
         VectorBaseBottomSheetDialogFragment<BottomSheetGenericListBinding>(),
         BottomSheetGenericController.Listener<ACTION> {
 
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
index 67347c3220..c5e0c51047 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericController.kt
@@ -17,12 +17,11 @@ package im.vector.app.core.ui.bottomsheet
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
-import im.vector.app.core.epoxy.dividerItem
 
 /**
  * Epoxy controller for generic bottom sheet actions
  */
-abstract class BottomSheetGenericController<State : BottomSheetGenericState, Action : BottomSheetGenericAction>
+abstract class BottomSheetGenericController<State : BottomSheetGenericState, Action : BottomSheetGenericRadioAction>
     : TypedEpoxyController<State>() {
 
     var listener: Listener<Action>? = null
@@ -43,16 +42,14 @@ abstract class BottomSheetGenericController<State : BottomSheetGenericState, Act
                 subTitle(getSubTitle())
             }
 
-            dividerItem {
-                id("title_separator")
-            }
+//            dividerItem {
+//                id("title_separator")
+//            }
         }
         // Actions
         val actions = getActions(state)
-        val showIcons = actions.any { it.iconResId > 0 }
         actions.forEach { action ->
-            action.toBottomSheetItem()
-                    .showIcon(showIcons)
+            action.toRadioBottomSheetItem()
                     .listener(View.OnClickListener { listener?.didSelectAction(action) })
                     .addTo(this)
         }
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericAction.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericRadioAction.kt
similarity index 56%
rename from vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericAction.kt
rename to vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericRadioAction.kt
index da48accf35..168e5edc44 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericAction.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericRadioAction.kt
@@ -16,27 +16,24 @@
 
 package im.vector.app.core.ui.bottomsheet
 
-import androidx.annotation.DrawableRes
-import im.vector.app.core.epoxy.bottomsheet.BottomSheetActionItem_
+import im.vector.app.core.epoxy.bottomsheet.BottomSheetRadioActionItem_
 import im.vector.app.core.platform.VectorSharedAction
 
 /**
  * Parent class for a bottom sheet action
  */
-open class BottomSheetGenericAction(
-        open val title: String,
-        @DrawableRes open val iconResId: Int,
-        open val isSelected: Boolean,
-        open val destructive: Boolean
+open class BottomSheetGenericRadioAction(
+        open val title: CharSequence?,
+        open val description: String? = null,
+        open val isSelected: Boolean
 ) : VectorSharedAction {
 
-    fun toBottomSheetItem(): BottomSheetActionItem_ {
-        return BottomSheetActionItem_().apply {
-            id("action_$title")
-            iconRes(iconResId)
-            text(title)
-            selected(isSelected)
-            destructive(destructive)
+    fun toRadioBottomSheetItem(): BottomSheetRadioActionItem_ {
+        return BottomSheetRadioActionItem_().apply {
+            id("action_${this@BottomSheetGenericRadioAction.title}")
+            title(this@BottomSheetGenericRadioAction.title)
+            selected(this@BottomSheetGenericRadioAction.isSelected)
+            description(this@BottomSheetGenericRadioAction.description)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
index 867c605030..9f550ecbca 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
@@ -17,7 +17,6 @@
 package im.vector.app.features.roomprofile.settings
 
 import im.vector.app.core.platform.VectorViewModelAction
-import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 
@@ -26,7 +25,7 @@ sealed class RoomSettingsAction : VectorViewModelAction {
     data class SetRoomName(val newName: String) : RoomSettingsAction()
     data class SetRoomTopic(val newTopic: String) : RoomSettingsAction()
     data class SetRoomHistoryVisibility(val visibility: RoomHistoryVisibility) : RoomSettingsAction()
-    data class SetRoomJoinRule(val roomJoinRule: RoomJoinRules?, val roomGuestAccess: GuestAccess?) : RoomSettingsAction()
+    data class SetRoomJoinRule(val roomJoinRule: RoomJoinRules?) : RoomSettingsAction()
 
     object Save : RoomSettingsAction()
     object Cancel : RoomSettingsAction()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index 755dcc4a25..6b7a9139db 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -26,7 +26,6 @@ import im.vector.app.features.form.formEditTextItem
 import im.vector.app.features.form.formEditableAvatarItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter
-import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
@@ -127,37 +126,23 @@ class RoomSettingsController @Inject constructor(
 
     private fun RoomSettingsViewState.getJoinRuleWording(): String {
         val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules
-        val guestAccess = newRoomJoinRules.newGuestAccess ?: currentGuestAccess
         val resId = when (joinRule) {
-            RoomJoinRules.INVITE     -> {
-                R.string.room_settings_room_access_entry_only_invited to null
+            RoomJoinRules.INVITE -> {
+                R.string.room_settings_room_access_private_title to null
             }
-            RoomJoinRules.PRIVATE    -> {
-                R.string.room_settings_room_access_entry_unknown to joinRule.value
+            RoomJoinRules.PUBLIC -> {
+                R.string.room_settings_room_access_public_title to null
             }
-            RoomJoinRules.PUBLIC     -> {
-                if (guestAccess == GuestAccess.CanJoin) {
-                    R.string.room_settings_room_access_entry_anyone_with_link_including_guest to null
-                } else {
-                    R.string.room_settings_room_access_entry_anyone_with_link_apart_guest to null
-                }
-            }
-            RoomJoinRules.KNOCK      -> {
+            RoomJoinRules.KNOCK -> {
                 R.string.room_settings_room_access_entry_knock to null
             }
             RoomJoinRules.RESTRICTED -> {
-                R.string.room_settings_room_access_entry_restricted to null
+                R.string.room_settings_room_access_restricted_title to null
+            }
+            else                     -> {
+                R.string.room_settings_room_access_entry_unknown to joinRule.value
             }
         }
         return if (resId.second == null) stringProvider.getString(resId.first) else stringProvider.getString(resId.first, resId.second)
-//        return stringProvider.getString(if (joinRule == RoomJoinRules.INVITE) {
-//            R.string.room_settings_room_access_entry_only_invited
-//        } else {
-//            if (guestAccess == GuestAccess.CanJoin) {
-//                R.string.room_settings_room_access_entry_anyone_with_link_including_guest
-//            } else {
-//                R.string.room_settings_room_access_entry_anyone_with_link_apart_guest
-//            }
-//        })
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index 129888ee04..dab99c388e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -104,7 +104,7 @@ class RoomSettingsFragment @Inject constructor(
         roomJoinRuleSharedActionViewModel
                 .observe()
                 .subscribe { action ->
-                    viewModel.handle(RoomSettingsAction.SetRoomJoinRule(action.roomJoinRule, action.roomGuestAccess))
+                    viewModel.handle(RoomSettingsAction.SetRoomJoinRule(action.roomJoinRule))
                 }
                 .disposeOnDestroyView()
     }
@@ -176,8 +176,7 @@ class RoomSettingsFragment @Inject constructor(
 
     override fun onJoinRuleClicked()  = withState(viewModel) { state ->
         val currentJoinRule = state.newRoomJoinRules.newJoinRules ?: state.currentRoomJoinRules
-        val currentGuestAccess = state.newRoomJoinRules.newGuestAccess ?: state.currentGuestAccess
-        RoomJoinRuleBottomSheet.newInstance(currentJoinRule, currentGuestAccess)
+        RoomJoinRuleBottomSheet.newInstance(currentJoinRule)
                 .show(childFragmentManager, "RoomJoinRuleBottomSheet")
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index bf227ea5e8..93814d3062 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -198,8 +198,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
     private fun handleSetRoomJoinRule(action: RoomSettingsAction.SetRoomJoinRule) = withState { state ->
         setState {
             copy(newRoomJoinRules = RoomSettingsViewState.NewJoinRule(
-                    action.roomJoinRule.takeIf { it != state.currentRoomJoinRules },
-                    action.roomGuestAccess.takeIf { it != state.currentGuestAccess }
+                    action.roomJoinRule.takeIf { it != state.currentRoomJoinRules }
             ))
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityBottomSheet.kt
index 76d7115f30..4089139b78 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityBottomSheet.kt
@@ -33,7 +33,7 @@ data class RoomHistoryVisibilityBottomSheetArgs(
         val currentRoomHistoryVisibility: RoomHistoryVisibility
 ) : Parcelable
 
-class RoomHistoryVisibilityBottomSheet : BottomSheetGeneric<RoomHistoryVisibilityState, RoomHistoryVisibilityAction>() {
+class RoomHistoryVisibilityBottomSheet : BottomSheetGeneric<RoomHistoryVisibilityState, RoomHistoryVisibilityRadioAction>() {
 
     private lateinit var roomHistoryVisibilitySharedActionViewModel: RoomHistoryVisibilitySharedActionViewModel
     @Inject lateinit var controller: RoomHistoryVisibilityController
@@ -43,14 +43,14 @@ class RoomHistoryVisibilityBottomSheet : BottomSheetGeneric<RoomHistoryVisibilit
         injector.inject(this)
     }
 
-    override fun getController(): BottomSheetGenericController<RoomHistoryVisibilityState, RoomHistoryVisibilityAction> = controller
+    override fun getController(): BottomSheetGenericController<RoomHistoryVisibilityState, RoomHistoryVisibilityRadioAction> = controller
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         roomHistoryVisibilitySharedActionViewModel = activityViewModelProvider.get(RoomHistoryVisibilitySharedActionViewModel::class.java)
     }
 
-    override fun didSelectAction(action: RoomHistoryVisibilityAction) {
+    override fun didSelectAction(action: RoomHistoryVisibilityRadioAction) {
         roomHistoryVisibilitySharedActionViewModel.post(action)
         dismiss()
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityController.kt
index a4899711f7..16aa456f69 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityController.kt
@@ -26,13 +26,13 @@ import javax.inject.Inject
 class RoomHistoryVisibilityController @Inject constructor(
         private val historyVisibilityFormatter: RoomHistoryVisibilityFormatter,
         private val stringProvider: StringProvider
-) : BottomSheetGenericController<RoomHistoryVisibilityState, RoomHistoryVisibilityAction>() {
+) : BottomSheetGenericController<RoomHistoryVisibilityState, RoomHistoryVisibilityRadioAction>() {
 
     override fun getTitle() = stringProvider.getString(R.string.room_settings_room_read_history_rules_pref_dialog_title)
 
     override fun getSubTitle() = stringProvider.getString(R.string.room_settings_room_read_history_dialog_subtitle)
 
-    override fun getActions(state: RoomHistoryVisibilityState): List<RoomHistoryVisibilityAction> {
+    override fun getActions(state: RoomHistoryVisibilityState): List<RoomHistoryVisibilityRadioAction> {
         return listOf(
                 RoomHistoryVisibility.WORLD_READABLE,
                 RoomHistoryVisibility.SHARED,
@@ -40,10 +40,9 @@ class RoomHistoryVisibilityController @Inject constructor(
                 RoomHistoryVisibility.JOINED
         )
                 .map { roomHistoryVisibility ->
-                    RoomHistoryVisibilityAction(
+                    RoomHistoryVisibilityRadioAction(
                             roomHistoryVisibility = roomHistoryVisibility,
                             title = historyVisibilityFormatter.getSetting(roomHistoryVisibility),
-                            iconResId = 0,
                             isSelected = roomHistoryVisibility == state.currentRoomHistoryVisibility
                     )
                 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityRadioAction.kt
similarity index 72%
rename from vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityAction.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityRadioAction.kt
index 3c989a7dbe..6a5ae24ca5 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilityRadioAction.kt
@@ -16,18 +16,14 @@
 
 package im.vector.app.features.roomprofile.settings.historyvisibility
 
-import androidx.annotation.DrawableRes
-import im.vector.app.core.ui.bottomsheet.BottomSheetGenericAction
+import im.vector.app.core.ui.bottomsheet.BottomSheetGenericRadioAction
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 
-class RoomHistoryVisibilityAction(
+class RoomHistoryVisibilityRadioAction(
         val roomHistoryVisibility: RoomHistoryVisibility,
-        title: String,
-        @DrawableRes iconResId: Int,
+        title: String?,
         isSelected: Boolean
-) : BottomSheetGenericAction(
+) : BottomSheetGenericRadioAction(
         title = title,
-        iconResId = iconResId,
-        isSelected = isSelected,
-        destructive = false
+        isSelected = isSelected
 )
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilitySharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilitySharedActionViewModel.kt
index 31c1c2631c..4f1bdca194 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilitySharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/historyvisibility/RoomHistoryVisibilitySharedActionViewModel.kt
@@ -20,4 +20,4 @@ import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 class RoomHistoryVisibilitySharedActionViewModel @Inject constructor()
-    : VectorSharedActionViewModel<RoomHistoryVisibilityAction>()
+    : VectorSharedActionViewModel<RoomHistoryVisibilityRadioAction>()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleBottomSheet.kt
index c6cb676e1f..d2e338d077 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleBottomSheet.kt
@@ -25,17 +25,15 @@ import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.ui.bottomsheet.BottomSheetGeneric
 import im.vector.app.core.ui.bottomsheet.BottomSheetGenericController
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import javax.inject.Inject
 
 @Parcelize
 data class RoomJoinRuleBottomSheetArgs(
-        val currentRoomJoinRule: RoomJoinRules,
-        val currentGuestAccess: GuestAccess?
+        val currentRoomJoinRule: RoomJoinRules
 ) : Parcelable
 
-class RoomJoinRuleBottomSheet : BottomSheetGeneric<RoomJoinRuleState, RoomJoinRuleAction>() {
+class RoomJoinRuleBottomSheet : BottomSheetGeneric<RoomJoinRuleState, RoomJoinRuleRadioAction>() {
 
     private lateinit var roomJoinRuleSharedActionViewModel: RoomJoinRuleSharedActionViewModel
     @Inject lateinit var controller: RoomJoinRuleController
@@ -45,14 +43,14 @@ class RoomJoinRuleBottomSheet : BottomSheetGeneric<RoomJoinRuleState, RoomJoinRu
         injector.inject(this)
     }
 
-    override fun getController(): BottomSheetGenericController<RoomJoinRuleState, RoomJoinRuleAction> = controller
+    override fun getController(): BottomSheetGenericController<RoomJoinRuleState, RoomJoinRuleRadioAction> = controller
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         roomJoinRuleSharedActionViewModel = activityViewModelProvider.get(RoomJoinRuleSharedActionViewModel::class.java)
     }
 
-    override fun didSelectAction(action: RoomJoinRuleAction) {
+    override fun didSelectAction(action: RoomJoinRuleRadioAction) {
         roomJoinRuleSharedActionViewModel.post(action)
         dismiss()
     }
@@ -63,9 +61,9 @@ class RoomJoinRuleBottomSheet : BottomSheetGeneric<RoomJoinRuleState, RoomJoinRu
     }
 
     companion object {
-        fun newInstance(currentRoomJoinRule: RoomJoinRules, currentGuestAccess: GuestAccess?): RoomJoinRuleBottomSheet {
+        fun newInstance(currentRoomJoinRule: RoomJoinRules): RoomJoinRuleBottomSheet {
             return RoomJoinRuleBottomSheet().apply {
-                setArguments(RoomJoinRuleBottomSheetArgs(currentRoomJoinRule, currentGuestAccess))
+                setArguments(RoomJoinRuleBottomSheetArgs(currentRoomJoinRule))
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt
index 4e94fa426b..a438e8deee 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleController.kt
@@ -17,46 +17,46 @@
 package im.vector.app.features.roomprofile.settings.joinrule
 
 import im.vector.app.R
+import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.bottomsheet.BottomSheetGenericController
-import org.matrix.android.sdk.api.session.room.model.GuestAccess
+import me.gujun.android.span.image
+import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import javax.inject.Inject
 
 class RoomJoinRuleController @Inject constructor(
-        private val stringProvider: StringProvider
-) : BottomSheetGenericController<RoomJoinRuleState, RoomJoinRuleAction>() {
+        private val stringProvider: StringProvider,
+        private val drawableProvider: DrawableProvider
+) : BottomSheetGenericController<RoomJoinRuleState, RoomJoinRuleRadioAction>() {
 
     override fun getTitle() = stringProvider.getString(R.string.room_settings_room_access_rules_pref_dialog_title)
 
-    override fun getActions(state: RoomJoinRuleState): List<RoomJoinRuleAction> {
+    override fun getActions(state: RoomJoinRuleState): List<RoomJoinRuleRadioAction> {
         return listOf(
-                RoomJoinRuleAction(
+                RoomJoinRuleRadioAction(
                         roomJoinRule = RoomJoinRules.INVITE,
-                        roomGuestAccess = null,
-                        title = stringProvider.getString(R.string.room_settings_room_access_entry_only_invited),
-                        iconResId = 0,
+                        description = stringProvider.getString(R.string.room_settings_room_access_private_description),
+                        title = stringProvider.getString(R.string.room_settings_room_access_private_title),
                         isSelected = state.currentRoomJoinRule == RoomJoinRules.INVITE
                 ),
-                RoomJoinRuleAction(
+                RoomJoinRuleRadioAction(
                         roomJoinRule = RoomJoinRules.PUBLIC,
-                        roomGuestAccess = GuestAccess.Forbidden,
-                        title = stringProvider.getString(R.string.room_settings_room_access_entry_anyone_with_link_apart_guest),
-                        iconResId = 0,
-                        isSelected = state.currentRoomJoinRule == RoomJoinRules.PUBLIC && state.currentGuestAccess == GuestAccess.Forbidden
+                        description = stringProvider.getString(R.string.room_settings_room_access_public_description),
+                        title = stringProvider.getString(R.string.room_settings_room_access_public_title),
+                        isSelected = state.currentRoomJoinRule == RoomJoinRules.PUBLIC
                 ),
-                RoomJoinRuleAction(
-                        roomJoinRule = RoomJoinRules.PUBLIC,
-                        roomGuestAccess = GuestAccess.CanJoin,
-                        title = stringProvider.getString(R.string.room_settings_room_access_entry_anyone_with_link_including_guest),
-                        iconResId = 0,
-                        isSelected = state.currentRoomJoinRule == RoomJoinRules.PUBLIC && state.currentGuestAccess == GuestAccess.CanJoin
-                ),
-                RoomJoinRuleAction(
+                RoomJoinRuleRadioAction(
                         roomJoinRule = RoomJoinRules.RESTRICTED,
-                        roomGuestAccess = null,
-                        title = stringProvider.getString(R.string.room_settings_room_access_entry_restricted),
-                        iconResId = 0,
+                        description = stringProvider.getString(R.string.room_settings_room_access_restricted_description),
+                        title = span {
+                            +stringProvider.getString(R.string.room_settings_room_access_restricted_title)
+                            + " "
+                            image(
+                                    drawableProvider.getDrawable(R.drawable.ic_beta_pill)!!,
+                                    "bottom"
+                            )
+                        },
                         isSelected = state.currentRoomJoinRule == RoomJoinRules.RESTRICTED
                 )
         )
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleRadioAction.kt
similarity index 68%
rename from vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleAction.kt
rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleRadioAction.kt
index 6f71669002..cdeb49f9ef 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleRadioAction.kt
@@ -16,20 +16,16 @@
 
 package im.vector.app.features.roomprofile.settings.joinrule
 
-import androidx.annotation.DrawableRes
-import im.vector.app.core.ui.bottomsheet.BottomSheetGenericAction
-import org.matrix.android.sdk.api.session.room.model.GuestAccess
+import im.vector.app.core.ui.bottomsheet.BottomSheetGenericRadioAction
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 
-class RoomJoinRuleAction(
+class RoomJoinRuleRadioAction(
         val roomJoinRule: RoomJoinRules,
-        val roomGuestAccess: GuestAccess?,
-        title: String,
-        @DrawableRes iconResId: Int,
+        title: CharSequence,
+        description: String,
         isSelected: Boolean
-) : BottomSheetGenericAction(
+) : BottomSheetGenericRadioAction(
         title = title,
-        iconResId = iconResId,
         isSelected = isSelected,
-        destructive = false
+        description = description
 )
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleSharedActionViewModel.kt
index 934b0dfc76..a7df2cb475 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleSharedActionViewModel.kt
@@ -20,4 +20,4 @@ import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
 class RoomJoinRuleSharedActionViewModel @Inject constructor()
-    : VectorSharedActionViewModel<RoomJoinRuleAction>()
+    : VectorSharedActionViewModel<RoomJoinRuleRadioAction>()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleState.kt
index ec16b02d60..85253091c4 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/RoomJoinRuleState.kt
@@ -26,7 +26,6 @@ data class RoomJoinRuleState(
 ) : BottomSheetGenericState() {
 
     constructor(args: RoomJoinRuleBottomSheetArgs) : this(
-            currentRoomJoinRule = args.currentRoomJoinRule,
-            currentGuestAccess = args.currentGuestAccess
+            currentRoomJoinRule = args.currentRoomJoinRule
     )
 }
diff --git a/vector/src/main/res/drawable/ic_beta_pill.xml b/vector/src/main/res/drawable/ic_beta_pill.xml
new file mode 100644
index 0000000000..44faacccae
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_beta_pill.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="47dp"
+    android:height="20dp"
+    android:viewportWidth="47"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M0,4C0,1.7909 1.7909,0 4,0H43C45.2091,0 47,1.7909 47,4V16C47,18.2091 45.2091,20 43,20H4C1.7909,20 0,18.2091 0,16V4Z"
+      android:fillColor="#368BD6"/>
+  <path
+      android:pathData="M8.8608,14V5.2727H12.2017C12.8324,5.2727 13.3565,5.3722 13.7741,5.571C14.1946,5.767 14.5085,6.0355 14.7159,6.3764C14.9261,6.7173 15.0312,7.1037 15.0312,7.5355C15.0312,7.8906 14.9631,8.1946 14.8267,8.4474C14.6903,8.6974 14.5071,8.9006 14.277,9.0568C14.0469,9.2131 13.7898,9.3253 13.5057,9.3935V9.4787C13.8153,9.4957 14.1122,9.5909 14.3963,9.7642C14.6832,9.9347 14.9176,10.1761 15.0994,10.4886C15.2813,10.8011 15.3722,11.179 15.3722,11.6222C15.3722,12.0739 15.2628,12.4801 15.044,12.8409C14.8253,13.1989 14.4957,13.4815 14.0554,13.6889C13.6151,13.8963 13.0611,14 12.3935,14H8.8608ZM10.4418,12.679H12.142C12.7159,12.679 13.1293,12.5696 13.3821,12.3509C13.6378,12.1293 13.7656,11.8452 13.7656,11.4986C13.7656,11.2401 13.7017,11.0071 13.5739,10.7997C13.446,10.5895 13.2642,10.4247 13.0284,10.3054C12.7926,10.1832 12.5114,10.1222 12.1847,10.1222H10.4418V12.679ZM10.4418,8.9844H12.0057C12.2784,8.9844 12.5241,8.9347 12.7429,8.8352C12.9616,8.733 13.1335,8.5895 13.2585,8.4048C13.3864,8.2173 13.4503,7.9957 13.4503,7.7401C13.4503,7.402 13.331,7.1236 13.0923,6.9048C12.8565,6.6861 12.5057,6.5767 12.0398,6.5767H10.4418V8.9844ZM16.7475,14V5.2727H22.4237V6.598H18.3285V8.9673H22.1296V10.2926H18.3285V12.6747H22.4577V14H16.7475ZM23.6531,6.598V5.2727H30.6161V6.598H27.9187V14H26.3505V6.598H23.6531ZM32.0245,14H30.337L33.4094,5.2727H35.3612L38.4379,14H36.7504L34.4194,7.0625H34.3512L32.0245,14ZM32.0799,10.5781H36.6822V11.848H32.0799V10.5781Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_radio_off.xml b/vector/src/main/res/drawable/ic_radio_off.xml
new file mode 100644
index 0000000000..90524c7ac2
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_radio_off.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2ZM12,20C7.6,20 4,16.4 4,12C4,7.6 7.6,4 12,4C16.4,4 20,7.6 20,12C20,16.4 16.4,20 12,20Z"
+      android:fillColor="#8E99A4"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_radio_on.xml b/vector/src/main/res/drawable/ic_radio_on.xml
new file mode 100644
index 0000000000..5cda8285e6
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_radio_on.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M12,7C9.2,7 7,9.2 7,12C7,14.8 9.2,17 12,17C14.8,17 17,14.8 17,12C17,9.2 14.8,7 12,7V7ZM12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2V2ZM12,20C7.6,20 4,16.4 4,12C4,7.6 7.6,4 12,4C16.4,4 20,7.6 20,12C20,16.4 16.4,20 12,20V20Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M2,2h20v20h-20z"
+        android:fillColor="#0DBD8B"/>
+  </group>
+</vector>
diff --git a/vector/src/main/res/layout/item_bottom_sheet_radio.xml b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
new file mode 100644
index 0000000000..e4137906ca
--- /dev/null
+++ b/vector/src/main/res/layout/item_bottom_sheet_radio.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    android:minHeight="50dp"
+    android:paddingStart="@dimen/layout_horizontal_margin"
+    android:paddingTop="8dp"
+    android:paddingEnd="@dimen/layout_horizontal_margin"
+    android:paddingBottom="8dp">
+
+    <ImageView
+        android:id="@+id/radioIcon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="15dp"
+        android:contentDescription="@string/a11y_checked"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="MissingPrefix"
+        tools:src="@drawable/ic_radio_on" />
+
+    <TextView
+        android:id="@+id/actionTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/radioIcon"
+        app:layout_constraintTop_toTopOf="@id/radioIcon"
+        tools:text="@string/space_type_private" />
+
+    <TextView
+        android:id="@+id/actionDescription"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:maxLines="4"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/actionTitle"
+        app:layout_constraintTop_toBottomOf="@id/actionTitle"
+        tools:text="@tools:sample/lorem/random" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_bottom_sheet_title.xml b/vector/src/main/res/layout/item_bottom_sheet_title.xml
index 5113c43f39..41191b53db 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_title.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_title.xml
@@ -16,6 +16,7 @@
         android:layout_height="wrap_content"
         android:textColor="?riotx_text_primary"
         android:textSize="18sp"
+        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/itemBottomSheetTitleSubtitle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 0566fbbacb..40d3cc5e1f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1451,9 +1451,14 @@
     <string name="room_settings_room_access_entry_only_invited">Only people who have been invited</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Anyone who knows the room’s link, apart from guests</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Anyone who knows the room’s link, including guests</string>
-    <string name="room_settings_room_access_entry_restricted">Restricted to members of a parent space</string>
     <string name="room_settings_room_access_entry_knock">Anyone can knock on the room, members can then accept or reject</string>
     <string name="room_settings_room_access_entry_unknown">Unknown access setting (%s)</string>
+    <string name="room_settings_room_access_private_title">Private</string>
+    <string name="room_settings_room_access_private_description">Only people invited can find and join</string>
+    <string name="room_settings_room_access_public_title">Public</string>
+    <string name="room_settings_room_access_public_description">Anyone can find the room and join</string>
+    <string name="room_settings_room_access_restricted_title">Spaces</string>
+    <string name="room_settings_room_access_restricted_description">Anyone in a space with this room can find and join it. Only admins of this room can add it to a space.</string>
 
     <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Banned users</string>
@@ -3229,6 +3234,7 @@
     <string name="a11y_open_emoji_picker">Open Emoji picker</string>
     <string name="a11y_close_emoji_picker">Close Emoji picker</string>
     <string name="a11y_checked">Checked</string>
+    <string name="a11y_unchecked">Unchecked</string>
     <string name="a11y_error_message_not_sent">Message not sent due to error</string>
     <string name="a11y_rule_notify_noisy">Notify with sound</string>
     <string name="a11y_rule_notify_silent">Notify without sound</string>

From 5a84456f1f7c6b2b97ceaa20072f915d65723276 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 15 Apr 2021 10:38:39 +0200
Subject: [PATCH 168/350] Set guest access in developer mode

---
 .../session/room/state/DefaultStateService.kt |  2 ++
 .../settings/RoomSettingsAction.kt            |  2 ++
 .../settings/RoomSettingsController.kt        | 19 +++++++++++++++++++
 .../settings/RoomSettingsFragment.kt          | 12 +++++++++---
 .../settings/RoomSettingsViewModel.kt         | 19 +++++++++++++++----
 vector/src/main/res/values/strings.xml        |  1 +
 6 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index 4948e3ace5..ff2afb5d61 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -34,6 +34,7 @@ import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.session.content.FileUploader
+import java.lang.UnsupportedOperationException
 
 internal class DefaultStateService @AssistedInject constructor(@Assisted private val roomId: String,
                                                                private val stateEventDataSource: StateEventDataSource,
@@ -127,6 +128,7 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
 
     override suspend fun updateJoinRule(joinRules: RoomJoinRules?, guestAccess: GuestAccess?) {
         if (joinRules != null) {
+            if (joinRules == RoomJoinRules.RESTRICTED) throw UnsupportedOperationException("No yet supported")
             sendStateEvent(
                     eventType = EventType.STATE_ROOM_JOIN_RULES,
                     body = mapOf("join_rule" to joinRules),
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
index 9f550ecbca..567caa5f97 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.roomprofile.settings
 
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 
@@ -26,6 +27,7 @@ sealed class RoomSettingsAction : VectorViewModelAction {
     data class SetRoomTopic(val newTopic: String) : RoomSettingsAction()
     data class SetRoomHistoryVisibility(val visibility: RoomHistoryVisibility) : RoomSettingsAction()
     data class SetRoomJoinRule(val roomJoinRule: RoomJoinRules?) : RoomSettingsAction()
+    data class SetRoomGuestAccess(val guestAccess: GuestAccess) : RoomSettingsAction()
 
     object Save : RoomSettingsAction()
     object Cancel : RoomSettingsAction()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index 6b7a9139db..8096903b4c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -24,8 +24,11 @@ import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.form.formEditTextItem
 import im.vector.app.features.form.formEditableAvatarItem
+import im.vector.app.features.form.formSwitchItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
@@ -34,6 +37,7 @@ class RoomSettingsController @Inject constructor(
         private val stringProvider: StringProvider,
         private val avatarRenderer: AvatarRenderer,
         private val roomHistoryVisibilityFormatter: RoomHistoryVisibilityFormatter,
+        private val vectorPreferences: VectorPreferences,
         colorProvider: ColorProvider
 ) : TypedEpoxyController<RoomSettingsViewState>() {
 
@@ -45,6 +49,7 @@ class RoomSettingsController @Inject constructor(
         fun onTopicChanged(topic: String)
         fun onHistoryVisibilityClicked()
         fun onJoinRuleClicked()
+        fun onToggleGuestAccess()
     }
 
     private val dividerColor = colorProvider.getColorFromAttribute(R.attr.vctr_list_divider_color)
@@ -122,6 +127,20 @@ class RoomSettingsController @Inject constructor(
                 editable = data.actionPermissions.canChangeJoinRule,
                 action = { if (data.actionPermissions.canChangeJoinRule) callback?.onJoinRuleClicked() }
         )
+
+        val isPublic = (data.newRoomJoinRules.newJoinRules ?: data.currentRoomJoinRules) == RoomJoinRules.PUBLIC
+        if (vectorPreferences.developerMode() && isPublic) {
+            val guestAccess = data.newRoomJoinRules.newGuestAccess ?: data.currentGuestAccess
+            // add guest access option?
+            formSwitchItem {
+                id("guest_access")
+                title(stringProvider.getString(R.string.room_settings_guest_access_title))
+                switchChecked(guestAccess == GuestAccess.CanJoin)
+                listener {
+                    callback?.onToggleGuestAccess()
+                }
+            }
+        }
     }
 
     private fun RoomSettingsViewState.getJoinRuleWording(): String {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index dab99c388e..99df27b8f1 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -42,11 +42,11 @@ import im.vector.app.databinding.FragmentRoomSettingGenericBinding
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import im.vector.app.features.roomprofile.RoomProfileSharedActionViewModel
-import im.vector.app.features.roomprofile.settings.historyvisibility.RoomHistoryVisibilitySharedActionViewModel
 import im.vector.app.features.roomprofile.settings.historyvisibility.RoomHistoryVisibilityBottomSheet
+import im.vector.app.features.roomprofile.settings.historyvisibility.RoomHistoryVisibilitySharedActionViewModel
 import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleBottomSheet
 import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleSharedActionViewModel
-
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.util.toMatrixItem
 import java.util.UUID
 import javax.inject.Inject
@@ -174,12 +174,18 @@ class RoomSettingsFragment @Inject constructor(
                 .show(childFragmentManager, "RoomHistoryVisibilityBottomSheet")
     }
 
-    override fun onJoinRuleClicked()  = withState(viewModel) { state ->
+    override fun onJoinRuleClicked() = withState(viewModel) { state ->
         val currentJoinRule = state.newRoomJoinRules.newJoinRules ?: state.currentRoomJoinRules
         RoomJoinRuleBottomSheet.newInstance(currentJoinRule)
                 .show(childFragmentManager, "RoomJoinRuleBottomSheet")
     }
 
+    override fun onToggleGuestAccess() = withState(viewModel) { state ->
+        val currentGuestAccess = state.newRoomJoinRules.newGuestAccess ?: state.currentGuestAccess
+        val toggled = if (currentGuestAccess == GuestAccess.Forbidden) GuestAccess.CanJoin else GuestAccess.Forbidden
+        viewModel.handle(RoomSettingsAction.SetRoomGuestAccess(toggled))
+    }
+
     override fun onImageReady(uri: Uri?) {
         uri ?: return
         viewModel.handle(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index 93814d3062..c9271f5357 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -21,8 +21,8 @@ import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
@@ -190,6 +190,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
             is RoomSettingsAction.SetRoomTopic             -> setState { copy(newTopic = action.newTopic) }
             is RoomSettingsAction.SetRoomHistoryVisibility -> setState { copy(newHistoryVisibility = action.visibility) }
             is RoomSettingsAction.SetRoomJoinRule          -> handleSetRoomJoinRule(action)
+            is RoomSettingsAction.SetRoomGuestAccess       -> handleSetGuestAccess(action)
             is RoomSettingsAction.Save                     -> saveSettings()
             is RoomSettingsAction.Cancel                   -> cancel()
         }.exhaustive
@@ -198,7 +199,17 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
     private fun handleSetRoomJoinRule(action: RoomSettingsAction.SetRoomJoinRule) = withState { state ->
         setState {
             copy(newRoomJoinRules = RoomSettingsViewState.NewJoinRule(
-                    action.roomJoinRule.takeIf { it != state.currentRoomJoinRules }
+                    newJoinRules = action.roomJoinRule.takeIf { it != state.currentRoomJoinRules },
+                    newGuestAccess = state.newRoomJoinRules.newGuestAccess.takeIf { it != state.currentGuestAccess }
+            ))
+        }
+    }
+
+    private fun handleSetGuestAccess(action: RoomSettingsAction.SetRoomGuestAccess) = withState { state ->
+        setState {
+            copy(newRoomJoinRules = RoomSettingsViewState.NewJoinRule(
+                    newJoinRules = state.newRoomJoinRules.newJoinRules.takeIf { it != state.currentRoomJoinRules },
+                    newGuestAccess = action.guestAccess.takeIf { it != state.currentGuestAccess }
             ))
         }
     }
@@ -230,8 +241,8 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
         val summary = state.roomSummary.invoke()
 
         when (val avatarAction = state.avatarAction) {
-            RoomSettingsViewState.AvatarAction.None            -> Unit
-            RoomSettingsViewState.AvatarAction.DeleteAvatar    -> {
+            RoomSettingsViewState.AvatarAction.None -> Unit
+            RoomSettingsViewState.AvatarAction.DeleteAvatar -> {
                 operationList.add(room.rx().deleteAvatar())
             }
             is RoomSettingsViewState.AvatarAction.UpdateAvatar -> {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 40d3cc5e1f..4bc0424c32 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1405,6 +1405,7 @@
     <string name="room_settings_room_read_history_dialog_subtitle">Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Who can access this room?</string>
     <string name="room_settings_room_access_title">Room access</string>
+    <string name="room_settings_guest_access_title">Allow guests to join</string>
 
     <!-- room settings : alias -->
     <string name="room_settings_alias_title">Room addresses</string>

From 8146d8ab1e787be3d6ed28ab849e8f919b3168a3 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 16 Apr 2021 16:55:11 +0200
Subject: [PATCH 169/350] Add Rooms to space

---
 .../sdk/api/query/ActiveSpaceFilter.kt        |   1 +
 .../sdk/api/session/room/RoomService.kt       |   6 +-
 .../sdk/api/session/room/RoomSortOrder.kt     |  23 +++
 .../sdk/api/session/room/model/RoomSummary.kt |   3 +-
 .../database/mapper/RoomSummaryMapper.kt      |   3 +-
 .../session/room/DefaultRoomService.kt        |   9 +-
 .../room/summary/RoomSummaryDataSource.kt     |  51 ++++-
 .../session/space/DefaultSpaceService.kt      |   3 +-
 tools/check/forbidden_strings_in_code.txt     |   2 +-
 vector/sampledata/matrix.json                 |   6 +
 vector/src/main/AndroidManifest.xml           |   1 +
 .../im/vector/app/core/di/FragmentModule.kt   |   6 +
 .../im/vector/app/core/di/ScreenComponent.kt  |   2 +
 .../spaces/SpaceSettingsMenuBottomSheet.kt    |   8 +
 .../spaces/manage/AddRoomListController.kt    |  89 ++++++++
 .../spaces/manage/RoomSelectionItem.kt        |  67 ++++++
 .../manage/RoomSelectionPlaceHolderItem.kt    |  27 +++
 .../spaces/manage/SpaceAddRoomActions.kt      |  27 +++
 .../spaces/manage/SpaceAddRoomFragment.kt     | 171 +++++++++++++++
 .../spaces/manage/SpaceAddRoomsState.kt       |  35 ++++
 .../spaces/manage/SpaceAddRoomsViewEvents.kt  |  25 +++
 .../spaces/manage/SpaceAddRoomsViewModel.kt   | 194 ++++++++++++++++++
 .../spaces/manage/SpaceManageActivity.kt      |  94 +++++++++
 .../manage/SpaceManageSharedViewModel.kt      |  59 ++++++
 .../spaces/manage/SpaceManageViewState.kt     |  27 +++
 .../spaces/manage/SpaceManagedSharedAction.kt |  25 +++
 .../manage/SpaceManagedSharedViewEvents.kt    |  25 +++
 .../src/main/res/drawable/ic_checkbox_off.xml |  11 +
 .../src/main/res/drawable/ic_checkbox_on.xml  |  18 ++
 .../layout/bottom_sheet_space_settings.xml    |  12 ++
 .../res/layout/fragment_space_add_rooms.xml   | 103 ++++++++++
 .../res/layout/item_room_to_add_in_space.xml  |  56 +++++
 .../item_room_to_add_in_space_placeholder.xml |  56 +++++
 .../src/main/res/menu/menu_space_add_room.xml |   9 +
 vector/src/main/res/values/strings.xml        |   6 +
 35 files changed, 1244 insertions(+), 16 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/RoomSelectionItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/RoomSelectionPlaceHolderItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomActions.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewEvents.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
 create mode 100644 vector/src/main/res/drawable/ic_checkbox_off.xml
 create mode 100644 vector/src/main/res/drawable/ic_checkbox_on.xml
 create mode 100644 vector/src/main/res/layout/fragment_space_add_rooms.xml
 create mode 100644 vector/src/main/res/layout/item_room_to_add_in_space.xml
 create mode 100644 vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml
 create mode 100644 vector/src/main/res/menu/menu_space_add_room.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt
index 3c716fe0fe..48619b9394 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/ActiveSpaceFilter.kt
@@ -19,4 +19,5 @@ package org.matrix.android.sdk.api.query
 sealed class ActiveSpaceFilter {
     object None : ActiveSpaceFilter()
     data class ActiveSpace(val currentSpaceId: String?) : ActiveSpaceFilter()
+    data class ExcludeSpace(val spaceId: String) : ActiveSpaceFilter()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 092c31de1d..871c5378a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -178,13 +178,15 @@ interface RoomService {
      * TODO Doc
      */
     fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                  pagedListConfig: PagedList.Config = defaultPagedListConfig): LiveData<PagedList<RoomSummary>>
+                                  pagedListConfig: PagedList.Config = defaultPagedListConfig,
+                                  sortOrder: RoomSortOrder = RoomSortOrder.ACTIVITY): LiveData<PagedList<RoomSummary>>
 
     /**
      * TODO Doc
      */
     fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                          pagedListConfig: PagedList.Config = defaultPagedListConfig): UpdatableLivePageResult
+                                          pagedListConfig: PagedList.Config = defaultPagedListConfig,
+                                          sortOrder: RoomSortOrder = RoomSortOrder.ACTIVITY): UpdatableLivePageResult
 
     /**
      * TODO Doc
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt
new file mode 100644
index 0000000000..36da242527
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSortOrder.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room
+
+enum class RoomSortOrder {
+    NAME,
+    ACTIVITY,
+    NONE
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index f08f605a24..2a802adcde 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -57,7 +57,8 @@ data class RoomSummary constructor(
         val hasFailedSending: Boolean = false,
         val roomType: String? = null,
         val spaceParents: List<SpaceParentInfo>? = null,
-        val children: List<SpaceChildInfo>? = null
+        val children: List<SpaceChildInfo>? = null,
+        val flattenParentIds: List<String> = emptyList()
 ) {
 
     val isVersioned: Boolean
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 87ac48e107..9109ef2e8f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -89,7 +89,8 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                             viaServers = it.viaServers.toList(),
                             parentRoomId = roomSummaryEntity.roomId
                     )
-                }
+                },
+                flattenParentIds = roomSummaryEntity.flattenParentIds?.split("|") ?: emptyList()
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index a871c53eed..d9fe1288e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -23,6 +23,7 @@ import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
@@ -91,14 +92,14 @@ internal class DefaultRoomService @Inject constructor(
         return roomSummaryDataSource.getRoomSummariesLive(queryParams)
     }
 
-    override fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config)
+    override fun getPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config, sortOrder: RoomSortOrder)
             : LiveData<PagedList<RoomSummary>> {
-        return roomSummaryDataSource.getSortedPagedRoomSummariesLive(queryParams, pagedListConfig)
+        return roomSummaryDataSource.getSortedPagedRoomSummariesLive(queryParams, pagedListConfig, sortOrder)
     }
 
-    override fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config)
+    override fun getFilteredPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams, pagedListConfig: PagedList.Config, sortOrder: RoomSortOrder)
             : UpdatableLivePageResult {
-        return roomSummaryDataSource.getUpdatablePagedRoomSummariesLive(queryParams, pagedListConfig)
+        return roomSummaryDataSource.getUpdatablePagedRoomSummariesLive(queryParams, pagedListConfig, sortOrder)
     }
 
     override fun getNotificationCountForRooms(queryParams: RoomSummaryQueryParams): RoomAggregateNotificationCount {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index ea4d2df473..06f84066be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -28,6 +28,7 @@ import io.realm.Sort
 import io.realm.kotlin.where
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -162,10 +163,22 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
     }
 
     fun getSortedPagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                        pagedListConfig: PagedList.Config): LiveData<PagedList<RoomSummary>> {
+                                        pagedListConfig: PagedList.Config,
+                                        sortOrder: RoomSortOrder): LiveData<PagedList<RoomSummary>> {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
             roomSummariesQuery(realm, queryParams)
-                    .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+                    .apply {
+                        when (sortOrder) {
+                            RoomSortOrder.NAME     -> {
+                                sort(RoomSummaryEntityFields.DISPLAY_NAME, Sort.ASCENDING)
+                            }
+                            RoomSortOrder.ACTIVITY -> {
+                                sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+                            }
+                            RoomSortOrder.NONE     -> {
+                            }
+                        }
+                    }
         }
         val dataSourceFactory = realmDataSourceFactory.map {
             roomSummaryMapper.map(it)
@@ -177,10 +190,22 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
     }
 
     fun getUpdatablePagedRoomSummariesLive(queryParams: RoomSummaryQueryParams,
-                                           pagedListConfig: PagedList.Config): UpdatableLivePageResult {
+                                           pagedListConfig: PagedList.Config,
+                                           sortOrder: RoomSortOrder): UpdatableLivePageResult {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
             roomSummariesQuery(realm, queryParams)
-                    .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+                    .apply {
+                        when (sortOrder) {
+                            RoomSortOrder.NAME     -> {
+                                sort(RoomSummaryEntityFields.DISPLAY_NAME, Sort.ASCENDING)
+                            }
+                            RoomSortOrder.ACTIVITY -> {
+                                sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+                            }
+                            RoomSortOrder.NONE     -> {
+                            }
+                        }
+                    }
         }
         val dataSourceFactory = realmDataSourceFactory.map {
             roomSummaryMapper.map(it)
@@ -197,7 +222,18 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
             override fun updateQuery(builder: (RoomSummaryQueryParams) -> RoomSummaryQueryParams) {
                 realmDataSourceFactory.updateQuery {
                     roomSummariesQuery(it, builder.invoke(queryParams))
-                            .sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+                            .apply {
+                                when (sortOrder) {
+                                    RoomSortOrder.NAME     -> {
+                                        sort(RoomSummaryEntityFields.DISPLAY_NAME, Sort.ASCENDING)
+                                    }
+                                    RoomSortOrder.ACTIVITY -> {
+                                        sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+                                    }
+                                    RoomSortOrder.NONE     -> {
+                                    }
+                                }
+                            }
                 }
             }
         }
@@ -272,7 +308,10 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                     query.contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.activeSpaceId.currentSpaceId)
                 }
             }
-            else                             -> {
+            is ActiveSpaceFilter.ExcludeSpace -> {
+                query.not().contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.activeSpaceId.spaceId)
+            }
+            else                              -> {
                 // nop
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index ba063df375..9ae8b25e5d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -120,7 +120,8 @@ internal class DefaultSpaceService @Inject constructor(
                             avatarUrl = spaceDesc?.avatarUrl ?: "",
                             encryptionEventTs = null,
                             typingUsers = emptyList(),
-                            isEncrypted = false
+                            isEncrypted = false,
+                            flattenParentIds = emptyList()
                     ),
                     second = response.rooms
                             ?.filter { it.roomId != spaceId }
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 8695dafb17..8f9cc852a7 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===98
+enum class===99
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3
diff --git a/vector/sampledata/matrix.json b/vector/sampledata/matrix.json
index 5328ec81b7..c69e0201ad 100644
--- a/vector/sampledata/matrix.json
+++ b/vector/sampledata/matrix.json
@@ -6,6 +6,7 @@
       "message": "William Shakespeare (bapt. 26 April 1564 – 23 April 1616) was an English poet, playwright and actor, widely regarded as the greatest writer in the English language and the world's greatest dramatist. He is often called England's national poet and the \"Bard of Avon\". His extant works, including collaborations, consist of approximately 39 plays, 154 sonnets, two long narrative poems, and a few other verses, some of uncertain authorship. His plays have been translated into every major living language and are performed more often than those of any other playwright.\n\nShakespeare was born and raised in Stratford-upon-Avon, Warwickshire. At the age of 18, he married Anne Hathaway, with whom he had three children: Susanna and twins Hamnet and Judith. Sometime between 1585 and 1592, he began a successful career in London as an actor, writer, and part-owner of a playing company called the Lord Chamberlain's Men, later known as the King's Men. At age 49 (around 1613), he appears to have retired to Stratford, where he died three years later. Few records of Shakespeare's private life survive; this has stimulated considerable speculation about such matters as his physical appearance, his sexuality, his religious beliefs, and whether the works attributed to him were written by others. Such theories are often criticised for failing to adequately note that few records survive of most commoners of the period.\n\nShakespeare produced most of his known works between 1589 and 1613. His early plays were primarily comedies and histories and are regarded as some of the best work produced in these genres. Until about 1608, he wrote mainly tragedies, among them Hamlet, Othello, King Lear, and Macbeth, all considered to be among the finest works in the English language. In the last phase of his life, he wrote tragicomedies (also known as romances) and collaborated with other playwrights.\n\nMany of Shakespeare's plays were published in editions of varying quality and accuracy in his lifetime. However, in 1623, two fellow actors and friends of Shakespeare's, John Heminges and Henry Condell, published a more definitive text known as the First Folio, a posthumous collected edition of Shakespeare's dramatic works that included all but two of his plays. The volume was prefaced with a poem by Ben Jonson, in which Jonson presciently hails Shakespeare in a now-famous quote as \"not of an age, but for all time\".\n\nThroughout the 20th and 21st centuries, Shakespeare's works have been continually adapted and rediscovered by new movements in scholarship and performance. His plays remain popular and are studied, performed, and reinterpreted through various cultural and political contexts around the world.",
       "roomName": "Matrix HQ",
       "roomAlias": "#matrix:matrix.org",
+      "spaceName": "Runner's world",
       "roomTopic": "Welcome to Matrix HQ! Here is the rest of the room topic, with a https://www.example.org url and a phone number: 0102030405 which should not be clickable."
     },
     {
@@ -14,6 +15,7 @@
       "message": "Hello!",
       "roomName": "Room name very loooooooong with some details",
       "roomAlias": "#matrix:matrix.org",
+      "spaceName": "Matrix Org",
       "roomTopic": "Room topic very loooooooong with some details"
     },
     {
@@ -22,6 +24,7 @@
       "message": "How are you?",
       "roomName": "Room name very loooooooong with some details",
       "roomAlias": "#matrix:matrix.org",
+      "spaceName": "Rennes",
       "roomTopic": "Room topic very loooooooong with some details"
     },
     {
@@ -30,6 +33,7 @@
       "message": "Great weather today!",
       "roomName": "Room name very loooooooong with some details",
       "roomAlias": "#matrix:matrix.org",
+      "spaceName": "Est London",
       "roomTopic": "Room topic very loooooooong with some details"
     },
     {
@@ -38,6 +42,7 @@
       "message": "Let's do a picnic",
       "roomName": "Room name very loooooooong with some details",
       "roomAlias": "#matrix:matrix.org",
+      "spaceName": "Element HQ",
       "roomTopic": "Room topic very loooooooong with some details"
     },
     {
@@ -46,6 +51,7 @@
       "message": "Yes, great idea",
       "roomName": "Room name very loooooooong with some details",
       "roomAlias": "#matrix:matrix.org",
+      "spaceName": "My Company",
       "roomTopic": "Room topic very loooooooong with some details"
     }
   ]
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index accf3d89ad..efa1ec7ae6 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -275,6 +275,7 @@
         <activity android:name=".features.spaces.SpacePreviewActivity" />
         <activity android:name=".features.spaces.SpaceExploreActivity" />
         <activity android:name=".features.spaces.SpaceCreationActivity" />
+        <activity android:name=".features.spaces.manage.SpaceManageActivity" />
         <!-- Services -->
 
         <service
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 8900241b88..3329c9d372 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -125,6 +125,7 @@ import im.vector.app.features.spaces.create.ChooseSpaceTypeFragment
 import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
 import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
 import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
+import im.vector.app.features.spaces.manage.SpaceAddRoomFragment
 import im.vector.app.features.spaces.preview.SpacePreviewFragment
 import im.vector.app.features.terms.ReviewTermsFragment
 import im.vector.app.features.usercode.ShowUserCodeFragment
@@ -678,4 +679,9 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(ChoosePrivateSpaceTypeFragment::class)
     fun bindChoosePrivateSpaceTypeFragment(fragment: ChoosePrivateSpaceTypeFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SpaceAddRoomFragment::class)
+    fun bindSpaceAddRoomFragment(fragment: SpaceAddRoomFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index d4b6178860..b6c75beb02 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -82,6 +82,7 @@ import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpaceExploreActivity
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
+import im.vector.app.features.spaces.manage.SpaceManageActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.ui.UiStateRepository
 import im.vector.app.features.usercode.UserCodeActivity
@@ -158,6 +159,7 @@ interface ScreenComponent {
     fun inject(activity: RoomDevToolActivity)
     fun inject(activity: SpaceCreationActivity)
     fun inject(activity: SpaceExploreActivity)
+    fun inject(activity: SpaceManageActivity)
 
     /* ==========================================================================================
      * BottomSheets
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index 765fc730ff..82337a3600 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -35,10 +35,12 @@ import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import im.vector.app.features.roomprofile.RoomProfileActivity
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.spaces.manage.SpaceManageActivity
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
@@ -91,7 +93,9 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
                 .subscribe { powerLevelContent ->
                     val powerLevelsHelper = PowerLevelsHelper(powerLevelContent)
                     val canInvite = powerLevelsHelper.isUserAbleToInvite(session.myUserId)
+                    val canAddChild = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_SPACE_CHILD)
                     views.invitePeople.isVisible = canInvite
+                    views.addRooms.isVisible = canAddChild
                 }.disposeOnDestroyView()
 
         views.invitePeople.views.bottomSheetActionClickableZone.debouncedClicks {
@@ -112,6 +116,10 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
             startActivity(SpaceExploreActivity.newIntent(requireContext(), spaceArgs.spaceId))
         }
 
+        views.addRooms.views.bottomSheetActionClickableZone.debouncedClicks {
+            startActivity(SpaceManageActivity.newIntent(requireContext(), spaceArgs.spaceId))
+        }
+
         views.leaveSpace.views.bottomSheetActionClickableZone.debouncedClicks {
             AlertDialog.Builder(requireContext())
                     .setMessage(getString(R.string.space_leave_prompt_msg))
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
new file mode 100644
index 0000000000..cc6ebe0f60
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import androidx.recyclerview.widget.DiffUtil
+import com.airbnb.epoxy.EpoxyModel
+import com.airbnb.epoxy.paging.PagedListEpoxyController
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.core.utils.createUIHandler
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class AddRoomListController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer
+) : PagedListEpoxyController<RoomSummary>(
+        // Important it must match the PageList builder notify Looper
+        modelBuildingHandler = createUIHandler(),
+
+        itemDiffCallback = object : DiffUtil.ItemCallback<RoomSummary>() {
+
+            override fun areItemsTheSame(oldItem: RoomSummary, newItem: RoomSummary): Boolean {
+                return oldItem.roomId == newItem.roomId
+            }
+
+            override fun areContentsTheSame(oldItem: RoomSummary, newItem: RoomSummary): Boolean {
+                // for this use case we can test less things
+                return oldItem.displayName == newItem.displayName
+                        && oldItem.avatarUrl == newItem.avatarUrl
+            }
+        }
+) {
+
+    interface Listener {
+        fun onItemSelected(roomSummary: RoomSummary)
+    }
+
+    var listener: Listener? = null
+    var ignoreRooms: List<String>? = null
+
+    var selectedItems: Map<String, Boolean> = emptyMap()
+        set(value) {
+            field = value
+            // mmm annoying but can't just force for a given model
+            requestForcedModelBuild()
+        }
+
+    override fun addModels(models: List<EpoxyModel<*>>) {
+        if (ignoreRooms == null) {
+            super.addModels(models)
+        } else {
+            super.addModels(
+                    models.filter {
+                        it !is RoomSelectionItem ||  !ignoreRooms!!.contains(it.matrixItem.id)
+                    }
+            )
+        }
+    }
+
+    override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
+        if (item == null) return RoomSelectionPlaceHolderItem_().apply { id(currentPosition) }
+        return RoomSelectionItem_().apply {
+            id(item.roomId)
+            matrixItem(item.toMatrixItem())
+            avatarRenderer(this@AddRoomListController.avatarRenderer)
+            space(item.roomType == RoomType.SPACE)
+            selected(selectedItems[item.roomId] ?: false)
+            itemClickListener(DebouncedClickListener({
+                listener?.onItemSelected(item)
+            }))
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/RoomSelectionItem.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/RoomSelectionItem.kt
new file mode 100644
index 0000000000..02c5f38226
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/RoomSelectionItem.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_room_to_add_in_space)
+abstract class RoomSelectionItem : VectorEpoxyModel<RoomSelectionItem.Holder>() {
+
+    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute var space: Boolean = false
+    @EpoxyAttribute var selected: Boolean = false
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemClickListener: View.OnClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        if (space) {
+            avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
+        } else {
+            avatarRenderer.render(matrixItem, holder.avatarImageView)
+        }
+        holder.titleText.text = matrixItem.getBestName()
+
+        if (selected) {
+            holder.checkboxImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_checkbox_on))
+            holder.checkboxImage.contentDescription = holder.view.context.getString(R.string.a11y_checked)
+        } else {
+            holder.checkboxImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_checkbox_off))
+            holder.checkboxImage.contentDescription = holder.view.context.getString(R.string.a11y_unchecked)
+        }
+
+        holder.view.setOnClickListener {
+            itemClickListener?.onClick(it)
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.itemAddRoomRoomAvatar)
+        val titleText by bind<TextView>(R.id.itemAddRoomRoomNameText)
+        val checkboxImage by bind<ImageView>(R.id.itemAddRoomRoomCheckBox)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/RoomSelectionPlaceHolderItem.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/RoomSelectionPlaceHolderItem.kt
new file mode 100644
index 0000000000..7c116811b4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/RoomSelectionPlaceHolderItem.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+
+@EpoxyModelClass(layout = R.layout.item_room_to_add_in_space_placeholder)
+abstract class RoomSelectionPlaceHolderItem : VectorEpoxyModel<RoomSelectionPlaceHolderItem.Holder>() {
+    class Holder : VectorEpoxyHolder()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomActions.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomActions.kt
new file mode 100644
index 0000000000..502d63cf89
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomActions.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+sealed class SpaceAddRoomActions : VectorViewModelAction {
+    data class UpdateFilter(val filter: String) : SpaceAddRoomActions()
+    data class ToggleSelection(val roomSummary: RoomSummary) : SpaceAddRoomActions()
+    object Save : SpaceAddRoomActions()
+//    object HandleBack : SpaceAddRoomActions()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
new file mode 100644
index 0000000000..ee14aec120
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import com.jakewharton.rxbinding3.appcompat.queryTextChanges
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentSpaceAddRoomsBinding
+import io.reactivex.rxkotlin.subscribeBy
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class SpaceAddRoomFragment @Inject constructor(
+        private val epoxyController: AddRoomListController,
+        private val viewModelFactory: SpaceAddRoomsViewModel.Factory
+) : VectorBaseFragment<FragmentSpaceAddRoomsBinding>(),
+        OnBackPressed, AddRoomListController.Listener, SpaceAddRoomsViewModel.Factory {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
+            FragmentSpaceAddRoomsBinding.inflate(layoutInflater, container, false)
+
+    private val viewModel by fragmentViewModel(SpaceAddRoomsViewModel::class)
+
+    private val sharedViewModel: SpaceManageSharedViewModel by activityViewModel()
+
+    override fun create(initialState: SpaceAddRoomsState): SpaceAddRoomsViewModel =
+            viewModelFactory.create(initialState)
+
+    override fun getMenuRes(): Int = R.menu.menu_space_add_room
+
+    private var saveNeeded = false
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        vectorBaseActivity.setSupportActionBar(views.addRoomToSpaceToolbar)
+
+        vectorBaseActivity.supportActionBar?.let {
+            it.setDisplayShowHomeEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+        }
+
+//        sharedActionViewModel = activityViewModelProvider.get(RoomDirectorySharedActionViewModel::class.java)
+        setupRecyclerView()
+
+        views.publicRoomsFilter.queryTextChanges()
+                .debounce(100, TimeUnit.MILLISECONDS)
+                .subscribeBy {
+                    viewModel.handle(SpaceAddRoomActions.UpdateFilter(it.toString()))
+                }
+                .disposeOnDestroyView()
+
+        viewModel.selectionListLiveData.observe(viewLifecycleOwner) {
+            epoxyController.selectedItems = it
+            saveNeeded = it.values.any { it }
+            invalidateOptionsMenu()
+        }
+
+        viewModel.selectSubscribe(this, SpaceAddRoomsState::spaceName) {
+            views.appBarSpaceInfo.text = it
+        }.disposeOnDestroyView()
+
+        viewModel.selectSubscribe(this, SpaceAddRoomsState::ignoreRooms) {
+            epoxyController.ignoreRooms = it
+        }.disposeOnDestroyView()
+
+        viewModel.selectSubscribe(this, SpaceAddRoomsState::isSaving) {
+            if (it is Loading) {
+                sharedViewModel.handle(SpaceManagedSharedAction.ShowLoading)
+            } else {
+                sharedViewModel.handle(SpaceManagedSharedAction.HideLoading)
+            }
+        }.disposeOnDestroyView()
+
+//        views.createNewRoom.debouncedClicks {
+//            sharedActionViewModel.post(RoomDirectorySharedAction.CreateRoom)
+//        }
+
+        viewModel.observeViewEvents {
+            when (it) {
+                SpaceAddRoomsViewEvents.WarnUnsavedChanged -> {
+                    AlertDialog.Builder(requireContext())
+                            .setTitle(R.string.dialog_title_warning)
+                            .setMessage(R.string.warning_unsaved_change)
+                            .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
+                                sharedViewModel.handle(SpaceManagedSharedAction.HandleBack)
+                            }
+                            .setNegativeButton(R.string.cancel, null)
+                            .show()
+                }
+                SpaceAddRoomsViewEvents.SaveFailed -> {
+                    invalidateOptionsMenu()
+                }
+                SpaceAddRoomsViewEvents.SavedDone -> {
+                    sharedViewModel.handle(SpaceManagedSharedAction.HandleBack)
+                }
+            }
+        }
+    }
+
+    override fun invalidate() = withState(viewModel) {
+        super.invalidate()
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        super.onPrepareOptionsMenu(menu)
+        menu.findItem(R.id.spaceAddRoomSaveItem).isVisible = saveNeeded
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.spaceAddRoomSaveItem) {
+            viewModel.handle(SpaceAddRoomActions.Save)
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onDestroyView() {
+        views.roomList.cleanup()
+        epoxyController.listener = null
+        super.onDestroyView()
+    }
+
+    private fun setupRecyclerView() {
+        views.roomList.configureWith(epoxyController, showDivider = true)
+        epoxyController.listener = this
+        viewModel.updatableLivePageResult.livePagedList.observe(viewLifecycleOwner) {
+            epoxyController.submitList(it)
+        }
+    }
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        if (viewModel.canGoBack()) {
+            sharedViewModel.handle(SpaceManagedSharedAction.HandleBack)
+        }
+        return true
+    }
+
+    override fun onItemSelected(roomSummary: RoomSummary) {
+        viewModel.handle(SpaceAddRoomActions.ToggleSelection(roomSummary))
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsState.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsState.kt
new file mode 100644
index 0000000000..6ce3468fe1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsState.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+
+data class SpaceAddRoomsState(
+        // The current filter
+        val spaceId: String = "",
+        val currentFilter: String = "",
+        val spaceName: String = "",
+        val ignoreRooms: List<String> = emptyList(),
+        val isSaving: Async<List<String>> = Uninitialized
+//        val selectionList: Map<String, Boolean> = emptyMap()
+) : MvRxState {
+    constructor(args: SpaceManageArgs) : this(
+            spaceId = args.spaceId
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewEvents.kt
new file mode 100644
index 0000000000..f0bc0cecc2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewEvents.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SpaceAddRoomsViewEvents : VectorViewEvents {
+    object WarnUnsavedChanged : SpaceAddRoomsViewEvents()
+    object SavedDone : SpaceAddRoomsViewEvents()
+    object SaveFailed : SpaceAddRoomsViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
new file mode 100644
index 0000000000..e90fc3754c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
+import androidx.paging.PagedList
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.RoomSortOrder
+import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+
+class AddRoomError(val errorList: Map<String, Throwable>) : Throwable()
+
+class SpaceAddRoomsViewModel @AssistedInject constructor(
+        @Assisted val initialState: SpaceAddRoomsState,
+        private val session: Session
+) : VectorViewModel<SpaceAddRoomsState, SpaceAddRoomActions, SpaceAddRoomsViewEvents>(initialState) {
+
+    val updatableLivePageResult: UpdatableLivePageResult by lazy {
+        session.getFilteredPagedRoomSummariesLive(
+                roomSummaryQueryParams {
+                    this.memberships = listOf(Membership.JOIN)
+                    this.excludeType = null
+                    this.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                    this.activeSpaceId = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
+                    this.displayName = QueryStringValue.Contains(initialState.currentFilter, QueryStringValue.Case.INSENSITIVE)
+                },
+                pagedListConfig = PagedList.Config.Builder()
+                        .setPageSize(10)
+                        .setInitialLoadSizeHint(20)
+                        .setEnablePlaceholders(true)
+                        .setPrefetchDistance(10)
+                        .build(),
+                sortOrder = RoomSortOrder.NAME
+        )
+    }
+
+    private val selectionList = mutableMapOf<String, Boolean>()
+    val selectionListLiveData = MutableLiveData<Map<String, Boolean>>()
+
+    init {
+        val spaceSummary = session.getRoomSummary(initialState.spaceId)
+        setState {
+            copy(
+                    spaceName = spaceSummary?.displayName ?: "",
+                    ignoreRooms = (spaceSummary?.flattenParentIds ?: emptyList()) + listOf(initialState.spaceId)
+            )
+        }
+    }
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: SpaceAddRoomsState): SpaceAddRoomsViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SpaceAddRoomsViewModel, SpaceAddRoomsState> {
+        override fun create(viewModelContext: ViewModelContext, state: SpaceAddRoomsState): SpaceAddRoomsViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    fun canGoBack(): Boolean {
+        val needToSave = selectionList.values.any { it }
+        if (needToSave) {
+            _viewEvents.post(SpaceAddRoomsViewEvents.WarnUnsavedChanged)
+        }
+        return !needToSave
+    }
+
+    override fun handle(action: SpaceAddRoomActions) {
+        when (action) {
+            is SpaceAddRoomActions.UpdateFilter -> {
+                updatableLivePageResult.updateQuery {
+                    it.copy(
+                            displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
+                    )
+                }
+                setState {
+                    copy(
+                            currentFilter = action.filter
+                    )
+                }
+            }
+            is SpaceAddRoomActions.ToggleSelection -> {
+                selectionList[action.roomSummary.roomId] = (selectionList[action.roomSummary.roomId] ?: false).not()
+                selectionListLiveData.postValue(selectionList.toMap())
+            }
+            SpaceAddRoomActions.Save -> {
+                doAddSelectedRooms()
+            }
+        }
+    }
+
+    private fun doAddSelectedRooms() {
+        val childrenToAdd = selectionList.filter { it.value }.keys
+        if (childrenToAdd.isEmpty()) return // should not happen
+
+        setState {
+            copy(
+                    isSaving = Loading()
+            )
+        }
+        viewModelScope.launch {
+            val errors = mutableMapOf<String, Throwable>()
+            val completed = mutableListOf<String>()
+            childrenToAdd.forEach { roomId ->
+                try {
+                    session.spaceService().getSpace(initialState.spaceId)!!.addChildren(
+                            roomId = roomId,
+                            viaServers = listOf(session.sessionParams.homeServerHost ?: ""),
+                            order = null
+                    )
+                    completed.add(roomId)
+                } catch (failure: Throwable) {
+                    errors[roomId] = failure
+                }
+            }
+            if (errors.isEmpty()) {
+                // success
+                withContext(Dispatchers.Main) {
+                    setState {
+                        copy(
+                                isSaving = Success(childrenToAdd.toList())
+                        )
+                    }
+                    completed.forEach {
+                        selectionList.remove(it)
+                    }
+                    _viewEvents.post(SpaceAddRoomsViewEvents.SavedDone)
+                }
+            } else if (errors.size < childrenToAdd.size) {
+                // partial success
+                withContext(Dispatchers.Main) {
+                    setState {
+                        copy(
+                                isSaving = Success(completed)
+                        )
+                    }
+                    completed.forEach {
+                        selectionList.remove(it)
+                    }
+                    _viewEvents.post(SpaceAddRoomsViewEvents.SavedDone)
+                }
+            } else {
+                // error
+                withContext(Dispatchers.Main) {
+                    setState {
+                        copy(
+                                isSaving = Fail(AddRoomError(errors))
+                        )
+                    }
+                    _viewEvents.post(SpaceAddRoomsViewEvents.SaveFailed)
+                }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
new file mode 100644
index 0000000000..25c659e66f
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.os.Parcelable
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.MvRx
+import com.airbnb.mvrx.viewModel
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivitySimpleBinding
+import kotlinx.parcelize.Parcelize
+import javax.inject.Inject
+
+@Parcelize
+data class SpaceManageArgs(
+        val spaceId: String
+) : Parcelable
+
+class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceManageSharedViewModel.Factory {
+
+    @Inject lateinit var sharedViewModelFactory: SpaceManageSharedViewModel.Factory
+
+    override fun injectWith(injector: ScreenComponent) {
+        injector.inject(this)
+    }
+
+    override fun getBinding(): ActivitySimpleBinding = ActivitySimpleBinding.inflate(layoutInflater)
+
+    override fun getTitleRes(): Int = R.string.space_add_existing_rooms
+
+    val sharedViewModel: SpaceManageSharedViewModel by viewModel()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (isFirstCreation()) {
+            val simpleName = SpaceAddRoomFragment::class.java.simpleName
+            val args = intent?.getParcelableExtra<SpaceManageArgs>(MvRx.KEY_ARG)
+            if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
+                supportFragmentManager.commitTransaction {
+                    replace(R.id.simpleFragmentContainer,
+                            SpaceAddRoomFragment::class.java,
+                            Bundle().apply { this.putParcelable(MvRx.KEY_ARG, args) },
+                            simpleName
+                    )
+                }
+            }
+        }
+
+        sharedViewModel.observeViewEvents {
+            when (it) {
+                SpaceManagedSharedViewEvents.Finish -> {
+                    finish()
+                }
+                SpaceManagedSharedViewEvents.HideLoading -> {
+                    views.simpleActivityWaitingView.isVisible = false
+                }
+                SpaceManagedSharedViewEvents.ShowLoading -> {
+                    views.simpleActivityWaitingView.isVisible = true
+                }
+            }
+        }
+    }
+
+    companion object {
+        fun newIntent(context: Context, spaceId: String): Intent {
+            return Intent(context, SpaceManageActivity::class.java).apply {
+                putExtra(MvRx.KEY_ARG, SpaceManageArgs(spaceId))
+            }
+        }
+    }
+
+    override fun create(initialState: SpaceManageViewState) = sharedViewModelFactory.create(initialState)
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
new file mode 100644
index 0000000000..1d8612f084
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+
+class SpaceManageSharedViewModel @AssistedInject constructor(
+        @Assisted initialState: SpaceManageViewState,
+        private val session: Session
+) : VectorViewModel<SpaceManageViewState, SpaceManagedSharedAction, SpaceManagedSharedViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: SpaceManageViewState): SpaceManageSharedViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SpaceManageSharedViewModel, SpaceManageViewState> {
+        override fun create(viewModelContext: ViewModelContext, state: SpaceManageViewState): SpaceManageSharedViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    override fun handle(action: SpaceManagedSharedAction) {
+        when (action) {
+            SpaceManagedSharedAction.HandleBack -> {
+                // for now finish
+                _viewEvents.post(SpaceManagedSharedViewEvents.Finish)
+            }
+            SpaceManagedSharedAction.HideLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading)
+            SpaceManagedSharedAction.ShowLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
new file mode 100644
index 0000000000..18c289f3b3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.mvrx.MvRxState
+
+data class SpaceManageViewState(
+        val spaceId: String = ""
+) : MvRxState {
+    constructor(args: SpaceManageArgs) : this(
+            spaceId = args.spaceId
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
new file mode 100644
index 0000000000..f3d7104d71
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class SpaceManagedSharedAction : VectorViewModelAction {
+    object HandleBack : SpaceManagedSharedAction()
+    object ShowLoading: SpaceManagedSharedAction()
+    object HideLoading: SpaceManagedSharedAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
new file mode 100644
index 0000000000..b1a35c3700
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SpaceManagedSharedViewEvents : VectorViewEvents {
+    object Finish : SpaceManagedSharedViewEvents()
+    object ShowLoading: SpaceManagedSharedViewEvents()
+    object HideLoading: SpaceManagedSharedViewEvents()
+}
diff --git a/vector/src/main/res/drawable/ic_checkbox_off.xml b/vector/src/main/res/drawable/ic_checkbox_off.xml
new file mode 100644
index 0000000000..d960c56a44
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_checkbox_off.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M4,0.75L12,0.75A3.25,3.25 0,0 1,15.25 4L15.25,12A3.25,3.25 0,0 1,12 15.25L4,15.25A3.25,3.25 0,0 1,0.75 12L0.75,4A3.25,3.25 0,0 1,4 0.75z"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#8D99A5"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_checkbox_on.xml b/vector/src/main/res/drawable/ic_checkbox_on.xml
new file mode 100644
index 0000000000..d152dccc29
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_checkbox_on.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M4,0.75L12,0.75A3.25,3.25 0,0 1,15.25 4L15.25,12A3.25,3.25 0,0 1,12 15.25L4,15.25A3.25,3.25 0,0 1,0.75 12L0.75,4A3.25,3.25 0,0 1,4 0.75z"
+      android:strokeWidth="1.5"
+      android:fillColor="#03B381"
+      android:strokeColor="#03B381"/>
+  <path
+      android:pathData="M12,5.5L6.5,11L4,8.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 35e631326f..053a326b03 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -111,6 +111,18 @@
         app:titleTextColor="?attr/riotx_text_primary"
         tools:actionDescription="" />
 
+
+    <im.vector.app.core.ui.views.BottomSheetActionButton
+        android:id="@+id/addRooms"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:actionTitle="@string/space_add_child_title"
+        app:leftIcon="@drawable/ic_add_black"
+        app:tint="?attr/riotx_text_primary"
+        app:titleTextColor="?attr/riotx_text_primary"
+        tools:actionDescription="" />
+
+
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/leaveSpace"
         android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
new file mode 100644
index 0000000000..ab2351f814
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/roomList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?riotx_header_panel_background"
+        android:overScrollMode="always"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/item_room_to_add_in_space" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        style="@style/VectorAppBarLayoutStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="4dp">
+
+        <!-- minHeight="0dp" is important to collapse on scroll -->
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/addRoomToSpaceToolbar"
+            style="@style/VectorToolbarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:elevation="4dp"
+            android:minHeight="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|start"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/appBarTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:ellipsize="end"
+                    android:gravity="start|center"
+                    android:maxLines="1"
+                    android:text="@string/space_add_existing_rooms"
+                    android:textColor="?riotx_text_primary"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/appBarSpaceInfo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:ellipsize="end"
+                    android:gravity="start|center"
+                    android:maxLines="1"
+                    android:textColor="?riotx_text_secondary"
+                    android:textSize="16sp"
+                    tools:text="@sample/matrix.json/data/spaceName" />
+
+            </LinearLayout>
+
+        </androidx.appcompat.widget.Toolbar>
+
+
+        <androidx.appcompat.widget.SearchView
+            android:id="@+id/publicRoomsFilter"
+            style="@style/VectorSearchView"
+            android:layout_width="match_parent"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
+            app:queryHint="@string/search_hint_room_name" />
+
+        <!--        <com.google.android.material.button.MaterialButton-->
+        <!--            android:id="@+id/createNewRoom"-->
+        <!--            style="@style/VectorButtonStyleText"-->
+        <!--            android:layout_width="wrap_content"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginStart="16dp"-->
+        <!--            android:layout_marginTop="8dp"-->
+        <!--            android:layout_marginBottom="8dp"-->
+        <!--            android:minHeight="@dimen/layout_touch_size"-->
+        <!--            android:text="@string/create_new_room"-->
+        <!--            app:icon="@drawable/ic_plus_circle"-->
+        <!--            app:iconPadding="13dp"-->
+        <!--            app:iconTint="@color/riotx_accent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar" />-->
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space.xml b/vector/src/main/res/layout/item_room_to_add_in_space.xml
new file mode 100644
index 0000000000..7d1c04468c
--- /dev/null
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemPublicRoomLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    android:minHeight="50dp">
+
+    <ImageView
+        android:id="@+id/itemAddRoomRoomAvatar"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="16dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/itemAddRoomRoomNameText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="17dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
+        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@sample/matrix.json/data/roomName" />
+
+    <ImageView
+        android:id="@+id/itemAddRoomRoomCheckBox"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginEnd="16dp"
+        android:contentDescription="@string/a11y_checked"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_checkbox_on" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml b/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml
new file mode 100644
index 0000000000..9ddce4ba18
--- /dev/null
+++ b/vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemPublicRoomLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background"
+    android:clickable="true"
+    android:focusable="true"
+    android:minHeight="50dp">
+
+    <ImageView
+        android:id="@+id/itemAddRoomRoomAvatar"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="16dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/header_panel_round_background"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/itemAddRoomRoomNameText"
+        android:layout_width="0dp"
+        android:layout_height="16sp"
+        android:layout_marginStart="17dp"
+        android:layout_marginEnd="40dp"
+        android:background="@drawable/rounded_rect_shape_8"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@sample/matrix.json/data/roomName" />
+
+    <!--    <ImageView-->
+    <!--        android:id="@+id/itemAddRoomRoomCheckBox"-->
+    <!--        android:layout_width="20dp"-->
+    <!--        android:layout_height="20dp"-->
+    <!--        android:layout_marginEnd="16dp"-->
+    <!--        android:importantForAccessibility="no"-->
+    <!--        android:src="@drawable/ic_checkbox_off"-->
+    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--        app:layout_constraintEnd_toEndOf="parent"-->
+    <!--        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"-->
+    <!--        app:layout_constraintTop_toTopOf="parent" />-->
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_space_add_room.xml b/vector/src/main/res/menu/menu_space_add_room.xml
new file mode 100644
index 0000000000..d4016536a6
--- /dev/null
+++ b/vector/src/main/res/menu/menu_space_add_room.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/spaceAddRoomSaveItem"
+        android:title="@string/save"
+        app:iconTint="?attr/colorAccent"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 4bc0424c32..60683ba862 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2193,6 +2193,8 @@
     <string name="room_directory_search_hint">Name or ID (#example:matrix.org)</string>
     <string name="user_directory_search_hint">Search by name or ID</string>
 
+    <string name="search_hint_room_name">Search Name</string>
+
     <string name="labs_swipe_to_reply_in_timeline">Enable swipe to reply in timeline</string>
     <string name="labs_show_unread_notifications_as_tab">Add a dedicated tab for unread notifications on main screen.</string>
 
@@ -3329,6 +3331,10 @@
     </plurals>
 
     <string name="space_explore_activity_title">Explore rooms</string>
+    <string name="space_add_child_title">Add rooms</string>
     <string name="leave_space">Leave Space</string>
     <string name="space_leave_prompt_msg">Are you sure you want to leave the space?</string>
+
+
+    <string name="space_add_existing_rooms">Add existing rooms and space</string>
 </resources>

From 4d7aeff54a9b012376b9ad85cb4ac6e5f2b93597 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Sat, 17 Apr 2021 09:03:41 +0200
Subject: [PATCH 170/350] Code review

---
 .../internal/query/QueryRoomOrderProcessor.kt | 37 ++++++++++++++++
 .../query/QueryStringValueProcessor.kt        | 16 +++----
 .../room/summary/RoomSummaryDataSource.kt     | 42 ++-----------------
 .../spaces/manage/SpaceAddRoomFragment.kt     |  8 +---
 .../spaces/manage/SpaceAddRoomsViewEvents.kt  |  2 +-
 .../spaces/manage/SpaceAddRoomsViewModel.kt   |  8 +++-
 6 files changed, 57 insertions(+), 56 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
new file mode 100644
index 0000000000..7a06c2129c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryRoomOrderProcessor.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.query
+
+import io.realm.RealmQuery
+import io.realm.Sort
+import org.matrix.android.sdk.api.session.room.RoomSortOrder
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
+import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
+
+internal fun RealmQuery<RoomSummaryEntity>.process(sortOrder: RoomSortOrder): RealmQuery<RoomSummaryEntity> {
+    when (sortOrder) {
+        RoomSortOrder.NAME     -> {
+            sort(RoomSummaryEntityFields.DISPLAY_NAME, Sort.ASCENDING)
+        }
+        RoomSortOrder.ACTIVITY -> {
+            sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
+        }
+        RoomSortOrder.NONE     -> {
+        }
+    }
+    return this
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
index 899024458a..c49efaaeef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
@@ -16,21 +16,21 @@
 
 package org.matrix.android.sdk.internal.query
 
-import org.matrix.android.sdk.api.query.QueryStringValue
 import io.realm.Case
 import io.realm.RealmObject
 import io.realm.RealmQuery
+import org.matrix.android.sdk.api.query.QueryStringValue
 import timber.log.Timber
 
 fun <T : RealmObject> RealmQuery<T>.process(field: String, queryStringValue: QueryStringValue): RealmQuery<T> {
     when (queryStringValue) {
         is QueryStringValue.NoCondition -> Timber.v("No condition to process")
-        is QueryStringValue.IsNotNull   -> isNotNull(field)
-        is QueryStringValue.IsNull      -> isNull(field)
-        is QueryStringValue.IsEmpty     -> isEmpty(field)
-        is QueryStringValue.IsNotEmpty  -> isNotEmpty(field)
-        is QueryStringValue.Equals      -> equalTo(field, queryStringValue.string, queryStringValue.case.toRealmCase())
-        is QueryStringValue.Contains    -> contains(field, queryStringValue.string, queryStringValue.case.toRealmCase())
+        is QueryStringValue.IsNotNull -> isNotNull(field)
+        is QueryStringValue.IsNull -> isNull(field)
+        is QueryStringValue.IsEmpty -> isEmpty(field)
+        is QueryStringValue.IsNotEmpty -> isNotEmpty(field)
+        is QueryStringValue.Equals -> equalTo(field, queryStringValue.string, queryStringValue.case.toRealmCase())
+        is QueryStringValue.Contains -> contains(field, queryStringValue.string, queryStringValue.case.toRealmCase())
     }
     return this
 }
@@ -38,6 +38,6 @@ fun <T : RealmObject> RealmQuery<T>.process(field: String, queryStringValue: Que
 private fun QueryStringValue.Case.toRealmCase(): Case {
     return when (this) {
         QueryStringValue.Case.INSENSITIVE -> Case.INSENSITIVE
-        QueryStringValue.Case.SENSITIVE   -> Case.SENSITIVE
+        QueryStringValue.Case.SENSITIVE -> Case.SENSITIVE
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 06f84066be..8b1fd2f404 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -166,19 +166,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                                         pagedListConfig: PagedList.Config,
                                         sortOrder: RoomSortOrder): LiveData<PagedList<RoomSummary>> {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
-            roomSummariesQuery(realm, queryParams)
-                    .apply {
-                        when (sortOrder) {
-                            RoomSortOrder.NAME     -> {
-                                sort(RoomSummaryEntityFields.DISPLAY_NAME, Sort.ASCENDING)
-                            }
-                            RoomSortOrder.ACTIVITY -> {
-                                sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
-                            }
-                            RoomSortOrder.NONE     -> {
-                            }
-                        }
-                    }
+            roomSummariesQuery(realm, queryParams).process(sortOrder)
         }
         val dataSourceFactory = realmDataSourceFactory.map {
             roomSummaryMapper.map(it)
@@ -193,19 +181,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                                            pagedListConfig: PagedList.Config,
                                            sortOrder: RoomSortOrder): UpdatableLivePageResult {
         val realmDataSourceFactory = monarchy.createDataSourceFactory { realm ->
-            roomSummariesQuery(realm, queryParams)
-                    .apply {
-                        when (sortOrder) {
-                            RoomSortOrder.NAME     -> {
-                                sort(RoomSummaryEntityFields.DISPLAY_NAME, Sort.ASCENDING)
-                            }
-                            RoomSortOrder.ACTIVITY -> {
-                                sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
-                            }
-                            RoomSortOrder.NONE     -> {
-                            }
-                        }
-                    }
+            roomSummariesQuery(realm, queryParams).process(sortOrder)
         }
         val dataSourceFactory = realmDataSourceFactory.map {
             roomSummaryMapper.map(it)
@@ -221,19 +197,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
 
             override fun updateQuery(builder: (RoomSummaryQueryParams) -> RoomSummaryQueryParams) {
                 realmDataSourceFactory.updateQuery {
-                    roomSummariesQuery(it, builder.invoke(queryParams))
-                            .apply {
-                                when (sortOrder) {
-                                    RoomSortOrder.NAME     -> {
-                                        sort(RoomSummaryEntityFields.DISPLAY_NAME, Sort.ASCENDING)
-                                    }
-                                    RoomSortOrder.ACTIVITY -> {
-                                        sort(RoomSummaryEntityFields.LAST_ACTIVITY_TIME, Sort.DESCENDING)
-                                    }
-                                    RoomSortOrder.NONE     -> {
-                                    }
-                                }
-                            }
+                    roomSummariesQuery(it, builder.invoke(queryParams)).process(sortOrder)
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
index ee14aec120..dc55373b36 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
@@ -26,7 +26,6 @@ import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
-import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.appcompat.queryTextChanges
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
@@ -117,7 +116,8 @@ class SpaceAddRoomFragment @Inject constructor(
                             .setNegativeButton(R.string.cancel, null)
                             .show()
                 }
-                SpaceAddRoomsViewEvents.SaveFailed -> {
+                is SpaceAddRoomsViewEvents.SaveFailed -> {
+                    showErrorInSnackbar(it.reason)
                     invalidateOptionsMenu()
                 }
                 SpaceAddRoomsViewEvents.SavedDone -> {
@@ -127,10 +127,6 @@ class SpaceAddRoomFragment @Inject constructor(
         }
     }
 
-    override fun invalidate() = withState(viewModel) {
-        super.invalidate()
-    }
-
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
         menu.findItem(R.id.spaceAddRoomSaveItem).isVisible = saveNeeded
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewEvents.kt
index f0bc0cecc2..cb5571b107 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewEvents.kt
@@ -21,5 +21,5 @@ import im.vector.app.core.platform.VectorViewEvents
 sealed class SpaceAddRoomsViewEvents : VectorViewEvents {
     object WarnUnsavedChanged : SpaceAddRoomsViewEvents()
     object SavedDone : SpaceAddRoomsViewEvents()
-    object SaveFailed : SpaceAddRoomsViewEvents()
+    data class SaveFailed(val reason: Throwable): SpaceAddRoomsViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index e90fc3754c..692f4343ba 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -42,7 +42,11 @@ import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 
-class AddRoomError(val errorList: Map<String, Throwable>) : Throwable()
+class AddRoomError(val errorList: Map<String, Throwable>) : Throwable() {
+    override fun getLocalizedMessage(): String? {
+        return errorList.map { it.value.localizedMessage }.joinToString(",")
+    }
+}
 
 class SpaceAddRoomsViewModel @AssistedInject constructor(
         @Assisted val initialState: SpaceAddRoomsState,
@@ -186,7 +190,7 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
                                 isSaving = Fail(AddRoomError(errors))
                         )
                     }
-                    _viewEvents.post(SpaceAddRoomsViewEvents.SaveFailed)
+                    _viewEvents.post(SpaceAddRoomsViewEvents.SaveFailed(AddRoomError(errors)))
                 }
             }
         }

From 7921a81b8e17329da4fccdd27306043825784d1b Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 19 Apr 2021 10:39:01 +0200
Subject: [PATCH 171/350] better management of collapsing for room controllers

---
 .../list/CollapsableControllerExtension.kt    | 32 +++++++
 .../list/CollapsableTypedEpoxyController.kt   | 83 +++++++++++++++++++
 .../home/room/list/RoomListFragment.kt        | 20 ++---
 .../room/list/RoomSummaryListController.kt    |  3 +-
 .../room/list/RoomSummaryPagedController.kt   | 38 ++++-----
 .../list/RoomSummaryPagedControllerFactory.kt | 36 ++++++++
 6 files changed, 177 insertions(+), 35 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/CollapsableControllerExtension.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableControllerExtension.kt b/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableControllerExtension.kt
new file mode 100644
index 0000000000..bd622faae1
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableControllerExtension.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.epoxy.EpoxyController
+import timber.log.Timber
+
+fun EpoxyController.setCollapsed(collapsed: Boolean) {
+    if (this is CollapsableControllerExtension) {
+        this.collapsed = collapsed
+    } else {
+        Timber.w("Try to collapse a controller that do not support collapse state")
+    }
+}
+
+interface CollapsableControllerExtension {
+    var collapsed: Boolean
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt
new file mode 100644
index 0000000000..19d718a3c7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/CollapsableTypedEpoxyController.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.epoxy.EpoxyController
+
+abstract class CollapsableTypedEpoxyController<T>
+    : EpoxyController(), CollapsableControllerExtension {
+
+    private var currentData: T? = null
+    private var allowModelBuildRequests = false
+
+    override var collapsed: Boolean = false
+        set(value) {
+            if (field != value) {
+                field = value
+                allowModelBuildRequests = true
+                requestModelBuild()
+                allowModelBuildRequests = false
+            }
+        }
+
+    fun setData(data: T?) {
+        currentData = data
+        allowModelBuildRequests = true
+        requestModelBuild()
+        allowModelBuildRequests = false
+    }
+
+    override fun requestModelBuild() {
+        check(allowModelBuildRequests) {
+            ("You cannot call `requestModelBuild` directly. Call `setData` instead to trigger a "
+                    + "model refresh with new data.")
+        }
+        super.requestModelBuild()
+    }
+
+    override fun moveModel(fromPosition: Int, toPosition: Int) {
+        allowModelBuildRequests = true
+        super.moveModel(fromPosition, toPosition)
+        allowModelBuildRequests = false
+    }
+
+    override fun requestDelayedModelBuild(delayMs: Int) {
+        check(allowModelBuildRequests) {
+            ("You cannot call `requestModelBuild` directly. Call `setData` instead to trigger a "
+                    + "model refresh with new data.")
+        }
+        super.requestDelayedModelBuild(delayMs)
+    }
+
+    fun getCurrentData(): T? {
+        return currentData
+    }
+
+    override fun buildModels() {
+        check(isBuildingModels()) {
+            ("You cannot call `buildModels` directly. Call `setData` instead to trigger a model "
+                    + "refresh with new data.")
+        }
+        if (collapsed) {
+            buildModels(null)
+        } else {
+            buildModels(currentData)
+        }
+    }
+
+    protected abstract fun buildModels(data: T?)
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 6147be462a..eb931f9e9c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -108,10 +108,10 @@ class RoomListFragment @Inject constructor(
         sharedActionViewModel = activityViewModelProvider.get(RoomListQuickActionsSharedActionViewModel::class.java)
         roomListViewModel.observeViewEvents {
             when (it) {
-                is RoomListViewEvents.Loading    -> showLoading(it.message)
-                is RoomListViewEvents.Failure    -> showFailure(it.throwable)
+                is RoomListViewEvents.Loading -> showLoading(it.message)
+                is RoomListViewEvents.Failure -> showFailure(it.throwable)
                 is RoomListViewEvents.SelectRoom -> handleSelectRoom(it)
-                is RoomListViewEvents.Done       -> Unit
+                is RoomListViewEvents.Done -> Unit
             }.exhaustive
         }
 
@@ -132,21 +132,15 @@ class RoomListFragment @Inject constructor(
     }
 
     private fun refreshCollapseStates() {
-        var contentInsertIndex = 1
         roomListViewModel.sections.forEachIndexed { index, roomsSection ->
             val actualBlock = adapterInfosList[index]
             val isRoomSectionExpanded = roomsSection.isExpanded.value.orTrue()
             if (actualBlock.section.isExpanded && !isRoomSectionExpanded) {
-                // we have to remove the content adapter
-                concatAdapter?.removeAdapter(actualBlock.contentAdapter.adapter)
+                // mark controller as collapsed
+                actualBlock.contentAdapter.setCollapsed(true)
             } else if (!actualBlock.section.isExpanded && isRoomSectionExpanded) {
-                // we must add it back!
-                concatAdapter?.addAdapter(contentInsertIndex, actualBlock.contentAdapter.adapter)
-            }
-            contentInsertIndex = if (isRoomSectionExpanded) {
-                contentInsertIndex + 2
-            } else {
-                contentInsertIndex + 1
+                // we must expand!
+                actualBlock.contentAdapter.setCollapsed(false)
             }
             actualBlock.section = actualBlock.section.copy(
                     isExpanded = isRoomSectionExpanded
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
index 330dffcced..75aaee45cb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryListController.kt
@@ -16,12 +16,11 @@
 
 package im.vector.app.features.home.room.list
 
-import com.airbnb.epoxy.TypedEpoxyController
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 class RoomSummaryListController(
         private val roomSummaryItemFactory: RoomSummaryItemFactory
-) : TypedEpoxyController<List<RoomSummary>>() {
+) : CollapsableTypedEpoxyController<List<RoomSummary>>() {
 
     var listener: RoomListListener? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
index 57ee83141f..aae548c1e7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
@@ -21,31 +21,13 @@ import com.airbnb.epoxy.paging.PagedListEpoxyController
 import im.vector.app.core.utils.createUIHandler
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import javax.inject.Inject
-
-class RoomSummaryPagedControllerFactory @Inject constructor(
-        private val roomSummaryItemFactory: RoomSummaryItemFactory
-) {
-
-    fun createRoomSummaryPagedController(): RoomSummaryPagedController {
-        return RoomSummaryPagedController(roomSummaryItemFactory)
-    }
-
-    fun createRoomSummaryListController(): RoomSummaryListController {
-        return RoomSummaryListController(roomSummaryItemFactory)
-    }
-
-    fun createSuggestedRoomListController(): SuggestedRoomListController {
-        return SuggestedRoomListController(roomSummaryItemFactory)
-    }
-}
 
 class RoomSummaryPagedController(
         private val roomSummaryItemFactory: RoomSummaryItemFactory
-) : PagedListEpoxyController<RoomSummary>(
+) : PagedListEpoxyController<RoomSummary> (
         // Important it must match the PageList builder notify Looper
         modelBuildingHandler = createUIHandler()
-) {
+), CollapsableControllerExtension {
 
     var listener: RoomListListener? = null
 
@@ -56,6 +38,22 @@ class RoomSummaryPagedController(
             requestForcedModelBuild()
         }
 
+    override var collapsed = false
+    set(value) {
+        if (field != value) {
+            field = value
+            requestForcedModelBuild()
+        }
+    }
+
+    override fun addModels(models: List<EpoxyModel<*>>) {
+        if (collapsed) {
+            super.addModels(emptyList())
+        } else {
+            super.addModels(models)
+        }
+    }
+
     override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
         // for place holder if enabled
         item ?: return roomSummaryItemFactory.createRoomItem(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt
new file mode 100644
index 0000000000..c86d8ab243
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedControllerFactory.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import javax.inject.Inject
+
+class RoomSummaryPagedControllerFactory @Inject constructor(
+        private val roomSummaryItemFactory: RoomSummaryItemFactory
+) {
+
+    fun createRoomSummaryPagedController(): RoomSummaryPagedController {
+        return RoomSummaryPagedController(roomSummaryItemFactory)
+    }
+
+    fun createRoomSummaryListController(): RoomSummaryListController {
+        return RoomSummaryListController(roomSummaryItemFactory)
+    }
+
+    fun createSuggestedRoomListController(): SuggestedRoomListController {
+        return SuggestedRoomListController(roomSummaryItemFactory)
+    }
+}

From 5e75a3a80b6525d55d732466820fada5694a698e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 19 Apr 2021 11:33:33 +0200
Subject: [PATCH 172/350] Add placehoders for paged room list

---
 .../room/list/RoomSummaryItemPlaceHolder.kt   | 27 +++++++
 .../room/list/RoomSummaryPagedController.kt   | 26 ++----
 .../room/list/SpaceRoomListSectionBuilder.kt  | 12 ++-
 .../main/res/layout/item_room_placeholder.xml | 79 +++++++++++++++++++
 4 files changed, 123 insertions(+), 21 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemPlaceHolder.kt
 create mode 100644 vector/src/main/res/layout/item_room_placeholder.xml

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemPlaceHolder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemPlaceHolder.kt
new file mode 100644
index 0000000000..96d8f6418b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemPlaceHolder.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list
+
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+
+@EpoxyModelClass(layout = R.layout.item_room_placeholder)
+abstract class RoomSummaryItemPlaceHolder : VectorEpoxyModel<RoomSummaryItemPlaceHolder.Holder>() {
+    class Holder : VectorEpoxyHolder()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
index aae548c1e7..e9cbc69215 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryPagedController.kt
@@ -24,7 +24,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 class RoomSummaryPagedController(
         private val roomSummaryItemFactory: RoomSummaryItemFactory
-) : PagedListEpoxyController<RoomSummary> (
+) : PagedListEpoxyController<RoomSummary>(
         // Important it must match the PageList builder notify Looper
         modelBuildingHandler = createUIHandler()
 ), CollapsableControllerExtension {
@@ -39,12 +39,12 @@ class RoomSummaryPagedController(
         }
 
     override var collapsed = false
-    set(value) {
-        if (field != value) {
-            field = value
-            requestForcedModelBuild()
+        set(value) {
+            if (field != value) {
+                field = value
+                requestForcedModelBuild()
+            }
         }
-    }
 
     override fun addModels(models: List<EpoxyModel<*>>) {
         if (collapsed) {
@@ -56,19 +56,7 @@ class RoomSummaryPagedController(
 
     override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
         // for place holder if enabled
-        item ?: return roomSummaryItemFactory.createRoomItem(
-                roomSummary = RoomSummary(
-                        roomId = "null_item_pos_$currentPosition",
-                        name = "",
-                        encryptionEventTs = null,
-                        isEncrypted = false,
-                        typingUsers = emptyList()
-                ),
-                selectedRoomIds = emptySet(),
-                onClick = null,
-                onLongClick = null
-        )
-
+        item ?: return RoomSummaryItemPlaceHolder_().apply { id(currentPosition) }
         return roomSummaryItemFactory.create(item, roomChangeMembershipStates.orEmpty(), emptySet(), listener)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 426c29a622..a05f6ebaf8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -20,6 +20,7 @@ import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.liveData
+import androidx.paging.PagedList
 import com.airbnb.mvrx.Async
 import im.vector.app.AppStateHandler
 import im.vector.app.R
@@ -52,6 +53,13 @@ class SpaceRoomListSectionBuilder(
         val onUdpatable: (UpdatableLivePageResult) -> Unit
 ) : RoomListSectionBuilder {
 
+    val pagedListConfig = PagedList.Config.Builder()
+            .setPageSize(10)
+            .setInitialLoadSizeHint(20)
+            .setEnablePlaceholders(true)
+            .setPrefetchDistance(10)
+            .build()
+
     override fun buildSections(mode: RoomListDisplayMode): List<RoomsSection> {
         val sections = mutableListOf<RoomsSection>()
         val activeSpaceAwareQueries = mutableListOf<RoomListViewModel.ActiveSpaceQueryUpdater>()
@@ -322,8 +330,8 @@ class SpaceRoomListSectionBuilder(
                                     }
                                 }
                                 RoomListViewModel.SpaceFilterStrategy.NONE       -> roomQueryParams
-                            }
-
+                            },
+                            pagedListConfig
                     ).also {
                         when (spaceFilterStrategy) {
                             RoomListViewModel.SpaceFilterStrategy.NORMAL     -> {
diff --git a/vector/src/main/res/layout/item_room_placeholder.xml b/vector/src/main/res/layout/item_room_placeholder.xml
new file mode 100644
index 0000000000..41131c5150
--- /dev/null
+++ b/vector/src/main/res/layout/item_room_placeholder.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemRoomLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground">
+
+
+    <FrameLayout
+        android:id="@+id/roomAvatarContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/roomAvatarImageView"
+            android:layout_width="56dp"
+            android:layout_height="56dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/header_panel_round_background" />
+
+    </FrameLayout>
+
+    <!-- Margin bottom does not work, so I use space -->
+    <Space
+        android:id="@+id/roomAvatarBottomSpace"
+        android:layout_width="0dp"
+        android:layout_height="12dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/roomAvatarContainer"
+        tools:layout_marginStart="20dp" />
+
+
+    <View
+        android:id="@+id/roomNameView"
+        android:layout_width="wrap_content"
+        android:layout_height="15dp"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="70dp"
+        android:background="@drawable/rounded_rect_shape_8"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <View
+        android:id="@+id/roomTypingView"
+        android:layout_width="0dp"
+        android:layout_height="30dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/rounded_rect_shape_8"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/roomNameView"
+        app:layout_constraintTop_toBottomOf="@+id/roomNameView" />
+
+
+    <View
+        android:id="@+id/roomDividerView"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?riotx_header_panel_border_mobile"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From d30ba9c7491b332b76c701edebb83a90079954b0 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 20 Apr 2021 10:29:44 +0200
Subject: [PATCH 173/350] Spaces quick fixes and updates

Make drawer menu more obvious + fix notification count
---
 CHANGES.md                                    |  2 +-
 .../summary/RoomAggregateNotificationCount.kt |  2 +-
 .../room/summary/RoomSummaryUpdater.kt        | 23 ++++++++
 .../grouplist/HomeSpaceSummaryItem.kt         |  5 ++
 .../app/features/home/HomeDetailFragment.kt   | 33 ------------
 .../app/features/home/HomeDetailViewModel.kt  |  4 +-
 .../room/list/SpaceRoomListSectionBuilder.kt  | 42 ++++++++-------
 .../app/features/spaces/SpaceListViewState.kt |  4 +-
 .../features/spaces/SpaceSummaryController.kt | 54 +++++++++++--------
 .../app/features/spaces/SpaceSummaryItem.kt   |  4 ++
 .../features/spaces/SpacesListViewModel.kt    | 25 +++++++++
 .../src/main/res/drawable/ic_space_icons.xml  | 27 ++++++++++
 .../main/res/layout/fragment_home_detail.xml  | 47 +++++++++++++---
 .../main/res/layout/item_room_placeholder.xml |  2 +-
 vector/src/main/res/layout/item_space.xml     | 22 ++++++++
 15 files changed, 211 insertions(+), 85 deletions(-)
 create mode 100644 vector/src/main/res/drawable/ic_space_icons.xml

diff --git a/CHANGES.md b/CHANGES.md
index b447b6e6e5..a99b4baf68 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@ Changes in Element 1.1.7 (2021-XX-XX)
 ===================================================
 
 Features ✨:
- -
+ - Spaces beta
 
 Improvements 🙌:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
index 066178b1ec..b3440059e8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
@@ -20,6 +20,6 @@ data class RoomAggregateNotificationCount(
         val notificationCount: Int,
         val highlightCount: Int
 ) {
-    val totalCount = notificationCount + highlightCount
+    val totalCount = notificationCount
     val isHighlight = highlightCount > 0
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index dae2c0838e..56eb3db236 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -349,6 +349,29 @@ internal class RoomSummaryUpdater @Inject constructor(
 //                        Timber.v("## SPACES: flatten of ${dmRoom.otherMemberIds.joinToString(",")} is ${dmRoom.flattenParentIds}")
                     }
 
+            // Maybe a good place to count the number of notifications for spaces?
+
+            realm.where(RoomSummaryEntity::class.java)
+                    .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
+                    .equalTo(RoomSummaryEntityFields.ROOM_TYPE, RoomType.SPACE)
+                    .findAll().forEach { space ->
+                        // get all children
+                        var highlightCount = 0
+                        var notificationCount = 0
+                        realm.where(RoomSummaryEntity::class.java)
+                                .process(RoomSummaryEntityFields.MEMBERSHIP_STR, listOf(Membership.JOIN))
+                                .notEqualTo(RoomSummaryEntityFields.ROOM_TYPE, RoomType.SPACE)
+                                .contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, space.roomId)
+                                .findAll().forEach {
+                                    highlightCount += it.highlightCount
+                                    notificationCount += it.notificationCount
+                                }
+
+                        space.highlightCount = highlightCount
+                        space.notificationCount = notificationCount
+                    }
+            // xxx invites??
+
             // LEGACY GROUPS
             // lets mark rooms that belongs to groups
             val existingGroups = GroupSummaryEntity.where(realm).findAll()
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
index 9912564720..553f82e98f 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
@@ -28,6 +28,7 @@ import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
 import im.vector.app.features.themes.ThemeUtils
 
 @EpoxyModelClass(layout = R.layout.item_space)
@@ -35,6 +36,7 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
 
     @EpoxyAttribute var selected: Boolean = false
     @EpoxyAttribute var listener: (() -> Unit)? = null
+    @EpoxyAttribute var countState : UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
 
     override fun getViewType(): Int {
         // mm.. it's reusing the same layout for basic space item
@@ -52,6 +54,8 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         holder.avatarImageView.imageTintList = ColorStateList.valueOf(ThemeUtils.getColor(holder.view.context, R.attr.riot_primary_text_color))
         holder.avatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
         holder.leaveView.isVisible = false
+
+        holder.counterBadgeView.render(countState)
     }
 
     class Holder : VectorEpoxyHolder() {
@@ -59,5 +63,6 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         val groupNameView by bind<TextView>(R.id.groupNameView)
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
         val leaveView by bind<ImageView>(R.id.groupTmpLeave)
+        val counterBadgeView by bind<UnreadCounterBadgeView>(R.id.groupCounterBadge)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 607a1aeb54..36bf32919c 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -22,7 +22,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.activityViewModel
@@ -32,7 +31,6 @@ import com.google.android.material.badge.BadgeDrawable
 import im.vector.app.R
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.toMvRxBundle
-import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.platform.ToolbarConfigurable
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
@@ -56,14 +54,9 @@ import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import javax.inject.Inject
 
-private const val INDEX_PEOPLE = 0
-private const val INDEX_ROOMS = 1
-private const val INDEX_CATCHUP = 2
-
 class HomeDetailFragment @Inject constructor(
         val homeDetailViewModelFactory: HomeDetailViewModel.Factory,
         private val serverBackupStatusViewModelFactory: ServerBackupStatusViewModel.Factory,
@@ -251,19 +244,8 @@ class HomeDetailFragment @Inject constructor(
     private fun onGroupChange(groupSummary: GroupSummary?) {
         groupSummary ?: return
         if (groupSummary.groupId == ALL_COMMUNITIES_GROUP_ID) {
-            // Special case
-            avatarRenderer.clear(views.groupToolbarAvatarImageView)
-            views.groupToolbarAvatarImageView.background = null
-
-            val myMxItem = withState(viewModel) { it.myMatrixItem }
-            if (myMxItem != null) {
-                avatarRenderer.render(myMxItem, views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
-            }
             views.groupToolbarSpaceTitleView.isVisible = false
         } else {
-            views.groupToolbarAvatarImageView.background = null
-            // Use GlideApp with activity context to avoid the glideRequests to be paused
-            avatarRenderer.render(groupSummary.toMatrixItem(), views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
             views.groupToolbarSpaceTitleView.isVisible = true
             views.groupToolbarSpaceTitleView.text = groupSummary.displayName
         }
@@ -271,24 +253,9 @@ class HomeDetailFragment @Inject constructor(
 
     private fun onSpaceChange(spaceSummary: RoomSummary?) {
         spaceSummary ?: return
-
-        // Use GlideApp with activity context to avoid the glideRequests to be paused
         if (spaceSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
-            // Special case
-            views.groupToolbarAvatarImageView.background = ContextCompat.getDrawable(requireContext(), R.drawable.space_home_background)
-            views.groupToolbarAvatarImageView.scaleType = ImageView.ScaleType.CENTER_INSIDE
-            ThemeUtils.tintDrawableWithColor(
-                    ContextCompat.getDrawable(requireContext(), R.drawable.ic_space_home)!!,
-                    ThemeUtils.getColor(requireContext(), R.attr.riot_primary_text_color)
-            ).let {
-                views.groupToolbarAvatarImageView.setImageDrawable(it)
-            }
-
             views.groupToolbarSpaceTitleView.isVisible = false
         } else {
-            avatarRenderer.clear(views.groupToolbarAvatarImageView)
-            views.groupToolbarAvatarImageView.background = null
-            avatarRenderer.renderSpace(spaceSummary.toMatrixItem(), views.groupToolbarAvatarImageView, GlideApp.with(requireActivity()))
             views.groupToolbarSpaceTitleView.isVisible = true
             views.groupToolbarSpaceTitleView.text = spaceSummary.displayName
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 8aa58632b3..1d57b26015 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -35,6 +35,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.util.toMatrixItem
@@ -163,7 +164,8 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
             session.getPagedRoomSummariesLive(
                     roomSummaryQueryParams {
                         memberships = Membership.activeMemberships()
-                    }
+                    },
+                    sortOrder = RoomSortOrder.NONE
             ).asObservable()
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index a05f6ebaf8..353cf5732d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -314,23 +314,7 @@ class SpaceRoomListSectionBuilder(
 
                     val name = stringProvider.getString(nameRes)
                     session.getFilteredPagedRoomSummariesLive(
-                            when (spaceFilterStrategy) {
-                                RoomListViewModel.SpaceFilterStrategy.NORMAL     -> {
-                                    roomQueryParams.copy(
-                                            activeSpaceId = ActiveSpaceFilter.ActiveSpace(appStateHandler.safeActiveSpaceId())
-                                    )
-                                }
-                                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL -> {
-                                    if (appStateHandler.safeActiveSpaceId() == null) {
-                                        roomQueryParams
-                                    } else {
-                                        roomQueryParams.copy(
-                                                activeSpaceId = ActiveSpaceFilter.ActiveSpace(appStateHandler.safeActiveSpaceId())
-                                        )
-                                    }
-                                }
-                                RoomListViewModel.SpaceFilterStrategy.NONE       -> roomQueryParams
-                            },
+                            roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId()),
                             pagedListConfig
                     ).also {
                         when (spaceFilterStrategy) {
@@ -371,7 +355,9 @@ class SpaceRoomListSectionBuilder(
                                         .subscribe {
                                             sections.find { it.sectionName == name }
                                                     ?.notificationCount
-                                                    ?.postValue(session.getNotificationCountForRooms(roomQueryParams))
+                                                    ?.postValue(session.getNotificationCountForRooms(
+                                                            roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())
+                                                    ))
                                         }.also {
                                             onDisposable.invoke(it)
                                         }
@@ -395,4 +381,24 @@ class SpaceRoomListSectionBuilder(
                 .build()
                 .let { block(it) }
     }
+
+    internal fun RoomSummaryQueryParams.process(spaceFilter: RoomListViewModel.SpaceFilterStrategy, currentSpace: String?): RoomSummaryQueryParams {
+        return when (spaceFilter) {
+            RoomListViewModel.SpaceFilterStrategy.NORMAL -> {
+                copy(
+                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(currentSpace)
+                )
+            }
+            RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL -> {
+                if (currentSpace == null) {
+                    this
+                } else {
+                    copy(
+                            activeSpaceId = ActiveSpaceFilter.ActiveSpace(currentSpace)
+                    )
+                }
+            }
+            RoomListViewModel.SpaceFilterStrategy.NONE -> this
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
index cd578bce11..558b631c16 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
@@ -20,10 +20,12 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 
 data class SpaceListViewState(
         val asyncSpaces: Async<List<RoomSummary>> = Uninitialized,
         val selectedSpace: RoomSummary? = null,
         val rootSpaces: List<RoomSummary>? = null,
-        val expandedStates: Map<String, Boolean> = emptyMap()
+        val expandedStates: Map<String, Boolean> = emptyMap(),
+        val homeAggregateCount : RoomAggregateNotificationCount = RoomAggregateNotificationCount(0, 0)
 ) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 2a20889545..14be8cd408 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -25,8 +25,10 @@ import im.vector.app.core.ui.list.genericItemHeader
 import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.grouplist.homeSpaceSummaryItem
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
@@ -53,13 +55,15 @@ class SpaceSummaryController @Inject constructor(
                 nonNullViewState.asyncSpaces(),
                 nonNullViewState.selectedSpace,
                 nonNullViewState.rootSpaces,
-                nonNullViewState.expandedStates)
+                nonNullViewState.expandedStates,
+                nonNullViewState.homeAggregateCount)
     }
 
     private fun buildGroupModels(summaries: List<RoomSummary>?,
                                  selected: RoomSummary?,
                                  rootSpaces: List<RoomSummary>?,
-                                 expandedStates: Map<String, Boolean>) {
+                                 expandedStates: Map<String, Boolean>,
+                                 homeCount: RoomAggregateNotificationCount) {
         if (summaries.isNullOrEmpty()) {
             return
         }
@@ -99,22 +103,14 @@ class SpaceSummaryController @Inject constructor(
                     homeSpaceSummaryItem {
                         id(it.roomId)
                         selected(it.roomId == selected?.roomId)
+                        countState(UnreadCounterBadgeView.State(homeCount.totalCount, homeCount.isHighlight))
                         listener { callback?.onSpaceSelected(it) }
                     }
                 }
 
-//        summaries
-//                .filter { it.membership == Membership.JOIN }
         rootSpaces
                 ?.forEach { groupSummary ->
                     val isSelected = groupSummary.roomId == selected?.roomId
-//                    if (groupSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
-//                        homeSpaceSummaryItem {
-//                            id(groupSummary.roomId)
-//                            selected(isSelected)
-//                            listener { callback?.onSpaceSelected(groupSummary) }
-//                        }
-//                    } else {
                     // does it have children?
                     val subSpaces = groupSummary.children?.filter { childInfo ->
                         summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
@@ -132,24 +128,36 @@ class SpaceSummaryController @Inject constructor(
                         onMore { callback?.onSpaceSettings(groupSummary) }
                         listener { callback?.onSpaceSelected(groupSummary) }
                         toggleExpand { callback?.onToggleExpand(groupSummary) }
+                        countState(
+                                UnreadCounterBadgeView.State(
+                                        groupSummary.notificationCount,
+                                        groupSummary.highlightCount > 0
+                                )
+                        )
                     }
 
                     if (hasChildren && expanded) {
                         // it's expanded
-                            subSpaces?.forEach { child ->
-                                summaries.firstOrNull { it.roomId == child.childRoomId }?.let {  childSum ->
-                                    val isChildSelected = childSum.roomId == selected?.roomId
-                                    spaceSummaryItem {
-                                        avatarRenderer(avatarRenderer)
-                                        id(child.childRoomId)
-                                        hasChildren(false)
-                                        selected(isChildSelected)
-                                        matrixItem(MatrixItem.RoomItem(child.childRoomId, child.name, child.avatarUrl))
-                                        listener { callback?.onSpaceSelected(childSum) }
-                                        indent(1)
-                                    }
+                        subSpaces?.forEach { child ->
+                            summaries.firstOrNull { it.roomId == child.childRoomId }?.let { childSum ->
+                                val isChildSelected = childSum.roomId == selected?.roomId
+                                spaceSummaryItem {
+                                    avatarRenderer(avatarRenderer)
+                                    id(child.childRoomId)
+                                    hasChildren(false)
+                                    selected(isChildSelected)
+                                    matrixItem(MatrixItem.RoomItem(child.childRoomId, child.name, child.avatarUrl))
+                                    listener { callback?.onSpaceSelected(childSum) }
+                                    indent(1)
+                                    countState(
+                                            UnreadCounterBadgeView.State(
+                                                    groupSummary.notificationCount,
+                                                    groupSummary.highlightCount > 0
+                                            )
+                                    )
                                 }
                             }
+                        }
                     }
                 }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index e3deca5367..797087e78b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -30,6 +30,7 @@ import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.platform.CheckableConstraintLayout
 import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
 import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_space)
@@ -44,6 +45,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
     @EpoxyAttribute var expanded: Boolean = false
     @EpoxyAttribute var hasChildren: Boolean = false
     @EpoxyAttribute var indent: Int = 0
+    @EpoxyAttribute var countState : UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
 
     override fun bind(holder: Holder) {
         super.bind(holder)
@@ -91,6 +93,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         holder.indentSpace.isVisible = indent > 0
 
         avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
+        holder.counterBadgeView.render(countState)
     }
 
     override fun unbind(holder: Holder) {
@@ -105,5 +108,6 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         val moreView by bind<ImageView>(R.id.groupTmpLeave)
         val collapseIndicator by bind<ImageView>(R.id.groupChildrenCollapse)
         val indentSpace by bind<Space>(R.id.indent)
+        val counterBadgeView by bind<UnreadCounterBadgeView>(R.id.groupCounterBadge)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 8889a76f9b..690e7970f1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -32,12 +32,16 @@ import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
+import java.util.concurrent.TimeUnit
 
 const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
 
@@ -78,6 +82,27 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                     }
                 }
                 .disposeOnClear()
+
+        session.getPagedRoomSummariesLive(
+                roomSummaryQueryParams {
+                    this.memberships = listOf(Membership.JOIN)
+                    this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                }, sortOrder = RoomSortOrder.NONE
+        ).asObservable()
+                .throttleFirst(300, TimeUnit.MILLISECONDS)
+                .subscribe {
+                    val counts = session.getNotificationCountForRooms(
+                            roomSummaryQueryParams {
+                                this.memberships = listOf(Membership.JOIN)
+                                this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                            }
+                    )
+                    setState {
+                        copy(
+                                homeAggregateCount = counts
+                        )
+                    }
+                }.disposeOnClear()
     }
 
     private fun observeSelectionState() {
diff --git a/vector/src/main/res/drawable/ic_space_icons.xml b/vector/src/main/res/drawable/ic_space_icons.xml
new file mode 100644
index 0000000000..44c75908c7
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_space_icons.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,12H21"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#8D99A5"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,6H21"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#8D99A5"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,18H21"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#8D99A5"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index bea64bcab1..419ba5b64f 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -19,15 +19,50 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:baselineAligned="false">
 
-            <ImageView
-                android:layout_gravity="center_vertical"
+            <RelativeLayout
                 android:id="@+id/groupToolbarAvatarImageView"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
                 android:contentDescription="@string/a11y_open_drawer"
-                tools:src="@tools:sample/avatars" />
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_width="40dp"
+                android:layout_height="40dp">
+
+                <ImageView
+                    android:importantForAccessibility="no"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:layout_centerVertical="true"
+                    android:src="@drawable/ic_space_icons"
+                    app:tint="?riotx_text_secondary"
+                    android:layout_marginStart="4dp"
+                    />
+
+                <!-- Not yet done -->
+<!--                <im.vector.app.features.home.room.list.UnreadCounterBadgeView-->
+<!--                    android:id="@+id/roomUnreadCounterBadgeView"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginEnd="0dp"-->
+<!--                    android:gravity="center"-->
+<!--                    android:minWidth="16dp"-->
+<!--                    android:minHeight="16dp"-->
+<!--                    android:paddingStart="4dp"-->
+<!--                    android:paddingEnd="4dp"-->
+<!--                    android:textColor="@android:color/white"-->
+<!--                    android:textSize="10sp"-->
+<!--                    android:visibility="gone"-->
+<!--                    android:layout_alignParentTop="true"-->
+<!--                    android:layout_alignParentEnd="true"-->
+<!--                    tools:background="@drawable/bg_unread_highlight"-->
+<!--                    tools:text="4"-->
+<!--                    tools:visibility="visible" />-->
+            </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="0dp"
diff --git a/vector/src/main/res/layout/item_room_placeholder.xml b/vector/src/main/res/layout/item_room_placeholder.xml
index 41131c5150..c5fdd7781a 100644
--- a/vector/src/main/res/layout/item_room_placeholder.xml
+++ b/vector/src/main/res/layout/item_room_placeholder.xml
@@ -60,7 +60,7 @@
         android:layout_width="0dp"
         android:layout_height="30dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="20dp"
         android:background="@drawable/rounded_rect_shape_8"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index fc7b43216a..ef147f7730 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -33,6 +33,28 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@tools:sample/avatars" />
 
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+        android:id="@+id/groupCounterBadge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        android:gravity="center"
+        android:minWidth="16dp"
+        android:minHeight="16dp"
+        android:textColor="@android:color/white"
+        android:textSize="10sp"
+        app:layout_constraintCircle="@+id/groupAvatarImageView"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="24dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:background="@drawable/bg_unread_highlight"
+        tools:text="147" />
+
+
     <TextView
         android:id="@+id/groupNameView"
         android:layout_width="0dp"

From 19bb4c616240d1c9787accdce0a77e269394f2d1 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 20 Apr 2021 11:39:16 +0200
Subject: [PATCH 174/350] Update lab flag label

---
 vector/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 60683ba862..55e898264d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2198,8 +2198,8 @@
     <string name="labs_swipe_to_reply_in_timeline">Enable swipe to reply in timeline</string>
     <string name="labs_show_unread_notifications_as_tab">Add a dedicated tab for unread notifications on main screen.</string>
 
-    <string name="labs_experimental_spaces">Spaces prototype. Incompatible with Communities, Communities v2 and Custom Tags. Requires compatible homeserver for some features.</string>
-    <string name="labs_experimental_spaces_desc">Warning: This will trigger a clear cache and initial sync</string>
+    <string name="labs_experimental_spaces">Spaces prototype</string>
+    <string name="labs_experimental_spaces_desc">Spaces are the new way to group people and rooms for work, fun or just yourself. You can try them out now on Android, or from your computer.</string>
 
     <string name="link_copied_to_clipboard">Link copied to clipboard</string>
 

From aa74646ddf662a428ad27ba63a25524669035c93 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 20 Apr 2021 14:30:51 +0200
Subject: [PATCH 175/350] Fix invited spaced filters rooms out of home + invite
 not working

---
 .../room/summary/RoomSummaryUpdater.kt        |  6 ++---
 .../app/features/spaces/SpaceListAction.kt    |  1 +
 .../app/features/spaces/SpaceListFragment.kt  |  3 +++
 .../features/spaces/SpaceSummaryController.kt |  4 +--
 .../features/spaces/SpacesListViewModel.kt    | 26 ++++++-------------
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 56eb3db236..f580a7f354 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -263,8 +263,8 @@ internal class RoomSummaryUpdater @Inject constructor(
 
             val graph = Graph()
             lookupMap
-                    // focus only on spaces, as room are just leaf
-                    .filter { it.key.roomType == RoomType.SPACE }
+                    // focus only on joined spaces, as room are just leaf
+                    .filter { it.key.roomType == RoomType.SPACE && it.key.membership == Membership.JOIN }
                     .forEach { (sum, children) ->
                         graph.getOrCreateNode(sum.roomId)
                         children.forEach {
@@ -294,7 +294,7 @@ internal class RoomSummaryUpdater @Inject constructor(
 //            Timber.v("## SPACES: lookup map ${lookupMap.map { it.key.name to it.value.map { it.name } }.toMap()}")
 
             lookupMap.entries
-                    .filter { it.key.roomType == RoomType.SPACE }
+                    .filter { it.key.roomType == RoomType.SPACE && it.key.membership == Membership.JOIN  }
                     .forEach { entry ->
                         val parent = RoomSummaryEntity.where(realm, entry.key.roomId).findFirst()
                         if (parent != null) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
index 8adfbae3bd..58812bd77e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
@@ -21,6 +21,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 sealed class SpaceListAction : VectorViewModelAction {
     data class SelectSpace(val spaceSummary: RoomSummary) : SpaceListAction()
+    data class OpenSpaceInvite(val spaceSummary: RoomSummary) : SpaceListAction()
     data class LeaveSpace(val spaceSummary: RoomSummary) : SpaceListAction()
     data class ToggleExpand(val spaceSummary: RoomSummary) : SpaceListAction()
     object AddSpace : SpaceListAction()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index bc7be74442..6455b18d13 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -80,6 +80,9 @@ class SpaceListFragment @Inject constructor(
         viewModel.handle(SpaceListAction.SelectSpace(spaceSummary))
     }
 
+    override fun onSpaceInviteSelected(spaceSummary: RoomSummary) {
+        viewModel.handle(SpaceListAction.OpenSpaceInvite(spaceSummary))
+    }
     override fun onSpaceSettings(spaceSummary: RoomSummary) {
         sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(spaceSummary.roomId))
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 14be8cd408..8b30687a12 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -82,8 +82,7 @@ class SpaceSummaryController @Inject constructor(
                                 id(it.roomId)
                                 matrixItem(it.toMatrixItem())
                                 selected(false)
-                                listener { callback?.onSpaceSelected(it) }
-//                                lea { callback?.onSpaceSelected(it) }
+                                listener { callback?.onSpaceInviteSelected(it) }
                             }
                         }
                         genericFooterItem {
@@ -173,6 +172,7 @@ class SpaceSummaryController @Inject constructor(
 
     interface Callback {
         fun onSpaceSelected(spaceSummary: RoomSummary)
+        fun onSpaceInviteSelected(spaceSummary: RoomSummary)
         fun onSpaceSettings(spaceSummary: RoomSummary)
         fun onToggleExpand(spaceSummary: RoomSummary)
         fun onAddSpaceSelected()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 690e7970f1..1671be5ffb 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -129,33 +129,23 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
             is SpaceListAction.LeaveSpace -> handleLeaveSpace(action)
             SpaceListAction.AddSpace -> handleAddSpace()
             is SpaceListAction.ToggleExpand -> handleToggleExpand(action)
+            is SpaceListAction.OpenSpaceInvite -> handleSelectSpaceInvite(action)
         }
     }
 
 // PRIVATE METHODS *****************************************************************************
 
     private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
-        // get uptodate version of the space
-        val summary = session.spaceService().getSpaceSummaries(roomSummaryQueryParams { roomId = QueryStringValue.Equals(action.spaceSummary.roomId) })
-                .firstOrNull()
-        if (summary?.membership == Membership.INVITE) {
-            _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary(summary.roomId))
-//            viewModelScope.launch(Dispatchers.IO) {
-//                tryOrNull { session.spaceService().peekSpace(action.spaceSummary.spaceId) }.let {
-//                    Timber.d("PEEK RESULT/ $it")
-//                }
-//            }
-        } else {
-            if (state.selectedSpace?.roomId != action.spaceSummary.roomId) {
-//                state.selectedSpace?.let {
-//                    selectedSpaceDataSource.post(Option.just(state.selectedSpace))
-//                }
-                setState { copy(selectedSpace = action.spaceSummary) }
-                uiStateRepository.storeSelectedSpace(action.spaceSummary.roomId, session.sessionId)
-            }
+        if (state.selectedSpace?.roomId != action.spaceSummary.roomId) {
+            setState { copy(selectedSpace = action.spaceSummary) }
+            uiStateRepository.storeSelectedSpace(action.spaceSummary.roomId, session.sessionId)
         }
     }
 
+    private fun handleSelectSpaceInvite(action: SpaceListAction.OpenSpaceInvite) {
+        _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary(action.spaceSummary.roomId))
+    }
+
     private fun handleToggleExpand(action: SpaceListAction.ToggleExpand) = withState { state ->
         val updatedToggleStates = state.expandedStates.toMutableMap().apply {
             this[action.spaceSummary.roomId] = !(this[action.spaceSummary.roomId] ?: false)

From b45585f7c02c3495cb29e57ae0034ec691bb472f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 21 Apr 2021 09:42:30 +0200
Subject: [PATCH 176/350] Fix / Suggested room section won't collapse

---
 .../features/home/room/list/SuggestedRoomListController.kt    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomListController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomListController.kt
index 621e5c6799..073fb43b6c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomListController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SuggestedRoomListController.kt
@@ -16,11 +16,9 @@
 
 package im.vector.app.features.home.room.list
 
-import com.airbnb.epoxy.TypedEpoxyController
-
 class SuggestedRoomListController(
         private val roomSummaryItemFactory: RoomSummaryItemFactory
-) : TypedEpoxyController<SuggestedRoomInfo>() {
+) : CollapsableTypedEpoxyController<SuggestedRoomInfo>() {
 
     var listener: RoomListListener? = null
 

From d42761f98a6d27f00c8dd8d305fba802e1885716 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 21 Apr 2021 10:47:43 +0200
Subject: [PATCH 177/350] Fix / Room list empty state flickering

---
 .../home/room/list/RoomListFragment.kt        | 26 ++++++++++++++-----
 .../home/room/list/SectionHeaderAdapter.kt    |  4 ++-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index eb931f9e9c..eeacdad363 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -251,7 +251,10 @@ class RoomListFragment @Inject constructor(
                                     .also { controller ->
                                         section.livePages.observe(viewLifecycleOwner) { pl ->
                                             controller.submitList(pl)
-                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = pl.isEmpty()))
+                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
+                                                    isHidden = pl.isEmpty(),
+                                                    isLoading = false
+                                            ))
                                             checkEmptyState()
                                         }
                                         section.notificationCount.observe(viewLifecycleOwner) { counts ->
@@ -271,7 +274,10 @@ class RoomListFragment @Inject constructor(
                                     .also { controller ->
                                         section.liveSuggested.observe(viewLifecycleOwner) { info ->
                                             controller.setData(info)
-                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = info.rooms.isEmpty()))
+                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
+                                                    isHidden = info.rooms.isEmpty(),
+                                                    isLoading = false
+                                            ))
                                             checkEmptyState()
                                         }
                                         section.isExpanded.observe(viewLifecycleOwner) { _ ->
@@ -285,7 +291,9 @@ class RoomListFragment @Inject constructor(
                                     .also { controller ->
                                         section.liveList?.observe(viewLifecycleOwner) { list ->
                                             controller.setData(list)
-                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(isHidden = list.isEmpty()))
+                                            sectionAdapter.updateSection(sectionAdapter.roomsSectionData.copy(
+                                                    isHidden = list.isEmpty(),
+                                                    isLoading = false))
                                             checkEmptyState()
                                         }
                                         section.notificationCount.observe(viewLifecycleOwner) { counts ->
@@ -393,8 +401,9 @@ class RoomListFragment @Inject constructor(
     }
 
     private fun checkEmptyState() {
-        val hasNoRoom = adapterInfosList.all { it.headerHeaderAdapter.roomsSectionData.isHidden }
-        if (hasNoRoom) {
+        val shouldShowEmpty = adapterInfosList.all { it.headerHeaderAdapter.roomsSectionData.isHidden }
+                && !adapterInfosList.any { it.headerHeaderAdapter.roomsSectionData.isLoading }
+        if (shouldShowEmpty) {
             val emptyState = when (roomListParams.displayMode) {
                 RoomListDisplayMode.NOTIFICATIONS -> {
                     StateView.State.Empty(
@@ -422,7 +431,12 @@ class RoomListFragment @Inject constructor(
             }
             views.stateView.state = emptyState
         } else {
-            views.stateView.state = StateView.State.Content
+            // is there something to show already?
+            if (adapterInfosList.any { !it.headerHeaderAdapter.roomsSectionData.isHidden }) {
+                views.stateView.state = StateView.State.Content
+            } else {
+                views.stateView.state = StateView.State.Loading
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
index f9c5766821..6cddf72c5a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
@@ -35,7 +35,9 @@ class SectionHeaderAdapter constructor(
             val isExpanded: Boolean = true,
             val notificationCount: Int = 0,
             val isHighlighted: Boolean = false,
-            val isHidden: Boolean = true
+            val isHidden: Boolean = true,
+            // This will be false until real data has been submitted once
+            val isLoading: Boolean = true
     )
 
     lateinit var roomsSectionData: RoomsSectionData

From 733d4185c491bd4860ba2f02dc3a6695a78e1346 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 21 Apr 2021 15:33:32 +0200
Subject: [PATCH 178/350] Fix / Add unread count in hamburger menu

---
 .../vector/app/features/home/HomeActivity.kt  |   6 +
 .../app/features/home/HomeDetailFragment.kt   |  15 ++
 .../home/UnreadMessagesSharedViewModel.kt     | 152 ++++++++++++++++++
 .../features/spaces/SpacesListViewModel.kt    |   4 +-
 .../main/res/layout/fragment_home_detail.xml  |  36 ++---
 5 files changed, 194 insertions(+), 19 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index cfdcc40a37..24ad6c8b85 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -85,6 +85,7 @@ class HomeActivity :
         ToolbarConfigurable,
         UnknownDeviceDetectorSharedViewModel.Factory,
         ServerBackupStatusViewModel.Factory,
+        UnreadMessagesSharedViewModel.Factory,
         NavigationInterceptor {
 
     private lateinit var sharedActionViewModel: HomeSharedActionViewModel
@@ -103,6 +104,7 @@ class HomeActivity :
     @Inject lateinit var popupAlertManager: PopupAlertManager
     @Inject lateinit var shortcutsHandler: ShortcutsHandler
     @Inject lateinit var unknownDeviceViewModelFactory: UnknownDeviceDetectorSharedViewModel.Factory
+    @Inject lateinit var unreadMessagesSharedViewModelFactory: UnreadMessagesSharedViewModel.Factory
     @Inject lateinit var permalinkHandler: PermalinkHandler
     @Inject lateinit var avatarRenderer: AvatarRenderer
     @Inject lateinit var initSyncStepFormatter: InitSyncStepFormatter
@@ -140,6 +142,10 @@ class HomeActivity :
         return serverBackupviewModelFactory.create(initialState)
     }
 
+    override fun create(initialState: UnreadMessagesState): UnreadMessagesSharedViewModel {
+        return unreadMessagesSharedViewModelFactory.create(initialState)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         FcmHelper.ensureFcmTokenIsRetrieved(this, pushManager, vectorPreferences.areNotificationEnabledForDevice())
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 36bf32919c..e7831c72cc 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -43,6 +43,7 @@ import im.vector.app.features.call.VectorCallActivity
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.home.room.list.RoomListFragment
 import im.vector.app.features.home.room.list.RoomListParams
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
 import im.vector.app.features.settings.VectorPreferences
@@ -71,6 +72,7 @@ class HomeDetailFragment @Inject constructor(
 
     private val viewModel: HomeDetailViewModel by fragmentViewModel()
     private val unknownDeviceDetectorSharedViewModel: UnknownDeviceDetectorSharedViewModel by activityViewModel()
+    private val unreadMessagesSharedViewModel: UnreadMessagesSharedViewModel by activityViewModel()
     private val serverBackupStatusViewModel: ServerBackupStatusViewModel by activityViewModel()
 
     private lateinit var sharedActionViewModel: HomeSharedActionViewModel
@@ -157,6 +159,19 @@ class HomeDetailFragment @Inject constructor(
             }
         }
 
+        unreadMessagesSharedViewModel.subscribe { state ->
+            if (vectorPreferences.labSpaces()) {
+                views.drawerUnreadCounterBadgeView.render(
+                        UnreadCounterBadgeView.State(
+                                count = state.otherSpacesUnread.totalCount,
+                                highlighted = state.otherSpacesUnread.isHighlight
+                        )
+                )
+            } else {
+                views.drawerUnreadCounterBadgeView.isVisible = false
+            }
+        }
+
         sharedCallActionViewModel
                 .liveKnownCalls
                 .observe(viewLifecycleOwner, {
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
new file mode 100644
index 0000000000..85440c6582
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home
+
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.AppStateHandler
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.settings.VectorPreferences
+import io.reactivex.Observable
+import io.reactivex.functions.BiFunction
+import io.reactivex.schedulers.Schedulers
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.RoomSortOrder
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
+import org.matrix.android.sdk.rx.asObservable
+import java.util.concurrent.TimeUnit
+
+data class UnreadMessagesState(
+        val homeSpaceUnread: RoomAggregateNotificationCount = RoomAggregateNotificationCount(0, 0),
+        val otherSpacesUnread: RoomAggregateNotificationCount = RoomAggregateNotificationCount(0, 0)
+) : MvRxState
+
+data class CountInfo(
+        val homeCount: RoomAggregateNotificationCount,
+        val otherCount: RoomAggregateNotificationCount
+)
+
+class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initialState: UnreadMessagesState,
+                                                                session: Session,
+                                                                appStateHandler: AppStateHandler,
+                                                                private val vectorPreferences: VectorPreferences)
+    : VectorViewModel<UnreadMessagesState, EmptyAction, EmptyViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: UnreadMessagesState): UnreadMessagesSharedViewModel
+    }
+
+    companion object : MvRxViewModelFactory<UnreadMessagesSharedViewModel, UnreadMessagesState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: UnreadMessagesState): UnreadMessagesSharedViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? UnreadMessagesSharedViewModel.Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? UnreadMessagesSharedViewModel.Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    override fun handle(action: EmptyAction) {}
+
+    init {
+
+        session.getPagedRoomSummariesLive(
+                roomSummaryQueryParams {
+                    this.memberships = listOf(Membership.JOIN)
+                    this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                }, sortOrder = RoomSortOrder.NONE
+        ).asObservable()
+                .throttleFirst(300, TimeUnit.MILLISECONDS)
+                .subscribe {
+                    val counts = session.getNotificationCountForRooms(
+                            roomSummaryQueryParams {
+                                this.memberships = listOf(Membership.JOIN)
+                                this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                            }
+                    )
+                    val invites = session.getRoomSummaries(roomSummaryQueryParams {
+                        this.memberships = listOf(Membership.INVITE)
+                        this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                    }).size
+                    setState {
+                        copy(
+                                homeSpaceUnread = RoomAggregateNotificationCount(
+                                        counts.notificationCount + invites,
+                                        highlightCount = counts.highlightCount + invites
+                                )
+                        )
+                    }
+                }.disposeOnClear()
+
+        Observable.combineLatest(
+                appStateHandler.selectedSpaceObservable.distinctUntilChanged(),
+                appStateHandler.selectedSpaceObservable.switchMap {
+                    session.getPagedRoomSummariesLive(
+                            roomSummaryQueryParams {
+                                this.memberships = Membership.activeMemberships()
+                            }, sortOrder = RoomSortOrder.NONE
+                    ).asObservable()
+                            .throttleFirst(300, TimeUnit.MILLISECONDS)
+                            .observeOn(Schedulers.computation())
+                },
+                BiFunction { _, _ ->
+                    val selectedSpace = appStateHandler.safeActiveSpaceId()
+                    val counts = session.getNotificationCountForRooms(
+                            roomSummaryQueryParams {
+                                this.memberships = listOf(Membership.JOIN)
+                                this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                            }
+                    )
+                    val rootCounts = session.spaceService().getRootSpaceSummaries()
+                            .filter {
+                                // filter out current selection
+                                it.roomId != selectedSpace
+                            }
+                    CountInfo(
+                            homeCount = counts,
+                            otherCount = RoomAggregateNotificationCount(
+                                    rootCounts.fold(0, { acc, rs ->
+                                        acc + rs.notificationCount
+                                    }) + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0),
+                                    rootCounts.fold(0, { acc, rs ->
+                                        acc + rs.highlightCount
+                                    }) + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
+                            )
+                    )
+                }
+        ).execute {
+            copy(
+                    homeSpaceUnread = it.invoke()?.homeCount ?: RoomAggregateNotificationCount(0, 0),
+                    otherSpacesUnread = it.invoke()?.otherCount ?: RoomAggregateNotificationCount(0, 0)
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 1671be5ffb..de8e8bbc95 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -30,6 +30,7 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.ui.UiStateRepository
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
+import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
@@ -90,6 +91,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                 }, sortOrder = RoomSortOrder.NONE
         ).asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
+                .observeOn(Schedulers.computation())
                 .subscribe {
                     val counts = session.getNotificationCountForRooms(
                             roomSummaryQueryParams {
@@ -168,7 +170,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     }
 
     private fun observeSpaceSummaries() {
-        val spaceSummaryQueryParams = roomSummaryQueryParams() {
+        val spaceSummaryQueryParams = roomSummaryQueryParams {
             memberships = listOf(Membership.JOIN, Membership.INVITE)
             displayName = QueryStringValue.IsNotEmpty
             excludeType = listOf(/**RoomType.MESSAGING,$*/
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index 419ba5b64f..e6ecdd9aa8 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -44,24 +44,24 @@
                     />
 
                 <!-- Not yet done -->
-<!--                <im.vector.app.features.home.room.list.UnreadCounterBadgeView-->
-<!--                    android:id="@+id/roomUnreadCounterBadgeView"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_marginEnd="0dp"-->
-<!--                    android:gravity="center"-->
-<!--                    android:minWidth="16dp"-->
-<!--                    android:minHeight="16dp"-->
-<!--                    android:paddingStart="4dp"-->
-<!--                    android:paddingEnd="4dp"-->
-<!--                    android:textColor="@android:color/white"-->
-<!--                    android:textSize="10sp"-->
-<!--                    android:visibility="gone"-->
-<!--                    android:layout_alignParentTop="true"-->
-<!--                    android:layout_alignParentEnd="true"-->
-<!--                    tools:background="@drawable/bg_unread_highlight"-->
-<!--                    tools:text="4"-->
-<!--                    tools:visibility="visible" />-->
+                <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+                    android:id="@+id/drawerUnreadCounterBadgeView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="0dp"
+                    android:gravity="center"
+                    android:minWidth="16dp"
+                    android:minHeight="16dp"
+                    android:paddingStart="4dp"
+                    android:paddingEnd="4dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="10sp"
+                    android:visibility="gone"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    tools:background="@drawable/bg_unread_highlight"
+                    tools:text="4"
+                    tools:visibility="visible" />
             </RelativeLayout>
 
             <LinearLayout

From 1ce7085ca9dce5f810a4e5eb6c8dc3ffa663f590 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 23 Apr 2021 17:26:17 +0200
Subject: [PATCH 179/350] Merge Space and Communities initial commit

---
 .../java/im/vector/app/AppStateHandler.kt     | 108 ++++++++++---
 .../im/vector/app/core/di/FragmentModule.kt   |   6 -
 .../im/vector/app/core/di/VectorComponent.kt  |   3 -
 .../app/features/grouplist/GroupListAction.kt |  25 ---
 .../features/grouplist/GroupListFragment.kt   |  83 ----------
 .../features/grouplist/GroupListViewModel.kt  | 142 ------------------
 .../features/grouplist/GroupListViewState.kt  |  27 ----
 .../grouplist/GroupSummaryController.kt       |  64 --------
 .../grouplist/SelectedGroupDataSource.kt      |  26 ----
 .../vector/app/features/home/HomeActivity.kt  |  21 ++-
 .../features/home/HomeActivitySharedAction.kt |   2 +-
 .../app/features/home/HomeDetailFragment.kt   |  38 ++---
 .../app/features/home/HomeDetailViewModel.kt  | 119 +++++++--------
 .../app/features/home/HomeDetailViewState.kt  |   6 +-
 .../app/features/home/HomeDrawerFragment.kt   |  10 +-
 .../home/UnreadMessagesSharedViewModel.kt     |   4 +-
 .../home/room/detail/RoomDetailViewModel.kt   |   6 +-
 .../room/list/GroupRoomListSectionBuilder.kt  |  27 ++--
 .../home/room/list/RoomListViewModel.kt       |  14 +-
 .../room/list/RoomListViewModelFactory.kt     |   5 +-
 .../home/room/list/RoomListViewState.kt       |   4 +-
 .../room/list/SpaceRoomListSectionBuilder.kt  |  16 +-
 .../features/navigation/DefaultNavigator.kt   |  89 ++++++-----
 .../app/features/spaces/SpaceAddItem.kt       |  41 +++++
 .../SpaceBetaHeaderItem.kt}                   |  18 ++-
 .../app/features/spaces/SpaceListAction.kt    |   3 +
 .../app/features/spaces/SpaceListFragment.kt  |  10 +-
 .../features/spaces/SpaceListViewEvents.kt    |   3 +-
 .../app/features/spaces/SpaceListViewState.kt |   7 +-
 .../features/spaces/SpaceSummaryController.kt | 112 +++++++++-----
 .../app/features/spaces/SpaceSummaryItem.kt   |   4 +
 .../features/spaces/SpacesListViewModel.kt    | 115 +++++++++-----
 .../ui/SharedPreferencesUiStateRepository.kt  |  30 +++-
 .../app/features/ui/UiStateRepository.kt      |   8 +-
 .../res/drawable/rounded_rect_stroke_8.xml    |  11 ++
 vector/src/main/res/layout/item_space.xml     |  32 +++-
 vector/src/main/res/layout/item_space_add.xml |  55 +++++++
 .../res/layout/item_space_beta_header.xml     |  47 ++++++
 vector/src/main/res/layout/view_state.xml     |   1 +
 vector/src/main/res/values/strings.xml        |   3 +
 40 files changed, 673 insertions(+), 672 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt
 delete mode 100644 vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt
 delete mode 100644 vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
 delete mode 100644 vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt
 delete mode 100644 vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt
 delete mode 100644 vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpaceAddItem.kt
 rename vector/src/main/java/im/vector/app/features/{grouplist/GroupListViewEvents.kt => spaces/SpaceBetaHeaderItem.kt} (57%)
 create mode 100644 vector/src/main/res/drawable/rounded_rect_stroke_8.xml
 create mode 100644 vector/src/main/res/layout/item_space_add.xml
 create mode 100644 vector/src/main/res/layout/item_space_beta_header.xml

diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 1f090c89ab..40bbcebbfd 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -19,20 +19,29 @@ package im.vector.app
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import arrow.core.Option
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.BehaviorDataSource
-import im.vector.app.features.spaces.ALL_COMMUNITIES_GROUP_ID
+import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.ui.UiStateRepository
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
+sealed class RoomGroupingMethod {
+    data class ByLegacyGroup(val groupSummary: GroupSummary?) : RoomGroupingMethod()
+    data class BySpace(val spaceSummary: RoomSummary?) : RoomGroupingMethod()
+}
+
+fun RoomGroupingMethod.space() = (this as? RoomGroupingMethod.BySpace)?.spaceSummary
+fun RoomGroupingMethod.group() = (this as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary
+
 /**
  * This class handles the global app state.
  * It requires to be added to ProcessLifecycleOwner.get().lifecycle
@@ -42,48 +51,83 @@ import javax.inject.Singleton
 class AppStateHandler @Inject constructor(
         sessionDataSource: ActiveSessionDataSource,
         private val uiStateRepository: UiStateRepository,
-        private val activeSessionHolder: ActiveSessionHolder
+        private val activeSessionHolder: ActiveSessionHolder,
+        vectorPreferences: VectorPreferences
 ) : LifecycleObserver {
 
     private val compositeDisposable = CompositeDisposable()
 
-    private val selectedSpaceDataSource = BehaviorDataSource<Option<RoomSummary>>(Option.empty())
+    private val selectedSpaceDataSource = BehaviorDataSource(
+            // TODO get that from latest persisted?
+            if (vectorPreferences.labSpaces())
+                RoomGroupingMethod.BySpace(null)
+            else RoomGroupingMethod.ByLegacyGroup(null)
+    )
 
-    val selectedSpaceObservable = selectedSpaceDataSource.observe()
+    val selectedRoomGroupingObservable = selectedSpaceDataSource.observe()
 
-    fun setCurrentSpace(space: RoomSummary?) {
-        if (space == selectedSpaceDataSource.currentValue?.orNull()) return
-        selectedSpaceDataSource.post(space?.let { Option.just(it) } ?: Option.empty())
-        if (space != null && space.roomId != ALL_COMMUNITIES_GROUP_ID) {
+    fun getCurrentRoomGroupingMethod(): RoomGroupingMethod = selectedSpaceDataSource.currentValue ?: RoomGroupingMethod.BySpace(null)
+
+    fun setCurrentSpace(spaceId: String?, session: Session? = null) {
+        val uSession = session ?: activeSessionHolder.getSafeActiveSession()
+        if (selectedSpaceDataSource.currentValue is RoomGroupingMethod.BySpace
+                && spaceId == selectedSpaceDataSource.currentValue?.space()?.roomId) return
+        val spaceSum = spaceId?.let { uSession?.getRoomSummary(spaceId) }
+        selectedSpaceDataSource.post(RoomGroupingMethod.BySpace(spaceSum))
+        if (spaceId != null) {
             GlobalScope.launch {
                 tryOrNull {
-                    activeSessionHolder.getSafeActiveSession()?.getRoom(space.roomId)?.loadRoomMembersIfNeeded()
+                    uSession?.getRoom(spaceId)?.loadRoomMembersIfNeeded()
+                }
+            }
+        }
+    }
+
+    fun setCurrentGroup(groupId: String?, session: Session? = null) {
+        val uSession = session ?: activeSessionHolder.getSafeActiveSession()
+        if (selectedSpaceDataSource.currentValue is RoomGroupingMethod.ByLegacyGroup
+                && groupId == selectedSpaceDataSource.currentValue?.group()?.groupId) return
+        val activeGroup = groupId?.let { uSession?.getGroupSummary(groupId) }
+        selectedSpaceDataSource.post(RoomGroupingMethod.ByLegacyGroup(activeGroup))
+        if (groupId != null) {
+            GlobalScope.launch {
+                tryOrNull {
+                    uSession?.getGroup(groupId)?.fetchGroupData()
                 }
             }
         }
     }
 
     init {
-        // restore current space from ui state
-        sessionDataSource.currentValue?.orNull()?.let { session ->
-            uiStateRepository.getSelectedSpace(session.sessionId)?.let { selectedSpaceId ->
-                session.getRoomSummary(selectedSpaceId)?.let {
-                    setCurrentSpace(it)
-                }
-            }
+
+        sessionDataSource.observe()
+                .distinctUntilChanged()
+                .subscribe {
+                    it.orNull()?.let { session ->
+                        Timber.w("VAL: Latest method is space? ${uiStateRepository.isGroupingMethodSpace(session.sessionId)}")
+                        if (uiStateRepository.isGroupingMethodSpace(session.sessionId)) {
+                            uiStateRepository.getSelectedSpace(session.sessionId)?.let { selectedSpaceId ->
+                                Timber.w("VAL: Latest selected space: $selectedSpaceId")
+                                setCurrentSpace(selectedSpaceId, session)
+                            }
+                        } else {
+                            uiStateRepository.getSelectedGroup(session.sessionId)?.let { selectedGroupId ->
+                                setCurrentGroup(selectedGroupId, session)
+                            }
+                        }
+                    }
+        }.also {
+            compositeDisposable.add(it)
         }
+        // restore current space from ui state
     }
 
     fun safeActiveSpaceId(): String? {
-        return selectedSpaceDataSource.currentValue?.orNull()?.roomId?.takeIf {
-            MatrixPatterns.isRoomId(it)
-        }
+        return (selectedSpaceDataSource.currentValue as? RoomGroupingMethod.BySpace)?.spaceSummary?.roomId
     }
 
-    fun safeActiveSpace(): RoomSummary? {
-        return selectedSpaceDataSource.currentValue?.orNull()?.takeIf {
-            MatrixPatterns.isRoomId(it.roomId)
-        }
+    fun safeActiveGroupId(): String? {
+        return (selectedSpaceDataSource.currentValue as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary?.groupId
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
@@ -93,5 +137,19 @@ class AppStateHandler @Inject constructor(
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
     fun entersBackground() {
         compositeDisposable.clear()
+        Timber.w("VAL: entersBackground session: ${ activeSessionHolder.getSafeActiveSession()?.myUserId}")
+        val session = activeSessionHolder.getSafeActiveSession() ?: return
+        when (val currentMethod = selectedSpaceDataSource.currentValue ?: RoomGroupingMethod.BySpace(null)) {
+            is RoomGroupingMethod.BySpace -> {
+                uiStateRepository.storeGroupingMethod(true, session)
+                Timber.w("VAL: Store selected space: ${currentMethod.spaceSummary?.roomId}")
+                uiStateRepository.storeSelectedSpace(currentMethod.spaceSummary?.roomId, session)
+            }
+            is RoomGroupingMethod.ByLegacyGroup -> {
+                uiStateRepository.storeGroupingMethod(false, session)
+                Timber.w("VAL: Store group space: ${currentMethod.groupSummary?.groupId}")
+                uiStateRepository.storeSelectedGroup(currentMethod.groupSummary?.groupId, session)
+            }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 3329c9d372..3d15bdd123 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -51,7 +51,6 @@ import im.vector.app.features.devtools.RoomDevToolSendFormFragment
 import im.vector.app.features.devtools.RoomDevToolStateEventListFragment
 import im.vector.app.features.discovery.DiscoverySettingsFragment
 import im.vector.app.features.discovery.change.SetIdentityServerFragment
-import im.vector.app.features.grouplist.GroupListFragment
 import im.vector.app.features.home.HomeDetailFragment
 import im.vector.app.features.home.HomeDrawerFragment
 import im.vector.app.features.home.LoadingFragment
@@ -150,11 +149,6 @@ interface FragmentModule {
     @FragmentKey(LocalePickerFragment::class)
     fun bindLocalePickerFragment(fragment: LocalePickerFragment): Fragment
 
-    @Binds
-    @IntoMap
-    @FragmentKey(GroupListFragment::class)
-    fun bindGroupListFragment(fragment: GroupListFragment): Fragment
-
     @Binds
     @IntoMap
     @FragmentKey(SpaceListFragment::class)
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
index c8d5f6dd20..e5a47e872c 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
@@ -35,7 +35,6 @@ import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.configuration.VectorConfiguration
 import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
 import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
-import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.CurrentSpaceSuggestedRoomListDataSource
 import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
@@ -115,8 +114,6 @@ interface VectorComponent {
 
     fun errorFormatter(): ErrorFormatter
 
-    fun selectedGroupStore(): SelectedGroupDataSource
-
     fun appStateHandler(): AppStateHandler
 
     fun currentSpaceSuggestedRoomListDataSource(): CurrentSpaceSuggestedRoomListDataSource
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt
deleted file mode 100644
index 4d974b8ce8..0000000000
--- a/vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package im.vector.app.features.grouplist
-
-import im.vector.app.core.platform.VectorViewModelAction
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
-
-sealed class GroupListAction : VectorViewModelAction {
-    data class SelectGroup(val groupSummary: GroupSummary) : GroupListAction()
-}
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt
deleted file mode 100644
index 297e33c583..0000000000
--- a/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package im.vector.app.features.grouplist
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.airbnb.mvrx.Incomplete
-import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.fragmentViewModel
-import com.airbnb.mvrx.withState
-import im.vector.app.core.extensions.cleanup
-import im.vector.app.core.extensions.configureWith
-import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.platform.StateView
-import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.databinding.FragmentGroupListBinding
-import im.vector.app.features.home.HomeActivitySharedAction
-import im.vector.app.features.home.HomeSharedActionViewModel
-
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
-import javax.inject.Inject
-
-class GroupListFragment @Inject constructor(
-        val groupListViewModelFactory: GroupListViewModel.Factory,
-        private val groupController: GroupSummaryController
-) : VectorBaseFragment<FragmentGroupListBinding>(),
-        GroupSummaryController.Callback {
-
-    private lateinit var sharedActionViewModel: HomeSharedActionViewModel
-    private val viewModel: GroupListViewModel by fragmentViewModel()
-
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGroupListBinding {
-        return FragmentGroupListBinding.inflate(inflater, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        sharedActionViewModel = activityViewModelProvider.get(HomeSharedActionViewModel::class.java)
-        groupController.callback = this
-        views.stateView.contentView = views.groupListView
-        views.groupListView.configureWith(groupController)
-        viewModel.observeViewEvents {
-            when (it) {
-                is GroupListViewEvents.OpenGroupSummary -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup)
-            }.exhaustive
-        }
-    }
-
-    override fun onDestroyView() {
-        groupController.callback = null
-        views.groupListView.cleanup()
-        super.onDestroyView()
-    }
-
-    override fun invalidate() = withState(viewModel) { state ->
-        when (state.asyncGroups) {
-            is Incomplete -> views.stateView.state = StateView.State.Loading
-            is Success    -> views.stateView.state = StateView.State.Content
-        }
-        groupController.update(state)
-    }
-
-    override fun onGroupSelected(groupSummary: GroupSummary) {
-        viewModel.handle(GroupListAction.SelectGroup(groupSummary))
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
deleted file mode 100644
index 0f6f77783d..0000000000
--- a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package im.vector.app.features.grouplist
-
-import androidx.lifecycle.viewModelScope
-import arrow.core.Option
-import com.airbnb.mvrx.FragmentViewModelContext
-import com.airbnb.mvrx.MvRxViewModelFactory
-import com.airbnb.mvrx.ViewModelContext
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import dagger.assisted.AssistedFactory
-import im.vector.app.R
-import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.resources.StringProvider
-import io.reactivex.Observable
-import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.api.query.QueryStringValue
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.group.groupSummaryQueryParams
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
-import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.rx.rx
-
-const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
-
-class GroupListViewModel @AssistedInject constructor(@Assisted initialState: GroupListViewState,
-                                                     private val selectedGroupStore: SelectedGroupDataSource,
-                                                     private val session: Session,
-                                                     private val stringProvider: StringProvider
-) : VectorViewModel<GroupListViewState, GroupListAction, GroupListViewEvents>(initialState) {
-
-    @AssistedFactory
-    interface Factory {
-        fun create(initialState: GroupListViewState): GroupListViewModel
-    }
-
-    companion object : MvRxViewModelFactory<GroupListViewModel, GroupListViewState> {
-
-        @JvmStatic
-        override fun create(viewModelContext: ViewModelContext, state: GroupListViewState): GroupListViewModel? {
-            val groupListFragment: GroupListFragment = (viewModelContext as FragmentViewModelContext).fragment()
-            return groupListFragment.groupListViewModelFactory.create(state)
-        }
-    }
-
-    private var currentGroupId = ""
-
-    init {
-        observeGroupSummaries()
-        observeSelectionState()
-    }
-
-    private fun observeSelectionState() {
-        selectSubscribe(GroupListViewState::selectedGroup) { groupSummary ->
-            if (groupSummary != null) {
-                // We only want to open group if the updated selectedGroup is a different one.
-                if (currentGroupId != groupSummary.groupId) {
-                    currentGroupId = groupSummary.groupId
-                    _viewEvents.post(GroupListViewEvents.OpenGroupSummary)
-                }
-                val optionGroup = Option.just(groupSummary)
-                selectedGroupStore.post(optionGroup)
-            } else {
-                // If selected group is null we force to default. It can happens when leaving the selected group.
-                setState {
-                    copy(selectedGroup = this.asyncGroups()?.find { it.groupId == ALL_COMMUNITIES_GROUP_ID })
-                }
-            }
-        }
-    }
-
-    override fun handle(action: GroupListAction) {
-        when (action) {
-            is GroupListAction.SelectGroup -> handleSelectGroup(action)
-        }
-    }
-
-    // PRIVATE METHODS *****************************************************************************
-
-    private fun handleSelectGroup(action: GroupListAction.SelectGroup) = withState { state ->
-        if (state.selectedGroup?.groupId != action.groupSummary.groupId) {
-            // We take care of refreshing group data when selecting to be sure we get all the rooms and users
-            tryOrNull {
-                viewModelScope.launch {
-                    session.getGroup(action.groupSummary.groupId)?.fetchGroupData()
-                }
-            }
-            setState { copy(selectedGroup = action.groupSummary) }
-        }
-    }
-
-    private fun observeGroupSummaries() {
-        val groupSummariesQueryParams = groupSummaryQueryParams {
-            memberships = listOf(Membership.JOIN)
-            displayName = QueryStringValue.IsNotEmpty
-        }
-        Observable.combineLatest<GroupSummary, List<GroupSummary>, List<GroupSummary>>(
-                session
-                        .rx()
-                        .liveUser(session.myUserId)
-                        .map { optionalUser ->
-                            GroupSummary(
-                                    groupId = ALL_COMMUNITIES_GROUP_ID,
-                                    membership = Membership.JOIN,
-                                    displayName = stringProvider.getString(R.string.group_all_communities),
-                                    avatarUrl = optionalUser.getOrNull()?.avatarUrl ?: "")
-                        },
-                session
-                        .rx()
-                        .liveGroupSummaries(groupSummariesQueryParams),
-                { allCommunityGroup, communityGroups ->
-                    listOf(allCommunityGroup) + communityGroups
-                }
-        )
-                .execute { async ->
-                    val currentSelectedGroupId = selectedGroup?.groupId
-                    val newSelectedGroup = if (currentSelectedGroupId != null) {
-                        async()?.find { it.groupId == currentSelectedGroupId }
-                    } else {
-                        async()?.firstOrNull()
-                    }
-                    copy(asyncGroups = async, selectedGroup = newSelectedGroup)
-                }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt
deleted file mode 100644
index 4abcff2f67..0000000000
--- a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.grouplist
-
-import com.airbnb.mvrx.Async
-import com.airbnb.mvrx.MvRxState
-import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
-
-data class GroupListViewState(
-        val asyncGroups: Async<List<GroupSummary>> = Uninitialized,
-        val selectedGroup: GroupSummary? = null
-) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt
deleted file mode 100644
index 03272c2729..0000000000
--- a/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package im.vector.app.features.grouplist
-
-import com.airbnb.epoxy.EpoxyController
-import im.vector.app.features.home.AvatarRenderer
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
-import org.matrix.android.sdk.api.util.toMatrixItem
-import javax.inject.Inject
-
-class GroupSummaryController @Inject constructor(private val avatarRenderer: AvatarRenderer) : EpoxyController() {
-
-    var callback: Callback? = null
-    private var viewState: GroupListViewState? = null
-
-    init {
-        requestModelBuild()
-    }
-
-    fun update(viewState: GroupListViewState) {
-        this.viewState = viewState
-        requestModelBuild()
-    }
-
-    override fun buildModels() {
-        val nonNullViewState = viewState ?: return
-        buildGroupModels(nonNullViewState.asyncGroups(), nonNullViewState.selectedGroup)
-    }
-
-    private fun buildGroupModels(summaries: List<GroupSummary>?, selected: GroupSummary?) {
-        if (summaries.isNullOrEmpty()) {
-            return
-        }
-        summaries.forEach { groupSummary ->
-            val isSelected = groupSummary.groupId == selected?.groupId
-            groupSummaryItem {
-                avatarRenderer(avatarRenderer)
-                id(groupSummary.groupId)
-                matrixItem(groupSummary.toMatrixItem())
-                selected(isSelected)
-                listener { callback?.onGroupSelected(groupSummary) }
-            }
-        }
-    }
-
-    interface Callback {
-        fun onGroupSelected(groupSummary: GroupSummary)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt b/vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt
deleted file mode 100644
index 5a172e2636..0000000000
--- a/vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.grouplist
-
-import arrow.core.Option
-import im.vector.app.core.utils.BehaviorDataSource
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class SelectedGroupDataSource @Inject constructor() : BehaviorDataSource<Option<GroupSummary>>(Option.empty())
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 24ad6c8b85..5a7f2e2f8f 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -32,6 +32,7 @@ import androidx.core.view.isVisible
 import androidx.drawerlayout.widget.DrawerLayout
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
+import im.vector.app.AppStateHandler
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ScreenComponent
@@ -108,6 +109,7 @@ class HomeActivity :
     @Inject lateinit var permalinkHandler: PermalinkHandler
     @Inject lateinit var avatarRenderer: AvatarRenderer
     @Inject lateinit var initSyncStepFormatter: InitSyncStepFormatter
+    @Inject lateinit var appStateHandler: AppStateHandler
 
     private val createSpaceResultLauncher = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
@@ -152,10 +154,15 @@ class HomeActivity :
         sharedActionViewModel = viewModelProvider.get(HomeSharedActionViewModel::class.java)
         views.drawerLayout.addDrawerListener(drawerListener)
         if (isFirstCreation()) {
-            replaceFragment(R.id.homeDetailFragmentContainer, LoadingFragment::class.java)
+            replaceFragment(R.id.homeDetailFragmentContainer, HomeDetailFragment::class.java)
             replaceFragment(R.id.homeDrawerFragmentContainer, HomeDrawerFragment::class.java)
         }
 
+//        appStateHandler.selectedRoomGroupingObservable.subscribe {
+//            if (supportFragmentManager.getFragment())
+//            replaceFragment(R.id.homeDetailFragmentContainer, HomeDetailFragment::class.java, allowStateLoss = true)
+//        }.disposeOnDestroy()
+
         sharedActionViewModel
                 .observe()
                 .subscribe { sharedAction ->
@@ -164,13 +171,17 @@ class HomeActivity :
                         is HomeActivitySharedAction.CloseDrawer -> views.drawerLayout.closeDrawer(GravityCompat.START)
                         is HomeActivitySharedAction.OpenGroup -> {
                             views.drawerLayout.closeDrawer(GravityCompat.START)
+
                             // Temporary
+                            // When switching from space to group or group to space, we need to reload the fragment
+                            // To be removed when dropping legacy groups
+                            if (sharedAction.clearFragment) {
+                                replaceFragment(R.id.homeDetailFragmentContainer, HomeDetailFragment::class.java, allowStateLoss = true)
+                            } else {
+                                // nop
+                            }
                             // we might want to delay that to avoid having the drawer animation lagging
                             // would be probably better to let the drawer do that? in the on closed callback?
-                            views.coordinatorLayout.postDelayed({
-                                replaceFragment(R.id.homeDetailFragmentContainer, HomeDetailFragment::class.java, allowStateLoss = true)
-                            }, 200)
-                            Unit
                         }
                         is HomeActivitySharedAction.OpenSpacePreview -> {
                             startActivity(SpacePreviewActivity.newIntent(this, sharedAction.spaceId))
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
index e87ce3476f..db0a9ba9eb 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
@@ -24,7 +24,7 @@ import im.vector.app.core.platform.VectorSharedAction
 sealed class HomeActivitySharedAction : VectorSharedAction {
     object OpenDrawer : HomeActivitySharedAction()
     object CloseDrawer : HomeActivitySharedAction()
-    object OpenGroup : HomeActivitySharedAction()
+    data class OpenGroup(val clearFragment: Boolean) : HomeActivitySharedAction()
     object AddSpace : HomeActivitySharedAction()
     data class OpenSpacePreview(val spaceId: String) : HomeActivitySharedAction()
     data class ShowSpaceSettings(val spaceId: String) : HomeActivitySharedAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index e7831c72cc..7b989b9bf8 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -29,6 +29,7 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.badge.BadgeDrawable
 import im.vector.app.R
+import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.platform.ToolbarConfigurable
@@ -48,7 +49,6 @@ import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity.Companion.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS
-import im.vector.app.features.spaces.ALL_COMMUNITIES_GROUP_ID
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.BannerState
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
@@ -125,15 +125,14 @@ class HomeDetailFragment @Inject constructor(
             views.bottomNavigationView.selectedItemId = it.displayMode.toMenuId()
         }
 
-        viewModel.selectSubscribe(this, HomeDetailViewState::groupSummary) { groupSummary ->
-            if (!vectorPreferences.labSpaces()) {
-                onGroupChange(groupSummary.orNull())
-            }
-        }
-
-        viewModel.selectSubscribe(this, HomeDetailViewState::spaceSummary) { spaceSummary ->
-            if (vectorPreferences.labSpaces()) {
-                onSpaceChange(spaceSummary.orNull())
+        viewModel.selectSubscribe(this, HomeDetailViewState::roomGroupingMethod) { roomGroupingMethod ->
+            when (roomGroupingMethod) {
+                is RoomGroupingMethod.ByLegacyGroup -> {
+                    onGroupChange(roomGroupingMethod.groupSummary)
+                }
+                is RoomGroupingMethod.BySpace -> {
+                    onSpaceChange(roomGroupingMethod.spaceSummary)
+                }
             }
         }
 
@@ -257,8 +256,7 @@ class HomeDetailFragment @Inject constructor(
     }
 
     private fun onGroupChange(groupSummary: GroupSummary?) {
-        groupSummary ?: return
-        if (groupSummary.groupId == ALL_COMMUNITIES_GROUP_ID) {
+        if (groupSummary == null) {
             views.groupToolbarSpaceTitleView.isVisible = false
         } else {
             views.groupToolbarSpaceTitleView.isVisible = true
@@ -267,8 +265,7 @@ class HomeDetailFragment @Inject constructor(
     }
 
     private fun onSpaceChange(spaceSummary: RoomSummary?) {
-        spaceSummary ?: return
-        if (spaceSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
+        if (spaceSummary == null) {
             views.groupToolbarSpaceTitleView.isVisible = false
         } else {
             views.groupToolbarSpaceTitleView.isVisible = true
@@ -310,11 +307,14 @@ class HomeDetailFragment @Inject constructor(
 
         views.homeToolbarContent.debouncedClicks {
             withState(viewModel) {
-                if (vectorPreferences.labSpaces()) {
-                    val currentSpace = it.spaceSummary.orNull()
-                            ?.takeIf { it.roomId != ALL_COMMUNITIES_GROUP_ID }
-                    if (vectorPreferences.labSpaces() && currentSpace != null) {
-                        sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(currentSpace.roomId))
+                when (it.roomGroupingMethod) {
+                    is RoomGroupingMethod.ByLegacyGroup -> {
+                        // nothing do far
+                    }
+                    is RoomGroupingMethod.BySpace -> {
+                        it.roomGroupingMethod.spaceSummary?.let {
+                            sharedActionViewModel.post(HomeActivitySharedAction.ShowSpaceSettings(it.roomId))
+                        }
                     }
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 1d57b26015..b497532a9b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -24,12 +24,12 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.AppStateHandler
+import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.di.HasScreenInjector
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.ui.UiStateRepository
+import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
@@ -51,9 +51,7 @@ import java.util.concurrent.TimeUnit
 class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: HomeDetailViewState,
                                                       private val session: Session,
                                                       private val uiStateRepository: UiStateRepository,
-                                                      private val selectedGroupStore: SelectedGroupDataSource,
-                                                      private val appStateHandler: AppStateHandler,
-                                                      private val stringProvider: StringProvider)
+                                                      private val appStateHandler: AppStateHandler)
     : VectorViewModel<HomeDetailViewState, HomeDetailAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
@@ -79,8 +77,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
 
     init {
         observeSyncState()
-        observeSelectedGroupStore()
-        observeSelectedSpaceStore()
+        observeRoomGroupingMethod()
         observeRoomSummaries()
 
         session.rx().liveUser(session.myUserId).execute {
@@ -138,29 +135,22 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                 .disposeOnClear()
     }
 
-    private fun observeSelectedGroupStore() {
-        selectedGroupStore
-                .observe()
+    private fun observeRoomGroupingMethod() {
+        appStateHandler.selectedRoomGroupingObservable
                 .subscribe {
-                    setState {
-                        copy(groupSummary = it)
-                    }
-                }
-                .disposeOnClear()
-    }
-
-    private fun observeSelectedSpaceStore() {
-        appStateHandler.selectedSpaceObservable
-                .subscribe {
-                    setState {
-                        copy(spaceSummary = it)
-                    }
+                   setState {
+                       copy(
+                               roomGroupingMethod = it
+                       )
+                   }
                 }
                 .disposeOnClear()
     }
 
     private fun observeRoomSummaries() {
-        appStateHandler.selectedSpaceObservable.distinctUntilChanged().switchMap {
+        appStateHandler.selectedRoomGroupingObservable.distinctUntilChanged().switchMap {
+            // we use it as a trigger to all changes in room, but do not really load
+            // the actual models
             session.getPagedRoomSummariesLive(
                     roomSummaryQueryParams {
                         memberships = Membership.activeMemberships()
@@ -168,50 +158,55 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                     sortOrder = RoomSortOrder.NONE
             ).asObservable()
         }
-
-//                .asObservable()
+                .observeOn(Schedulers.computation())
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
                 .subscribe {
-                    val activeSpace = appStateHandler.safeActiveSpaceId()
-                    val dmInvites = session.getRoomSummaries(
-                            roomSummaryQueryParams {
-                                memberships = listOf(Membership.INVITE)
-                                roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                            }
-                    ).size
+                    when (val groupingMethod = appStateHandler.getCurrentRoomGroupingMethod()) {
+                        is RoomGroupingMethod.ByLegacyGroup -> {
+                            // TODO!!
+                        }
+                        is RoomGroupingMethod.BySpace -> {
+                            val dmInvites = session.getRoomSummaries(
+                                    roomSummaryQueryParams {
+                                        memberships = listOf(Membership.INVITE)
+                                        roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                                    }
+                            ).size
 
-                    val roomsInvite = session.getRoomSummaries(
-                            roomSummaryQueryParams {
-                                memberships = listOf(Membership.INVITE)
-                                roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                            }
-                    ).size
+                            val roomsInvite = session.getRoomSummaries(
+                                    roomSummaryQueryParams {
+                                        memberships = listOf(Membership.INVITE)
+                                        roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                                    }
+                            ).size
 
-                    val dmRooms = session.getNotificationCountForRooms(
-                            roomSummaryQueryParams {
-                                memberships = listOf(Membership.JOIN)
-                                roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                            }
-                    )
+                            val dmRooms = session.getNotificationCountForRooms(
+                                    roomSummaryQueryParams {
+                                        memberships = listOf(Membership.JOIN)
+                                        roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                                    }
+                            )
 
-                    val otherRooms = session.getNotificationCountForRooms(
-                            roomSummaryQueryParams {
-                                memberships = listOf(Membership.JOIN)
-                                roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                                activeSpaceId = ActiveSpaceFilter.ActiveSpace(activeSpace)
-                            }
-                    )
+                            val otherRooms = session.getNotificationCountForRooms(
+                                    roomSummaryQueryParams {
+                                        memberships = listOf(Membership.JOIN)
+                                        roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(groupingMethod.spaceSummary?.roomId)
+                                    }
+                            )
 
-                    setState {
-                        copy(
-                                notificationCountCatchup = dmRooms.totalCount + otherRooms.totalCount + roomsInvite + dmInvites,
-                                notificationHighlightCatchup = dmRooms.isHighlight || otherRooms.isHighlight,
-                                notificationCountPeople = dmRooms.totalCount + dmInvites,
-                                notificationHighlightPeople = dmRooms.isHighlight || dmInvites > 0,
-                                notificationCountRooms = otherRooms.totalCount + roomsInvite,
-                                notificationHighlightRooms = otherRooms.isHighlight || roomsInvite > 0,
-                                hasUnreadMessages = dmRooms.totalCount + otherRooms.totalCount > 0
-                        )
+                            setState {
+                                copy(
+                                        notificationCountCatchup = dmRooms.totalCount + otherRooms.totalCount + roomsInvite + dmInvites,
+                                        notificationHighlightCatchup = dmRooms.isHighlight || otherRooms.isHighlight,
+                                        notificationCountPeople = dmRooms.totalCount + dmInvites,
+                                        notificationHighlightPeople = dmRooms.isHighlight || dmInvites > 0,
+                                        notificationCountRooms = otherRooms.totalCount + roomsInvite,
+                                        notificationHighlightRooms = otherRooms.isHighlight || roomsInvite > 0,
+                                        hasUnreadMessages = dmRooms.totalCount + otherRooms.totalCount > 0
+                                )
+                            }
+                        }
                     }
                 }
                 .disposeOnClear()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
index 637182d052..5aa9612a7a 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
@@ -16,18 +16,16 @@
 
 package im.vector.app.features.home
 
-import arrow.core.Option
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import im.vector.app.RoomGroupingMethod
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.util.MatrixItem
 
 data class HomeDetailViewState(
-        val groupSummary: Option<GroupSummary> = Option.empty(),
-        val spaceSummary: Option<RoomSummary> = Option.empty(),
+        val roomGroupingMethod: RoomGroupingMethod = RoomGroupingMethod.BySpace(null),
         val myMatrixItem: MatrixItem? = null,
         val asyncRooms: Async<List<RoomSummary>> = Uninitialized,
         val displayMode: RoomListDisplayMode = RoomListDisplayMode.PEOPLE,
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index 91811ffb13..e935b71604 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -30,7 +30,7 @@ import im.vector.app.core.extensions.replaceChildFragment
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.FragmentHomeDrawerBinding
-import im.vector.app.features.grouplist.GroupListFragment
+// import im.vector.app.features.grouplist.GroupListFragment
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.spaces.SpaceListFragment
@@ -59,11 +59,11 @@ class HomeDrawerFragment @Inject constructor(
         sharedActionViewModel = activityViewModelProvider.get(HomeSharedActionViewModel::class.java)
 
         if (savedInstanceState == null) {
-            if (vectorPreferences.labSpaces()) {
+//            if (vectorPreferences.labSpaces()) {
                 replaceChildFragment(R.id.homeDrawerGroupListContainer, SpaceListFragment::class.java)
-            } else {
-                replaceChildFragment(R.id.homeDrawerGroupListContainer, GroupListFragment::class.java)
-            }
+//            } else {
+//                replaceChildFragment(R.id.homeDrawerGroupListContainer, GroupListFragment::class.java)
+//            }
         }
         session.getUserLive(session.myUserId).observeK(viewLifecycleOwner) { optionalUser ->
             val user = optionalUser?.getOrNull()
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index 85440c6582..fd5b0d12d7 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -107,8 +107,8 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                 }.disposeOnClear()
 
         Observable.combineLatest(
-                appStateHandler.selectedSpaceObservable.distinctUntilChanged(),
-                appStateHandler.selectedSpaceObservable.switchMap {
+                appStateHandler.selectedRoomGroupingObservable.distinctUntilChanged(),
+                appStateHandler.selectedRoomGroupingObservable.switchMap {
                     session.getPagedRoomSummariesLive(
                             roomSummaryQueryParams {
                                 this.memberships = Membership.activeMemberships()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index c7d18f1da7..3d91aaedd4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -179,14 +179,14 @@ class RoomDetailViewModel @AssistedInject constructor(
         observePowerLevel()
         updateShowDialerOptionState()
         room.getRoomSummaryLive()
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
         }
         // Inform the SDK that the room is displayed
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO)  {
             try {
                 session.onRoomDisplayed(initialState.roomId)
-            } catch (_: Exception) {
+            } catch (_: Throwable) {
             }
         }
         callManager.addPstnSupportListener(this)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
index 7c994666a9..6287ef58e0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
@@ -17,10 +17,10 @@
 package im.vector.app.features.home.room.list
 
 import androidx.annotation.StringRes
+import im.vector.app.AppStateHandler
 import im.vector.app.R
+import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.grouplist.ALL_COMMUNITIES_GROUP_ID
-import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.home.RoomListDisplayMode
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
@@ -37,25 +37,24 @@ class GroupRoomListSectionBuilder(
         val session: Session,
         val stringProvider: StringProvider,
         val viewModelScope: CoroutineScope,
-        val selectedGroupDataSource: SelectedGroupDataSource,
+        val appStateHandler: AppStateHandler,
         val onDisposable: (Disposable) -> Unit,
         val onUdpatable: (UpdatableLivePageResult) -> Unit
 ) : RoomListSectionBuilder {
 
     override fun buildSections(mode: RoomListDisplayMode): List<RoomsSection> {
-        val activeSpaceAwareQueries = mutableListOf<UpdatableLivePageResult>()
+        val activeGroupAwareQueries = mutableListOf<UpdatableLivePageResult>()
         val sections = mutableListOf<RoomsSection>()
-        val actualGroupId = selectedGroupDataSource.currentValue?.orNull()
-                ?.groupId?.takeIf { it != ALL_COMMUNITIES_GROUP_ID }
+        val actualGroupId = appStateHandler.safeActiveGroupId()
 
         when (mode) {
             RoomListDisplayMode.PEOPLE -> {
                 // 3 sections Invites / Fav / Dms
-                buildPeopleSections(sections, activeSpaceAwareQueries, actualGroupId)
+                buildPeopleSections(sections, activeGroupAwareQueries, actualGroupId)
             }
             RoomListDisplayMode.ROOMS -> {
                 // 5 sections invites / Fav / Rooms / Low Priority / Server notice
-                buildRoomsSections(sections, activeSpaceAwareQueries, actualGroupId)
+                buildRoomsSections(sections, activeGroupAwareQueries, actualGroupId)
             }
             RoomListDisplayMode.FILTERED -> {
                 // Used when searching for rooms
@@ -76,7 +75,7 @@ class GroupRoomListSectionBuilder(
             RoomListDisplayMode.NOTIFICATIONS -> {
                 addSection(
                         sections,
-                        activeSpaceAwareQueries,
+                        activeGroupAwareQueries,
                         R.string.invitations_header,
                         true
                 ) {
@@ -87,7 +86,7 @@ class GroupRoomListSectionBuilder(
 
                 addSection(
                         sections,
-                        activeSpaceAwareQueries,
+                        activeGroupAwareQueries,
                         R.string.bottom_action_rooms,
                         false
                 ) {
@@ -98,11 +97,11 @@ class GroupRoomListSectionBuilder(
             }
         }
 
-        selectedGroupDataSource.observe()
+        appStateHandler.selectedRoomGroupingObservable
                 .distinctUntilChanged()
-                .subscribe { activeSpaceOption ->
-                    val selectedGroupId = activeSpaceOption.orNull()?.groupId?.takeIf { it != ALL_COMMUNITIES_GROUP_ID }
-                    activeSpaceAwareQueries.onEach { updater ->
+                .subscribe { groupingMethod ->
+                    val selectedGroupId = (groupingMethod as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary?.groupId
+                    activeGroupAwareQueries.onEach { updater ->
                         updater.updateQuery { query ->
                             query.copy(activeGroupId = selectedGroupId)
                         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 7f213336f8..00079e5a7b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -26,10 +26,10 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import im.vector.app.AppStateHandler
+import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -49,7 +49,6 @@ class RoomListViewModel @Inject constructor(
         private val session: Session,
         private val stringProvider: StringProvider,
         private val appStateHandler: AppStateHandler,
-        private val selectedGroupDataSource: SelectedGroupDataSource,
         private val vectorPreferences: VectorPreferences
 ) : VectorViewModel<RoomListViewState, RoomListAction, RoomListViewEvents>(initialState) {
 
@@ -72,15 +71,14 @@ class RoomListViewModel @Inject constructor(
     }
 
     init {
+        Timber.w("VAL: RoomListViewModel INIT")
         observeMembershipChanges()
 
-        appStateHandler.selectedSpaceObservable
-                .distinctUntilChanged()
-                .map { it.orNull() }
+        appStateHandler.selectedRoomGroupingObservable
                 .distinctUntilChanged()
                 .execute {
                     copy(
-                            currentSpace = it
+                            currentRoomGrouping = it
                     )
                 }
 
@@ -113,7 +111,7 @@ class RoomListViewModel @Inject constructor(
     }
 
     val sections: List<RoomsSection> by lazy {
-        if (vectorPreferences.labSpaces()) {
+        if (appStateHandler.getCurrentRoomGroupingMethod() is RoomGroupingMethod.BySpace) {
             SpaceRoomListSectionBuilder(
                     session,
                     stringProvider,
@@ -132,7 +130,7 @@ class RoomListViewModel @Inject constructor(
                     session,
                     stringProvider,
                     viewModelScope,
-                    selectedGroupDataSource,
+                    appStateHandler,
                     {
                         it.disposeOnClear()
                     },
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
index 0a142304a0..a30c175f41 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.home.room.list
 
 import im.vector.app.AppStateHandler
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
@@ -27,8 +26,7 @@ import javax.inject.Provider
 class RoomListViewModelFactory @Inject constructor(private val session: Provider<Session>,
                                                    private val appStateHandler: AppStateHandler,
                                                    private val stringProvider: StringProvider,
-                                                   private val vectorPreferences: VectorPreferences,
-                                                   private val selectedGroupDataSource: SelectedGroupDataSource)
+                                                   private val vectorPreferences: VectorPreferences)
     : RoomListViewModel.Factory {
 
     override fun create(initialState: RoomListViewState): RoomListViewModel {
@@ -37,7 +35,6 @@ class RoomListViewModelFactory @Inject constructor(private val session: Provider
                 session.get(),
                 stringProvider,
                 appStateHandler,
-                selectedGroupDataSource,
                 vectorPreferences
         )
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index d18574d75b..68a8b9e515 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -19,9 +19,9 @@ package im.vector.app.features.home.room.list
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.RoomGroupingMethod
 import im.vector.app.features.home.RoomListDisplayMode
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 
 data class RoomListViewState(
@@ -30,7 +30,7 @@ data class RoomListViewState(
         val roomMembershipChanges: Map<String, ChangeMembershipState> = emptyMap(),
         val asyncSuggestedRooms: Async<List<SpaceChildInfo>> = Uninitialized,
         val currentUserName: String? = null,
-        val currentSpace: Async<RoomSummary?> = Uninitialized
+        val currentRoomGrouping: Async<RoomGroupingMethod> = Uninitialized
 ) : MvRxState {
 
     constructor(args: RoomListParams) : this(displayMode = args.displayMode)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 353cf5732d..42f73caa74 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -26,13 +26,13 @@ import im.vector.app.AppStateHandler
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.RoomListDisplayMode
+import im.vector.app.space
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 import io.reactivex.rxkotlin.Observables
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
@@ -110,12 +110,12 @@ class SpaceRoomListSectionBuilder(
             }
         }
 
-        appStateHandler.selectedSpaceObservable
+        appStateHandler.selectedRoomGroupingObservable
                 .distinctUntilChanged()
-                .subscribe { activeSpaceOption ->
-                    val selectedSpace = activeSpaceOption.orNull()
+                .subscribe { groupingMethod ->
+                    val selectedSpace = groupingMethod.space()
                     activeSpaceAwareQueries.onEach { updater ->
-                        updater.updateForSpaceId(selectedSpace?.roomId?.takeIf { MatrixPatterns.isRoomId(it) })
+                        updater.updateForSpaceId(selectedSpace?.roomId)
                     }
                 }.also {
                     onDisposable.invoke(it)
@@ -185,10 +185,10 @@ class SpaceRoomListSectionBuilder(
 
         // add suggested rooms
         val suggestedRoomsObservable = // MutableLiveData<List<SpaceChildInfo>>()
-                appStateHandler.selectedSpaceObservable
+                appStateHandler.selectedRoomGroupingObservable
                         .distinctUntilChanged()
-                        .switchMap { activeSpaceOption ->
-                            val selectedSpace = activeSpaceOption.orNull()
+                        .switchMap { groupingMethod ->
+                            val selectedSpace = groupingMethod.space()
                             if (selectedSpace == null) {
                                 Observable.just(emptyList())
                             } else {
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index c033cc40fa..73d8325bca 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -31,6 +31,7 @@ import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
 import im.vector.app.AppStateHandler
 import im.vector.app.R
+import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.fatalError
 import im.vector.app.core.platform.VectorBaseActivity
@@ -76,13 +77,13 @@ import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgsBuilder
+import im.vector.app.space
 import org.matrix.android.sdk.api.session.crypto.verification.IncomingSasVerificationTransaction
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
-import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -106,17 +107,11 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun switchToSpace(context: Context, spaceId: String, roomId: String?, openShareSheet: Boolean) {
-        if (sessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(spaceId) == null) {
+        if (sessionHolder.getSafeActiveSession()?.getRoomSummary(spaceId) == null) {
             fatalError("Trying to open an unknown space $spaceId", vectorPreferences.failFast())
             return
         }
-
-        sessionHolder.getSafeActiveSession()?.spaceService()?.getSpace(spaceId)?.spaceSummary()?.let {
-            Timber.d("## Nav: Switching to space $spaceId / ${it.name}")
-            appStateHandler.setCurrentSpace(it)
-        } ?: kotlin.run {
-            Timber.d("## Nav: Failed to switch to space $spaceId")
-        }
+        appStateHandler.setCurrentSpace(spaceId)
         if (roomId != null) {
             val args = RoomDetailArgs(roomId, eventId = null, openShareSpaceForId = spaceId.takeIf { openShareSheet })
             val intent = RoomDetailActivity.newIntent(context, args)
@@ -251,15 +246,22 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openRoomDirectory(context: Context, initialFilter: String) {
-        val selectedSpace = appStateHandler.safeActiveSpace()?.let {
-            sessionHolder.getSafeActiveSession()?.getRoomSummary(it.roomId)
-        }
-        if (selectedSpace == null) {
-            val intent = RoomDirectoryActivity.getIntent(context, initialFilter)
-            context.startActivity(intent)
-        } else {
-            SpaceExploreActivity.newIntent(context, selectedSpace.roomId).let {
-                context.startActivity(it)
+        when (val groupingMethod = appStateHandler.getCurrentRoomGroupingMethod()) {
+            is RoomGroupingMethod.ByLegacyGroup -> {
+                // TODO should open list of rooms of this group
+                val intent = RoomDirectoryActivity.getIntent(context, initialFilter)
+                context.startActivity(intent)
+            }
+            is RoomGroupingMethod.BySpace -> {
+                val selectedSpace = groupingMethod.space()
+                if (selectedSpace == null) {
+                    val intent = RoomDirectoryActivity.getIntent(context, initialFilter)
+                    context.startActivity(intent)
+                } else {
+                    SpaceExploreActivity.newIntent(context, selectedSpace.roomId).let {
+                        context.startActivity(it)
+                    }
+                }
             }
         }
     }
@@ -275,29 +277,36 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openInviteUsersToRoom(context: Context, roomId: String) {
-        val selectedSpace = appStateHandler.safeActiveSpace()
-        if (vectorPreferences.labSpaces() && selectedSpace != null) {
-            // let user decides if he does it from space or room
-            (context as? AppCompatActivity)?.supportFragmentManager?.let { fm ->
-                InviteRoomSpaceChooserBottomSheet.newInstance(
-                        selectedSpace.roomId,
-                        roomId,
-                        object : InviteRoomSpaceChooserBottomSheet.InteractionListener {
-                            override fun inviteToSpace(spaceId: String) {
-                                val intent = InviteUsersToRoomActivity.getIntent(context, spaceId)
-                                context.startActivity(intent)
-                            }
-
-                            override fun inviteToRoom(roomId: String) {
-                                val intent = InviteUsersToRoomActivity.getIntent(context, roomId)
-                                context.startActivity(intent)
-                            }
-                        }
-                ).show(fm, InviteRoomSpaceChooserBottomSheet::class.java.name)
+        when (val currentGroupingMethod = appStateHandler.getCurrentRoomGroupingMethod()) {
+            is RoomGroupingMethod.ByLegacyGroup -> {
+                val intent = InviteUsersToRoomActivity.getIntent(context, roomId)
+                context.startActivity(intent)
+            }
+            is RoomGroupingMethod.BySpace -> {
+                if (currentGroupingMethod.spaceSummary != null) {
+                    // let user decides if he does it from space or room
+                    (context as? AppCompatActivity)?.supportFragmentManager?.let { fm ->
+                        InviteRoomSpaceChooserBottomSheet.newInstance(
+                                currentGroupingMethod.spaceSummary.roomId,
+                                roomId,
+                                object : InviteRoomSpaceChooserBottomSheet.InteractionListener {
+                                    override fun inviteToSpace(spaceId: String) {
+                                        val intent = InviteUsersToRoomActivity.getIntent(context, spaceId)
+                                        context.startActivity(intent)
+                                    }
+
+                                    override fun inviteToRoom(roomId: String) {
+                                        val intent = InviteUsersToRoomActivity.getIntent(context, roomId)
+                                        context.startActivity(intent)
+                                    }
+                                }
+                        ).show(fm, InviteRoomSpaceChooserBottomSheet::class.java.name)
+                    }
+                } else {
+                    val intent = InviteUsersToRoomActivity.getIntent(context, roomId)
+                    context.startActivity(intent)
+                }
             }
-        } else {
-            val intent = InviteUsersToRoomActivity.getIntent(context, roomId)
-            context.startActivity(intent)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceAddItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceAddItem.kt
new file mode 100644
index 0000000000..703ba73790
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceAddItem.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.utils.DebouncedClickListener
+
+@EpoxyModelClass(layout = R.layout.item_space_add)
+abstract class SpaceAddItem : VectorEpoxyModel<SpaceAddItem.Holder>() {
+
+    @EpoxyAttribute var listener: (() -> Unit)? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.view.setOnClickListener(
+                DebouncedClickListener({
+                    listener?.invoke()
+                })
+        )
+    }
+
+    class Holder : VectorEpoxyHolder()
+}
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
similarity index 57%
rename from vector/src/main/java/im/vector/app/features/grouplist/GroupListViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
index 7cd12b8364..8014dfad3d 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright (c) 2021 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.grouplist
+package im.vector.app.features.spaces
 
-import im.vector.app.core.platform.VectorViewEvents
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 
-/**
- * Transient events for group list screen
- */
-sealed class GroupListViewEvents : VectorViewEvents {
-    object OpenGroupSummary : GroupListViewEvents()
+@EpoxyModelClass(layout = R.layout.item_space_beta_header)
+abstract class SpaceBetaHeaderItem : VectorEpoxyModel<SpaceBetaHeaderItem.Holder>() {
+
+    class Holder : VectorEpoxyHolder()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
index 58812bd77e..ce4ac38a72 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.spaces
 
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 sealed class SpaceListAction : VectorViewModelAction {
@@ -25,4 +26,6 @@ sealed class SpaceListAction : VectorViewModelAction {
     data class LeaveSpace(val spaceSummary: RoomSummary) : SpaceListAction()
     data class ToggleExpand(val spaceSummary: RoomSummary) : SpaceListAction()
     object AddSpace : SpaceListAction()
+
+    data class SelectLegacyGroup(val groupSummary: GroupSummary?) : SpaceListAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index 6455b18d13..50d06d8238 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -32,6 +32,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentGroupListBinding
 import im.vector.app.features.home.HomeActivitySharedAction
 import im.vector.app.features.home.HomeSharedActionViewModel
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
@@ -56,8 +57,9 @@ class SpaceListFragment @Inject constructor(
         viewModel.observeViewEvents {
             when (it) {
                 is SpaceListViewEvents.OpenSpaceSummary -> sharedActionViewModel.post(HomeActivitySharedAction.OpenSpacePreview(it.id))
-                is SpaceListViewEvents.OpenSpace -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup)
-                is SpaceListViewEvents.AddSpace -> sharedActionViewModel.post(HomeActivitySharedAction.AddSpace)
+                is SpaceListViewEvents.OpenSpace        -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup(it.groupingMethodHasChanged))
+                is SpaceListViewEvents.AddSpace         -> sharedActionViewModel.post(HomeActivitySharedAction.AddSpace)
+                is SpaceListViewEvents.OpenGroup        -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup(it.groupingMethodHasChanged))
             }.exhaustive
         }
     }
@@ -94,4 +96,8 @@ class SpaceListFragment @Inject constructor(
     override fun onAddSpaceSelected() {
         viewModel.handle(SpaceListAction.AddSpace)
     }
+
+    override fun onGroupSelected(groupSummary: GroupSummary?) {
+        viewModel.handle(SpaceListAction.SelectLegacyGroup(groupSummary))
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt
index 7f05172cd1..b7e31d28f2 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt
@@ -22,7 +22,8 @@ import im.vector.app.core.platform.VectorViewEvents
  * Transient events for group list screen
  */
 sealed class SpaceListViewEvents : VectorViewEvents {
-    object OpenSpace : SpaceListViewEvents()
+    data class OpenSpace(val groupingMethodHasChanged: Boolean) : SpaceListViewEvents()
     data class OpenSpaceSummary(val id: String) : SpaceListViewEvents()
     object AddSpace : SpaceListViewEvents()
+    data class OpenGroup(val groupingMethodHasChanged: Boolean) : SpaceListViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
index 558b631c16..b57a5d364b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt
@@ -19,13 +19,18 @@ package im.vector.app.features.spaces
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.RoomGroupingMethod
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
+import org.matrix.android.sdk.api.util.MatrixItem
 
 data class SpaceListViewState(
+        val myMxItem : Async<MatrixItem.UserItem> = Uninitialized,
         val asyncSpaces: Async<List<RoomSummary>> = Uninitialized,
-        val selectedSpace: RoomSummary? = null,
+        val selectedGroupingMethod: RoomGroupingMethod = RoomGroupingMethod.BySpace(null),
         val rootSpaces: List<RoomSummary>? = null,
+        val legacyGroups: List<GroupSummary>? = null,
         val expandedStates: Map<String, Boolean> = emptyMap(),
         val homeAggregateCount : RoomAggregateNotificationCount = RoomAggregateNotificationCount(0, 0)
 ) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 8b30687a12..7d01032eb5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -18,14 +18,17 @@ package im.vector.app.features.spaces
 
 import com.airbnb.epoxy.EpoxyController
 import im.vector.app.R
+import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.core.ui.list.genericButtonItem
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItemHeader
-import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.grouplist.groupSummaryItem
 import im.vector.app.features.grouplist.homeSpaceSummaryItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import im.vector.app.group
+import im.vector.app.space
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
@@ -53,63 +56,101 @@ class SpaceSummaryController @Inject constructor(
         val nonNullViewState = viewState ?: return
         buildGroupModels(
                 nonNullViewState.asyncSpaces(),
-                nonNullViewState.selectedSpace,
+                nonNullViewState.selectedGroupingMethod,
                 nonNullViewState.rootSpaces,
                 nonNullViewState.expandedStates,
                 nonNullViewState.homeAggregateCount)
+
+        if (!nonNullViewState.legacyGroups.isNullOrEmpty()) {
+            genericFooterItem {
+                id("legacy_space")
+                text(" ")
+            }
+
+            genericItemHeader {
+                id("legacy_groups")
+                text(stringProvider.getString(R.string.groups_header))
+            }
+
+            // add home for communities
+            nonNullViewState.myMxItem.invoke()?.let { mxItem ->
+                groupSummaryItem {
+                    avatarRenderer(avatarRenderer)
+                    id("all_communities")
+                    matrixItem(mxItem.copy(displayName = stringProvider.getString(R.string.group_all_communities)))
+                    selected(nonNullViewState.selectedGroupingMethod is RoomGroupingMethod.ByLegacyGroup
+                            && nonNullViewState.selectedGroupingMethod.group() == null)
+                    listener { callback?.onGroupSelected(null) }
+                }
+            }
+
+            nonNullViewState.legacyGroups.forEach { groupSummary ->
+                groupSummaryItem {
+                    avatarRenderer(avatarRenderer)
+                    id(groupSummary.groupId)
+                    matrixItem(groupSummary.toMatrixItem())
+                    selected(nonNullViewState.selectedGroupingMethod is RoomGroupingMethod.ByLegacyGroup
+                            && nonNullViewState.selectedGroupingMethod.group()?.groupId == groupSummary.groupId)
+                    listener { callback?.onGroupSelected(groupSummary) }
+                }
+            }
+        }
     }
 
     private fun buildGroupModels(summaries: List<RoomSummary>?,
-                                 selected: RoomSummary?,
+                                 selected: RoomGroupingMethod,
                                  rootSpaces: List<RoomSummary>?,
                                  expandedStates: Map<String, Boolean>,
                                  homeCount: RoomAggregateNotificationCount) {
         if (summaries.isNullOrEmpty()) {
             return
         }
-        // show invites on top
-
-        summaries.filter { it.membership == Membership.INVITE }
-                .let { invites ->
-                    if (invites.isNotEmpty()) {
-                        genericItemHeader {
-                            id("invites")
-                            text(stringProvider.getString(R.string.spaces_invited_header))
-                        }
-                        invites.forEach {
-                            spaceSummaryItem {
-                                avatarRenderer(avatarRenderer)
-                                id(it.roomId)
-                                matrixItem(it.toMatrixItem())
-                                selected(false)
-                                listener { callback?.onSpaceInviteSelected(it) }
-                            }
-                        }
-                        genericFooterItem {
-                            id("invite_space")
-                            text("")
-                        }
-                    }
-                }
 
         genericItemHeader {
             id("spaces")
             text(stringProvider.getString(R.string.spaces_header))
         }
 
+        spaceBetaHeaderItem { id("beta_header") }
+
+        // show invites on top
+
+        summaries.filter { it.membership == Membership.INVITE }
+                .let { invites ->
+                    if (invites.isNotEmpty()) {
+//                        genericItemHeader {
+//                            id("invites")
+//                            text(stringProvider.getString(R.string.spaces_invited_header))
+//                        }
+                        invites.forEach {
+                            spaceSummaryItem {
+                                avatarRenderer(avatarRenderer)
+                                id(it.roomId)
+                                matrixItem(it.toMatrixItem())
+                                countState(UnreadCounterBadgeView.State(1, true))
+                                selected(false)
+                                description(stringProvider.getString(R.string.you_are_invited))
+                                listener { callback?.onSpaceInviteSelected(it) }
+                            }
+                        }
+                    }
+                }
+
         summaries.firstOrNull { it.roomId == ALL_COMMUNITIES_GROUP_ID }
                 ?.let {
+                    val isSelected = selected is RoomGroupingMethod.BySpace && selected.space() == null
                     homeSpaceSummaryItem {
                         id(it.roomId)
-                        selected(it.roomId == selected?.roomId)
+                        selected(isSelected)
                         countState(UnreadCounterBadgeView.State(homeCount.totalCount, homeCount.isHighlight))
                         listener { callback?.onSpaceSelected(it) }
                     }
                 }
 
         rootSpaces
+                ?.sortedBy { it.displayName }
                 ?.forEach { groupSummary ->
-                    val isSelected = groupSummary.roomId == selected?.roomId
+                    val isSelected = selected is RoomGroupingMethod.BySpace && groupSummary.roomId == selected.space()?.roomId
                     // does it have children?
                     val subSpaces = groupSummary.children?.filter { childInfo ->
                         summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
@@ -139,7 +180,7 @@ class SpaceSummaryController @Inject constructor(
                         // it's expanded
                         subSpaces?.forEach { child ->
                             summaries.firstOrNull { it.roomId == child.childRoomId }?.let { childSum ->
-                                val isChildSelected = childSum.roomId == selected?.roomId
+                                val isChildSelected = selected is RoomGroupingMethod.BySpace &&  childSum.roomId == selected.space()?.roomId
                                 spaceSummaryItem {
                                     avatarRenderer(avatarRenderer)
                                     id(child.childRoomId)
@@ -161,12 +202,9 @@ class SpaceSummaryController @Inject constructor(
                 }
 
 // Temporary item to create a new Space (will move with final design)
-
-        genericButtonItem {
+        spaceAddItem {
             id("create")
-            text(stringProvider.getString(R.string.add_space))
-            iconRes(R.drawable.ic_add_black)
-            buttonClickAction(DebouncedClickListener({ callback?.onAddSpaceSelected() }))
+            listener { callback?.onAddSpaceSelected() }
         }
     }
 
@@ -176,5 +214,7 @@ class SpaceSummaryController @Inject constructor(
         fun onSpaceSettings(spaceSummary: RoomSummary)
         fun onToggleExpand(spaceSummary: RoomSummary)
         fun onAddSpaceSelected()
+
+        fun onGroupSelected(groupSummary: GroupSummary?)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 797087e78b..105cb0dd57 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -27,6 +27,7 @@ import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.CheckableConstraintLayout
 import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.home.AvatarRenderer
@@ -46,6 +47,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
     @EpoxyAttribute var hasChildren: Boolean = false
     @EpoxyAttribute var indent: Int = 0
     @EpoxyAttribute var countState : UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+    @EpoxyAttribute var description: String? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
@@ -62,6 +64,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
             holder.moreView.isVisible = false
         }
 
+        holder.secondLineText.setTextOrHide(description)
         if (hasChildren) {
 //            holder.collapseIndicator.setOnClickListener(
 //                    DebouncedClickListener({ _ ->
@@ -104,6 +107,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
     class Holder : VectorEpoxyHolder() {
         val avatarImageView by bind<ImageView>(R.id.groupAvatarImageView)
         val groupNameView by bind<TextView>(R.id.groupNameView)
+        val secondLineText by bind<TextView>(R.id.groupDescView)
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
         val moreView by bind<ImageView>(R.id.groupTmpLeave)
         val collapseIndicator by bind<ImageView>(R.id.groupChildrenCollapse)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index de8e8bbc95..6066cf8c1c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -18,16 +18,21 @@ package im.vector.app.features.spaces
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.AppStateHandler
 import im.vector.app.R
+import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.ui.UiStateRepository
+import im.vector.app.group
+import im.vector.app.space
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import io.reactivex.schedulers.Schedulers
@@ -36,10 +41,12 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.group.groupSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
@@ -67,23 +74,42 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         }
     }
 
-    private var currentGroupId = ""
+//    private var currentGroupingMethod : RoomGroupingMethod? = null
 
     init {
-        observeSpaceSummaries()
-        observeSelectionState()
-        appStateHandler.selectedSpaceObservable
+
+        session.getUserLive(session.myUserId).asObservable()
                 .subscribe {
-                    if (currentGroupId != it.orNull()?.roomId) {
-                        setState {
-                            copy(
-                                    selectedSpace = it.orNull()
-                            )
-                        }
+                    setState {
+                        copy(
+                                myMxItem = it?.getOrNull()?.toMatrixItem()?.let { Success(it) } ?: Loading()
+                        )
+                    }
+                }.disposeOnClear()
+
+        observeSpaceSummaries()
+//        observeSelectionState()
+        appStateHandler.selectedRoomGroupingObservable
+                .distinctUntilChanged()
+                .subscribe {
+                    setState {
+                        copy(
+                                selectedGroupingMethod = it
+                        )
                     }
                 }
                 .disposeOnClear()
 
+        session.getGroupSummariesLive(groupSummaryQueryParams {})
+                .asObservable()
+                .subscribe {
+                    setState {
+                        copy(
+                                legacyGroups = it
+                        )
+                    }
+                }.disposeOnClear()
+
         session.getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
@@ -107,23 +133,23 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                 }.disposeOnClear()
     }
 
-    private fun observeSelectionState() {
-        selectSubscribe(SpaceListViewState::selectedSpace) { spaceSummary ->
-            if (spaceSummary != null) {
-                // We only want to open group if the updated selectedGroup is a different one.
-                if (currentGroupId != spaceSummary.roomId) {
-                    currentGroupId = spaceSummary.roomId
-                    _viewEvents.post(SpaceListViewEvents.OpenSpace)
-                }
-                appStateHandler.setCurrentSpace(spaceSummary)
-            } else {
-                // If selected group is null we force to default. It can happens when leaving the selected group.
-                setState {
-                    copy(selectedSpace = this.asyncSpaces()?.find { it.roomId == ALL_COMMUNITIES_GROUP_ID })
-                }
-            }
-        }
-    }
+//    private fun observeSelectionState() {
+//        selectSubscribe(SpaceListViewState::selectedSpace) { spaceSummary ->
+//            if (spaceSummary != null) {
+//                // We only want to open group if the updated selectedGroup is a different one.
+//                if (currentGroupId != spaceSummary.roomId) {
+//                    currentGroupId = spaceSummary.roomId
+//                    _viewEvents.post(SpaceListViewEvents.OpenSpace)
+//                }
+//                appStateHandler.setCurrentSpace(spaceSummary.roomId)
+//            } else {
+//                // If selected group is null we force to default. It can happens when leaving the selected group.
+//                setState {
+//                    copy(selectedSpace = this.asyncSpaces()?.find { it.roomId == ALL_COMMUNITIES_GROUP_ID })
+//                }
+//            }
+//        }
+//    }
 
     override fun handle(action: SpaceListAction) {
         when (action) {
@@ -132,15 +158,31 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
             SpaceListAction.AddSpace -> handleAddSpace()
             is SpaceListAction.ToggleExpand -> handleToggleExpand(action)
             is SpaceListAction.OpenSpaceInvite -> handleSelectSpaceInvite(action)
+            is SpaceListAction.SelectLegacyGroup -> handleSelectGroup(action)
         }
     }
 
 // PRIVATE METHODS *****************************************************************************
 
     private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
-        if (state.selectedSpace?.roomId != action.spaceSummary.roomId) {
-            setState { copy(selectedSpace = action.spaceSummary) }
-            uiStateRepository.storeSelectedSpace(action.spaceSummary.roomId, session.sessionId)
+        val groupingMethod = state.selectedGroupingMethod
+        if (groupingMethod is RoomGroupingMethod.ByLegacyGroup || groupingMethod.space()?.roomId != action.spaceSummary.roomId) {
+            setState { copy(selectedGroupingMethod = RoomGroupingMethod.BySpace(action.spaceSummary)) }
+            if (action.spaceSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
+                appStateHandler.setCurrentSpace(null)
+            } else {
+                appStateHandler.setCurrentSpace(action.spaceSummary.roomId)
+            }
+            _viewEvents.post(SpaceListViewEvents.OpenSpace(groupingMethod is RoomGroupingMethod.ByLegacyGroup))
+        }
+    }
+
+    private fun handleSelectGroup(action: SpaceListAction.SelectLegacyGroup) = withState { state ->
+        val groupingMethod = state.selectedGroupingMethod
+        if (groupingMethod is RoomGroupingMethod.BySpace || groupingMethod.group()?.groupId != action.groupSummary?.groupId) {
+            setState { copy(selectedGroupingMethod = RoomGroupingMethod.ByLegacyGroup(action.groupSummary)) }
+            appStateHandler.setCurrentGroup(action.groupSummary?.groupId)
+            _viewEvents.post(SpaceListViewEvents.OpenGroup(groupingMethod is RoomGroupingMethod.BySpace))
         }
     }
 
@@ -199,15 +241,14 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                 }
         )
                 .execute { async ->
-                    val currentSelectedGroupId = selectedSpace?.roomId
-                    val newSelectedGroup = if (currentSelectedGroupId != null) {
-                        async()?.find { it.roomId == currentSelectedGroupId }
-                    } else {
-                        async()?.firstOrNull()
-                    }
+//                    val currentSelectedGroupId = selectedGroupingMethod?.roomId
+//                    val newSelectedGroup = if (currentSelectedGroupId != null) {
+//                        async()?.find { it.roomId == currentSelectedGroupId }
+//                    } else {
+//                        async()?.firstOrNull()
+//                    }
                     copy(
                             asyncSpaces = async,
-                            selectedSpace = newSelectedGroup,
                             rootSpaces = session.spaceService().getRootSpaceSummaries()
                     )
                 }
diff --git a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index 696a8c69cb..482e98dc35 100644
--- a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -20,6 +20,8 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.Session
+import timber.log.Timber
 import javax.inject.Inject
 
 /**
@@ -59,16 +61,38 @@ class SharedPreferencesUiStateRepository @Inject constructor(
         }
     }
 
-    override fun storeSelectedSpace(spaceId: String?, sessionId: String) {
-        sharedPreferences.edit {
+    override fun storeSelectedSpace(spaceId: String?, sessionId: Session?) {
+        Timber.w("VAL: storeSelectedSpace $spaceId")
+        sharedPreferences.edit(true)  {
             putString("$KEY_SELECTED_SPACE@$sessionId", spaceId)
         }
     }
 
+    override fun storeSelectedGroup(groupId: String?, sessionId: Session?) {
+        Timber.w("VAL: storeSelectedSpace $groupId")
+        sharedPreferences.edit(true) {
+            putString("$KEY_SELECTED_GROUP@$sessionId", groupId)
+        }
+    }
+
+    override fun storeGroupingMethod(isSpace: Boolean, sessionId: Session?) {
+        sharedPreferences.edit(true)  {
+            putBoolean("$KEY_SELECTED_METHOD@$sessionId", isSpace)
+        }
+    }
+
+    override fun getSelectedGroup(sessionId: String): String? {
+        return sharedPreferences.getString("$KEY_SELECTED_GROUP@$sessionId", null)
+    }
+
     override fun getSelectedSpace(sessionId: String): String? {
         return sharedPreferences.getString("$KEY_SELECTED_SPACE@$sessionId", null)
     }
 
+    override fun isGroupingMethodSpace(sessionId: String): Boolean {
+        return sharedPreferences.getBoolean("$KEY_SELECTED_METHOD@$sessionId", true)
+    }
+
     companion object {
         private const val KEY_DISPLAY_MODE = "UI_STATE_DISPLAY_MODE"
         private const val VALUE_DISPLAY_MODE_CATCHUP = 0
@@ -76,5 +100,7 @@ class SharedPreferencesUiStateRepository @Inject constructor(
         private const val VALUE_DISPLAY_MODE_ROOMS = 2
 
         private const val KEY_SELECTED_SPACE = "UI_STATE_SELECTED_SPACE"
+        private const val KEY_SELECTED_GROUP = "UI_STATE_SELECTED_GROUP"
+        private const val KEY_SELECTED_METHOD = "UI_STATE_SELECTED_METHOD"
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
index 25e81efa83..a8fe20b066 100644
--- a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.ui
 
 import im.vector.app.features.home.RoomListDisplayMode
+import org.matrix.android.sdk.api.session.Session
 
 /**
  * This interface is used to persist UI state across application restart
@@ -32,7 +33,12 @@ interface UiStateRepository {
 
     fun storeDisplayMode(displayMode: RoomListDisplayMode)
 
-    fun storeSelectedSpace(spaceId: String?, sessionId: String)
+    fun storeSelectedSpace(spaceId: String?, sessionId: Session?)
+    fun storeSelectedGroup(groupId: String?, sessionId: Session?)
+
+    fun storeGroupingMethod(isSpace: Boolean, sessionId: Session?)
 
     fun getSelectedSpace(sessionId: String): String?
+    fun getSelectedGroup(sessionId: String): String?
+    fun isGroupingMethodSpace(sessionId: String): Boolean
 }
diff --git a/vector/src/main/res/drawable/rounded_rect_stroke_8.xml b/vector/src/main/res/drawable/rounded_rect_stroke_8.xml
new file mode 100644
index 0000000000..56696f1b58
--- /dev/null
+++ b/vector/src/main/res/drawable/rounded_rect_stroke_8.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:width="40dp" android:height="40dp"/>
+
+    <stroke android:width="1dp" android:color="?riotx_list_bottom_sheet_divider_color" />
+
+    <corners android:radius="8dp" />
+
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space.xml b/vector/src/main/res/layout/item_space.xml
index ef147f7730..91952391be 100644
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@@ -39,20 +39,20 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
-        android:paddingStart="4dp"
-        android:paddingEnd="4dp"
         android:gravity="center"
         android:minWidth="16dp"
         android:minHeight="16dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         android:textColor="@android:color/white"
         android:textSize="10sp"
+        android:visibility="gone"
         app:layout_constraintCircle="@+id/groupAvatarImageView"
         app:layout_constraintCircleAngle="45"
         app:layout_constraintCircleRadius="24dp"
-        android:visibility="gone"
-        tools:visibility="visible"
         tools:background="@drawable/bg_unread_highlight"
-        tools:text="147" />
+        tools:text="147"
+        tools:visibility="visible" />
 
 
     <TextView
@@ -66,10 +66,30 @@
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintBottom_toTopOf="@+id/groupDescView"
         app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
         app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@tools:sample/lorem/random" />
+
+    <TextView
+        android:id="@+id/groupDescView"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
+        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintTop_toBottomOf="@id/groupNameView"
+        app:layout_constraintVertical_chainStyle="packed"
         tools:text="@tools:sample/lorem/random" />
 
 
diff --git a/vector/src/main/res/layout/item_space_add.xml b/vector/src/main/res/layout/item_space_add.xml
new file mode 100644
index 0000000000..12f75c0356
--- /dev/null
+++ b/vector/src/main/res/layout/item_space_add.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/itemGroupLayout"
+    android:layout_width="match_parent"
+    android:layout_height="65dp"
+    android:background="@drawable/bg_space_item"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground">
+
+
+    <ImageView
+        android:id="@+id/groupAvatarImageView"
+        android:layout_width="42dp"
+        android:layout_height="42dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:background="@drawable/rounded_rect_shape_8"
+        android:backgroundTint="?colorPrimary"
+        android:contentDescription="@string/avatar"
+        android:duplicateParentState="true"
+        android:importantForAccessibility="no"
+        android:padding="10dp"
+        android:src="@drawable/ic_fab_add"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/groupNameView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@string/add_space"
+        android:textColor="?colorPrimary"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <!--    <View-->
+    <!--        android:id="@+id/groupBottomSeparator"-->
+    <!--        android:layout_width="0dp"-->
+    <!--        android:layout_height="1dp"-->
+    <!--        android:background="?riotx_header_panel_border_mobile"-->
+    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--        app:layout_constraintEnd_toEndOf="parent"-->
+    <!--        app:layout_constraintStart_toStartOf="parent" />-->
+
+</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
new file mode 100644
index 0000000000..77e260d9fd
--- /dev/null
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rounded_rect_stroke_8"
+        android:padding="8dp">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_beta_pill" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/spaces_beta_welcome_to_spaces"
+                android:textColor="?riotx_text_primary"
+                android:textSize="15sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:text="@string/spaces_beta_welcome_to_spaces_desc"
+                android:textColor="?riotx_text_secondary"
+                android:textSize="15sp" />
+        </LinearLayout>
+
+    </FrameLayout>
+
+
+</FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 731f3bd5c8..51a7afe652 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -9,6 +9,7 @@
 
     <ProgressBar
         android:id="@+id/progressBar"
+        style="?progressBarStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center" />
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 55e898264d..46cd57ee5a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3337,4 +3337,7 @@
 
 
     <string name="space_add_existing_rooms">Add existing rooms and space</string>
+    <string name="spaces_beta_welcome_to_spaces">Welcome to Spaces!</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Spaces are ways to group rooms and people for work, fun or just yourself.</string>
+    <string name="you_are_invited">You are invited</string>
 </resources>

From d186b73c90961012ecaa55d8c9428ac4397e51cb Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 26 Apr 2021 09:46:29 +0200
Subject: [PATCH 180/350] Fix / last selected space-group not restored after
 restart

---
 .../java/im/vector/app/AppStateHandler.kt     | 49 +++++++------------
 .../app/features/home/HomeDetailViewModel.kt  |  2 +-
 .../home/UnreadMessagesSharedViewModel.kt     | 10 ++--
 .../home/room/list/RoomListViewModel.kt       |  3 +-
 .../room/list/SpaceRoomListSectionBuilder.kt  |  4 +-
 .../app/features/spaces/SpaceListAction.kt    |  2 +-
 .../app/features/spaces/SpaceListFragment.kt  |  2 +-
 .../features/spaces/SpaceSummaryController.kt | 21 ++++----
 .../features/spaces/SpacesListViewModel.kt    | 38 ++++----------
 .../ui/SharedPreferencesUiStateRepository.kt  | 14 ++----
 .../app/features/ui/UiStateRepository.kt      |  7 ++-
 11 files changed, 57 insertions(+), 95 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 40bbcebbfd..ce6a274e09 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -19,6 +19,7 @@ package im.vector.app
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
+import arrow.core.Option
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.BehaviorDataSource
 import im.vector.app.features.settings.VectorPreferences
@@ -30,7 +31,6 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -57,23 +57,18 @@ class AppStateHandler @Inject constructor(
 
     private val compositeDisposable = CompositeDisposable()
 
-    private val selectedSpaceDataSource = BehaviorDataSource(
-            // TODO get that from latest persisted?
-            if (vectorPreferences.labSpaces())
-                RoomGroupingMethod.BySpace(null)
-            else RoomGroupingMethod.ByLegacyGroup(null)
-    )
+    private val selectedSpaceDataSource = BehaviorDataSource<Option<RoomGroupingMethod>>(Option.empty())
 
     val selectedRoomGroupingObservable = selectedSpaceDataSource.observe()
 
-    fun getCurrentRoomGroupingMethod(): RoomGroupingMethod = selectedSpaceDataSource.currentValue ?: RoomGroupingMethod.BySpace(null)
+    fun getCurrentRoomGroupingMethod(): RoomGroupingMethod? = selectedSpaceDataSource.currentValue?.orNull()
 
     fun setCurrentSpace(spaceId: String?, session: Session? = null) {
         val uSession = session ?: activeSessionHolder.getSafeActiveSession()
-        if (selectedSpaceDataSource.currentValue is RoomGroupingMethod.BySpace
-                && spaceId == selectedSpaceDataSource.currentValue?.space()?.roomId) return
+        if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.BySpace
+                && spaceId == selectedSpaceDataSource.currentValue?.orNull()?.space()?.roomId) return
         val spaceSum = spaceId?.let { uSession?.getRoomSummary(spaceId) }
-        selectedSpaceDataSource.post(RoomGroupingMethod.BySpace(spaceSum))
+        selectedSpaceDataSource.post(Option.just(RoomGroupingMethod.BySpace(spaceSum)))
         if (spaceId != null) {
             GlobalScope.launch {
                 tryOrNull {
@@ -85,10 +80,10 @@ class AppStateHandler @Inject constructor(
 
     fun setCurrentGroup(groupId: String?, session: Session? = null) {
         val uSession = session ?: activeSessionHolder.getSafeActiveSession()
-        if (selectedSpaceDataSource.currentValue is RoomGroupingMethod.ByLegacyGroup
-                && groupId == selectedSpaceDataSource.currentValue?.group()?.groupId) return
+        if (selectedSpaceDataSource.currentValue?.orNull() is RoomGroupingMethod.ByLegacyGroup
+                && groupId == selectedSpaceDataSource.currentValue?.orNull()?.group()?.groupId) return
         val activeGroup = groupId?.let { uSession?.getGroupSummary(groupId) }
-        selectedSpaceDataSource.post(RoomGroupingMethod.ByLegacyGroup(activeGroup))
+        selectedSpaceDataSource.post(Option.just(RoomGroupingMethod.ByLegacyGroup(activeGroup)))
         if (groupId != null) {
             GlobalScope.launch {
                 tryOrNull {
@@ -99,19 +94,17 @@ class AppStateHandler @Inject constructor(
     }
 
     init {
-
         sessionDataSource.observe()
                 .distinctUntilChanged()
                 .subscribe {
+                    // sessionDataSource could already return a session while acitveSession holder still returns null
                     it.orNull()?.let { session ->
-                        Timber.w("VAL: Latest method is space? ${uiStateRepository.isGroupingMethodSpace(session.sessionId)}")
                         if (uiStateRepository.isGroupingMethodSpace(session.sessionId)) {
-                            uiStateRepository.getSelectedSpace(session.sessionId)?.let { selectedSpaceId ->
-                                Timber.w("VAL: Latest selected space: $selectedSpaceId")
+                            uiStateRepository.getSelectedSpace(session.sessionId).let { selectedSpaceId ->
                                 setCurrentSpace(selectedSpaceId, session)
                             }
                         } else {
-                            uiStateRepository.getSelectedGroup(session.sessionId)?.let { selectedGroupId ->
+                            uiStateRepository.getSelectedGroup(session.sessionId).let { selectedGroupId ->
                                 setCurrentGroup(selectedGroupId, session)
                             }
                         }
@@ -119,15 +112,14 @@ class AppStateHandler @Inject constructor(
         }.also {
             compositeDisposable.add(it)
         }
-        // restore current space from ui state
     }
 
     fun safeActiveSpaceId(): String? {
-        return (selectedSpaceDataSource.currentValue as? RoomGroupingMethod.BySpace)?.spaceSummary?.roomId
+        return (selectedSpaceDataSource.currentValue?.orNull() as? RoomGroupingMethod.BySpace)?.spaceSummary?.roomId
     }
 
     fun safeActiveGroupId(): String? {
-        return (selectedSpaceDataSource.currentValue as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary?.groupId
+        return (selectedSpaceDataSource.currentValue?.orNull() as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary?.groupId
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
@@ -137,18 +129,15 @@ class AppStateHandler @Inject constructor(
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
     fun entersBackground() {
         compositeDisposable.clear()
-        Timber.w("VAL: entersBackground session: ${ activeSessionHolder.getSafeActiveSession()?.myUserId}")
         val session = activeSessionHolder.getSafeActiveSession() ?: return
-        when (val currentMethod = selectedSpaceDataSource.currentValue ?: RoomGroupingMethod.BySpace(null)) {
+        when (val currentMethod = selectedSpaceDataSource.currentValue?.orNull() ?: RoomGroupingMethod.BySpace(null)) {
             is RoomGroupingMethod.BySpace -> {
-                uiStateRepository.storeGroupingMethod(true, session)
-                Timber.w("VAL: Store selected space: ${currentMethod.spaceSummary?.roomId}")
-                uiStateRepository.storeSelectedSpace(currentMethod.spaceSummary?.roomId, session)
+                uiStateRepository.storeGroupingMethod(true, session.sessionId)
+                uiStateRepository.storeSelectedSpace(currentMethod.spaceSummary?.roomId, session.sessionId)
             }
             is RoomGroupingMethod.ByLegacyGroup -> {
-                uiStateRepository.storeGroupingMethod(false, session)
-                Timber.w("VAL: Store group space: ${currentMethod.groupSummary?.groupId}")
-                uiStateRepository.storeSelectedGroup(currentMethod.groupSummary?.groupId, session)
+                uiStateRepository.storeGroupingMethod(false, session.sessionId)
+                uiStateRepository.storeSelectedGroup(currentMethod.groupSummary?.groupId, session.sessionId)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index b497532a9b..91f3877fab 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -140,7 +140,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                 .subscribe {
                    setState {
                        copy(
-                               roomGroupingMethod = it
+                               roomGroupingMethod = it.orNull() ?: RoomGroupingMethod.BySpace(null)
                        )
                    }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index fd5b0d12d7..ab4e9f4f60 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -92,10 +92,12 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                                 this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
                             }
                     )
-                    val invites = session.getRoomSummaries(roomSummaryQueryParams {
-                        this.memberships = listOf(Membership.INVITE)
-                        this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
-                    }).size
+                    val invites = session.getRoomSummaries(
+                            roomSummaryQueryParams {
+                                this.memberships = listOf(Membership.INVITE)
+                                this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                            }
+                    ).size
                     setState {
                         copy(
                                 homeSpaceUnread = RoomAggregateNotificationCount(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 00079e5a7b..1044d598c8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -71,14 +71,13 @@ class RoomListViewModel @Inject constructor(
     }
 
     init {
-        Timber.w("VAL: RoomListViewModel INIT")
         observeMembershipChanges()
 
         appStateHandler.selectedRoomGroupingObservable
                 .distinctUntilChanged()
                 .execute {
                     copy(
-                            currentRoomGrouping = it
+                            currentRoomGrouping = it.invoke()?.orNull()?.let { Success(it) } ?: Loading()
                     )
                 }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 42f73caa74..7edd2afccf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -113,7 +113,7 @@ class SpaceRoomListSectionBuilder(
         appStateHandler.selectedRoomGroupingObservable
                 .distinctUntilChanged()
                 .subscribe { groupingMethod ->
-                    val selectedSpace = groupingMethod.space()
+                    val selectedSpace = groupingMethod.orNull()?.space()
                     activeSpaceAwareQueries.onEach { updater ->
                         updater.updateForSpaceId(selectedSpace?.roomId)
                     }
@@ -188,7 +188,7 @@ class SpaceRoomListSectionBuilder(
                 appStateHandler.selectedRoomGroupingObservable
                         .distinctUntilChanged()
                         .switchMap { groupingMethod ->
-                            val selectedSpace = groupingMethod.space()
+                            val selectedSpace = groupingMethod.orNull()?.space()
                             if (selectedSpace == null) {
                                 Observable.just(emptyList())
                             } else {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
index ce4ac38a72..b8b6cb4667 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListAction.kt
@@ -21,7 +21,7 @@ import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 sealed class SpaceListAction : VectorViewModelAction {
-    data class SelectSpace(val spaceSummary: RoomSummary) : SpaceListAction()
+    data class SelectSpace(val spaceSummary: RoomSummary?) : SpaceListAction()
     data class OpenSpaceInvite(val spaceSummary: RoomSummary) : SpaceListAction()
     data class LeaveSpace(val spaceSummary: RoomSummary) : SpaceListAction()
     data class ToggleExpand(val spaceSummary: RoomSummary) : SpaceListAction()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index 50d06d8238..672fb28928 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -78,7 +78,7 @@ class SpaceListFragment @Inject constructor(
         spaceController.update(state)
     }
 
-    override fun onSpaceSelected(spaceSummary: RoomSummary) {
+    override fun onSpaceSelected(spaceSummary: RoomSummary?) {
         viewModel.handle(SpaceListAction.SelectSpace(spaceSummary))
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 7d01032eb5..8a1529493d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -136,16 +136,13 @@ class SpaceSummaryController @Inject constructor(
                     }
                 }
 
-        summaries.firstOrNull { it.roomId == ALL_COMMUNITIES_GROUP_ID }
-                ?.let {
-                    val isSelected = selected is RoomGroupingMethod.BySpace && selected.space() == null
-                    homeSpaceSummaryItem {
-                        id(it.roomId)
-                        selected(isSelected)
-                        countState(UnreadCounterBadgeView.State(homeCount.totalCount, homeCount.isHighlight))
-                        listener { callback?.onSpaceSelected(it) }
-                    }
-                }
+        val isSelected = selected is RoomGroupingMethod.BySpace && selected.space() == null
+        homeSpaceSummaryItem {
+            id("space_home")
+            selected(isSelected)
+            countState(UnreadCounterBadgeView.State(homeCount.totalCount, homeCount.isHighlight))
+            listener { callback?.onSpaceSelected(null) }
+        }
 
         rootSpaces
                 ?.sortedBy { it.displayName }
@@ -180,7 +177,7 @@ class SpaceSummaryController @Inject constructor(
                         // it's expanded
                         subSpaces?.forEach { child ->
                             summaries.firstOrNull { it.roomId == child.childRoomId }?.let { childSum ->
-                                val isChildSelected = selected is RoomGroupingMethod.BySpace &&  childSum.roomId == selected.space()?.roomId
+                                val isChildSelected = selected is RoomGroupingMethod.BySpace && childSum.roomId == selected.space()?.roomId
                                 spaceSummaryItem {
                                     avatarRenderer(avatarRenderer)
                                     id(child.childRoomId)
@@ -209,7 +206,7 @@ class SpaceSummaryController @Inject constructor(
     }
 
     interface Callback {
-        fun onSpaceSelected(spaceSummary: RoomSummary)
+        fun onSpaceSelected(spaceSummary: RoomSummary?)
         fun onSpaceInviteSelected(spaceSummary: RoomSummary)
         fun onSpaceSettings(spaceSummary: RoomSummary)
         fun onToggleExpand(spaceSummary: RoomSummary)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 6066cf8c1c..90ab771342 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -26,7 +26,6 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.AppStateHandler
-import im.vector.app.R
 import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
@@ -46,13 +45,12 @@ import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.rx.asObservable
 import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
 
-const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
-
 class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
                                                       private val appStateHandler: AppStateHandler,
                                                       private val session: Session,
@@ -94,7 +92,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                 .subscribe {
                     setState {
                         copy(
-                                selectedGroupingMethod = it
+                                selectedGroupingMethod = it.orNull() ?: RoomGroupingMethod.BySpace(null)
                         )
                     }
                 }
@@ -166,13 +164,9 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
 
     private fun handleSelectSpace(action: SpaceListAction.SelectSpace) = withState { state ->
         val groupingMethod = state.selectedGroupingMethod
-        if (groupingMethod is RoomGroupingMethod.ByLegacyGroup || groupingMethod.space()?.roomId != action.spaceSummary.roomId) {
+        if (groupingMethod is RoomGroupingMethod.ByLegacyGroup || groupingMethod.space()?.roomId != action.spaceSummary?.roomId) {
             setState { copy(selectedGroupingMethod = RoomGroupingMethod.BySpace(action.spaceSummary)) }
-            if (action.spaceSummary.roomId == ALL_COMMUNITIES_GROUP_ID) {
-                appStateHandler.setCurrentSpace(null)
-            } else {
-                appStateHandler.setCurrentSpace(action.spaceSummary.roomId)
-            }
+            appStateHandler.setCurrentSpace(action.spaceSummary?.roomId)
             _viewEvents.post(SpaceListViewEvents.OpenSpace(groupingMethod is RoomGroupingMethod.ByLegacyGroup))
         }
     }
@@ -218,35 +212,21 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
             excludeType = listOf(/**RoomType.MESSAGING,$*/
                     null)
         }
-        Observable.combineLatest<RoomSummary, List<RoomSummary>, List<RoomSummary>>(
+        Observable.combineLatest<User?, List<RoomSummary>, List<RoomSummary>>(
                 session
                         .rx()
                         .liveUser(session.myUserId)
-                        .map { optionalUser ->
-                            RoomSummary(
-                                    roomId = ALL_COMMUNITIES_GROUP_ID,
-                                    membership = Membership.JOIN,
-                                    displayName = stringProvider.getString(R.string.group_all_communities),
-                                    avatarUrl = optionalUser.getOrNull()?.avatarUrl ?: "",
-                                    encryptionEventTs = 0,
-                                    isEncrypted = false,
-                                    typingUsers = emptyList()
-                            )
+                        .map {
+                             it.getOrNull()
                         },
                 session
                         .rx()
                         .liveSpaceSummaries(spaceSummaryQueryParams),
-                BiFunction { allCommunityGroup, communityGroups ->
-                    (listOf(allCommunityGroup) + communityGroups)
+                BiFunction { _, communityGroups ->
+                    communityGroups
                 }
         )
                 .execute { async ->
-//                    val currentSelectedGroupId = selectedGroupingMethod?.roomId
-//                    val newSelectedGroup = if (currentSelectedGroupId != null) {
-//                        async()?.find { it.roomId == currentSelectedGroupId }
-//                    } else {
-//                        async()?.firstOrNull()
-//                    }
                     copy(
                             asyncSpaces = async,
                             rootSpaces = session.spaceService().getRootSpaceSummaries()
diff --git a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index 482e98dc35..6c6f0908c3 100644
--- a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -20,8 +20,6 @@ import android.content.SharedPreferences
 import androidx.core.content.edit
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.settings.VectorPreferences
-import org.matrix.android.sdk.api.session.Session
-import timber.log.Timber
 import javax.inject.Inject
 
 /**
@@ -61,22 +59,20 @@ class SharedPreferencesUiStateRepository @Inject constructor(
         }
     }
 
-    override fun storeSelectedSpace(spaceId: String?, sessionId: Session?) {
-        Timber.w("VAL: storeSelectedSpace $spaceId")
-        sharedPreferences.edit(true)  {
+    override fun storeSelectedSpace(spaceId: String?, sessionId: String) {
+        sharedPreferences.edit(true) {
             putString("$KEY_SELECTED_SPACE@$sessionId", spaceId)
         }
     }
 
-    override fun storeSelectedGroup(groupId: String?, sessionId: Session?) {
-        Timber.w("VAL: storeSelectedSpace $groupId")
+    override fun storeSelectedGroup(groupId: String?, sessionId: String) {
         sharedPreferences.edit(true) {
             putString("$KEY_SELECTED_GROUP@$sessionId", groupId)
         }
     }
 
-    override fun storeGroupingMethod(isSpace: Boolean, sessionId: Session?) {
-        sharedPreferences.edit(true)  {
+    override fun storeGroupingMethod(isSpace: Boolean, sessionId: String) {
+        sharedPreferences.edit(true) {
             putBoolean("$KEY_SELECTED_METHOD@$sessionId", isSpace)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
index a8fe20b066..935da83f5d 100644
--- a/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt
@@ -17,7 +17,6 @@
 package im.vector.app.features.ui
 
 import im.vector.app.features.home.RoomListDisplayMode
-import org.matrix.android.sdk.api.session.Session
 
 /**
  * This interface is used to persist UI state across application restart
@@ -33,10 +32,10 @@ interface UiStateRepository {
 
     fun storeDisplayMode(displayMode: RoomListDisplayMode)
 
-    fun storeSelectedSpace(spaceId: String?, sessionId: Session?)
-    fun storeSelectedGroup(groupId: String?, sessionId: Session?)
+    fun storeSelectedSpace(spaceId: String?, sessionId: String)
+    fun storeSelectedGroup(groupId: String?, sessionId: String)
 
-    fun storeGroupingMethod(isSpace: Boolean, sessionId: Session?)
+    fun storeGroupingMethod(isSpace: Boolean, sessionId: String)
 
     fun getSelectedSpace(sessionId: String): String?
     fun getSelectedGroup(sessionId: String): String?

From dba6784487d6d1326b3ee8b599f4d90909f841d8 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 26 Apr 2021 10:13:33 +0200
Subject: [PATCH 181/350] Remove space lab flags

---
 .../app/features/home/HomeDetailFragment.kt   | 16 ++---
 .../app/features/home/HomeDrawerFragment.kt   |  6 +-
 .../home/UnreadMessagesSharedViewModel.kt     | 68 ++++++++++++-------
 .../features/settings/VectorPreferences.kt    | 14 ----
 .../settings/VectorSettingsLabsFragment.kt    | 10 +--
 vector/src/main/res/values/strings.xml        |  3 -
 .../src/main/res/xml/vector_settings_labs.xml |  7 --
 7 files changed, 50 insertions(+), 74 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index 7b989b9bf8..69395b2386 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -159,16 +159,12 @@ class HomeDetailFragment @Inject constructor(
         }
 
         unreadMessagesSharedViewModel.subscribe { state ->
-            if (vectorPreferences.labSpaces()) {
-                views.drawerUnreadCounterBadgeView.render(
-                        UnreadCounterBadgeView.State(
-                                count = state.otherSpacesUnread.totalCount,
-                                highlighted = state.otherSpacesUnread.isHighlight
-                        )
-                )
-            } else {
-                views.drawerUnreadCounterBadgeView.isVisible = false
-            }
+            views.drawerUnreadCounterBadgeView.render(
+                    UnreadCounterBadgeView.State(
+                            count = state.otherSpacesUnread.totalCount,
+                            highlighted = state.otherSpacesUnread.isHighlight
+                    )
+            )
         }
 
         sharedCallActionViewModel
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index e935b71604..9ff865b9d1 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -59,11 +59,7 @@ class HomeDrawerFragment @Inject constructor(
         sharedActionViewModel = activityViewModelProvider.get(HomeSharedActionViewModel::class.java)
 
         if (savedInstanceState == null) {
-//            if (vectorPreferences.labSpaces()) {
-                replaceChildFragment(R.id.homeDrawerGroupListContainer, SpaceListFragment::class.java)
-//            } else {
-//                replaceChildFragment(R.id.homeDrawerGroupListContainer, GroupListFragment::class.java)
-//            }
+            replaceChildFragment(R.id.homeDrawerGroupListContainer, SpaceListFragment::class.java)
         }
         session.getUserLive(session.myUserId).observeK(viewLifecycleOwner) { optionalUser ->
             val user = optionalUser?.getOrNull()
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index ab4e9f4f60..cfafd1f103 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -25,10 +25,10 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.AppStateHandler
+import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.settings.VectorPreferences
 import io.reactivex.Observable
 import io.reactivex.functions.BiFunction
 import io.reactivex.schedulers.Schedulers
@@ -53,8 +53,7 @@ data class CountInfo(
 
 class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initialState: UnreadMessagesState,
                                                                 session: Session,
-                                                                appStateHandler: AppStateHandler,
-                                                                private val vectorPreferences: VectorPreferences)
+                                                                appStateHandler: AppStateHandler)
     : VectorViewModel<UnreadMessagesState, EmptyAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
@@ -119,30 +118,47 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                             .throttleFirst(300, TimeUnit.MILLISECONDS)
                             .observeOn(Schedulers.computation())
                 },
-                BiFunction { _, _ ->
-                    val selectedSpace = appStateHandler.safeActiveSpaceId()
-                    val counts = session.getNotificationCountForRooms(
-                            roomSummaryQueryParams {
-                                this.memberships = listOf(Membership.JOIN)
-                                this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
-                            }
-                    )
-                    val rootCounts = session.spaceService().getRootSpaceSummaries()
-                            .filter {
-                                // filter out current selection
-                                it.roomId != selectedSpace
-                            }
-                    CountInfo(
-                            homeCount = counts,
-                            otherCount = RoomAggregateNotificationCount(
-                                    rootCounts.fold(0, { acc, rs ->
-                                        acc + rs.notificationCount
-                                    }) + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0),
-                                    rootCounts.fold(0, { acc, rs ->
-                                        acc + rs.highlightCount
-                                    }) + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
+                BiFunction { groupingMethod, _ ->
+                    when (groupingMethod.orNull()) {
+                        is RoomGroupingMethod.ByLegacyGroup -> {
+                            // currently not supported
+                            CountInfo(
+                                    RoomAggregateNotificationCount(0, 0),
+                                    RoomAggregateNotificationCount(0, 0)
                             )
-                    )
+                        }
+                        is RoomGroupingMethod.BySpace       -> {
+                            val selectedSpace = appStateHandler.safeActiveSpaceId()
+                            val counts = session.getNotificationCountForRooms(
+                                    roomSummaryQueryParams {
+                                        this.memberships = listOf(Membership.JOIN)
+                                        this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                                    }
+                            )
+                            val rootCounts = session.spaceService().getRootSpaceSummaries()
+                                    .filter {
+                                        // filter out current selection
+                                        it.roomId != selectedSpace
+                                    }
+                            CountInfo(
+                                    homeCount = counts,
+                                    otherCount = RoomAggregateNotificationCount(
+                                            rootCounts.fold(0, { acc, rs ->
+                                                acc + rs.notificationCount
+                                            }) + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0),
+                                            rootCounts.fold(0, { acc, rs ->
+                                                acc + rs.highlightCount
+                                            }) + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
+                                    )
+                            )
+                        }
+                        null                                -> {
+                            CountInfo(
+                                    RoomAggregateNotificationCount(0, 0),
+                                    RoomAggregateNotificationCount(0, 0)
+                            )
+                        }
+                    }
                 }
         ).execute {
             copy(
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index b2b609d714..2754d3fab0 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -20,12 +20,10 @@ import android.media.RingtoneManager
 import android.net.Uri
 import android.provider.MediaStore
 import androidx.core.content.edit
-import androidx.lifecycle.LiveData
 import com.squareup.seismic.ShakeDetector
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.DefaultSharedPreferences
-import im.vector.app.core.platform.livedata.SharedPreferenceLiveData
 import im.vector.app.features.disclaimer.SHARED_PREF_KEY
 import im.vector.app.features.homeserver.ServerUrlsRepository
 import im.vector.app.features.themes.ThemeUtils
@@ -310,18 +308,6 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB, false)
     }
 
-    fun labSpaces(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_USE_SPACES, false)
-    }
-
-    fun labSpacesLive(): LiveData<Boolean> {
-        return SharedPreferenceLiveData.booleanLiveData(
-                defaultPrefs,
-                SETTINGS_LABS_USE_SPACES,
-                false
-        )
-    }
-
     fun failFast(): Boolean {
         return BuildConfig.DEBUG || (developerMode() && defaultPrefs.getBoolean(SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY, false))
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
index cc2ca4eb4d..6a4ea83d68 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
@@ -17,9 +17,6 @@
 package im.vector.app.features.settings
 
 import im.vector.app.R
-import im.vector.app.core.preference.VectorSwitchPreference
-import im.vector.app.features.MainActivity
-import im.vector.app.features.MainActivityArgs
 import javax.inject.Inject
 
 class VectorSettingsLabsFragment @Inject constructor(
@@ -30,11 +27,6 @@ class VectorSettingsLabsFragment @Inject constructor(
     override val preferenceXmlRes = R.xml.vector_settings_labs
 
     override fun bindPref() {
-        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_USE_SPACES)!!.let { pref ->
-            pref.setOnPreferenceChangeListener { _, _ ->
-                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = false))
-                true
-            }
-        }
+        // Nothing to do
     }
 }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 46cd57ee5a..0bbf293587 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2198,9 +2198,6 @@
     <string name="labs_swipe_to_reply_in_timeline">Enable swipe to reply in timeline</string>
     <string name="labs_show_unread_notifications_as_tab">Add a dedicated tab for unread notifications on main screen.</string>
 
-    <string name="labs_experimental_spaces">Spaces prototype</string>
-    <string name="labs_experimental_spaces_desc">Spaces are the new way to group people and rooms for work, fun or just yourself. You can try them out now on Android, or from your computer.</string>
-
     <string name="link_copied_to_clipboard">Link copied to clipboard</string>
 
     <string name="add_by_matrix_id">Add by matrix ID</string>
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index aa55a3c5ec..fef5a2fe9d 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -45,11 +45,4 @@
         android:title="@string/labs_show_unread_notifications_as_tab" />
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
-
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SETTINGS_LABS_USE_SPACES"
-        android:title="@string/labs_experimental_spaces"
-        android:summary="@string/labs_experimental_spaces_desc"/>
-
 </androidx.preference.PreferenceScreen>
\ No newline at end of file

From 45200572a2f30bd7ac32c1c2a8928ee9ff43dd97 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 26 Apr 2021 10:38:38 +0200
Subject: [PATCH 182/350] Cleaning

---
 .../main/java/im/vector/app/AppStateHandler.kt | 18 ++++++------------
 .../room/list/GroupRoomListSectionBuilder.kt   |  2 +-
 .../features/spaces/SpaceSummaryController.kt  |  3 +--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index ce6a274e09..0df41d106d 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -22,7 +22,6 @@ import androidx.lifecycle.OnLifecycleEvent
 import arrow.core.Option
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.BehaviorDataSource
-import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.ui.UiStateRepository
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.coroutines.GlobalScope
@@ -51,8 +50,7 @@ fun RoomGroupingMethod.group() = (this as? RoomGroupingMethod.ByLegacyGroup)?.gr
 class AppStateHandler @Inject constructor(
         sessionDataSource: ActiveSessionDataSource,
         private val uiStateRepository: UiStateRepository,
-        private val activeSessionHolder: ActiveSessionHolder,
-        vectorPreferences: VectorPreferences
+        private val activeSessionHolder: ActiveSessionHolder
 ) : LifecycleObserver {
 
     private val compositeDisposable = CompositeDisposable()
@@ -100,18 +98,14 @@ class AppStateHandler @Inject constructor(
                     // sessionDataSource could already return a session while acitveSession holder still returns null
                     it.orNull()?.let { session ->
                         if (uiStateRepository.isGroupingMethodSpace(session.sessionId)) {
-                            uiStateRepository.getSelectedSpace(session.sessionId).let { selectedSpaceId ->
-                                setCurrentSpace(selectedSpaceId, session)
-                            }
+                            setCurrentSpace(uiStateRepository.getSelectedSpace(session.sessionId), session)
                         } else {
-                            uiStateRepository.getSelectedGroup(session.sessionId).let { selectedGroupId ->
-                                setCurrentGroup(selectedGroupId, session)
-                            }
+                            setCurrentGroup(uiStateRepository.getSelectedGroup(session.sessionId), session)
                         }
                     }
-        }.also {
-            compositeDisposable.add(it)
-        }
+                }.also {
+                    compositeDisposable.add(it)
+                }
     }
 
     fun safeActiveSpaceId(): String? {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
index 6287ef58e0..22b0eb091c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/GroupRoomListSectionBuilder.kt
@@ -100,7 +100,7 @@ class GroupRoomListSectionBuilder(
         appStateHandler.selectedRoomGroupingObservable
                 .distinctUntilChanged()
                 .subscribe { groupingMethod ->
-                    val selectedGroupId = (groupingMethod as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary?.groupId
+                    val selectedGroupId = (groupingMethod.orNull() as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary?.groupId
                     activeGroupAwareQueries.onEach { updater ->
                         updater.updateQuery { query ->
                             query.copy(activeGroupId = selectedGroupId)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 8a1529493d..c3e730f29e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -136,10 +136,9 @@ class SpaceSummaryController @Inject constructor(
                     }
                 }
 
-        val isSelected = selected is RoomGroupingMethod.BySpace && selected.space() == null
         homeSpaceSummaryItem {
             id("space_home")
-            selected(isSelected)
+            selected(selected is RoomGroupingMethod.BySpace && selected.space() == null)
             countState(UnreadCounterBadgeView.State(homeCount.totalCount, homeCount.isHighlight))
             listener { callback?.onSpaceSelected(null) }
         }

From 46834d2178951d6867d62146017dd1fec697f983 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 26 Apr 2021 11:52:54 +0200
Subject: [PATCH 183/350] Fix / dm filtering not working when going back to
 home

---
 .../features/home/room/list/SpaceRoomListSectionBuilder.kt  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 7edd2afccf..37c1228b50 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -338,6 +338,12 @@ class SpaceRoomListSectionBuilder(
                                                         activeSpaceId = ActiveSpaceFilter.ActiveSpace(roomId)
                                                 )
                                             }
+                                        } else {
+                                            it.updateQuery {
+                                                it.copy(
+                                                        activeSpaceId = ActiveSpaceFilter.None
+                                                )
+                                            }
                                         }
                                     }
                                 })

From 3378e23cc2b1db0acd50d11e480e9dc577c301ed Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 26 Apr 2021 15:40:41 +0200
Subject: [PATCH 184/350] Add lab flag to use restricted access rule

Fixes #3226
---
 .../features/settings/VectorPreferences.kt    |  8 +++-
 .../spaces/create/CreateSpaceViewModelTask.kt | 41 ++++++++++++++++---
 vector/src/main/res/values/strings.xml        |  4 ++
 .../src/main/res/xml/vector_settings_labs.xml |  7 ++++
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 2754d3fab0..8c6edccda8 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -150,14 +150,13 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         private const val SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY = "SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY"
 
         const val SETTINGS_LABS_ALLOW_EXTENDED_LOGS = "SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
+        const val SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE = "SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE"
 
         private const val SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         private const val SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY = "SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
         private const val SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY = "SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
         private const val SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY"
 
-        const val SETTINGS_LABS_USE_SPACES = "SETTINGS_LABS_USE_SPACES"
-
         // SETTINGS_LABS_HIDE_TECHNICAL_E2E_ERRORS
         private const val SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM = "SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM"
         const val SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB = "SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
@@ -236,6 +235,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
                 SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY,
                 SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY,
                 SETTINGS_LABS_ALLOW_EXTENDED_LOGS,
+                SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE,
                 SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY,
 
                 SETTINGS_USE_RAGE_SHAKE_KEY,
@@ -944,4 +944,8 @@ class VectorPreferences @Inject constructor(private val context: Context) {
             BackgroundSyncMode.FDROID_BACKGROUND_SYNC_MODE_FOR_BATTERY
         }
     }
+
+    fun labsUseExperimentalRestricted(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE, false)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
index 38bc645aa2..9ce1089f6c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModelTask.kt
@@ -18,8 +18,14 @@ package im.vector.app.features.spaces.create
 
 import android.net.Uri
 import im.vector.app.core.platform.ViewModelTask
+import im.vector.app.features.raw.wellknown.getElementWellknown
+import im.vector.app.features.raw.wellknown.isE2EByDefault
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
+import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesAllowEntry
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
@@ -44,8 +50,9 @@ data class CreateSpaceTaskParams(
 )
 
 class CreateSpaceViewModelTask @Inject constructor(
-        private val session: Session
-//        private val stringProvider: StringProvider
+        private val session: Session,
+        private val vectorPreferences: VectorPreferences,
+        private val rawService: RawService
 ) : ViewModelTask<CreateSpaceTaskParams, CreateSpaceTaskResult> {
 
     override suspend fun execute(params: CreateSpaceTaskParams): CreateSpaceTaskResult {
@@ -59,16 +66,27 @@ class CreateSpaceViewModelTask @Inject constructor(
 
         val childErrors = mutableMapOf<String, Throwable>()
         val childIds = mutableListOf<String>()
+
+        val e2eByDefault = tryOrNull {
+            rawService.getElementWellknown(session.myUserId)
+                    ?.isE2EByDefault()
+                    ?: true
+        } ?: true
+
         params.defaultRooms
                 .filter { it.isNotBlank() }
                 .forEach { roomName ->
                     try {
                         val roomId = try {
                             if (params.isPublic) {
-                                    session.createRoom(CreateRoomParams().apply {
-                                        this.name = roomName
-                                        this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT })
+                                session.createRoom(
+                                        CreateRoomParams().apply {
+                                            this.name = roomName
+                                            this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+                                        }
+                                )
                             } else {
+                                if (vectorPreferences.labsUseExperimentalRestricted()) {
                                     session.createRoom(CreateRoomParams().apply {
                                         this.name = roomName
                                         this.joinRuleRestricted = listOf(
@@ -77,7 +95,20 @@ class CreateSpaceViewModelTask @Inject constructor(
                                                         via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
                                                 )
                                         )
+                                        if (e2eByDefault) {
+                                            this.enableEncryption()
+                                        }
                                     })
+                                } else {
+                                    session.createRoom(CreateRoomParams().apply {
+                                        this.name = roomName
+                                        visibility = RoomDirectoryVisibility.PRIVATE
+                                        this.preset = CreateRoomPreset.PRESET_PRIVATE_CHAT
+                                        if (e2eByDefault) {
+                                            this.enableEncryption()
+                                        }
+                                    })
+                                }
                             }
                         } catch (timeout: CreateRoomFailure.CreatedWithTimeout) {
                             // we ignore that?
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 0bbf293587..26367cb9a5 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3337,4 +3337,8 @@
     <string name="spaces_beta_welcome_to_spaces">Welcome to Spaces!</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Spaces are ways to group rooms and people for work, fun or just yourself.</string>
     <string name="you_are_invited">You are invited</string>
+
+
+    <string name="labs_use_restricted_join_rule">Experimental Space - Restricted Room.</string>
+    <string name="labs_use_restricted_join_rule_desc">Warning requires server support and experimental room version</string>
 </resources>
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index fef5a2fe9d..607f01db35 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -43,6 +43,13 @@
         android:defaultValue="false"
         android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
         android:title="@string/labs_show_unread_notifications_as_tab" />
+
+
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:key="SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE"
+        android:title="@string/labs_use_restricted_join_rule"
+        android:summary="@string/labs_use_restricted_join_rule_desc"/>
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file

From 872c45d5a3024df55ba18c96b1db29848ce444a2 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 26 Apr 2021 15:45:34 +0200
Subject: [PATCH 185/350] Fix / kebab menu not always visible in space item

Bug due to cell reuse not showing back menu
---
 .../vector/app/features/spaces/SpaceSummaryItem.kt  | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 105cb0dd57..013f7d6db5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -55,6 +55,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         holder.groupNameView.text = matrixItem.displayName
         holder.rootView.isChecked = selected
         if (onMore != null) {
+            holder.moreView.isVisible = true
             holder.moreView.setOnClickListener(
                     DebouncedClickListener({ _ ->
                         onMore?.invoke()
@@ -66,16 +67,6 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
 
         holder.secondLineText.setTextOrHide(description)
         if (hasChildren) {
-//            holder.collapseIndicator.setOnClickListener(
-//                    DebouncedClickListener({ _ ->
-//                        toggleExpand?.invoke()
-//                    })
-//            )
-//            when (expanded) {
-//                null -> {
-//                    holder.collapseIndicator.isGone = true
-//                }
-//                else -> {
             holder.collapseIndicator.isVisible = true
             holder.collapseIndicator.setImageDrawable(
                     ContextCompat.getDrawable(holder.view.context,
@@ -87,8 +78,6 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
                         toggleExpand?.invoke()
                     })
             )
-//                }
-//            }
         } else {
             holder.collapseIndicator.isGone = true
         }

From 7d3d080603eae13baf9f8160834ce28c8677a689 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 27 Apr 2021 18:51:43 +0200
Subject: [PATCH 186/350] Code review

---
 .../org/matrix/android/sdk/rx/RxSession.kt    |  7 ---
 .../sdk/session/space/SpaceCreationTest.kt    | 10 ++--
 .../room/model/RoomJoinRulesContent.kt        |  2 +-
 .../sdk/api/session/room/model/RoomSummary.kt |  2 +-
 .../sdk/api/session/space/JoinSpaceResult.kt  | 27 +++++++++
 .../sdk/api/session/space/SpaceService.kt     | 10 ----
 .../matrix/android/sdk/api/util/MatrixItem.kt |  9 ++-
 .../SessionRealmConfigurationFactory.kt       |  3 +-
 .../database/mapper/RoomSummaryMapper.kt      |  2 +-
 .../query/QueryStringValueProcessor.kt        | 14 ++---
 .../room/create/CreateRoomBodyBuilder.kt      |  3 +-
 .../summary/{GrapUtils.kt => GraphUtils.kt}   |  0
 .../room/summary/RoomSummaryDataSource.kt     |  6 +-
 .../internal/session/space/CreateSpaceTask.kt | 56 -------------------
 .../session/space/DefaultSpaceService.kt      |  8 ++-
 .../internal/session/space/JoinSpaceTask.kt   | 24 ++++----
 .../sdk/internal/session/space/SpaceModule.kt |  3 -
 .../BottomSheetGenericRadioAction.kt          | 10 ++--
 .../home/UnreadMessagesSharedViewModel.kt     | 25 ++++-----
 .../home/room/detail/RoomDetailFragment.kt    |  3 +
 .../home/room/list/RoomListFragment.kt        | 22 ++++----
 .../home/room/list/RoomListViewModel.kt       |  9 +++
 .../home/room/list/RoomSummaryItemFactory.kt  |  3 +-
 .../matrixto/MatrixToBottomSheetViewModel.kt  |  4 +-
 .../settings/RoomSettingsAction.kt            |  2 +-
 .../features/spaces/SpaceSummaryController.kt |  2 +-
 .../spaces/create/CreateSpaceState.kt         |  2 +-
 .../create/SpaceDetailEpoxyController.kt      |  2 +-
 .../spaces/explore/SpaceDirectoryViewModel.kt | 17 ++----
 .../spaces/manage/SpaceAddRoomsViewModel.kt   |  2 +-
 .../spaces/manage/SpaceManagedSharedAction.kt |  4 +-
 .../manage/SpaceManagedSharedViewEvents.kt    |  4 +-
 .../spaces/preview/SpacePreviewViewModel.kt   |  8 +--
 .../ui/SharedPreferencesUiStateRepository.kt  |  4 +-
 .../main/res/layout/fragment_home_detail.xml  | 32 +++++------
 .../res/layout/fragment_space_add_rooms.xml   |  2 +-
 vector/src/main/res/layout/view_state.xml     |  1 -
 37 files changed, 149 insertions(+), 195 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/JoinSpaceResult.kt
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/{GrapUtils.kt => GraphUtils.kt} (100%)
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 7f794be399..67a35cac2e 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -74,13 +74,6 @@ class RxSession(private val session: Session) {
                 }
     }
 
-    fun liveFlattenRoomSummaryChildOf(spaceId: String?): Observable<List<RoomSummary>> {
-        return session.getFlattenRoomSummaryChildrenOfLive(spaceId).asObservable()
-                .startWithCallable {
-                    session.getFlattenRoomSummaryChildrenOf(spaceId)
-                }
-    }
-
     fun liveBreadcrumbs(queryParams: RoomSummaryQueryParams): Observable<List<RoomSummary>> {
         return session.getBreadcrumbsLive(queryParams).asObservable()
                 .startWithCallable {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 6f7a2e1f17..278762671b 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -39,7 +39,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.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import org.matrix.android.sdk.api.session.space.SpaceService
+import org.matrix.android.sdk.api.session.space.JoinSpaceResult
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.SessionTestParams
 import kotlin.test.assertEquals
@@ -112,12 +112,12 @@ class SpaceCreationTest : InstrumentedTest {
 
         // Try to join from bob, it's a public space no need to invite
 
-        val joinResult: SpaceService.JoinSpaceResult
+        val joinResult: JoinSpaceResult
         runBlocking {
             joinResult = bobSession.spaceService().joinSpace(spaceId)
         }
 
-        assertEquals(SpaceService.JoinSpaceResult.Success, joinResult)
+        assertEquals(JoinSpaceResult.Success, joinResult)
 
         val spaceBobPov = bobSession.spaceService().getSpace(spaceId)
         assertEquals(roomName, spaceBobPov?.asRoom()?.roomSummary()?.name, "Room name should be set")
@@ -169,7 +169,7 @@ class SpaceCreationTest : InstrumentedTest {
             bobSession.spaceService().joinSpace(spaceId)
         }
 
-        assertEquals(SpaceService.JoinSpaceResult.Success, joinResult)
+        assertEquals(JoinSpaceResult.Success, joinResult)
 
         val spaceBobPov = bobSession.spaceService().getSpace(spaceId)
         assertEquals(roomName, spaceBobPov?.asRoom()?.roomSummary()?.name, "Room name should be set")
@@ -186,7 +186,7 @@ class SpaceCreationTest : InstrumentedTest {
             this.memberships = listOf(Membership.JOIN)
         }).firstOrNull()
 
-        assertEquals(2, spaceSummaryBobPov?.children?.size ?: -1, "Unexpected number of children")
+        assertEquals(2, spaceSummaryBobPov?.spaceChildren?.size ?: -1, "Unexpected number of children")
 
         commonTestHelper.signOutAndClose(aliceSession)
         commonTestHelper.signOutAndClose(bobSession)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
index 6892cac001..33f402cad3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
@@ -31,7 +31,7 @@ data class RoomJoinRulesContent(
         /**
          * If the allow key is an empty list (or not a list at all), then the room reverts to standard public join rules
          */
-        @Json(name = "allow") val allowList:List<RoomJoinRulesAllowEntry>? = null
+        @Json(name = "allow") val allowList: List<RoomJoinRulesAllowEntry>? = null
 ) {
     val joinRules: RoomJoinRules? = when (_joinRules) {
         "public" -> RoomJoinRules.PUBLIC
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index 2a802adcde..9a37975ffa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -57,7 +57,7 @@ data class RoomSummary constructor(
         val hasFailedSending: Boolean = false,
         val roomType: String? = null,
         val spaceParents: List<SpaceParentInfo>? = null,
-        val children: List<SpaceChildInfo>? = null,
+        val spaceChildren: List<SpaceChildInfo>? = null,
         val flattenParentIds: List<String> = emptyList()
 ) {
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/JoinSpaceResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/JoinSpaceResult.kt
new file mode 100644
index 0000000000..e8c69977c6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/JoinSpaceResult.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.space
+
+sealed class JoinSpaceResult {
+    object Success : JoinSpaceResult()
+    data class Fail(val error: Throwable) : JoinSpaceResult()
+
+    /** Success fully joined the space, but failed to join all or some of it's rooms */
+    data class PartialSuccess(val failedRooms: Map<String, Throwable>) : JoinSpaceResult()
+
+    fun isSuccess() = this is Success || this is PartialSuccess
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
index 1f88403eab..fedf38fe06 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/SpaceService.kt
@@ -67,16 +67,6 @@ interface SpaceService {
 
     fun getSpaceSummaries(spaceSummaryQueryParams: SpaceSummaryQueryParams): List<RoomSummary>
 
-    sealed class JoinSpaceResult {
-        object Success : JoinSpaceResult()
-        data class Fail(val error: Throwable) : JoinSpaceResult()
-
-        /** Success fully joined the space, but failed to join all or some of it's rooms */
-        data class PartialSuccess(val failedRooms: Map<String, Throwable>) : JoinSpaceResult()
-
-        fun isSuccess() = this is Success || this is PartialSuccess
-    }
-
     suspend fun joinSpace(spaceIdOrAlias: String,
                           reason: String? = null,
                           viaServers: List<String> = emptyList()): JoinSpaceResult
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
index a904b43faa..7b2fae86ef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
@@ -20,6 +20,7 @@ import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.session.room.sender.SenderInfo
 import org.matrix.android.sdk.api.session.user.model.User
@@ -86,9 +87,9 @@ sealed class MatrixItem(
     }
 
     protected fun checkId() {
-//        if (!id.startsWith(getIdPrefix())) {
-//            error("Wrong usage of MatrixItem: check the id $id should start with ${getIdPrefix()}")
-//        }
+        if (!id.startsWith(getIdPrefix())) {
+            error("Wrong usage of MatrixItem: check the id $id should start with ${getIdPrefix()}")
+        }
     }
 
     /**
@@ -157,3 +158,5 @@ fun PublicRoom.toMatrixItem() = MatrixItem.RoomItem(roomId, name ?: getPrimaryAl
 fun RoomMemberSummary.toMatrixItem() = MatrixItem.UserItem(userId, displayName, avatarUrl)
 
 fun SenderInfo.toMatrixItem() = MatrixItem.UserItem(userId, disambiguatedDisplayName, avatarUrl)
+
+fun SpaceChildInfo.toMatrixItem() = MatrixItem.RoomItem(childRoomId, name, avatarUrl)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index 4cce93f9f9..244fe3432a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -72,8 +72,7 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
                 .allowWritesOnUiThread(true)
                 .modules(SessionRealmModule())
                 .schemaVersion(RealmSessionStoreMigration.SESSION_STORE_SCHEMA_VERSION)
-                .deleteRealmIfMigrationNeeded()
-//                .migration(migration)
+                .migration(migration)
                 .build()
 
         // Try creating a realm instance and if it succeeds we can clear the flag
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 9109ef2e8f..ff2793b0ab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -75,7 +75,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                             viaServers = relationInfoEntity.viaServers.toList()
                     )
                 },
-                children = roomSummaryEntity.children.map {
+                spaceChildren = roomSummaryEntity.children.map {
                     SpaceChildInfo(
                             childRoomId = it.childRoomId ?: "",
                             isKnown = it.childSummaryEntity != null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
index c49efaaeef..fd33682231 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
@@ -25,12 +25,12 @@ import timber.log.Timber
 fun <T : RealmObject> RealmQuery<T>.process(field: String, queryStringValue: QueryStringValue): RealmQuery<T> {
     when (queryStringValue) {
         is QueryStringValue.NoCondition -> Timber.v("No condition to process")
-        is QueryStringValue.IsNotNull -> isNotNull(field)
-        is QueryStringValue.IsNull -> isNull(field)
-        is QueryStringValue.IsEmpty -> isEmpty(field)
-        is QueryStringValue.IsNotEmpty -> isNotEmpty(field)
-        is QueryStringValue.Equals -> equalTo(field, queryStringValue.string, queryStringValue.case.toRealmCase())
-        is QueryStringValue.Contains -> contains(field, queryStringValue.string, queryStringValue.case.toRealmCase())
+        is QueryStringValue.IsNotNull   -> isNotNull(field)
+        is QueryStringValue.IsNull      -> isNull(field)
+        is QueryStringValue.IsEmpty     -> isEmpty(field)
+        is QueryStringValue.IsNotEmpty  -> isNotEmpty(field)
+        is QueryStringValue.Equals      -> equalTo(field, queryStringValue.string, queryStringValue.case.toRealmCase())
+        is QueryStringValue.Contains    -> contains(field, queryStringValue.string, queryStringValue.case.toRealmCase())
     }
     return this
 }
@@ -38,6 +38,6 @@ fun <T : RealmObject> RealmQuery<T>.process(field: String, queryStringValue: Que
 private fun QueryStringValue.Case.toRealmCase(): Case {
     return when (this) {
         QueryStringValue.Case.INSENSITIVE -> Case.INSENSITIVE
-        QueryStringValue.Case.SENSITIVE -> Case.SENSITIVE
+        QueryStringValue.Case.SENSITIVE   -> Case.SENSITIVE
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 49a3ffac5a..018b865388 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -24,7 +24,6 @@ import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.toMedium
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
-import org.matrix.android.sdk.api.session.room.model.RoomGuestAccessContent
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
@@ -144,7 +143,7 @@ internal class CreateRoomBodyBuilder @Inject constructor(
                     Event(
                             type = EventType.STATE_ROOM_GUEST_ACCESS,
                             stateKey = "",
-                            content = RoomGuestAccessContent(it.value).toContent()
+                            content = mapOf("guest_access" to it.value)
                     )
                 }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GraphUtils.kt
similarity index 100%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GrapUtils.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/GraphUtils.kt
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 8b1fd2f404..d2bb51cbef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -349,7 +349,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
 
         // it may not have a parent relation but could be a child of some other....
         for (spaceSummary in getSpaceSummaries(spaceSummaryQueryParams { memberships = Membership.activeMemberships() })) {
-            if (spaceSummary.children?.any { it.childRoomId == roomSummary.roomId } == true) {
+            if (spaceSummary.spaceChildren?.any { it.childRoomId == roomSummary.roomId } == true) {
                 return false
             }
         }
@@ -358,7 +358,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
     }
 
     fun flattenChild(current: RoomSummary, parenting: List<String>, output: MutableList<RoomSummary>, memberShips: List<Membership>) {
-        current.children?.sortedBy { it.order ?: it.name }?.forEach { childInfo ->
+        current.spaceChildren?.sortedBy { it.order ?: it.name }?.forEach { childInfo ->
             if (childInfo.roomType == RoomType.SPACE) {
                 // Add recursive
                 if (!parenting.contains(childInfo.childRoomId)) { // avoid cycles!
@@ -388,7 +388,7 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         if (includeCurrent) {
             output.add(current)
         }
-        current.children?.sortedBy { it.order ?: it.name }?.forEach {
+        current.spaceChildren?.sortedBy { it.order ?: it.name }?.forEach {
             if (it.roomType == RoomType.SPACE) {
                 // Add recursive
                 if (!parenting.contains(it.childRoomId)) { // avoid cycles!
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt
deleted file mode 100644
index 826fa76f77..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/CreateSpaceTask.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2021 The Matrix.org Foundation C.I.C.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk.internal.session.space
-
-import io.realm.RealmConfiguration
-import kotlinx.coroutines.TimeoutCancellationException
-import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
-import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
-import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
-import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
-import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
-import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
-import org.matrix.android.sdk.internal.task.Task
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-/**
- * A simple wrapper of create room task that adds waiting for DB entities of spaces
- */
-internal interface CreateSpaceTask : Task<CreateRoomParams, String>
-
-internal class DefaultCreateSpaceTask @Inject constructor(
-        private val createRoomTask: CreateRoomTask,
-        @SessionDatabase private val realmConfiguration: RealmConfiguration
-) : CreateSpaceTask {
-
-    override suspend fun execute(params: CreateRoomParams): String {
-        val spaceId = createRoomTask.execute(params)
-
-        try {
-            awaitNotEmptyResult(realmConfiguration, TimeUnit.MINUTES.toMillis(1L)) { realm ->
-                realm.where(RoomSummaryEntity::class.java)
-                        .equalTo(RoomSummaryEntityFields.ROOM_ID, spaceId)
-            }
-        } catch (exception: TimeoutCancellationException) {
-            throw CreateRoomFailure.CreatedWithTimeout(spaceId)
-        }
-
-        return spaceId
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 9ae8b25e5d..8fdc563edb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -32,6 +32,7 @@ import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.space.CreateSpaceParams
+import org.matrix.android.sdk.api.session.space.JoinSpaceResult
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.SpaceService
 import org.matrix.android.sdk.api.session.space.SpaceSummaryQueryParams
@@ -40,6 +41,7 @@ import org.matrix.android.sdk.api.session.space.model.SpaceParentContent
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.room.RoomGetter
 import org.matrix.android.sdk.internal.session.room.SpaceGetter
+import org.matrix.android.sdk.internal.session.room.create.CreateRoomTask
 import org.matrix.android.sdk.internal.session.room.membership.leaving.LeaveRoomTask
 import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
@@ -49,7 +51,7 @@ import javax.inject.Inject
 
 internal class DefaultSpaceService @Inject constructor(
         @UserId private val userId: String,
-        private val createSpaceTask: CreateSpaceTask,
+        private val createRoomTask: CreateRoomTask,
         private val joinSpaceTask: JoinSpaceTask,
         private val spaceGetter: SpaceGetter,
         private val roomGetter: RoomGetter,
@@ -61,7 +63,7 @@ internal class DefaultSpaceService @Inject constructor(
 ) : SpaceService {
 
     override suspend fun createSpace(params: CreateSpaceParams): String {
-        return createSpaceTask.executeRetry(params, 3)
+        return createRoomTask.executeRetry(params, 3)
     }
 
     override suspend fun createSpace(name: String, topic: String?, avatarUri: Uri?, isPublic: Boolean): String {
@@ -149,7 +151,7 @@ internal class DefaultSpaceService @Inject constructor(
 
     override suspend fun joinSpace(spaceIdOrAlias: String,
                                    reason: String?,
-                                   viaServers: List<String>): SpaceService.JoinSpaceResult {
+                                   viaServers: List<String>): JoinSpaceResult {
         return joinSpaceTask.execute(JoinSpaceTask.Params(spaceIdOrAlias, reason, viaServers))
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
index 7e9f2235b9..5e1b829249 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/JoinSpaceTask.kt
@@ -20,7 +20,7 @@ import io.realm.RealmConfiguration
 import kotlinx.coroutines.TimeoutCancellationException
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomType
-import org.matrix.android.sdk.api.session.space.SpaceService
+import org.matrix.android.sdk.api.session.space.JoinSpaceResult
 import org.matrix.android.sdk.internal.database.awaitNotEmptyResult
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
@@ -32,7 +32,7 @@ import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
-internal interface JoinSpaceTask : Task<JoinSpaceTask.Params, SpaceService.JoinSpaceResult> {
+internal interface JoinSpaceTask : Task<JoinSpaceTask.Params, JoinSpaceResult> {
     data class Params(
             val roomIdOrAlias: String,
             val reason: String?,
@@ -47,7 +47,7 @@ internal class DefaultJoinSpaceTask @Inject constructor(
         private val roomSummaryDataSource: RoomSummaryDataSource
 ) : JoinSpaceTask {
 
-    override suspend fun execute(params: JoinSpaceTask.Params): SpaceService.JoinSpaceResult {
+    override suspend fun execute(params: JoinSpaceTask.Params): JoinSpaceResult {
         Timber.v("## Space: > Joining root space ${params.roomIdOrAlias} ...")
         try {
             joinRoomTask.execute(JoinRoomTask.Params(
@@ -56,7 +56,7 @@ internal class DefaultJoinSpaceTask @Inject constructor(
                     params.viaServers
             ))
         } catch (failure: Throwable) {
-            return SpaceService.JoinSpaceResult.Fail(failure)
+            return JoinSpaceResult.Fail(failure)
         }
         Timber.v("## Space: < Joining root space done for ${params.roomIdOrAlias}")
         // we want to wait for sync result to check for auto join rooms
@@ -76,15 +76,15 @@ internal class DefaultJoinSpaceTask @Inject constructor(
             }
         } catch (exception: TimeoutCancellationException) {
             Timber.w("## Space: > Error created with timeout")
-            return SpaceService.JoinSpaceResult.PartialSuccess(emptyMap())
+            return JoinSpaceResult.PartialSuccess(emptyMap())
         }
 
         val errors = mutableMapOf<String, Throwable>()
         Timber.v("## Space: > Sync done ...")
         // after that i should have the children (? do I need to paginate to get state)
         val summary = roomSummaryDataSource.getSpaceSummary(params.roomIdOrAlias)
-        Timber.v("## Space: Found space summary Name:[${summary?.name}] children: ${summary?.children?.size}")
-        summary?.children?.forEach {
+        Timber.v("## Space: Found space summary Name:[${summary?.name}] children: ${summary?.spaceChildren?.size}")
+        summary?.spaceChildren?.forEach {
 //            val childRoomSummary = it.roomSummary ?: return@forEach
             Timber.v("## Space: Processing child :[${it.childRoomId}] autoJoin:${it.autoJoin}")
             if (it.autoJoin) {
@@ -92,13 +92,13 @@ internal class DefaultJoinSpaceTask @Inject constructor(
                 if (it.roomType == RoomType.SPACE) {
                     // recursively join auto-joined child of this space?
                     when (val subspaceJoinResult = execute(JoinSpaceTask.Params(it.childRoomId, null, it.viaServers))) {
-                        SpaceService.JoinSpaceResult.Success -> {
+                        JoinSpaceResult.Success           -> {
                             // nop
                         }
-                        is SpaceService.JoinSpaceResult.Fail -> {
+                        is JoinSpaceResult.Fail           -> {
                             errors[it.childRoomId] = subspaceJoinResult.error
                         }
-                        is SpaceService.JoinSpaceResult.PartialSuccess -> {
+                        is JoinSpaceResult.PartialSuccess -> {
                             errors.putAll(subspaceJoinResult.failedRooms)
                         }
                     }
@@ -119,9 +119,9 @@ internal class DefaultJoinSpaceTask @Inject constructor(
         }
 
         return if (errors.isEmpty()) {
-            SpaceService.JoinSpaceResult.Success
+            JoinSpaceResult.Success
         } else {
-            SpaceService.JoinSpaceResult.PartialSuccess(errors)
+            JoinSpaceResult.PartialSuccess(errors)
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
index 34bc66baa0..87425f4af2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/SpaceModule.kt
@@ -48,9 +48,6 @@ internal abstract class SpaceModule {
     @Binds
     abstract fun bindJoinSpaceTask(task: DefaultJoinSpaceTask): JoinSpaceTask
 
-    @Binds
-    abstract fun bindCreateSpaceTask(task: DefaultCreateSpaceTask): CreateSpaceTask
-
     @Binds
     abstract fun bindSpaceGetter(getter: DefaultSpaceGetter): SpaceGetter
 }
diff --git a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericRadioAction.kt b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericRadioAction.kt
index 168e5edc44..516612717a 100644
--- a/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericRadioAction.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGenericRadioAction.kt
@@ -29,11 +29,11 @@ open class BottomSheetGenericRadioAction(
 ) : VectorSharedAction {
 
     fun toRadioBottomSheetItem(): BottomSheetRadioActionItem_ {
-        return BottomSheetRadioActionItem_().apply {
-            id("action_${this@BottomSheetGenericRadioAction.title}")
-            title(this@BottomSheetGenericRadioAction.title)
-            selected(this@BottomSheetGenericRadioAction.isSelected)
-            description(this@BottomSheetGenericRadioAction.description)
+        return BottomSheetRadioActionItem_().also {
+            it.id("action_$title")
+            it.title(title)
+            it.selected(isSelected)
+            it.description(description)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index cfafd1f103..77ffe903fc 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -30,7 +30,6 @@ import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import io.reactivex.Observable
-import io.reactivex.functions.BiFunction
 import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.session.Session
@@ -66,8 +65,8 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
         @JvmStatic
         override fun create(viewModelContext: ViewModelContext, state: UnreadMessagesState): UnreadMessagesSharedViewModel? {
             val factory = when (viewModelContext) {
-                is FragmentViewModelContext -> viewModelContext.fragment as? UnreadMessagesSharedViewModel.Factory
-                is ActivityViewModelContext -> viewModelContext.activity as? UnreadMessagesSharedViewModel.Factory
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
             }
             return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
         }
@@ -84,7 +83,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                 }, sortOrder = RoomSortOrder.NONE
         ).asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
-                .subscribe {
+                .execute {
                     val counts = session.getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
@@ -97,15 +96,13 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                                 this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
                             }
                     ).size
-                    setState {
-                        copy(
-                                homeSpaceUnread = RoomAggregateNotificationCount(
-                                        counts.notificationCount + invites,
-                                        highlightCount = counts.highlightCount + invites
-                                )
-                        )
-                    }
-                }.disposeOnClear()
+                    copy(
+                            homeSpaceUnread = RoomAggregateNotificationCount(
+                                    counts.notificationCount + invites,
+                                    highlightCount = counts.highlightCount + invites
+                            )
+                    )
+                }
 
         Observable.combineLatest(
                 appStateHandler.selectedRoomGroupingObservable.distinctUntilChanged(),
@@ -118,7 +115,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                             .throttleFirst(300, TimeUnit.MILLISECONDS)
                             .observeOn(Schedulers.computation())
                 },
-                BiFunction { groupingMethod, _ ->
+                { groupingMethod, _ ->
                     when (groupingMethod.orNull()) {
                         is RoomGroupingMethod.ByLegacyGroup -> {
                             // currently not supported
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 1cac86fef5..ff288e2729 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -644,6 +644,9 @@ class RoomDetailFragment @Inject constructor(
     private fun handleSpaceShare() {
         roomDetailArgs.openShareSpaceForId?.let { spaceId ->
             ShareSpaceBottomSheet.show(childFragmentManager, spaceId)
+            view?.post {
+                handleChatEffect(ChatEffect.CONFETTI)
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index eeacdad363..76d7752ea7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -92,8 +92,8 @@ class RoomListFragment @Inject constructor(
 
     data class SectionAdapterInfo(
             var section: SectionKey,
-            val headerHeaderAdapter: SectionHeaderAdapter,
-            val contentAdapter: EpoxyController
+            val sectionHeaderAdapter: SectionHeaderAdapter,
+            val contentEpoxyController: EpoxyController
     )
 
     private val adapterInfosList = mutableListOf<SectionAdapterInfo>()
@@ -126,7 +126,7 @@ class RoomListFragment @Inject constructor(
             // it's for invites local echo
             adapterInfosList.filter { it.section.notifyOfLocalEcho }
                     .onEach {
-                        (it.contentAdapter as? RoomSummaryPagedController)?.roomChangeMembershipStates = ms
+                        (it.contentEpoxyController as? RoomSummaryPagedController)?.roomChangeMembershipStates = ms
                     }
         }
     }
@@ -137,16 +137,16 @@ class RoomListFragment @Inject constructor(
             val isRoomSectionExpanded = roomsSection.isExpanded.value.orTrue()
             if (actualBlock.section.isExpanded && !isRoomSectionExpanded) {
                 // mark controller as collapsed
-                actualBlock.contentAdapter.setCollapsed(true)
+                actualBlock.contentEpoxyController.setCollapsed(true)
             } else if (!actualBlock.section.isExpanded && isRoomSectionExpanded) {
                 // we must expand!
-                actualBlock.contentAdapter.setCollapsed(false)
+                actualBlock.contentEpoxyController.setCollapsed(false)
             }
             actualBlock.section = actualBlock.section.copy(
                     isExpanded = isRoomSectionExpanded
             )
-            actualBlock.headerHeaderAdapter.updateSection(
-                    actualBlock.headerHeaderAdapter.roomsSectionData.copy(isExpanded = isRoomSectionExpanded)
+            actualBlock.sectionHeaderAdapter.updateSection(
+                    actualBlock.sectionHeaderAdapter.roomsSectionData.copy(isExpanded = isRoomSectionExpanded)
             )
         }
     }
@@ -156,7 +156,7 @@ class RoomListFragment @Inject constructor(
     }
 
     override fun onDestroyView() {
-        adapterInfosList.onEach { it.contentAdapter.removeModelBuildListener(modelBuildListener) }
+        adapterInfosList.onEach { it.contentEpoxyController.removeModelBuildListener(modelBuildListener) }
         adapterInfosList.clear()
         modelBuildListener = null
         views.roomListView.cleanup()
@@ -401,8 +401,8 @@ class RoomListFragment @Inject constructor(
     }
 
     private fun checkEmptyState() {
-        val shouldShowEmpty = adapterInfosList.all { it.headerHeaderAdapter.roomsSectionData.isHidden }
-                && !adapterInfosList.any { it.headerHeaderAdapter.roomsSectionData.isLoading }
+        val shouldShowEmpty = adapterInfosList.all { it.sectionHeaderAdapter.roomsSectionData.isHidden }
+                && !adapterInfosList.any { it.sectionHeaderAdapter.roomsSectionData.isLoading }
         if (shouldShowEmpty) {
             val emptyState = when (roomListParams.displayMode) {
                 RoomListDisplayMode.NOTIFICATIONS -> {
@@ -432,7 +432,7 @@ class RoomListFragment @Inject constructor(
             views.stateView.state = emptyState
         } else {
             // is there something to show already?
-            if (adapterInfosList.any { !it.headerHeaderAdapter.roomsSectionData.isHidden }) {
+            if (adapterInfosList.any { !it.sectionHeaderAdapter.roomsSectionData.isHidden }) {
                 views.stateView.state = StateView.State.Content
             } else {
                 views.stateView.state = StateView.State.Loading
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 1044d598c8..bc24705e13 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -65,8 +65,17 @@ class RoomListViewModel @Inject constructor(
     }
 
     enum class SpaceFilterStrategy {
+        /**
+         * Filter the rooms if they are part of the current space (children and grand children).
+         * If current space is null, will return orphan rooms only
+         */
         NORMAL,
+        /**
+         * Special case when we don't want to discriminate rooms when current space is null.
+         * In this case return all.
+         */
         NOT_IF_ALL,
+        /** Do not filter based on space*/
         NONE
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 2f073a68c6..283ed0ac85 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -32,7 +32,6 @@ import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
-import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -60,7 +59,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
                          onJoinClick: View.OnClickListener): VectorEpoxyModel<*> {
         return SpaceChildInfoItem_()
                 .id("sug_${spaceChildInfo.childRoomId}")
-                .matrixItem(MatrixItem.RoomItem(spaceChildInfo.childRoomId, spaceChildInfo.name, spaceChildInfo.avatarUrl))
+                .matrixItem(spaceChildInfo.toMatrixItem())
                 .avatarRenderer(avatarRenderer)
                 .topic(spaceChildInfo.topic)
                 .buttonLabel(stringProvider.getString(R.string.join))
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index b641779ed5..0d633ac422 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -40,7 +40,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
-import org.matrix.android.sdk.api.session.space.SpaceService
+import org.matrix.android.sdk.api.session.space.JoinSpaceResult
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
@@ -281,7 +281,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                 if (joinResult.isSuccess()) {
                     _viewEvents.post(MatrixToViewEvents.NavigateToSpace(joinSpace.spaceID))
                 } else {
-                    val errMsg = errorFormatter.toHumanReadable((joinResult as? SpaceService.JoinSpaceResult.Fail)?.error)
+                    val errMsg = errorFormatter.toHumanReadable((joinResult as? JoinSpaceResult.Fail)?.error)
                     _viewEvents.post(MatrixToViewEvents.ShowModalError(errMsg))
                 }
             } catch (failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
index 567caa5f97..eb601605e0 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
@@ -26,7 +26,7 @@ sealed class RoomSettingsAction : VectorViewModelAction {
     data class SetRoomName(val newName: String) : RoomSettingsAction()
     data class SetRoomTopic(val newTopic: String) : RoomSettingsAction()
     data class SetRoomHistoryVisibility(val visibility: RoomHistoryVisibility) : RoomSettingsAction()
-    data class SetRoomJoinRule(val roomJoinRule: RoomJoinRules?) : RoomSettingsAction()
+    data class SetRoomJoinRule(val roomJoinRule: RoomJoinRules) : RoomSettingsAction()
     data class SetRoomGuestAccess(val guestAccess: GuestAccess) : RoomSettingsAction()
 
     object Save : RoomSettingsAction()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index c3e730f29e..a26f28a1c4 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -148,7 +148,7 @@ class SpaceSummaryController @Inject constructor(
                 ?.forEach { groupSummary ->
                     val isSelected = selected is RoomGroupingMethod.BySpace && groupSummary.roomId == selected.space()?.roomId
                     // does it have children?
-                    val subSpaces = groupSummary.children?.filter { childInfo ->
+                    val subSpaces = groupSummary.spaceChildren?.filter { childInfo ->
                         summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
                     }
                     val hasChildren = (subSpaces?.size ?: 0) > 0
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
index 7bad36ced2..147fd3a616 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceState.kt
@@ -29,7 +29,7 @@ data class CreateSpaceState(
         val spaceType: SpaceType? = null,
         val spaceTopology: SpaceTopology? = null,
         val nameInlineError: String? = null,
-        val defaultRooms: Map<Int, String?>? = null,
+        val defaultRooms: Map<Int /** position in form */, String?>? = null,
         val creationResult: Async<String> = Uninitialized
 ) : MvRxState {
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
index 96e5ec24c4..d46ae36275 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt
@@ -53,7 +53,7 @@ class SpaceDetailEpoxyController @Inject constructor(
             enabled(true)
             imageUri(data?.avatarUri)
             avatarRenderer(avatarRenderer)
-            matrixItem(data?.name?.let { MatrixItem.RoomItem("", it, null).takeIf { !it.displayName.isNullOrBlank() } })
+            matrixItem(data?.name?.let { MatrixItem.RoomItem("!", it, null).takeIf { !it.displayName.isNullOrBlank() } })
             clickListener { listener?.onAvatarChange() }
             deleteListener { listener?.onAvatarDelete() }
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index 76d62b58b6..fbe405e641 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -63,7 +63,7 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
         val spaceSum = session.getRoomSummary(initialState.spaceId)
         setState {
             copy(
-                    childList = spaceSum?.children ?: emptyList(),
+                    childList = spaceSum?.spaceChildren ?: emptyList(),
                     spaceSummaryApiResult = Loading()
             )
         }
@@ -95,17 +95,12 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
         session
                 .rx()
                 .liveRoomSummaries(queryParams)
-                .subscribe { list ->
-                    val joinedRoomIds = list
-                            ?.map { it.roomId }
-                            ?.toSet()
-                            ?: emptySet()
-
-                    setState {
-                        copy(joinedRoomsIds = joinedRoomIds)
-                    }
+                .map {
+                    it.map { it.roomId }.toSet()
+                }
+                .execute {
+                    copy(joinedRoomsIds = it.invoke() ?: emptySet())
                 }
-                .disposeOnClear()
     }
 
     private fun observeMembershipChanges() {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index 692f4343ba..e12aa14e83 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -44,7 +44,7 @@ import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 
 class AddRoomError(val errorList: Map<String, Throwable>) : Throwable() {
     override fun getLocalizedMessage(): String? {
-        return errorList.map { it.value.localizedMessage }.joinToString(",")
+        return errorList.map { it.value.localizedMessage }.joinToString()
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
index f3d7104d71..59e2742379 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
@@ -20,6 +20,6 @@ import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class SpaceManagedSharedAction : VectorViewModelAction {
     object HandleBack : SpaceManagedSharedAction()
-    object ShowLoading: SpaceManagedSharedAction()
-    object HideLoading: SpaceManagedSharedAction()
+    object ShowLoading : SpaceManagedSharedAction()
+    object HideLoading : SpaceManagedSharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
index b1a35c3700..067592b6ce 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
@@ -20,6 +20,6 @@ import im.vector.app.core.platform.VectorViewEvents
 
 sealed class SpaceManagedSharedViewEvents : VectorViewEvents {
     object Finish : SpaceManagedSharedViewEvents()
-    object ShowLoading: SpaceManagedSharedViewEvents()
-    object HideLoading: SpaceManagedSharedViewEvents()
+    object ShowLoading : SpaceManagedSharedViewEvents()
+    object HideLoading : SpaceManagedSharedViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index 66a702f685..7da6c8a053 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -34,7 +34,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.peeking.PeekResult
-import org.matrix.android.sdk.api.session.space.SpaceService
+import org.matrix.android.sdk.api.session.space.JoinSpaceResult
 import org.matrix.android.sdk.internal.session.space.peeking.SpacePeekResult
 import org.matrix.android.sdk.internal.session.space.peeking.SpaceSubChildPeekResult
 import timber.log.Timber
@@ -102,12 +102,12 @@ class SpacePreviewViewModel @AssistedInject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             val joinResult = session.spaceService().joinSpace(initialState.idOrAlias, null, spaceVia)
             when (joinResult) {
-                SpaceService.JoinSpaceResult.Success,
-                is SpaceService.JoinSpaceResult.PartialSuccess -> {
+                JoinSpaceResult.Success,
+                is JoinSpaceResult.PartialSuccess -> {
                     // For now we don't handle partial success, it's just success
                     _viewEvents.post(SpacePreviewViewEvents.JoinSuccess)
                 }
-                is SpaceService.JoinSpaceResult.Fail -> {
+                is JoinSpaceResult.Fail           -> {
                     _viewEvents.post(SpacePreviewViewEvents.JoinFailure(joinResult.error.toString()))
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index 6c6f0908c3..9848cb5bf1 100644
--- a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -60,13 +60,13 @@ class SharedPreferencesUiStateRepository @Inject constructor(
     }
 
     override fun storeSelectedSpace(spaceId: String?, sessionId: String) {
-        sharedPreferences.edit(true) {
+        sharedPreferences.edit {
             putString("$KEY_SELECTED_SPACE@$sessionId", spaceId)
         }
     }
 
     override fun storeSelectedGroup(groupId: String?, sessionId: String) {
-        sharedPreferences.edit(true) {
+        sharedPreferences.edit {
             putString("$KEY_SELECTED_GROUP@$sessionId", groupId)
         }
     }
diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml
index e6ecdd9aa8..fcfe8374d7 100644
--- a/vector/src/main/res/layout/fragment_home_detail.xml
+++ b/vector/src/main/res/layout/fragment_home_detail.xml
@@ -18,36 +18,36 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:baselineAligned="false"
             android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:baselineAligned="false">
+            android:orientation="horizontal">
 
             <RelativeLayout
                 android:id="@+id/groupToolbarAvatarImageView"
-                android:contentDescription="@string/a11y_open_drawer"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"
+                android:contentDescription="@string/a11y_open_drawer"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_width="40dp"
-                android:layout_height="40dp">
+                app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
-                    android:importantForAccessibility="no"
                     android:layout_width="28dp"
                     android:layout_height="28dp"
                     android:layout_centerVertical="true"
-                    android:src="@drawable/ic_space_icons"
-                    app:tint="?riotx_text_secondary"
                     android:layout_marginStart="4dp"
-                    />
+                    android:importantForAccessibility="no"
+                    android:src="@drawable/ic_space_icons"
+                    app:tint="?riotx_text_secondary" />
 
-                <!-- Not yet done -->
                 <im.vector.app.features.home.room.list.UnreadCounterBadgeView
                     android:id="@+id/drawerUnreadCounterBadgeView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
                     android:layout_marginEnd="0dp"
                     android:gravity="center"
                     android:minWidth="16dp"
@@ -57,20 +57,18 @@
                     android:textColor="@android:color/white"
                     android:textSize="10sp"
                     android:visibility="gone"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
                     tools:background="@drawable/bg_unread_highlight"
                     tools:text="4"
                     tools:visibility="visible" />
             </RelativeLayout>
 
             <LinearLayout
+                android:id="@+id/homeToolbarContent"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="start"
                 android:orientation="vertical"
-                android:id="@+id/homeToolbarContent"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp">
 
@@ -90,14 +88,14 @@
                     android:id="@+id/groupToolbarSpaceTitleView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    tools:visibility="visible"
-                    android:visibility="gone"
                     android:ellipsize="end"
                     android:gravity="start"
                     android:maxLines="1"
                     android:textColor="?riotx_text_primary"
                     android:textSize="14sp"
-                    tools:text="@tools:sample/lorem/random" />
+                    android:visibility="gone"
+                    tools:text="@tools:sample/lorem/random"
+                    tools:visibility="visible" />
 
             </LinearLayout>
 
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index ab2351f814..23b2807151 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -74,9 +74,9 @@
             android:id="@+id/publicRoomsFilter"
             style="@style/VectorSearchView"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 51a7afe652..731f3bd5c8 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -9,7 +9,6 @@
 
     <ProgressBar
         android:id="@+id/progressBar"
-        style="?progressBarStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center" />

From 70476b912f017a13561381646caa263b17550fff Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 28 Apr 2021 09:26:32 +0200
Subject: [PATCH 187/350] Fix / placeholder in dark time

---
 .../room/relationship/RoomChildRelationInfo.kt        |  3 +--
 .../res/drawable/placeholder_round_background.xml     |  5 +++++
 vector/src/main/res/drawable/placeholder_shape_8.xml  | 11 +++++++++++
 vector/src/main/res/layout/item_editable_avatar.xml   |  2 +-
 .../main/res/layout/item_editable_square_avatar.xml   |  2 +-
 vector/src/main/res/layout/item_room_placeholder.xml  |  6 +++---
 6 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 vector/src/main/res/drawable/placeholder_round_background.xml
 create mode 100644 vector/src/main/res/drawable/placeholder_shape_8.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
index cff1019893..2efea7f118 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
@@ -24,7 +24,6 @@ import org.matrix.android.sdk.api.session.space.model.SpaceParentContent
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
 import org.matrix.android.sdk.internal.database.query.whereType
-import timber.log.Timber
 
 /**
  * Relationship between rooms and spaces
@@ -66,7 +65,7 @@ internal class RoomChildRelationInfo(
 //                }
                 .mapNotNull {
                     ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.let { scc ->
-                        Timber.v("## Space child desc state event $scc")
+//                        Timber.v("## Space child desc state event $scc")
                         // Children where via is not present are ignored.
                         scc.via?.let { via ->
                             SpaceChildInfo(
diff --git a/vector/src/main/res/drawable/placeholder_round_background.xml b/vector/src/main/res/drawable/placeholder_round_background.xml
new file mode 100644
index 0000000000..b7bde9ed67
--- /dev/null
+++ b/vector/src/main/res/drawable/placeholder_round_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="?riotx_reaction_background_off" />
+</shape>
diff --git a/vector/src/main/res/drawable/placeholder_shape_8.xml b/vector/src/main/res/drawable/placeholder_shape_8.xml
new file mode 100644
index 0000000000..f0a9e856a2
--- /dev/null
+++ b/vector/src/main/res/drawable/placeholder_shape_8.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:width="40dp" android:height="40dp"/>
+
+    <solid android:color="?riotx_reaction_background_off" />
+
+    <corners android:radius="8dp" />
+
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_editable_avatar.xml b/vector/src/main/res/layout/item_editable_avatar.xml
index 654787384f..7c067cc46c 100644
--- a/vector/src/main/res/layout/item_editable_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_avatar.xml
@@ -13,7 +13,7 @@
         android:id="@+id/itemEditableAvatarImageContainer"
         android:layout_width="128dp"
         android:layout_height="128dp"
-        android:background="@drawable/header_panel_round_background"
+        android:background="@drawable/placeholder_round_background"
         android:contentDescription="@string/a11y_change_avatar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_editable_square_avatar.xml b/vector/src/main/res/layout/item_editable_square_avatar.xml
index 04bf95e983..d931e807ea 100644
--- a/vector/src/main/res/layout/item_editable_square_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_square_avatar.xml
@@ -13,7 +13,7 @@
         android:id="@+id/itemEditableAvatarImageContainer"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:background="@drawable/rounded_rect_shape_16"
+        android:background="@drawable/placeholder_shape_8"
         android:contentDescription="@string/a11y_change_avatar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/layout/item_room_placeholder.xml b/vector/src/main/res/layout/item_room_placeholder.xml
index c5fdd7781a..8ce1ded2e1 100644
--- a/vector/src/main/res/layout/item_room_placeholder.xml
+++ b/vector/src/main/res/layout/item_room_placeholder.xml
@@ -25,7 +25,7 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:importantForAccessibility="no"
-            android:src="@drawable/header_panel_round_background" />
+            android:src="@drawable/placeholder_round_background" />
 
     </FrameLayout>
 
@@ -46,7 +46,7 @@
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="70dp"
-        android:background="@drawable/rounded_rect_shape_8"
+        android:background="@drawable/placeholder_shape_8"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -61,7 +61,7 @@
         android:layout_height="30dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="20dp"
-        android:background="@drawable/rounded_rect_shape_8"
+        android:background="@drawable/placeholder_shape_8"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomNameView" />

From 32605be6e835784edd066e934b3fc0868095897f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 28 Apr 2021 11:42:08 +0200
Subject: [PATCH 188/350] Fix / migration recover room type

---
 .../database/RealmSessionStoreMigration.kt    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 477955cbaf..ac72592a1e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -19,7 +19,10 @@ package org.matrix.android.sdk.internal.database
 import io.realm.DynamicRealm
 import io.realm.FieldAttribute
 import io.realm.RealmMigration
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
+import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
 import org.matrix.android.sdk.internal.database.model.EditAggregatedSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.EditionOfEventFields
 import org.matrix.android.sdk.internal.database.model.EventEntityFields
@@ -33,6 +36,7 @@ import org.matrix.android.sdk.internal.database.model.RoomTagEntityFields
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.SpaceParentSummaryEntityFields
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -177,7 +181,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 ?.addIndex(RoomSummaryEntityFields.IS_SERVER_NOTICE)
 
                 ?.transform { obj ->
-
                     val isFavorite = obj.getList(RoomSummaryEntityFields.TAGS.`$`).any {
                         it.getString(RoomTagEntityFields.TAG_NAME) == RoomTag.ROOM_TAG_FAVOURITE
                     }
@@ -215,13 +218,24 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 ?.addRealmObjectField(SpaceParentSummaryEntityFields.PARENT_SUMMARY_ENTITY.`$`, realm.schema.get("RoomSummaryEntity")!!)
                 ?.addRealmListField(SpaceParentSummaryEntityFields.VIA_SERVERS.`$`, String::class.java)
 
+        val creationContentAdapter = MoshiProvider.providesMoshi().adapter(RoomCreateContent::class.java)
         realm.schema.get("RoomSummaryEntity")
                 ?.addField(RoomSummaryEntityFields.ROOM_TYPE, String::class.java)
                 ?.addField(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, String::class.java)
                 ?.addField(RoomSummaryEntityFields.GROUP_IDS, String::class.java)
                 ?.transform { obj ->
-                    // Should I put messaging type here?
-                    obj.setString(RoomSummaryEntityFields.ROOM_TYPE, null)
+
+                    val creationEvent = realm.where("CurrentStateEventEntity")
+                            .equalTo(CurrentStateEventEntityFields.ROOM_ID, obj.getString(RoomSummaryEntityFields.ROOM_ID))
+                            .equalTo(CurrentStateEventEntityFields.TYPE, EventType.STATE_ROOM_CREATE)
+                            .findFirst()
+
+                    val roomType = creationEvent?.getObject(CurrentStateEventEntityFields.ROOT.`$`)
+                            ?.getString(EventEntityFields.CONTENT)?.let {
+                                creationContentAdapter.fromJson(it)?.type
+                            }
+
+                    obj.setString(RoomSummaryEntityFields.ROOM_TYPE, roomType)
                 }
                 ?.addRealmListField(RoomSummaryEntityFields.PARENTS.`$`, realm.schema.get("SpaceParentSummaryEntity")!!)
                 ?.addRealmListField(RoomSummaryEntityFields.CHILDREN.`$`, realm.schema.get("SpaceChildSummaryEntity")!!)

From 506bdd8eb06a84b6151b413a4fd107ddc24f6138 Mon Sep 17 00:00:00 2001
From: yostyle <yoanp@element.io>
Date: Wed, 28 Apr 2021 12:22:43 +0200
Subject: [PATCH 189/350] directUserId can be null

---
 .../android/sdk/internal/database/mapper/RoomSummaryMapper.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index d6b46ae436..6c91f72c7b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -43,7 +43,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                 topic = roomSummaryEntity.topic ?: "",
                 avatarUrl = roomSummaryEntity.avatarUrl ?: "",
                 isDirect = roomSummaryEntity.isDirect,
-                directUserId = roomSummaryEntity.directUserId ?: "",
+                directUserId = roomSummaryEntity.directUserId,
                 latestPreviewableEvent = latestEvent,
                 joinedMembersCount = roomSummaryEntity.joinedMembersCount,
                 invitedMembersCount = roomSummaryEntity.invitedMembersCount,

From 8c1afbaa66f24c0b61c92d09c459e40108e079a2 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 28 Apr 2021 12:54:19 +0200
Subject: [PATCH 190/350] Fix / empty space pannel on new accounts

---
 .../features/spaces/SpaceSummaryController.kt | 37 ++++++-------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index a26f28a1c4..4b78a999bb 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -102,10 +102,6 @@ class SpaceSummaryController @Inject constructor(
                                  rootSpaces: List<RoomSummary>?,
                                  expandedStates: Map<String, Boolean>,
                                  homeCount: RoomAggregateNotificationCount) {
-        if (summaries.isNullOrEmpty()) {
-            return
-        }
-
         genericItemHeader {
             id("spaces")
             text(stringProvider.getString(R.string.spaces_header))
@@ -115,24 +111,16 @@ class SpaceSummaryController @Inject constructor(
 
         // show invites on top
 
-        summaries.filter { it.membership == Membership.INVITE }
-                .let { invites ->
-                    if (invites.isNotEmpty()) {
-//                        genericItemHeader {
-//                            id("invites")
-//                            text(stringProvider.getString(R.string.spaces_invited_header))
-//                        }
-                        invites.forEach {
-                            spaceSummaryItem {
-                                avatarRenderer(avatarRenderer)
-                                id(it.roomId)
-                                matrixItem(it.toMatrixItem())
-                                countState(UnreadCounterBadgeView.State(1, true))
-                                selected(false)
-                                description(stringProvider.getString(R.string.you_are_invited))
-                                listener { callback?.onSpaceInviteSelected(it) }
-                            }
-                        }
+        summaries?.filter { it.membership == Membership.INVITE }
+                ?.forEach {
+                    spaceSummaryItem {
+                        avatarRenderer(avatarRenderer)
+                        id(it.roomId)
+                        matrixItem(it.toMatrixItem())
+                        countState(UnreadCounterBadgeView.State(1, true))
+                        selected(false)
+                        description(stringProvider.getString(R.string.you_are_invited))
+                        listener { callback?.onSpaceInviteSelected(it) }
                     }
                 }
 
@@ -149,7 +137,7 @@ class SpaceSummaryController @Inject constructor(
                     val isSelected = selected is RoomGroupingMethod.BySpace && groupSummary.roomId == selected.space()?.roomId
                     // does it have children?
                     val subSpaces = groupSummary.spaceChildren?.filter { childInfo ->
-                        summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
+                        summaries?.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
                     }
                     val hasChildren = (subSpaces?.size ?: 0) > 0
                     val expanded = expandedStates[groupSummary.roomId] == true
@@ -175,7 +163,7 @@ class SpaceSummaryController @Inject constructor(
                     if (hasChildren && expanded) {
                         // it's expanded
                         subSpaces?.forEach { child ->
-                            summaries.firstOrNull { it.roomId == child.childRoomId }?.let { childSum ->
+                            summaries?.firstOrNull { it.roomId == child.childRoomId }?.let { childSum ->
                                 val isChildSelected = selected is RoomGroupingMethod.BySpace && childSum.roomId == selected.space()?.roomId
                                 spaceSummaryItem {
                                     avatarRenderer(avatarRenderer)
@@ -197,7 +185,6 @@ class SpaceSummaryController @Inject constructor(
                     }
                 }
 
-// Temporary item to create a new Space (will move with final design)
         spaceAddItem {
             id("create")
             listener { callback?.onAddSpaceSelected() }

From 9cb19c058152a14c0992f98accde23b4a29dccbb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 28 Apr 2021 14:04:27 +0200
Subject: [PATCH 191/350] Fix issues on Android 11 (#3067) Add <queries> tag in
 manifest to be able to open file using external app and to use full feature
 of CustomTab

---
 CHANGES.md                          |  1 +
 vector/src/main/AndroidManifest.xml | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b447b6e6e5..1385e0db1a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Bugfix 🐛:
  - Fix exception in rxSingle (#3180)
  - Do not invite the current user when creating a room (#3123)
  - Fix color issues when the system theme is changed (#2738)
+ - Fix issues on Android 11 (#3067)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 07606d315c..6c6ea46626 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -48,6 +48,22 @@
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
 
+    <!-- Since Android 11, see https://developer.android.com/training/package-visibility -->
+    <queries>
+        <!-- To open URL in CustomTab (prefetch, etc.). It makes CustomTabsClient.getPackageName() work
+         see https://developer.android.com/training/package-visibility/use-cases#open-urls-custom-tabs -->
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+
+        <!-- The app can open attachments of any mime type
+        see https://developer.android.com/training/package-visibility/use-cases#open-a-file -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:mimeType="*/*" />
+        </intent>
+    </queries>
+
     <application
         android:name=".VectorApplication"
         android:allowBackup="false"

From 195bc8e9148581188f9a8ead4b82442e2552d0b4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 28 Apr 2021 15:11:48 +0200
Subject: [PATCH 192/350] Fix issue when opening encrypted files (#3186) Also
 always open the file after a successful download

---
 CHANGES.md                                    |  1 +
 .../sdk/api/session/file/FileService.kt       | 15 ++++--
 .../internal/session/DefaultFileService.kt    | 13 +++--
 .../home/room/detail/RoomDetailViewModel.kt   | 48 +++++++++++--------
 4 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1385e0db1a..2574ea07b5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Bugfix 🐛:
  - Do not invite the current user when creating a room (#3123)
  - Fix color issues when the system theme is changed (#2738)
  - Fix issues on Android 11 (#3067)
+ - Fix issue when opening encrypted files (#3186)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
index adfdc2498e..23dc1e0ba8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
@@ -29,14 +29,19 @@ import java.io.File
  */
 interface FileService {
 
-    enum class FileState {
-        IN_CACHE,
-        DOWNLOADING,
-        UNKNOWN
+    sealed class FileState {
+        /**
+         * The original file is in cache, but the decrypted files can be deleted for security reason.
+         * To decrypt the file again, call [downloadFile], the encrypted file will not be downloaded again
+         * @param decryptedFileInCache true if the decrypted file is available. Always true for clear files.
+         */
+        data class InCache(val decryptedFileInCache: Boolean) : FileState()
+        object Downloading : FileState()
+        object Unknown : FileState()
     }
 
     /**
-     * Download a file.
+     * Download a file if necessary and ensure that if the file is encrypted, the file is decrypted.
      * Result will be a decrypted file, stored in the cache folder. url parameter will be used to create unique filename to avoid name collision.
      */
     suspend fun downloadFile(fileName: String,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
index d05ee48c1b..891858d857 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@@ -219,7 +219,7 @@ internal class DefaultFileService @Inject constructor(
                                fileName: String,
                                mimeType: String?,
                                elementToDecrypt: ElementToDecrypt?): Boolean {
-        return fileState(mxcUrl, fileName, mimeType, elementToDecrypt) == FileService.FileState.IN_CACHE
+        return fileState(mxcUrl, fileName, mimeType, elementToDecrypt) is FileService.FileState.InCache
     }
 
     internal data class CachedFiles(
@@ -256,12 +256,17 @@ internal class DefaultFileService @Inject constructor(
                            fileName: String,
                            mimeType: String?,
                            elementToDecrypt: ElementToDecrypt?): FileService.FileState {
-        mxcUrl ?: return FileService.FileState.UNKNOWN
-        if (getFiles(mxcUrl, fileName, mimeType, elementToDecrypt != null).file.exists()) return FileService.FileState.IN_CACHE
+        mxcUrl ?: return FileService.FileState.Unknown
+        val files = getFiles(mxcUrl, fileName, mimeType, elementToDecrypt != null)
+        if (files.file.exists()) {
+            return FileService.FileState.InCache(
+                    decryptedFileInCache = files.getClearFile().exists()
+            )
+        }
         val isDownloading = synchronized(ongoing) {
             ongoing[mxcUrl] != null
         }
-        return if (isDownloading) FileService.FileState.DOWNLOADING else FileService.FileState.UNKNOWN
+        return if (isDownloading) FileService.FileState.Downloading else FileService.FileState.Unknown
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 006a2c9b5f..f4d3c8138c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -78,6 +78,7 @@ import org.matrix.android.sdk.api.session.events.model.isAttachmentMessage
 import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
@@ -823,7 +824,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                         }
                     }.exhaustive
                 }
-                is SendMode.EDIT -> {
+                is SendMode.EDIT    -> {
                     // is original event a reply?
                     val inReplyTo = state.sendMode.timelineEvent.getRelationContent()?.inReplyTo?.eventId
                     if (inReplyTo != null) {
@@ -846,7 +847,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.QUOTE -> {
+                is SendMode.QUOTE   -> {
                     val messageContent = state.sendMode.timelineEvent.getLastMessageContent()
                     val textMsg = messageContent?.body
 
@@ -867,7 +868,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.REPLY -> {
+                is SendMode.REPLY   -> {
                     state.sendMode.timelineEvent.let {
                         room.replyToMessage(it, action.text.toString(), action.autoMarkdown)
                         _viewEvents.post(RoomDetailViewEvents.MessageSent)
@@ -1138,7 +1139,6 @@ class RoomDetailViewModel @AssistedInject constructor(
         val mxcUrl = action.messageFileContent.getFileUrl() ?: return
         val isLocalSendingFile = action.senderId == session.myUserId
                 && mxcUrl.startsWith("content://")
-        val isDownloaded = session.fileService().isFileInCache(action.messageFileContent)
         if (isLocalSendingFile) {
             tryOrNull { Uri.parse(mxcUrl) }?.let {
                 _viewEvents.post(RoomDetailViewEvents.OpenFile(
@@ -1147,26 +1147,34 @@ class RoomDetailViewModel @AssistedInject constructor(
                         null
                 ))
             }
-        } else if (isDownloaded) {
-            // we can open it
-            session.fileService().getTemporarySharableURI(action.messageFileContent)?.let { uri ->
-                _viewEvents.post(RoomDetailViewEvents.OpenFile(
-                        action.messageFileContent.mimeType,
-                        uri,
-                        null
-                ))
-            }
         } else {
             viewModelScope.launch {
-                val result = runCatching {
-                    session.fileService().downloadFile(messageContent = action.messageFileContent)
+                val fileState = session.fileService().fileState(action.messageFileContent)
+                var canOpen = fileState is FileService.FileState.InCache && fileState.decryptedFileInCache
+                if (!canOpen) {
+                    // First download, or download and decrypt, or decrypt from cache
+                    val result = runCatching {
+                        session.fileService().downloadFile(messageContent = action.messageFileContent)
+                    }
+
+                    _viewEvents.post(RoomDetailViewEvents.DownloadFileState(
+                            action.messageFileContent.mimeType,
+                            result.getOrNull(),
+                            result.exceptionOrNull()
+                    ))
+                    canOpen = result.isSuccess
                 }
 
-                _viewEvents.post(RoomDetailViewEvents.DownloadFileState(
-                        action.messageFileContent.mimeType,
-                        result.getOrNull(),
-                        result.exceptionOrNull()
-                ))
+                if (canOpen) {
+                    // We can now open the file
+                    session.fileService().getTemporarySharableURI(action.messageFileContent)?.let { uri ->
+                        _viewEvents.post(RoomDetailViewEvents.OpenFile(
+                                action.messageFileContent.mimeType,
+                                uri,
+                                null
+                        ))
+                    }
+                }
             }
         }
     }

From c40476aa94bf78429dbda8304e31e443fec24802 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 28 Apr 2021 15:55:21 +0200
Subject: [PATCH 193/350] Add ability to install APK from directly from Element
 (#2381) And cleanup `data class OpenFile`

---
 CHANGES.md                                    |  2 +-
 .../matrix/android/sdk/api/util/MimeTypes.kt  |  1 +
 vector/src/main/AndroidManifest.xml           |  3 +
 .../im/vector/app/core/utils/SystemUtils.kt   | 12 ++++
 .../home/room/detail/RoomDetailFragment.kt    | 57 +++++++++++++++----
 .../home/room/detail/RoomDetailViewEvents.kt  |  5 +-
 .../home/room/detail/RoomDetailViewModel.kt   |  9 +--
 7 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 2574ea07b5..85819b4604 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - Add ability to install APK from directly from Element (#2381)
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MimeTypes.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MimeTypes.kt
index c74999b4ab..182b37f2ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MimeTypes.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MimeTypes.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.api.extensions.orFalse
 object MimeTypes {
     const val Any: String = "*/*"
     const val OctetStream = "application/octet-stream"
+    const val Apk = "application/vnd.android.package-archive"
 
     const val Images = "image/*"
 
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 6c6ea46626..9322adbe04 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -28,6 +28,9 @@
     <!-- Needed for incoming calls  -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
+    <!-- To be able to install APK from the application -->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
     <!-- Jitsi libs adds CALENDAR permissions, but we can remove them safely according to https://github.com/jitsi/jitsi-meet/issues/4068#issuecomment-480482481 -->
     <uses-permission
         android:name="android.permission.READ_CALENDAR"
diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index 2348b07c7b..b12c1b7369 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -29,6 +29,7 @@ import android.os.PowerManager
 import android.provider.Settings
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
+import androidx.annotation.RequiresApi
 import androidx.annotation.StringRes
 import androidx.core.content.getSystemService
 import androidx.fragment.app.Fragment
@@ -132,6 +133,17 @@ fun startAddGoogleAccountIntent(context: Context, activityResultLauncher: Activi
     }
 }
 
+@RequiresApi(Build.VERSION_CODES.O)
+fun startInstallFromSourceIntent(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>) {
+    try {
+        val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES)
+                .setData(Uri.parse(String.format("package:%s", context.packageName)))
+        activityResultLauncher.launch(intent)
+    } catch (activityNotFoundException: ActivityNotFoundException) {
+        context.toast(R.string.error_no_external_application_found)
+    }
+}
+
 fun startSharePlainTextIntent(fragment: Fragment,
                               activityResultLauncher: ActivityResultLauncher<Intent>?,
                               chooserTitle: String?,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index b7e2e189d3..13e9fb18b0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -113,6 +113,7 @@ import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.saveMedia
 import im.vector.app.core.utils.shareMedia
 import im.vector.app.core.utils.shareText
+import im.vector.app.core.utils.startInstallFromSourceIntent
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.DialogReportContentBinding
 import im.vector.app.databinding.FragmentRoomDetailBinding
@@ -197,6 +198,7 @@ import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 import org.matrix.android.sdk.internal.crypto.model.event.WithHeldCode
@@ -589,20 +591,53 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun startOpenFileIntent(action: RoomDetailViewEvents.OpenFile) {
-        if (action.uri != null) {
-            val intent = Intent(Intent.ACTION_VIEW).apply {
-                setDataAndTypeAndNormalize(action.uri, action.mimeType)
-                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
-            }
-
-            if (intent.resolveActivity(requireActivity().packageManager) != null) {
-                requireActivity().startActivity(intent)
-            } else {
-                requireActivity().toast(R.string.error_no_external_application_found)
-            }
+        if (action.mimeType == MimeTypes.Apk) {
+            installApk(action)
+        } else {
+            openFile(action)
         }
     }
 
+    private fun openFile(action: RoomDetailViewEvents.OpenFile) {
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            setDataAndTypeAndNormalize(action.uri, action.mimeType)
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+
+        if (intent.resolveActivity(requireActivity().packageManager) != null) {
+            requireActivity().startActivity(intent)
+        } else {
+            requireActivity().toast(R.string.error_no_external_application_found)
+        }
+    }
+
+    private fun installApk(action: RoomDetailViewEvents.OpenFile) {
+        val safeContext = context ?: return
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!safeContext.packageManager.canRequestPackageInstalls()) {
+                roomDetailViewModel.pendingEvent = action
+                startInstallFromSourceIntent(safeContext, installApkActivityResultLauncher)
+            } else {
+                openFile(action)
+            }
+        } else {
+            openFile(action)
+        }
+    }
+
+    private val installApkActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            roomDetailViewModel.pendingEvent?.let {
+                if (it is RoomDetailViewEvents.OpenFile) {
+                    openFile(it)
+                }
+            }
+        } else {
+            // User cancelled
+        }
+        roomDetailViewModel.pendingEvent = null
+    }
+
     private fun displayPromptForIntegrationManager() {
         // The Sticker picker widget is not installed yet. Propose the user to install it
         val builder = AlertDialog.Builder(requireContext())
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
index 9f801e7272..b326700d5e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
@@ -67,9 +67,8 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
     ) : RoomDetailViewEvents()
 
     data class OpenFile(
-            val mimeType: String?,
-            val uri: Uri?,
-            val throwable: Throwable?
+            val uri: Uri,
+            val mimeType: String?
     ) : RoomDetailViewEvents()
 
     abstract class SendMessageResult : RoomDetailViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index f4d3c8138c..e21428921f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -141,6 +141,9 @@ class RoomDetailViewModel @AssistedInject constructor(
     // Slot to keep a pending action during permission request
     var pendingAction: RoomDetailAction? = null
 
+    // Slot to keep a pending event during permission request
+    var pendingEvent: RoomDetailViewEvents? = null
+
     private var trackUnreadMessages = AtomicBoolean(false)
     private var mostRecentDisplayedEvent: TimelineEvent? = null
 
@@ -1142,9 +1145,8 @@ class RoomDetailViewModel @AssistedInject constructor(
         if (isLocalSendingFile) {
             tryOrNull { Uri.parse(mxcUrl) }?.let {
                 _viewEvents.post(RoomDetailViewEvents.OpenFile(
-                        action.messageFileContent.mimeType,
                         it,
-                        null
+                        action.messageFileContent.mimeType
                 ))
             }
         } else {
@@ -1169,9 +1171,8 @@ class RoomDetailViewModel @AssistedInject constructor(
                     // We can now open the file
                     session.fileService().getTemporarySharableURI(action.messageFileContent)?.let { uri ->
                         _viewEvents.post(RoomDetailViewEvents.OpenFile(
-                                action.messageFileContent.mimeType,
                                 uri,
-                                null
+                                action.messageFileContent.mimeType
                         ))
                     }
                 }

From b2e6b3f0db7f13c5cb0e35d757960ec2f29ccd86 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 28 Apr 2021 16:55:09 +0200
Subject: [PATCH 194/350] Latest cleanup before merging to develop

---
 .../settings/RoomSettingsController.kt        | 20 +++++++++----------
 .../ui/SharedPreferencesUiStateRepository.kt  |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index 8096903b4c..299c8ed6ec 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -144,24 +144,22 @@ class RoomSettingsController @Inject constructor(
     }
 
     private fun RoomSettingsViewState.getJoinRuleWording(): String {
-        val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules
-        val resId = when (joinRule) {
-            RoomJoinRules.INVITE -> {
-                R.string.room_settings_room_access_private_title to null
+        return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
+            RoomJoinRules.INVITE     -> {
+                stringProvider.getString(R.string.room_settings_room_access_private_title)
             }
-            RoomJoinRules.PUBLIC -> {
-                R.string.room_settings_room_access_public_title to null
+            RoomJoinRules.PUBLIC     -> {
+                stringProvider.getString(R.string.room_settings_room_access_public_title)
             }
-            RoomJoinRules.KNOCK -> {
-                R.string.room_settings_room_access_entry_knock to null
+            RoomJoinRules.KNOCK      -> {
+                stringProvider.getString(R.string.room_settings_room_access_entry_knock)
             }
             RoomJoinRules.RESTRICTED -> {
-                R.string.room_settings_room_access_restricted_title to null
+                stringProvider.getString(R.string.room_settings_room_access_restricted_title)
             }
             else                     -> {
-                R.string.room_settings_room_access_entry_unknown to joinRule.value
+                stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
             }
         }
-        return if (resId.second == null) stringProvider.getString(resId.first) else stringProvider.getString(resId.first, resId.second)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
index 9848cb5bf1..1ec3a8ab46 100644
--- a/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
@@ -72,7 +72,7 @@ class SharedPreferencesUiStateRepository @Inject constructor(
     }
 
     override fun storeGroupingMethod(isSpace: Boolean, sessionId: String) {
-        sharedPreferences.edit(true) {
+        sharedPreferences.edit {
             putBoolean("$KEY_SELECTED_METHOD@$sessionId", isSpace)
         }
     }

From ea645d147d50b06f16eecfeef9bde3a2a3b463e5 Mon Sep 17 00:00:00 2001
From: Juhana Uuttu <rexroom@sci.fi>
Date: Tue, 27 Apr 2021 16:21:12 +0000
Subject: [PATCH 195/350] Translated using Weblate (Finnish)

Currently translated at 79.3% (1875 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
---
 vector/src/main/res/values-fi/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index e8786bdaf6..36d87488da 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -2228,4 +2228,6 @@
     <string name="send_a_sticker">Tarra</string>
     <string name="uploads_files_title">TIEDOSTOT</string>
     <string name="uploads_media_title">MEDIA</string>
+    <string name="notice_room_server_acl_set_title_by_you">Asetit palvelimen käyttäjäoikeuslistan tähän huoneeseen.</string>
+    <string name="notice_room_server_acl_set_title">%s asetti palvelimen käyttäjäoikeuslistan tähän huoneeseen.</string>
 </resources>
\ No newline at end of file

From 4d3a02f71fdc909a21e3061e2bde78a646dfca0d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Tue, 27 Apr 2021 09:29:58 +0000
Subject: [PATCH 196/350] Translated using Weblate (French)

Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 29e0d1a881..9fb80f67a7 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2501,7 +2501,7 @@
     <string name="a11y_rule_notify_silent">Notifier sans son</string>
     <string name="a11y_rule_notify_noisy">Notifier avec son</string>
     <string name="a11y_error_message_not_sent">Message non envoyé suite à une erreur</string>
-    <string name="a11y_checked">Vérifié</string>
+    <string name="a11y_checked">Coché</string>
     <string name="a11y_close_emoji_picker">Fermer le sélecteur d’émojis</string>
     <string name="a11y_open_emoji_picker">Ouvrir le sélecteur d’émojis</string>
     <string name="a11y_trust_level_trusted">Reconnu</string>

From c043e6e95893710a0d04f63cdaeb293fb012208d Mon Sep 17 00:00:00 2001
From: Line <LineAirline@protonmail.com>
Date: Mon, 26 Apr 2021 20:43:15 +0000
Subject: [PATCH 197/350] Translated using Weblate (Latvian)

Currently translated at 86.8% (2052 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
---
 vector/src/main/res/values-lv/strings.xml | 181 ++++++++++++++++++++++
 1 file changed, 181 insertions(+)

diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 00274660c0..4e3055b472 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -2152,4 +2152,185 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="title_activity_keys_backup_setup">Atslēgu Dublējums</string>
     <string name="notice_room_update_by_you">Jūs atjauninājāt šo istabu.</string>
     <string name="notice_room_update">%s atjaunināja šo istabu.</string>
+    <string name="set_recovery_passphrase">Iestatīt kā %s</string>
+    <string name="recovery_passphrase">Atjaunošanas Frāze</string>
+    <string name="e2e_use_keybackup">Atbloķēt šifrēto ziņu vēsturi</string>
+    <string name="template_login_default_session_public_name">${app_name} Android</string>
+    <string name="keys_backup_restore_success_title_already_up_to_date">Atslēgas jau ir atjauninātas!</string>
+    <string name="event_redacted_by_admin_reason_with_reason">Pasākumu moderē telpas administrators, iemesls: %1$s</string>
+    <string name="event_redacted_by_user_reason_with_reason">Lietotājs izdzēsa notikumu, iemesls: %1$s</string>
+    <string name="poll_item_selected_aria">Izvēlētā Opcija</string>
+    <string name="delete_account_data_warning">Dzēst %1$s tipa konta datus\?
+\n
+\nLietojiet piesardzīgi, tas var izraisīt neparedzētu uzvedību.</string>
+    <string name="settings_dev_tools">Izstrādātāj rīki</string>
+    <string name="complete_security">Pilnīga Drošība</string>
+    <string name="settings_failed_to_get_crypto_device_info">Nav pieejama kriptogrāfiska informācija</string>
+    <string name="settings_server_upload_size_content">Jūsu serveris pieņem pielikumus (failus, multivides u.c.), kuru izmērs nepārsniedz %s.</string>
+    <string name="settings_server_upload_size_unknown">Robeža nav zināma.</string>
+    <string name="settings_server_upload_size_title">Servera failu augšupielādes ierobežojums</string>
+    <string name="settings_server_version">Servera versija</string>
+    <string name="settings_server_name">Servera nosaukums</string>
+    <string name="settings_developer_mode_fail_fast_title">Neizdoties-ātri</string>
+    <string name="rageshake_detected">Kratīšana detektēta!</string>
+    <string name="settings_rageshake_detection_threshold_summary">Kratiet telefonu, lai pārbaudītu detektēšanas slieksni</string>
+    <string name="settings_rageshake_detection_threshold">Detektēšanas slieksnis</string>
+    <string name="settings_rageshake">Dusmu tricinājums</string>
+    <string name="settings_developer_mode_summary">Izstrādātāja režīms aktivizē slēptās funkcijas un var arī padarīt lietojumprogrammu mazāk stabilu. Tikai izstrādātājiem!</string>
+    <string name="settings_developer_mode">Izstrādātāja režīms</string>
+    <string name="bug_report_error_too_short">Apraksts ir pārāk īss</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Jūs zaudēsiet piekļuvi šifrētām ziņām, ja nepierakstīsities, lai atgūtu šifrēšanas atslēgas.</string>
+    <string name="seen_by">Skatīja</string>
+    <plurals name="login_error_limit_exceeded_retry_after">
+        <item quantity="zero">Ir nosūtīts pārāk daudz pieprasījumu. Jūs varat atkārtot mēģinājumu pēc %1$d sekundēm…</item>
+        <item quantity="one">Ir nosūtīts pārāk daudz pieprasījumu. Jūs varat atkārtot mēģinājumu pēc %1$d sekundes…</item>
+        <item quantity="other">Ir nosūtīts pārāk daudz pieprasījumu. Jūs varat atkārtot mēģinājumu pēc %1$d sekundēm…</item>
+    </plurals>
+    <string name="reaction_search_type_hint">Ievadiet atslēgvārdus, lai atrastu reakciju.</string>
+    <string name="spoiler">Spoileris</string>
+    <string name="content_reported_as_inappropriate_content">Par šo saturu tika ziņots kā par nepiemērotu.
+\n
+\nJa vairs nevēlaties redzēt saturu no šī lietotāja, varat to ignorēt, lai paslēptu viņa ziņojumus.</string>
+    <string name="content_reported_as_inappropriate_title">Ziņots kā nepiemērots</string>
+    <string name="content_reported_as_spam_content">Par šo saturu tika ziņots kā par spamu.
+\n
+\nJa vairs nevēlaties redzēt saturu no šī lietotāja, varat to ignorēt, lai paslēptu viņa ziņojumus.</string>
+    <string name="content_reported_as_spam_title">Ziņots kā spams</string>
+    <string name="content_reported_content">Par šo saturu tika ziņots.
+\n
+\nJa vairs nevēlaties redzēt saturu no šī lietotāja, varat to ignorēt, lai paslēptu viņa ziņojumus.</string>
+    <string name="content_reported_title">Saturs ziņots</string>
+    <string name="block_user">IGNORĒT LIETOTĀJU</string>
+    <string name="rotate_and_crop_screen_title">Rotēšana un apgriešana</string>
+    <plurals name="fallback_users_read">
+        <item quantity="zero">%d lietotāju izlasīja</item>
+        <item quantity="one">%d lietotājs izlasīja</item>
+        <item quantity="other">%d lietotāji izlasīja</item>
+    </plurals>
+    <string name="a11y_jump_to_bottom">Pāriet uz apakšu</string>
+    <string name="a11y_hide_password">Paslēpt paroli</string>
+    <string name="a11y_show_password">Rādīt paroli</string>
+    <string name="a11y_close_keys_backup_banner">Aizvērt atslēgu dublējuma baneri</string>
+    <string name="a11y_create_room">Izveidot jaunu telpu</string>
+    <string name="error_terms_not_accepted">Lūdzu, mēģiniet vēlreiz, tiklīdz esat piekritis sava servera noteikumiem un nosacījumiem.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Pašlaik jūs kopīgojat e-pasta adreses vai tālruņa numurus identitātes serverī %1$s. Lai pārtrauktu to koplietošanu, jums būs jāpārveido savienojums ar %2$s.</string>
+    <string name="settings_discovery_no_terms">Jūsu izvēlētajam identitātes serverim nav pakalpojumu sniegšanas noteikumu. Turpiniet tikai tad, ja uzticaties pakalpojuma īpašniekam.</string>
+    <string name="settings_discovery_no_terms_title">Identitātes serverim nav pakalpojumu sniegšanas noteikumu</string>
+    <string name="settings_discovery_please_enter_server">Lūdzu, ievadiet identitātes servera url</string>
+    <string name="settings_discovery_enter_identity_server">Ievadiet identitātes servera URL</string>
+    <string name="identity_server_consent_dialog_title">Sūtīt e-pastus un tālruņa numurus</string>
+    <string name="settings_discovery_consent_action_give_consent">Sniegt piekrišanu</string>
+    <string name="settings_discovery_consent_action_revoke">Atsaukt manu piekrišanu</string>
+    <string name="settings_discovery_consent_notice_off">Jūs neesat devis piekrišanu sūtīt e-pastus un tālruņa numurus uz šo identitātes serveri, lai atrastu citus lietotājus no jūsu kontaktiem.</string>
+    <string name="settings_discovery_consent_notice_on">Jūs esat devis savu piekrišanu sūtīt e-pastus un tālruņa numurus uz šo identitātes serveri, lai atklātu citus lietotājus no jūsu kontaktiem.</string>
+    <string name="settings_discovery_consent_title">Sūtīt e-pastus un tālruņa numurus</string>
+    <string name="settings_discovery_mail_pending">Gaida</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">Mēs nosūtījām jums apstiprinājuma e-pastu uz %s, lūdzu, vispirms pārbaudiet savu e-pastu un noklikšķiniet uz apstiprinājuma saites</string>
+    <string name="settings_discovery_confirm_mail">Mēs nosūtījām jums apstiprinājuma e-pastu uz %s, pārbaudiet savu e-pastu un noklikšķiniet uz apstiprinājuma saites</string>
+    <string name="settings_discovery_msisdn_title">Atrodamie tālruņa numuri</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Atvienošanās no identitātes servera nozīmē, ka citi lietotāji nevarēs jūs atrast, un jūs nevarēsiet uzaicināt citus lietotājus, izmantojot e-pastu vai tālruni.</string>
+    <string name="settings_discovery_no_msisdn">Pēc tālruņa numura pievienošanas tiks parādītas atklāšanas opcijas.</string>
+    <string name="settings_discovery_no_mails">Pēc e-pasta pievienošanas tiks parādītas atklāšanas opcijas.</string>
+    <string name="settings_discovery_emails_title">Atklājamās e-pasta adreses</string>
+    <string name="settings_discovery_identity_server_info_none">Pašlaik neizmantojat identitātes serveri. Lai atklātu esošos kontaktus un būtu atrodami jūsu zināmajiem kontaktiem, konfigurējiet šādu serveri.</string>
+    <string name="settings_discovery_identity_server_info">Pašlaik izmantojat %1$s, lai atrastu un būtu atrodams esošajiem kontaktiem, kurus pazīstat.</string>
+    <string name="change_identity_server">Mainīt identitātes serveri</string>
+    <string name="read_at">Lasīt</string>
+    <string name="terms_description_for_integration_manager">Izmantojiet Botus, tiltus, logrīkus un uzlīmju paketes</string>
+    <string name="terms_description_for_identity_server">Esiet atrodams citiem</string>
+    <string name="terms_of_service">Pakalpojumu sniegšanas noteikumi</string>
+    <string name="message_view_edit_history">Skatīt Rediģēšanas Vēsturi</string>
+    <string name="settings_labs_show_hidden_events_in_timeline">Rādīt slēptos notikumus laika joslā</string>
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">Reģistrēt žetonu</string>
+    <plurals name="keys_backup_info_keys_backing_up">
+        <item quantity="zero">Dublē %d atslēgu…</item>
+        <item quantity="one">Dublē %d atslēgu…</item>
+        <item quantity="other">Dublē %d atslēgas…</item>
+    </plurals>
+    <string name="keys_backup_settings_untrusted_backup">Lai šajā sesijā izmantotu Atslēgu Dublēšanu, tagad atjaunojiet, izmantojot savu piekļuves frāzi vai atkopšanas atslēgu.</string>
+    <string name="keys_backup_get_trust_error">Neizdevās iegūt uzticamības informāciju rezerves kopijai (%s).</string>
+    <string name="keys_backup_settings_invalid_signature_from_unverified_device">Rezerves kopijai ir nederīgs paraksts no nepārbaudītas sesijas %s</string>
+    <string name="keys_backup_settings_invalid_signature_from_verified_device">Rezerves kopijai ir nederīgs paraksts no pārbaudītas sesijas %s</string>
+    <string name="keys_backup_settings_valid_signature_from_unverified_device">Rezerves kopijai ir derīgs paraksts no nepārbaudītas sesijas %s</string>
+    <string name="keys_backup_settings_valid_signature_from_verified_device">Rezerves kopijai ir derīgs paraksts no pārbaudītas sesijas %s.</string>
+    <string name="keys_backup_settings_valid_signature_from_this_device">Rezerves kopijai ir derīgs šīs sesijas paraksts.</string>
+    <string name="keys_backup_settings_signature_from_unknown_device">Rezerves kopijai ir paraksts no nezināmas sesijas ar ID %s.</string>
+    <string name="keys_backup_settings_status_not_setup">Jūsu atslēgas netiek dublētas no šīs sesijas.</string>
+    <string name="keys_backup_settings_status_ko">Šajā sesijā Atslēgu Dublēšana nav aktīva.</string>
+    <string name="keys_backup_settings_status_ok">Atslēgu Dublēšana šai sesijai ir pareizi iestatīta.</string>
+    <string name="keys_backup_settings_restore_backup_button">Atjaunot no Dublējuma</string>
+    <string name="keys_backup_no_keysbackup_sdk_error">Sesijas šifrēšana nav aktivizēta</string>
+    <plurals name="keys_backup_restore_success_description_part1">
+        <item quantity="zero">Atjaunota rezerves kopija ar %d atslēgu.</item>
+        <item quantity="one">Atjaunota rezerves kopija ar %d atslēgu.</item>
+        <item quantity="other">Atjaunota rezerves kopija ar %d atslēgām.</item>
+    </plurals>
+    <string name="keys_backup_recovery_code_empty_error_message">Lūdzu, ievadiet atgūšanas atslēgu</string>
+    <string name="keys_backup_restoring_waiting_message">Rezerves kopijas atjaunošana:</string>
+    <string name="network_error_please_check_and_retry">Tīkla kļūda: lūdzu, pārbaudiet savienojumu un mēģiniet vēlreiz.</string>
+    <string name="keys_backup_passphrase_error_decrypt">Rezerves kopiju nevarēja atšifrēt ar šo piekļuves frāzi: lūdzu, pārbaudiet, vai ievadījāt pareizu atgūšanas piekļuves frāzi.</string>
+    <string name="keys_backup_restore_with_key_helper">Vai esat pazaudējis atgūšanas atslēgu\? Iestatījumos varat iestatīt jaunu.</string>
+    <string name="keys_backup_restore_setup_recovery_key">Ziņu Atgūšana</string>
+    <string name="keys_backup_restore_key_enter_hint">Ievadiet Atgūšanas Atslēgu</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">Kopīgojiet atkopšanas atslēgu ar…</string>
+    <string name="resource_limit_hard_contact">Lūdzu, %s, lai turpinātu izmantot šo pakalpojumu.</string>
+    <string name="resource_limit_soft_contact">Lūdzu, %s, lai palielinātu šo limitu.</string>
+    <plurals name="group_rooms">
+        <item quantity="zero">%d telpu</item>
+        <item quantity="one">%d telpa</item>
+        <item quantity="other">%d telpas</item>
+    </plurals>
+    <plurals name="group_members">
+        <item quantity="zero">%d dalībnieku</item>
+        <item quantity="one">%d dalībnieks</item>
+        <item quantity="other">%d dalībnieki</item>
+    </plurals>
+    <string name="settings_labs_keyboard_options_to_send_message">Tastatūras Enter taustiņš nosūtīs ziņu</string>
+    <string name="settings_labs_native_camera_summary">Palaidiet sistēmas kameru, nevis pielāgotās kameras ekrānu.</string>
+    <string name="room_widget_webview_read_protected_media">Lasīt DRM aizsargātu multividi</string>
+    <string name="room_widget_permission_shared_info_title">Izmantojot to, var kopīgot datus ar %s:</string>
+    <string name="room_widget_permission_webview_shared_info_title">Izmantojot to, var iestatīt sīkfailus un kopīgot datus ar %s:</string>
+    <string name="active_widget_view_action">SKATĪT</string>
+    <plurals name="notification_compat_summary_title">
+        <item quantity="zero">%d paziņojumu</item>
+        <item quantity="one">%d paziņojums</item>
+        <item quantity="other">%d paziņojumi</item>
+    </plurals>
+    <plurals name="notification_compat_summary_line_for_room">
+        <item quantity="zero">%1$s: %2$d ziņojumu</item>
+        <item quantity="one">%1$s: %2$d ziņojums</item>
+        <item quantity="other">%1$s: %2$d ziņojumi</item>
+    </plurals>
+    <plurals name="notification_invitations">
+        <item quantity="zero">%d uzaicinājumu</item>
+        <item quantity="one">%d uzaicinājums</item>
+        <item quantity="other">%d uzaicinājumi</item>
+    </plurals>
+    <plurals name="encryption_import_room_keys_success">
+        <item quantity="zero">%1$d/%2$d veiksmīgi importēta atslēgas.</item>
+        <item quantity="one">%1$d/%2$d veiksmīgi importēta atslēga.</item>
+        <item quantity="other">%1$d/%2$d veiksmīgi importēta atslēgas.</item>
+    </plurals>
+    <string name="settings_default_media_source">Noklusējuma multivides avots</string>
+    <string name="settings_media">Mediji</string>
+    <string name="settings_discovery_manage">Pārvaldiet atklāšanas iestatījumus.</string>
+    <string name="settings_discovery_category">Atklāšana</string>
+    <string name="settings_preview_media_before_sending">Priekšskatīt failu pirms nosūtīšanas</string>
+    <string name="template_settings_background_fdroid_sync_mode_real_time_description">${app_name} sinhronizēsies fonā periodiski, precīzi, noteiktā laikā (konfigurējams).
+\nTas ietekmēs radio un akumulatora izmantošanu, tiks parādīts pastāvīgs paziņojums par to, ka ${app_name} klausās notikumus.</string>
+    <string name="settings_notification_privacy_fcm">• Paziņojumi tiek nosūtīti, izmantojot Firebase Cloud Messaging</string>
+    <string name="settings_troubleshoot_test_battery_failed">Ja lietotājs kādu laiku atstāj ierīci atvienotu no tīkla un nekustīgu, ar izslēgtu ekrānu, ierīcē tiek ieslēgts dīkstāves režīms. Tas neļauj lietotnēm piekļūt tīklam un atliek to darbu izpildi, sinhronizāciju un standarta trauksmes signālus.</string>
+    <string name="template_settings_troubleshoot_test_service_boot_failed">Pakalpojums nesāksies, kad ierīce tiks restartēta, jūs nesaņemsiet paziņojumus, kamēr vismaz vienreiz nebūsiet atvēris ${app_name}.</string>
+    <string name="settings_troubleshoot_test_notification_notice">Lūdzu, noklikšķiniet uz paziņojuma. Ja paziņojums nav redzams, pārbaudiet sistēmas iestatījumus.</string>
+    <plurals name="room_details_selected">
+        <item quantity="zero">%d izvēlēti</item>
+        <item quantity="one">%d izvēlēts</item>
+        <item quantity="other">%d izvēlēti</item>
+    </plurals>
+    <string name="room_permissions_modify_widgets">Modificēt logrīku</string>
+    <plurals name="format_time_s">
+        <item quantity="zero">%d</item>
+        <item quantity="one">%ds</item>
+        <item quantity="other">%di</item>
+    </plurals>
 </resources>
\ No newline at end of file

From cacc83bf1774ae1ff6882237bd0031ea5afb3f3b Mon Sep 17 00:00:00 2001
From: Vivek K J <VIVEKKJ2004@gmail.com>
Date: Tue, 27 Apr 2021 13:28:02 +0000
Subject: [PATCH 198/350] Translated using Weblate (Malayalam)

Currently translated at 38.7% (915 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ml/
---
 vector/src/main/res/values-ml/strings.xml | 177 ++++++++++++++++++++++
 1 file changed, 177 insertions(+)

diff --git a/vector/src/main/res/values-ml/strings.xml b/vector/src/main/res/values-ml/strings.xml
index f394245469..b41bdae287 100644
--- a/vector/src/main/res/values-ml/strings.xml
+++ b/vector/src/main/res/values-ml/strings.xml
@@ -808,4 +808,181 @@
     <string name="ssl_remain_offline">അവഗണിക്കുക</string>
     <string name="room_participants_action_unban">നിരോധനം മാറ്റുക</string>
     <string name="room_participants_header_devices">സെഷനുകൾ</string>
+    <string name="encryption_information_session_id">സെഷൻ ഐഡി</string>
+    <string name="encryption_information_user_id">ഉപയോക്തൃ ഐഡി</string>
+    <string name="encryption_information_device_info">ഇവന്റ് വിവരങ്ങൾ</string>
+    <string name="room_settings_labs_end_to_end">എൻഡ്-ടു-എൻഡ് എൻ‌ക്രിപ്ഷൻ</string>
+    <string name="room_settings_banned_users_title">നിരോധിച്ച ഉപയോക്താക്കൾ</string>
+    <string name="room_alias_local_address_title">പ്രാദേശിക വിലാസങ്ങൾ</string>
+    <string name="room_alias_main_address_hint">പ്രധാന വിലാസം</string>
+    <string name="room_alias_published_alias_title">പ്രസിദ്ധീകരിച്ച വിലാസങ്ങൾ</string>
+    <string name="room_alias_title">മുറി വിലാസങ്ങൾ</string>
+    <string name="room_settings_alias_title">മുറി വിലാസങ്ങൾ</string>
+    <string name="room_settings_tag_pref_entry_low_priority">കുറഞ്ഞ മുൻ‌ഗണന</string>
+    <string name="room_settings_tag_pref_dialog_title">ടാഗുചെയ്തത്:</string>
+    <string name="room_settings_room_tag">മുറിയുടെ ടാഗ്</string>
+    <string name="room_settings_room_name">മുറിയുടെ പേര്</string>
+    <string name="room_settings_room_photo">മുറിയുടെ ചിത്രം</string>
+    <string name="media_saving_period_1_month">1 മാസം</string>
+    <string name="media_saving_period_1_week">1 ആഴ്ച</string>
+    <string name="media_saving_period_3_days">3 ദിവസം</string>
+    <string name="settings_default_compression">തനത് കംപ്രഷൻ</string>
+    <string name="settings_phone_number_verification">ഫോൺ സ്ഥിരീകരിച്ചുറപ്പിക്കൽ</string>
+    <string name="settings_phone_number_label">ഫോൺ നമ്പർ</string>
+    <string name="settings_change_password_submit">രഹസ്യവാക്ക് പുതുക്കുക</string>
+    <string name="settings_new_password">പുതിയ രഹസ്യവാക്ക്</string>
+    <string name="settings_old_password">നിലവിലെ രഹസ്യവാക്ക്</string>
+    <string name="settings_change_password">രഹസ്യവാക്ക് മാറ്റുക</string>
+    <string name="account_email_validation_title">സ്ഥിരീകരണം തീർച്ചപ്പെടുത്തിയിട്ടില്ല</string>
+    <string name="settings_select_language">ഭാഷ തിരഞ്ഞെടുക്കുക</string>
+    <string name="settings_user_interface">ഉപയോക്തൃ ഇന്റർഫേസ്</string>
+    <string name="settings_integration_manager">സംയോജക മാനേജർ</string>
+    <string name="settings_integration_allow">സംയോജനങ്ങൾ അനുവദിക്കുക</string>
+    <string name="settings_identity_server">തിരിച്ചറിയൽ സെർവർ</string>
+    <string name="settings_home_server">ഹോം സെർവർ</string>
+    <string name="devices_details_last_seen_title">അവസാനം കണ്ടത്</string>
+    <string name="devices_details_name_title">പൊതു നാമം</string>
+    <string name="devices_details_dialog_title">സെഷൻ വിവരം</string>
+    <string name="startup_notification_fdroid_battery_optim_button_grant">അനുമതി നൽകുക</string>
+    <string name="startup_notification_fdroid_battery_optim_title">പശ്ചാത്തല കണക്ഷൻ</string>
+    <string name="startup_notification_privacy_button_grant">അനുമതി നൽകുക</string>
+    <string name="startup_notification_privacy_title">അറിയിപ്പ് സ്വകാര്യത</string>
+    <string name="settings_deactivate_account_section">അക്കൗണ്ട് മരവിപ്പിക്കുക</string>
+    <string name="settings_secure_backup_section_title">സുരക്ഷിത ബാക്കപ്പ്</string>
+    <string name="settings_send_markdown">മാർക്ക്ഡൗൺ ഫോർമാറ്റിംഗ്</string>
+    <string name="settings_home_display">ഹോം ഡിസ്‌പ്ലേ</string>
+    <string name="settings_contacts_phonebook_country">ഫോൺബുക്ക് രാജ്യം</string>
+    <string name="settings_contacts_app_permission">കോൺ‌ടാക്റ്റുകളുടെ അനുമതി</string>
+    <string name="settings_contact">പ്രാദേശിക കോൺടാക്റ്റുകൾ</string>
+    <string name="settings_ignored_users">അവഗണിച്ച ഉപയോക്താക്കൾ</string>
+    <string name="settings_user_settings">ഉപയോക്തൃ ക്രമീകരണങ്ങൾ</string>
+    <string name="settings_clear_cache">കാഷെ മായ്‌ക്കുക</string>
+    <string name="settings_keep_media">മീഡിയ സൂക്ഷിക്കുക</string>
+    <string name="settings_privacy_policy">സ്വകാര്യതാ നയം</string>
+    <string name="settings_olm_version">olm പതിപ്പ്</string>
+    <plurals name="seconds">
+        <item quantity="one">%d സെക്കൻഡ്</item>
+        <item quantity="other">%d സെക്കൻഡുകൾ</item>
+    </plurals>
+    <string name="settings_background_sync">പശ്ചാത്തല സമന്വയം</string>
+    <string name="settings_call_invitations">കോൾ ക്ഷണങ്ങൾ</string>
+    <string name="settings_notification_ringtone">അറിയിപ്പ് ശബ്‌ദം</string>
+    <string name="settings_notification_privacy_reduced">സ്വകാര്യത കുറച്ചു</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">ഒപ്റ്റിമൈസേഷൻ അവഗണിക്കുക</string>
+    <string name="settings_troubleshoot_test_battery_title">ബാറ്ററി ഒപ്റ്റിമൈസേഷൻ</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">നിയന്ത്രണങ്ങൾ പ്രവർത്തനരഹിതമാക്കുക</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">സേവനം ആരംഭിക്കുക</string>
+    <string name="settings_troubleshoot_test_notification_title">അറിയിപ്പ് പ്രദർശനം</string>
+    <string name="settings_troubleshoot_test_token_registration_title">ടോക്കൺ രജിസ്ട്രേഷൻ</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">അക്കൗണ്ട് ചേർക്കുക</string>
+    <string name="settings_troubleshoot_test_fcm_title">ഫയർബേസ് ടോക്കൺ</string>
+    <string name="settings_troubleshoot_test_bing_settings_quickfix">ക്രമീകരണങ്ങൾ പരിശോധിക്കുക</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">ഇച്ഛാനുസൃത ക്രമീകരണങ്ങൾ.</string>
+    <string name="settings_troubleshoot_test_device_settings_title">സെഷൻ ക്രമീകരണങ്ങൾ.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">അക്കൗണ്ട് ക്രമീകരണങ്ങൾ.</string>
+    <string name="open_settings">ക്രമീകരണങ്ങൾ തുറക്കുക</string>
+    <string name="settings_troubleshoot_test_system_settings_title">സിസ്റ്റം ക്രമീകരണങ്ങൾ.</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">ടെസ്റ്റുകൾ പ്രവർത്തിപ്പിക്കുക</string>
+    <string name="settings_notification_troubleshoot">പ്രശ്നപരിഹാര അറിയിപ്പുകൾ</string>
+    <string name="settings_notification_privacy">അറിയിപ്പ് സ്വകാര്യത</string>
+    <string name="settings_remove_three_pid_confirmation_content">%s നീക്കംചെയ്യണോ\?</string>
+    <string name="room_settings_leave_conversation">സംഭാഷണം വിടുക</string>
+    <string name="room_settings_direct_chat">നേരിട്ടുള്ള ചാറ്റ്</string>
+    <string name="directory_searching_title">ഡയറക്‌ടറിയിൽ തിരയുന്നു…</string>
+    <string name="directory_search_results_title">ഡയറക്ടറി ബ്രൗസ് ചെയ്യുക</string>
+    <string name="room_recents_low_priority">കുറഞ്ഞ മുൻ‌ഗണന</string>
+    <string name="room_event_action_cancel_download">ഡൗൺലോഡ് റദ്ദാക്കുക</string>
+    <string name="room_event_action_cancel_upload">അപ്‌ലോഡ് റദ്ദാക്കുക</string>
+    <plurals name="room_details_selected">
+        <item quantity="one">%d തിരഞ്ഞെടുത്തു</item>
+        <item quantity="other">%d തിരഞ്ഞെടുത്തു</item>
+    </plurals>
+    <string name="room_permissions_change_permissions">അനുമതികൾ മാറ്റുക</string>
+    <string name="room_permissions_modify_widgets">വിഡ്ജറ്റുകൾ പരിഷ്‌ക്കരിക്കുക</string>
+    <string name="room_permissions_default_role">തനത് പങ്ക്</string>
+    <string name="ssl_fingerprint_hash">ഫിംഗർപ്രിന്റ് (%s):</string>
+    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
+    <string name="room_participants_action_set_moderator">മോഡറേറ്ററാക്കുക</string>
+    <string name="room_participants_leave_prompt_title">മുറി വിടുക</string>
+    <string name="open_chat_header">ഹെഡർ തുറക്കുക</string>
+    <string name="incoming_call">ഇൻകമിംഗ് കോൾ</string>
+    <string name="call_connecting">കോൾ കണക്റ്റുചെയ്യുന്നു…</string>
+    <string name="call_connected">കോൾ കണക്റ്റുചെയ്‌തു</string>
+    <string name="attachment_remaining_time_minutes">%1$d മി %2$d സെ</string>
+    <string name="attachment_remaining_time_seconds">%d സെ</string>
+    <string name="compression_options">എന്നപോലെ അയയ്‌ക്കുക</string>
+    <string name="groups_list">ഗ്രൂപ്പുകളുടെ പട്ടിക</string>
+    <string name="login_error_bad_json">തെറ്റായ JSON</string>
+    <string name="login_error_forbidden">തെറ്റായ ഉപയോക്തൃനാമം/രഹസ്യവാക്ക്</string>
+    <string name="login_error_ssl_other">SSL പിശക്.</string>
+    <string name="auth_invalid_token">അസാധുവായ ടോക്കൺ</string>
+    <string name="auth_missing_password">രഹസ്യവാക്ക് കണ്ടെത്തിയില്ല</string>
+    <string name="sound_device_wireless_headset">വയർലെസ് ഹെഡ്‌സെറ്റ്</string>
+    <string name="send_files_in">ഇതിലേക്ക് അയയ്‌ക്കുക</string>
+    <string name="send_bug_report_include_logs">ലോഗുകൾ അയയ്‌ക്കുക</string>
+    <string name="rooms_directory_header">മുറി ഡയറക്ടറി</string>
+    <string name="user_directory_header">ഉപയോക്തൃ ഡയറക്‌ടറി</string>
+    <string name="low_priority_header">കുറഞ്ഞ മുൻ‌ഗണന</string>
+    <string name="home_filter_placeholder_favorites">പ്രിയങ്കരങ്ങൾ ഫിൽട്ടർ ചെയ്യുക</string>
+    <string name="action_quick_reply">പെട്ടെന്നുള്ള മറുപടി</string>
+    <string name="action_sign_out">പുറത്തു കടക്കുക</string>
+    <string name="call_notification_hangup">മാറ്റിവയ്ക്കുക</string>
+    <string name="report_content">ഉള്ളടക്കം റിപ്പോർട്ടുചെയ്യുക</string>
+    <string name="view_source">ഉറവിടം കാണുക</string>
+    <string name="title_activity_bug_report">ബഗ് റിപ്പോർട്ട്</string>
+    <string name="event_status_a11y_failed">പരാജയപ്പെട്ടു</string>
+    <string name="event_status_a11y_sent">അയച്ചു</string>
+    <string name="event_status_a11y_sending">അയയ്ക്കുന്നു</string>
+    <string name="dev_tools_form_hint_type">തരം</string>
+    <string name="a11y_checked">പരിശോധിച്ചു</string>
+    <string name="a11y_selected">തിരഞ്ഞെടുത്തു</string>
+    <string name="a11y_video">വീഡിയോ</string>
+    <string name="a11y_image">ചിത്രം</string>
+    <string name="a11y_screenshot">സ്ക്രീൻഷോട്ട്</string>
+    <string name="action_switch">മാറുക</string>
+    <string name="call_transfer_title">കൈമാറുക</string>
+    <string name="call_transfer_connect_action">ബന്ധിപ്പിക്കുക</string>
+    <string name="power_level_title">പങ്ക്</string>
+    <string name="invite_users_to_room_action_invite">ക്ഷണം</string>
+    <string name="room_message_placeholder">സന്ദേശം…</string>
+    <string name="settings_troubleshoot_title">പ്രശ്‌നപരിഹാരം</string>
+    <string name="topic_prefix">"വിഷയം: "</string>
+    <string name="refresh">പുതുക്കുക</string>
+    <string name="message_action_item_redact">നീക്കംചെയ്യൂ…</string>
+    <string name="enter_secret_storage_passphrase_warning">മുന്നറിയിപ്പ്:</string>
+    <string name="qr_code_scanned_by_other_no">ഇല്ല</string>
+    <string name="qr_code_scanned_by_other_yes">അതെ</string>
+    <string name="trusted">വിശ്വസനീയമാണ്</string>
+    <string name="room_member_profile_sessions_section_title">സെഷനുകൾ</string>
+    <string name="verification_profile_verified">പരിശോധിച്ചുറപ്പിച്ചു</string>
+    <string name="room_member_power_level_invites">ക്ഷണങ്ങൾ</string>
+    <string name="room_member_power_level_custom">ഇച്ഛാനുസൃതം</string>
+    <string name="room_member_power_level_moderators">മോഡറേറ്റർമാർ</string>
+    <string name="direct_room_profile_section_more_leave">വിടുക</string>
+    <string name="room_profile_section_security">സുരക്ഷ</string>
+    <string name="sent_a_poll">പോൾ</string>
+    <string name="settings_rageshake">രാഗേഷേക്ക്</string>
+    <string name="soft_logout_signin_password_hint">രഹസ്യവാക്ക്</string>
+    <string name="login_signup_cancel_confirmation_title">മുന്നറിയിപ്പ്</string>
+    <string name="login_signup_password_hint">രഹസ്യവാക്ക്</string>
+    <string name="login_set_email_mandatory_hint">ഈ - മെയിൽ</string>
+    <string name="login_reset_password_warning_submit">തുടരുക</string>
+    <string name="login_reset_password_email_hint">ഈമെയിൽ</string>
+    <string name="spoiler">സ്‌പോയിലർ</string>
+    <string name="room_list_quick_actions_notifications_mute">നിശബ്ദമാക്കുക</string>
+    <string name="report_content_custom_submit">റിപ്പോർട്ട്</string>
+    <string name="uploads_files_title">ഫയലുകൾ</string>
+    <string name="uploads_media_title">മീഡിയ</string>
+    <string name="attachment_type_sticker">സ്റ്റിക്കർ</string>
+    <string name="attachment_type_gallery">ഗാലറി</string>
+    <string name="attachment_type_audio">ഓ‍ഡിയോ</string>
+    <string name="attachment_type_camera">ക്യാമറ</string>
+    <string name="attachment_type_contact">കോൺടാക്റ്റ്</string>
+    <string name="attachment_type_file">ഫയൽ</string>
+    <string name="settings_text_message_sent_hint">കോഡ്</string>
+    <string name="settings_discovery_mail_pending">ശേഷിക്കുന്നു</string>
+    <string name="direct_room_user_list_suggestions_title">നിർദ്ദേശങ്ങൾ</string>
+    <string name="encryption_information_unblock">കരിമ്പട്ടികയിൽ നിന്നും നീക്കുക</string>
+    <string name="encryption_import_import">ഇമ്പോർട്ട്</string>
+    <string name="encryption_export_export">എക്സ്പോർട്ട്</string>
 </resources>
\ No newline at end of file

From 7593c3f03dd2ce3d4b27322d26d48a7ad596bb1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 07:18:14 +0000
Subject: [PATCH 199/350] Bump libphonenumber from 8.12.21 to 8.12.22

Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.21 to 8.12.22.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.21...v8.12.22)

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 2807a2f824..ea94d44346 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -169,7 +169,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.21'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.22'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.5.1'
diff --git a/vector/build.gradle b/vector/build.gradle
index e09c7dc6f2..15cbca11ef 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -342,7 +342,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.21'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.22'
 
     // rx
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'

From 95639927a7f83be6e8758623a2cafb41fe0477ec Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 19 Apr 2021 09:55:14 +0200
Subject: [PATCH 200/350] Catch Throwable on not only Exception

---
 .../home/room/detail/RoomDetailViewModel.kt       | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 13cb27efaf..49f3d280e2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -188,10 +188,7 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
         // Inform the SDK that the room is displayed
         viewModelScope.launch(Dispatchers.IO)  {
-            try {
-                session.onRoomDisplayed(initialState.roomId)
-            } catch (_: Throwable) {
-            }
+            tryOrNull { session.onRoomDisplayed(initialState.roomId) }
         }
         callManager.addPstnSupportListener(this)
         callManager.checkForPSTNSupportIfNeeded()
@@ -1162,19 +1159,13 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     private fun handleRejectInvite() {
         viewModelScope.launch {
-            try {
-                room.leave(null)
-            } catch (_: Exception) {
-            }
+            tryOrNull { room.leave(null) }
         }
     }
 
     private fun handleAcceptInvite() {
         viewModelScope.launch {
-            try {
-                room.join()
-            } catch (_: Exception) {
-            }
+            tryOrNull { room.join() }
         }
     }
 

From 82ee2567b7a3f4d5369ec6c59d78bb020aae9976 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 19 Apr 2021 10:54:54 +0200
Subject: [PATCH 201/350] Provide a session scope, to launch coroutines without
 using the ViewModelScope It could be used elsewhere, will change other
 location in another commit.

---
 .../matrix/android/sdk/api/session/Session.kt  |  5 +++++
 .../sdk/internal/session/DefaultSession.kt     | 18 +++++++++++++++++-
 .../home/room/detail/RoomDetailViewModel.kt    |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 5f442c33f9..1250c0d36b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -272,4 +272,9 @@ interface Session :
      * Maintenance API, allows to print outs info on DB size to logcat
      */
     fun logDbUsageInfo()
+
+    /**
+     * Launch a coroutine using the session scope
+     */
+    fun launch(block: suspend () -> Unit )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 6c574be826..078cac278d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -19,12 +19,16 @@ package org.matrix.android.sdk.internal.session
 import androidx.annotation.MainThread
 import dagger.Lazy
 import io.realm.RealmConfiguration
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.federation.FederationService
 import org.matrix.android.sdk.api.pushrules.PushRuleService
-import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.account.AccountService
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
@@ -38,6 +42,7 @@ import org.matrix.android.sdk.api.session.file.ContentDownloadStateTracker
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.group.GroupService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
+import org.matrix.android.sdk.api.session.initsync.InitialSyncProgressService
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.media.MediaService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
@@ -155,10 +160,13 @@ internal class DefaultSession @Inject constructor(
     override val isOpenable: Boolean
         get() = sessionParamsStore.get(sessionId)?.isTokenValid ?: false
 
+    private var sessionScope: CoroutineScope? = null
+
     @MainThread
     override fun open() {
         assert(!isOpen)
         isOpen = true
+        sessionScope = CoroutineScope(SupervisorJob())
         cryptoService.get().ensureDevice()
         uiHandler.post {
             lifecycleObservers.forEach { it.onSessionStarted() }
@@ -199,6 +207,8 @@ internal class DefaultSession @Inject constructor(
 
     override fun close() {
         assert(isOpen)
+        sessionScope?.coroutineContext?.cancelChildren(CancellationException("Closing session"))
+        sessionScope = null
         stopSync()
         // timelineEventDecryptor.destroy()
         uiHandler.post {
@@ -301,4 +311,10 @@ internal class DefaultSession @Inject constructor(
     override fun logDbUsageInfo() {
         RealmDebugTools(realmConfiguration).logInfo("Session")
     }
+
+    override fun launch(block: suspend () -> Unit) {
+        sessionScope?.launch {
+            block()
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 49f3d280e2..5bc59c7afc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -1318,7 +1318,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                         }
                     }
                     bufferedMostRecentDisplayedEvent.root.eventId?.let { eventId ->
-                        viewModelScope.launch {
+                        session.launch {
                             tryOrNull { room.setReadReceipt(eventId) }
                         }
                     }

From 8afa6975916e389007b35528729e2957478b8c5d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 19 Apr 2021 11:36:54 +0200
Subject: [PATCH 202/350] GlobalScope -> sessionScope

---
 .../im/vector/app/core/glide/VectorGlideModelLoader.kt    | 2 +-
 .../app/features/home/room/detail/RoomDetailFragment.kt   | 2 +-
 .../notifications/NotificationBroadcastReceiver.kt        | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index fb2f59d6b5..ab4ac00b1e 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -115,7 +115,7 @@ class VectorGlideDataFetcher(context: Context,
             callback.onLoadFailed(IllegalArgumentException("No File service"))
         }
         // Use the file vector service, will avoid flickering and redownload after upload
-        GlobalScope.launch {
+        activeSessionHolder.getSafeActiveSession()?.launch {
             val result = runCatching {
                 fileService.downloadFile(
                         fileName = data.filename,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 699906b2c4..5eaca48e68 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1749,7 +1749,7 @@ class RoomDetailFragment @Inject constructor(
             sharedActionViewModel.pendingAction = action
             return
         }
-        lifecycleScope.launch {
+        session.launch {
             val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
             if (!isAdded) return@launch
             result.fold(
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index f265a5bd5f..5368491d96 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -23,8 +23,6 @@ import androidx.core.app.RemoteInput
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.vectorComponent
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.Room
@@ -78,7 +76,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
             val room = session.getRoom(roomId)
             if (room != null) {
-                GlobalScope.launch {
+                session.launch {
                     tryOrNull { room.join() }
                 }
             }
@@ -89,7 +87,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
             val room = session.getRoom(roomId)
             if (room != null) {
-                GlobalScope.launch {
+                session.launch {
                     tryOrNull { room.leave() }
                 }
             }
@@ -100,7 +98,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         activeSessionHolder.getActiveSession().let { session ->
             val room = session.getRoom(roomId)
             if (room != null) {
-                GlobalScope.launch {
+                session.launch {
                     tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
                 }
             }

From 0e563596dd9ee2d506b6b31fd0fc84c425b2a0b0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 19 Apr 2021 11:52:07 +0200
Subject: [PATCH 203/350] Remove useless call to parent method

---
 .../main/java/im/vector/app/features/call/VectorCallActivity.kt  | 1 -
 .../vector/app/features/call/conference/VectorJitsiActivity.kt   | 1 -
 .../im/vector/app/features/call/transfer/CallTransferActivity.kt | 1 -
 .../vector/app/features/home/room/detail/RoomDetailActivity.kt   | 1 -
 .../app/features/home/room/detail/search/SearchActivity.kt       | 1 -
 .../app/features/roommemberprofile/RoomMemberProfileActivity.kt  | 1 -
 .../im/vector/app/features/roomprofile/RoomProfileActivity.kt    | 1 -
 7 files changed, 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
index 091dbeec24..a9e2982714 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -78,7 +78,6 @@ class VectorCallActivity : VectorBaseActivity<ActivityCallBinding>(), CallContro
     @Inject lateinit var avatarRenderer: AvatarRenderer
 
     override fun injectWith(injector: ScreenComponent) {
-        super.injectWith(injector)
         injector.inject(this)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index 16478192f7..3f2d52e9e7 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -67,7 +67,6 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
     private val jitsiViewModel: JitsiCallViewModel by viewModel()
 
     override fun injectWith(injector: ScreenComponent) {
-        super.injectWith(injector)
         injector.inject(this)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
index c5b4dda135..7f59a1c89b 100644
--- a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
@@ -59,7 +59,6 @@ class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>(),
     override fun getCoordinatorLayout() = views.vectorCoordinatorLayout
 
     override fun injectWith(injector: ScreenComponent) {
-        super.injectWith(injector)
         injector.inject(this)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
index 906d81bc25..640e9a62ff 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt
@@ -69,7 +69,6 @@ class RoomDetailActivity :
     }
 
     override fun injectWith(injector: ScreenComponent) {
-        super.injectWith(injector)
         injector.inject(this)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
index 94bb71243a..d9a2f98e32 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
@@ -39,7 +39,6 @@ class SearchActivity : VectorBaseActivity<ActivitySearchBinding>() {
     override fun getCoordinatorLayout() = views.coordinatorLayout
 
     override fun injectWith(injector: ScreenComponent) {
-        super.injectWith(injector)
         injector.inject(this)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
index 1fd8aeee7e..ef0c7dc962 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt
@@ -57,7 +57,6 @@ class RoomMemberProfileActivity :
     }
 
     override fun injectWith(injector: ScreenComponent) {
-        super.injectWith(injector)
         injector.inject(this)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
index e45ad69e7e..8a075e650e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
@@ -81,7 +81,6 @@ class RoomProfileActivity :
     }
 
     override fun injectWith(injector: ScreenComponent) {
-        super.injectWith(injector)
         injector.inject(this)
     }
 

From c33da38ddbf87e49db922b8e9ade7c6eac79d306 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 19 Apr 2021 12:40:56 +0200
Subject: [PATCH 204/350] GlobalScope -> sessionScope

---
 .../app/features/settings/troubleshoot/TestAccountSettings.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
index 1f9b59af54..723d2d797d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
@@ -21,8 +21,6 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.StringProvider
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.pushrules.RuleIds
@@ -52,7 +50,7 @@ class TestAccountSettings @Inject constructor(private val stringProvider: String
                     override fun doFix() {
                         if (manager?.diagStatus == TestStatus.RUNNING) return // wait before all is finished
 
-                        GlobalScope.launch {
+                        session.launch {
                             tryOrNull {
                                 session.updatePushRuleEnableStatus(RuleKind.OVERRIDE, defaultRule, !defaultRule.enabled)
                             }

From ecd2d0fb765a1643273431ffabb961e58173a2d7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 19 Apr 2021 16:01:33 +0200
Subject: [PATCH 205/350] Use session scope

---
 .../main/java/org/matrix/android/sdk/api/session/Session.kt | 5 ++++-
 .../matrix/android/sdk/internal/session/DefaultSession.kt   | 6 ++++--
 .../app/features/home/room/detail/RoomDetailViewModel.kt    | 3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 1250c0d36b..b2e426efda 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -56,6 +56,8 @@ import org.matrix.android.sdk.api.session.thirdparty.ThirdPartyService
 import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
 import org.matrix.android.sdk.api.session.user.UserService
 import org.matrix.android.sdk.api.session.widgets.WidgetService
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * This interface defines interactions with a session.
@@ -276,5 +278,6 @@ interface Session :
     /**
      * Launch a coroutine using the session scope
      */
-    fun launch(block: suspend () -> Unit )
+    fun launch(context: CoroutineContext = EmptyCoroutineContext,
+               block: suspend () -> Unit )
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 078cac278d..58be33460b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -79,6 +79,7 @@ import org.matrix.android.sdk.internal.util.createUIHandler
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Provider
+import kotlin.coroutines.CoroutineContext
 
 @SessionScope
 internal class DefaultSession @Inject constructor(
@@ -312,8 +313,9 @@ internal class DefaultSession @Inject constructor(
         RealmDebugTools(realmConfiguration).logInfo("Session")
     }
 
-    override fun launch(block: suspend () -> Unit) {
-        sessionScope?.launch {
+    override fun launch(context: CoroutineContext,
+                        block: suspend () -> Unit) {
+        sessionScope?.launch(context) {
             block()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 5bc59c7afc..a5a140cadc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -59,7 +59,6 @@ import io.reactivex.Observable
 import io.reactivex.rxkotlin.subscribeBy
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.commonmark.parser.Parser
@@ -571,7 +570,7 @@ class RoomDetailViewModel @AssistedInject constructor(
      * Convert a send mode to a draft and save the draft
      */
     private fun handleSaveDraft(action: RoomDetailAction.SaveDraft) = withState {
-        viewModelScope.launch(NonCancellable) {
+        session.launch {
             when {
                 it.sendMode is SendMode.REGULAR && !it.sendMode.fromSharing -> {
                     setState { copy(sendMode = it.sendMode.copy(action.draft)) }

From dc69d5c68a900b47b0b98532c78e6430e2e7a0ca Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 19 Apr 2021 16:07:08 +0200
Subject: [PATCH 206/350] Create a holder

---
 .../sdk/internal/session/DefaultSession.kt    | 10 ++---
 .../session/SessionCoroutineScopeHolder.kt    | 38 +++++++++++++++++++
 2 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 58be33460b..3c1a461861 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -84,6 +84,7 @@ import kotlin.coroutines.CoroutineContext
 @SessionScope
 internal class DefaultSession @Inject constructor(
         override val sessionParams: SessionParams,
+        private val sessionCoroutineScopeHolder: SessionCoroutineScopeHolder,
         private val workManagerProvider: WorkManagerProvider,
         private val globalErrorHandler: GlobalErrorHandler,
         @SessionId
@@ -161,13 +162,11 @@ internal class DefaultSession @Inject constructor(
     override val isOpenable: Boolean
         get() = sessionParamsStore.get(sessionId)?.isTokenValid ?: false
 
-    private var sessionScope: CoroutineScope? = null
-
     @MainThread
     override fun open() {
         assert(!isOpen)
         isOpen = true
-        sessionScope = CoroutineScope(SupervisorJob())
+        sessionCoroutineScopeHolder.start()
         cryptoService.get().ensureDevice()
         uiHandler.post {
             lifecycleObservers.forEach { it.onSessionStarted() }
@@ -208,8 +207,7 @@ internal class DefaultSession @Inject constructor(
 
     override fun close() {
         assert(isOpen)
-        sessionScope?.coroutineContext?.cancelChildren(CancellationException("Closing session"))
-        sessionScope = null
+        sessionCoroutineScopeHolder.stop()
         stopSync()
         // timelineEventDecryptor.destroy()
         uiHandler.post {
@@ -315,7 +313,7 @@ internal class DefaultSession @Inject constructor(
 
     override fun launch(context: CoroutineContext,
                         block: suspend () -> Unit) {
-        sessionScope?.launch(context) {
+        sessionCoroutineScopeHolder.scope?.launch(context) {
             block()
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
new file mode 100644
index 0000000000..0d9e31f8cc
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session
+
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancelChildren
+
+@SessionScope
+internal class SessionCoroutineScopeHolder {
+
+    var scope: CoroutineScope? = null
+        private set
+
+    fun start() {
+        scope = CoroutineScope(SupervisorJob())
+    }
+
+    fun stop() {
+        scope?.coroutineContext?.cancelChildren(CancellationException("Closing session"))
+        scope = null
+    }
+}

From e5d0a8f3d890612d8afe1347cae0932829e98435 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 19 Apr 2021 16:11:42 +0200
Subject: [PATCH 207/350] Cleanup

---
 .../main/java/org/matrix/android/sdk/api/session/Session.kt   | 2 +-
 .../org/matrix/android/sdk/internal/session/DefaultSession.kt | 4 ----
 .../java/im/vector/app/core/glide/VectorGlideModelLoader.kt   | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index b2e426efda..33769152b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -279,5 +279,5 @@ interface Session :
      * Launch a coroutine using the session scope
      */
     fun launch(context: CoroutineContext = EmptyCoroutineContext,
-               block: suspend () -> Unit )
+               block: suspend () -> Unit)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 3c1a461861..14856dc9a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -19,10 +19,6 @@ package org.matrix.android.sdk.internal.session
 import androidx.annotation.MainThread
 import dagger.Lazy
 import io.realm.RealmConfiguration
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancelChildren
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.auth.data.SessionParams
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index ab4ac00b1e..5a053b446b 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -29,7 +29,6 @@ import im.vector.app.core.extensions.vectorComponent
 import im.vector.app.core.files.LocalFilesHelper
 import im.vector.app.features.media.ImageContentRenderer
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient

From a5c0c23baeb49b8664d541293cf11a2f1fae0f15 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 10:22:37 +0200
Subject: [PATCH 208/350] Inject constructor...

---
 .../sdk/internal/session/SessionCoroutineScopeHolder.kt        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
index 0d9e31f8cc..2a099ba2ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
@@ -20,9 +20,10 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
+import javax.inject.Inject
 
 @SessionScope
-internal class SessionCoroutineScopeHolder {
+internal class SessionCoroutineScopeHolder @Inject constructor() {
 
     var scope: CoroutineScope? = null
         private set

From bd0fcce572e43660c14034deafb4d28bd16a6fea Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 20 Apr 2021 10:25:23 +0200
Subject: [PATCH 209/350] Return Job

---
 .../java/org/matrix/android/sdk/api/session/Session.kt     | 3 ++-
 .../matrix/android/sdk/internal/session/DefaultSession.kt  | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 33769152b0..17f5e1fc1e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.api.session
 
 import androidx.annotation.MainThread
 import androidx.lifecycle.LiveData
+import kotlinx.coroutines.Job
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.GlobalError
@@ -279,5 +280,5 @@ interface Session :
      * Launch a coroutine using the session scope
      */
     fun launch(context: CoroutineContext = EmptyCoroutineContext,
-               block: suspend () -> Unit)
+               block: suspend () -> Unit): Job
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 14856dc9a5..842ff55f06 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.session
 import androidx.annotation.MainThread
 import dagger.Lazy
 import io.realm.RealmConfiguration
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.auth.data.SessionParams
@@ -308,9 +309,9 @@ internal class DefaultSession @Inject constructor(
     }
 
     override fun launch(context: CoroutineContext,
-                        block: suspend () -> Unit) {
-        sessionCoroutineScopeHolder.scope?.launch(context) {
+                        block: suspend () -> Unit): Job {
+        return sessionCoroutineScopeHolder.scope?.launch(context) {
             block()
-        }
+        } ?: throw IllegalStateException("Session is closed")
     }
 }

From 80b155e042356ae6675a6bf7aad5ca49dbd312c8 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 22 Apr 2021 19:28:17 +0200
Subject: [PATCH 210/350] Refact coroutine session scope

---
 .../matrix/android/sdk/api/session/Session.kt | 13 +------
 .../session/SessionLifecycleObserver.kt       | 11 +++---
 .../sdk/internal/database/DatabaseCleaner.kt  |  5 ++-
 .../database/RealmLiveEntityObserver.kt       |  9 +++--
 .../internal/database/RealmSessionProvider.kt |  7 ++--
 .../sdk/internal/session/DefaultSession.kt    | 38 ++++++++++---------
 .../session/SessionCoroutineScopeHolder.kt    | 21 ++++++----
 .../sdk/internal/session/SessionListeners.kt  |  5 +--
 .../sdk/internal/session/SessionModule.kt     |  5 +++
 .../identity/DefaultIdentityService.kt        |  7 ++--
 .../integrationmanager/IntegrationManager.kt  |  7 ++--
 .../room/send/queue/EventSenderProcessor.kt   |  2 +-
 .../queue/EventSenderProcessorCoroutine.kt    |  3 +-
 .../send/queue/EventSenderProcessorThread.kt  |  5 ++-
 .../widgets/DefaultWidgetURLFormatter.kt      |  7 ++--
 .../internal/session/widgets/WidgetManager.kt |  7 ++--
 .../app/core/glide/VectorGlideModelLoader.kt  |  3 +-
 .../home/room/detail/RoomDetailFragment.kt    |  4 +-
 .../home/room/detail/RoomDetailViewModel.kt   |  5 ++-
 .../NotificationBroadcastReceiver.kt          |  8 ++--
 .../session/SessionCoroutineScopes.kt         | 33 ++++++++++++++++
 .../app/features/session/SessionListener.kt   | 12 +++++-
 .../troubleshoot/TestAccountSettings.kt       |  4 +-
 23 files changed, 142 insertions(+), 79 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/session/SessionLifecycleObserver.kt (80%)
 create mode 100644 vector/src/main/java/im/vector/app/features/session/SessionCoroutineScopes.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 17f5e1fc1e..86252665a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.api.session
 
 import androidx.annotation.MainThread
 import androidx.lifecycle.LiveData
-import kotlinx.coroutines.Job
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.GlobalError
@@ -57,8 +56,6 @@ import org.matrix.android.sdk.api.session.thirdparty.ThirdPartyService
 import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
 import org.matrix.android.sdk.api.session.user.UserService
 import org.matrix.android.sdk.api.session.widgets.WidgetService
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * This interface defines interactions with a session.
@@ -258,13 +255,13 @@ interface Session :
     /**
      * A global session listener to get notified for some events.
      */
-    interface Listener {
+    interface Listener : SessionLifecycleObserver {
         /**
          * Possible cases:
          * - The access token is not valid anymore,
          * - a M_CONSENT_NOT_GIVEN error has been received from the homeserver
          */
-        fun onGlobalError(globalError: GlobalError)
+        fun onGlobalError(session: Session, globalError: GlobalError)
     }
 
     val sharedSecretStorageService: SharedSecretStorageService
@@ -275,10 +272,4 @@ interface Session :
      * Maintenance API, allows to print outs info on DB size to logcat
      */
     fun logDbUsageInfo()
-
-    /**
-     * Launch a coroutine using the session scope
-     */
-    fun launch(context: CoroutineContext = EmptyCoroutineContext,
-               block: suspend () -> Unit): Job
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionLifecycleObserver.kt
similarity index 80%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionLifecycleObserver.kt
index cb37fbec75..b76e454e4b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/SessionLifecycleObserver.kt
@@ -14,20 +14,19 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session
+package org.matrix.android.sdk.api.session
 
 import androidx.annotation.MainThread
 
 /**
  * This defines methods associated with some lifecycle events of a session.
- * A list of SessionLifecycle will be injected into [DefaultSession]
  */
-internal interface SessionLifecycleObserver {
+interface SessionLifecycleObserver {
     /*
     Called when the session is opened
      */
     @MainThread
-    fun onSessionStarted() {
+    fun onSessionStarted(session: Session) {
         // noop
     }
 
@@ -35,7 +34,7 @@ internal interface SessionLifecycleObserver {
     Called when the session is cleared
      */
     @MainThread
-    fun onClearCache() {
+    fun onClearCache(session: Session) {
         // noop
     }
 
@@ -43,7 +42,7 @@ internal interface SessionLifecycleObserver {
     Called when the session is closed
      */
     @MainThread
-    fun onSessionStopped() {
+    fun onSessionStopped(session: Session) {
         // noop
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
index f11ecc5d75..ee58880eb8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
@@ -20,6 +20,7 @@ import io.realm.Realm
 import io.realm.RealmConfiguration
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.internal.database.helper.nextDisplayIndex
 import org.matrix.android.sdk.internal.database.model.ChunkEntity
 import org.matrix.android.sdk.internal.database.model.ChunkEntityFields
@@ -29,7 +30,7 @@ import org.matrix.android.sdk.internal.database.model.TimelineEventEntity
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.database.model.deleteOnCascade
 import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import timber.log.Timber
@@ -47,7 +48,7 @@ private const val MIN_NUMBER_OF_EVENTS_BY_CHUNK = 300
 internal class DatabaseCleaner @Inject constructor(@SessionDatabase private val realmConfiguration: RealmConfiguration,
                                                    private val taskExecutor: TaskExecutor) : SessionLifecycleObserver {
 
-    override fun onSessionStarted() {
+    override fun onSessionStarted(session: Session) {
         taskExecutor.executorScope.launch(Dispatchers.Default) {
             awaitTransaction(realmConfiguration) { realm ->
                 val allRooms = realm.where(RoomEntity::class.java).findAll()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
index 2a0cd963b2..c602ed7075 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
@@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.database
 
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 import org.matrix.android.sdk.internal.util.createBackgroundHandler
 import io.realm.Realm
 import io.realm.RealmChangeListener
@@ -28,6 +28,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.android.asCoroutineDispatcher
 import kotlinx.coroutines.cancelChildren
+import org.matrix.android.sdk.api.session.Session
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
 
@@ -46,7 +47,7 @@ internal abstract class RealmLiveEntityObserver<T : RealmObject>(protected val r
     private val backgroundRealm = AtomicReference<Realm>()
     private lateinit var results: AtomicReference<RealmResults<T>>
 
-    override fun onSessionStarted() {
+    override fun onSessionStarted(session: Session) {
         if (isStarted.compareAndSet(false, true)) {
             BACKGROUND_HANDLER.post {
                 val realm = Realm.getInstance(realmConfiguration)
@@ -58,7 +59,7 @@ internal abstract class RealmLiveEntityObserver<T : RealmObject>(protected val r
         }
     }
 
-    override fun onSessionStopped() {
+    override fun onSessionStopped(session: Session) {
         if (isStarted.compareAndSet(true, false)) {
             BACKGROUND_HANDLER.post {
                 results.getAndSet(null).removeAllChangeListeners()
@@ -70,7 +71,7 @@ internal abstract class RealmLiveEntityObserver<T : RealmObject>(protected val r
         }
     }
 
-    override fun onClearCache() {
+    override fun onClearCache(session: Session) {
         observerScope.coroutineContext.cancelChildren()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
index f8d5d323a5..52fbabb49f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
@@ -20,8 +20,9 @@ import android.os.Looper
 import androidx.annotation.MainThread
 import com.zhuinden.monarchy.Monarchy
 import io.realm.Realm
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.internal.di.SessionDatabase
-import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 import org.matrix.android.sdk.internal.session.SessionScope
 import javax.inject.Inject
 import kotlin.concurrent.getOrSet
@@ -44,14 +45,14 @@ internal class RealmSessionProvider @Inject constructor(@SessionDatabase private
     }
 
     @MainThread
-    override fun onSessionStarted() {
+    override fun onSessionStarted(session: Session) {
         realmThreadLocal.getOrSet {
             Realm.getInstance(monarchy.realmConfiguration)
         }
     }
 
     @MainThread
-    override fun onSessionStopped() {
+    override fun onSessionStopped(session: Session) {
         realmThreadLocal.get()?.close()
         realmThreadLocal.remove()
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 842ff55f06..7199fc0bfe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -19,14 +19,15 @@ package org.matrix.android.sdk.internal.session
 import androidx.annotation.MainThread
 import dagger.Lazy
 import io.realm.RealmConfiguration
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.federation.FederationService
 import org.matrix.android.sdk.api.pushrules.PushRuleService
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 import org.matrix.android.sdk.api.session.account.AccountService
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
 import org.matrix.android.sdk.api.session.cache.CacheService
@@ -76,7 +77,6 @@ import org.matrix.android.sdk.internal.util.createUIHandler
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Provider
-import kotlin.coroutines.CoroutineContext
 
 @SessionScope
 internal class DefaultSession @Inject constructor(
@@ -163,10 +163,12 @@ internal class DefaultSession @Inject constructor(
     override fun open() {
         assert(!isOpen)
         isOpen = true
-        sessionCoroutineScopeHolder.start()
         cryptoService.get().ensureDevice()
         uiHandler.post {
-            lifecycleObservers.forEach { it.onSessionStarted() }
+            lifecycleObservers.forEach { it.onSessionStarted(this) }
+            sessionListeners.dispatch {
+                it.onSessionStarted(this)
+            }
         }
         globalErrorHandler.listener = this
     }
@@ -204,11 +206,13 @@ internal class DefaultSession @Inject constructor(
 
     override fun close() {
         assert(isOpen)
-        sessionCoroutineScopeHolder.stop()
         stopSync()
         // timelineEventDecryptor.destroy()
         uiHandler.post {
-            lifecycleObservers.forEach { it.onSessionStopped() }
+            lifecycleObservers.forEach { it.onSessionStopped(this) }
+            sessionListeners.dispatch {
+                it.onSessionStopped(this)
+            }
         }
         cryptoService.get().close()
         isOpen = false
@@ -233,14 +237,21 @@ internal class DefaultSession @Inject constructor(
         stopSync()
         stopAnyBackgroundSync()
         uiHandler.post {
-            lifecycleObservers.forEach { it.onClearCache() }
+            lifecycleObservers.forEach { it.onClearCache(this) }
+            sessionListeners.dispatch {
+                it.onClearCache(this)
+            }
+        }
+        withContext(NonCancellable) {
+            cacheService.get().clearCache()
         }
-        cacheService.get().clearCache()
         workManagerProvider.cancelAllWorks()
     }
 
     override fun onGlobalError(globalError: GlobalError) {
-        sessionListeners.dispatchGlobalError(globalError)
+        sessionListeners.dispatch {
+            it.onGlobalError(this, globalError)
+        }
     }
 
     override fun contentUrlResolver() = contentUrlResolver
@@ -307,11 +318,4 @@ internal class DefaultSession @Inject constructor(
     override fun logDbUsageInfo() {
         RealmDebugTools(realmConfiguration).logInfo("Session")
     }
-
-    override fun launch(context: CoroutineContext,
-                        block: suspend () -> Unit): Job {
-        return sessionCoroutineScopeHolder.scope?.launch(context) {
-            block()
-        } ?: throw IllegalStateException("Session is closed")
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
index 2a099ba2ff..29368debc3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
@@ -21,19 +21,24 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelChildren
 import javax.inject.Inject
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 
 @SessionScope
-internal class SessionCoroutineScopeHolder @Inject constructor() {
+internal class SessionCoroutineScopeHolder @Inject constructor(): SessionLifecycleObserver {
 
-    var scope: CoroutineScope? = null
-        private set
+    val scope: CoroutineScope = CoroutineScope(SupervisorJob())
 
-    fun start() {
-        scope = CoroutineScope(SupervisorJob())
+    override fun onSessionStopped(session: Session) {
+        scope.cancelChildren()
     }
 
-    fun stop() {
-        scope?.coroutineContext?.cancelChildren(CancellationException("Closing session"))
-        scope = null
+    override fun onClearCache(session: Session) {
+        scope.cancelChildren()
     }
+
+    private fun CoroutineScope.cancelChildren(){
+        coroutineContext.cancelChildren(CancellationException("Closing session"))
+    }
+
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
index 64f2d249f3..563ff4ada3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.session
 
-import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 
@@ -36,10 +35,10 @@ internal class SessionListeners @Inject constructor() {
         }
     }
 
-    fun dispatchGlobalError(globalError: GlobalError) {
+    fun dispatch(block: (Session.Listener) -> Unit) {
         synchronized(listeners) {
             listeners.forEach {
-                it.onGlobalError(globalError)
+                block(it)
             }
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index e61e4ecd89..63423b72c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -33,6 +33,7 @@ import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.auth.data.sessionId
 import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
 import org.matrix.android.sdk.api.session.events.EventService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
@@ -343,6 +344,10 @@ internal abstract class SessionModule {
     @IntoSet
     abstract fun bindRealmSessionProvider(provider: RealmSessionProvider): SessionLifecycleObserver
 
+    @Binds
+    @IntoSet
+    abstract fun bindSessionCoroutineScopeHolder(holder: SessionCoroutineScopeHolder): SessionLifecycleObserver
+
     @Binds
     @IntoSet
     abstract fun bindEventSenderProcessorAsSessionLifecycleObserver(processor: EventSenderProcessorCoroutine): SessionLifecycleObserver
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
index f5391d6cdb..475781ef01 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@@ -36,7 +36,7 @@ import org.matrix.android.sdk.internal.di.AuthenticatedIdentity
 import org.matrix.android.sdk.internal.di.UnauthenticatedWithCertificate
 import org.matrix.android.sdk.internal.extensions.observeNotNull
 import org.matrix.android.sdk.internal.network.RetrofitFactory
-import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.identity.data.IdentityStore
 import org.matrix.android.sdk.internal.session.openid.GetOpenIdTokenTask
@@ -51,6 +51,7 @@ import org.matrix.android.sdk.internal.util.ensureProtocol
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
 import javax.inject.Inject
 import javax.net.ssl.HttpsURLConnection
@@ -86,7 +87,7 @@ internal class DefaultIdentityService @Inject constructor(
 
     private val listeners = mutableSetOf<IdentityServiceListener>()
 
-    override fun onSessionStarted() {
+    override fun onSessionStarted(session: Session) {
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
         // Observe the account data change
         accountDataDataSource
@@ -111,7 +112,7 @@ internal class DefaultIdentityService @Inject constructor(
         }
     }
 
-    override fun onSessionStopped() {
+    override fun onSessionStopped(session: Session) {
         lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
index e34615d269..3df9a00cc1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
@@ -21,6 +21,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
@@ -29,7 +30,7 @@ import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.internal.database.model.WellknownIntegrationManagerConfigEntity
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.extensions.observeNotNull
-import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
@@ -77,7 +78,7 @@ internal class IntegrationManager @Inject constructor(matrixConfiguration: Matri
         currentConfigs.add(defaultConfig)
     }
 
-    override fun onSessionStarted() {
+    override fun onSessionStarted(session: Session) {
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
         observeWellknownConfig()
         accountDataDataSource
@@ -105,7 +106,7 @@ internal class IntegrationManager @Inject constructor(matrixConfiguration: Matri
                 }
     }
 
-    override fun onSessionStopped() {
+    override fun onSessionStopped(session: Session) {
         lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt
index 8bafa5f882..cd5bf575db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessor.kt
@@ -18,7 +18,7 @@ package org.matrix.android.sdk.internal.session.room.send.queue
 
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 
 internal interface EventSenderProcessor: SessionLifecycleObserver {
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
index a5c09f5ff6..80bfd02b0e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorCoroutine.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.auth.data.SessionParams
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.failure.getRetryDelay
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.util.Cancelable
@@ -72,7 +73,7 @@ internal class EventSenderProcessorCoroutine @Inject constructor(
      */
     private val cancelableBag = ConcurrentHashMap<String, Cancelable>()
 
-    override fun onSessionStarted() {
+    override fun onSessionStarted(session: Session) {
         // We should check for sending events not handled because app was killed
         // But we should be careful of only took those that was submitted to us, because if it's
         // for example it's a media event it is handled by some worker and he will handle it
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
index b79a86dd7e..9db7cc9039 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.failure.isTokenError
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.sync.SyncState
@@ -64,11 +65,11 @@ internal class EventSenderProcessorThread @Inject constructor(
         memento.unTrack(task)
     }
 
-    override fun onSessionStarted() {
+    override fun onSessionStarted(session: Session) {
         start()
     }
 
-    override fun onSessionStopped() {
+    override fun onSessionStopped(session: Session) {
         interrupt()
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
index 0937f6d18b..f7664bf3c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
@@ -17,12 +17,13 @@
 package org.matrix.android.sdk.internal.session.widgets
 
 import org.matrix.android.sdk.api.MatrixConfiguration
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.widgets.WidgetURLFormatter
 import org.matrix.android.sdk.api.util.appendParamToUrl
 import org.matrix.android.sdk.api.util.appendParamsToUrl
-import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManager
 import org.matrix.android.sdk.internal.session.widgets.token.GetScalarTokenTask
@@ -37,12 +38,12 @@ internal class DefaultWidgetURLFormatter @Inject constructor(private val integra
     private lateinit var currentConfig: IntegrationManagerConfig
     private var whiteListedUrls: List<String> = emptyList()
 
-    override fun onSessionStarted() {
+    override fun onSessionStarted(session: Session) {
         setupWithConfiguration()
         integrationManager.addListener(this)
     }
 
-    override fun onSessionStopped() {
+    override fun onSessionStopped(session: Session) {
         integrationManager.removeListener(this)
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
index 3244212487..d741dbc966 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
@@ -22,6 +22,7 @@ import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
 import org.matrix.android.sdk.api.session.events.model.Content
@@ -34,7 +35,7 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.widgets.WidgetManagementFailure
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.internal.di.UserId
-import org.matrix.android.sdk.internal.session.SessionLifecycleObserver
+import org.matrix.android.sdk.api.session.SessionLifecycleObserver
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.integrationmanager.IntegrationManager
 import org.matrix.android.sdk.internal.session.room.state.StateEventDataSource
@@ -57,12 +58,12 @@ internal class WidgetManager @Inject constructor(private val integrationManager:
     private val lifecycleOwner: LifecycleOwner = LifecycleOwner { lifecycleRegistry }
     private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(lifecycleOwner)
 
-    override fun onSessionStarted() {
+    override fun onSessionStarted(session: Session) {
         lifecycleRegistry.currentState = Lifecycle.State.STARTED
         integrationManager.addListener(this)
     }
 
-    override fun onSessionStopped() {
+    override fun onSessionStopped(session: Session) {
         integrationManager.removeListener(this)
         lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
     }
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index 5a053b446b..5fae815dfb 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -28,6 +28,7 @@ import com.bumptech.glide.signature.ObjectKey
 import im.vector.app.core.extensions.vectorComponent
 import im.vector.app.core.files.LocalFilesHelper
 import im.vector.app.features.media.ImageContentRenderer
+import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -114,7 +115,7 @@ class VectorGlideDataFetcher(context: Context,
             callback.onLoadFailed(IllegalArgumentException("No File service"))
         }
         // Use the file vector service, will avoid flickering and redownload after upload
-        activeSessionHolder.getSafeActiveSession()?.launch {
+        activeSessionHolder.getSafeActiveSession()?.coroutineScope?.launch {
             val result = runCatching {
                 fileService.downloadFile(
                         fileName = data.filename,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 5eaca48e68..82187ecdd3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -161,6 +161,7 @@ import im.vector.app.features.permalink.NavigationInterceptor
 import im.vector.app.features.permalink.PermalinkHandler
 import im.vector.app.features.reactions.EmojiReactionPickerActivity
 import im.vector.app.features.roomprofile.RoomProfileActivity
+import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
@@ -1744,12 +1745,13 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun onSaveActionClicked(action: EventSharedAction.Save) {
+
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
                 && !checkPermissions(PERMISSIONS_FOR_WRITING_FILES, requireActivity(), saveActionActivityResultLauncher)) {
             sharedActionViewModel.pendingAction = action
             return
         }
-        session.launch {
+        session.coroutineScope.launch {
             val result = runCatching { session.fileService().downloadFile(messageContent = action.messageContent) }
             if (!isAdded) return@launch
             result.fold(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index a5a140cadc..d64acb9afb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -53,6 +53,7 @@ import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
 import im.vector.app.features.home.room.typing.TypingHelper
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import im.vector.app.features.raw.wellknown.getElementWellknown
+import im.vector.app.features.session.coroutineScope
 import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.settings.VectorPreferences
 import io.reactivex.Observable
@@ -570,7 +571,7 @@ class RoomDetailViewModel @AssistedInject constructor(
      * Convert a send mode to a draft and save the draft
      */
     private fun handleSaveDraft(action: RoomDetailAction.SaveDraft) = withState {
-        session.launch {
+        session.coroutineScope.launch {
             when {
                 it.sendMode is SendMode.REGULAR && !it.sendMode.fromSharing -> {
                     setState { copy(sendMode = it.sendMode.copy(action.draft)) }
@@ -1317,7 +1318,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                         }
                     }
                     bufferedMostRecentDisplayedEvent.root.eventId?.let { eventId ->
-                        session.launch {
+                        session.coroutineScope.launch {
                             tryOrNull { room.setReadReceipt(eventId) }
                         }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index 5368491d96..2c4cdab25e 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -23,6 +23,8 @@ import androidx.core.app.RemoteInput
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.vectorComponent
+import im.vector.app.features.session.coroutineScope
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.Room
@@ -76,7 +78,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
             val room = session.getRoom(roomId)
             if (room != null) {
-                session.launch {
+                session.coroutineScope.launch {
                     tryOrNull { room.join() }
                 }
             }
@@ -87,7 +89,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         activeSessionHolder.getSafeActiveSession()?.let { session ->
             val room = session.getRoom(roomId)
             if (room != null) {
-                session.launch {
+                session.coroutineScope.launch {
                     tryOrNull { room.leave() }
                 }
             }
@@ -98,7 +100,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
         activeSessionHolder.getActiveSession().let { session ->
             val room = session.getRoom(roomId)
             if (room != null) {
-                session.launch {
+                session.coroutineScope.launch {
                     tryOrNull { room.markAsRead(ReadService.MarkAsReadParams.READ_RECEIPT) }
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/session/SessionCoroutineScopes.kt b/vector/src/main/java/im/vector/app/features/session/SessionCoroutineScopes.kt
new file mode 100644
index 0000000000..28fcab6fb9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/session/SessionCoroutineScopes.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.session
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import org.matrix.android.sdk.api.session.Session
+
+private val sessionCoroutineScopes = HashMap<String, CoroutineScope>(1)
+
+val Session.coroutineScope: CoroutineScope
+    get() {
+        return synchronized(sessionCoroutineScopes) {
+            sessionCoroutineScopes.getOrPut(sessionId) {
+                CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
+            }
+        }
+    }
diff --git a/vector/src/main/java/im/vector/app/features/session/SessionListener.kt b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
index 66b1bae70d..aaed15f12f 100644
--- a/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
+++ b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
@@ -20,6 +20,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import im.vector.app.core.extensions.postLiveEvent
 import im.vector.app.core.utils.LiveEvent
+import kotlinx.coroutines.cancelChildren
 import org.matrix.android.sdk.api.failure.GlobalError
 import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
@@ -32,7 +33,16 @@ class SessionListener @Inject constructor() : Session.Listener {
     val globalErrorLiveData: LiveData<LiveEvent<GlobalError>>
         get() = _globalErrorLiveData
 
-    override fun onGlobalError(globalError: GlobalError) {
+    override fun onGlobalError(session: Session, globalError: GlobalError) {
         _globalErrorLiveData.postLiveEvent(globalError)
     }
+
+    override fun onSessionStopped(session: Session) {
+        session.coroutineScope.coroutineContext.cancelChildren()
+    }
+
+    override fun onClearCache(session: Session) {
+        session.coroutineScope.coroutineContext.cancelChildren()
+    }
+
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
index 723d2d797d..dad35fd13f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
@@ -20,7 +20,9 @@ import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.pushrules.RuleIds
@@ -50,7 +52,7 @@ class TestAccountSettings @Inject constructor(private val stringProvider: String
                     override fun doFix() {
                         if (manager?.diagStatus == TestStatus.RUNNING) return // wait before all is finished
 
-                        session.launch {
+                        session.coroutineScope.launch {
                             tryOrNull {
                                 session.updatePushRuleEnableStatus(RuleKind.OVERRIDE, defaultRule, !defaultRule.enabled)
                             }

From e073563a67e06fc3a7df31b34ba4ed923aca0d3e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 26 Apr 2021 15:54:38 +0200
Subject: [PATCH 211/350] Cleanup

---
 .../android/sdk/internal/session/DefaultSession.kt       | 9 ++++++---
 .../sdk/internal/session/SessionCoroutineScopeHolder.kt  | 3 +--
 .../app/features/home/room/detail/RoomDetailFragment.kt  | 1 -
 .../im/vector/app/features/session/SessionListener.kt    | 1 -
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 7199fc0bfe..53e13c14ec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -81,7 +81,6 @@ import javax.inject.Provider
 @SessionScope
 internal class DefaultSession @Inject constructor(
         override val sessionParams: SessionParams,
-        private val sessionCoroutineScopeHolder: SessionCoroutineScopeHolder,
         private val workManagerProvider: WorkManagerProvider,
         private val globalErrorHandler: GlobalErrorHandler,
         @SessionId
@@ -165,7 +164,9 @@ internal class DefaultSession @Inject constructor(
         isOpen = true
         cryptoService.get().ensureDevice()
         uiHandler.post {
-            lifecycleObservers.forEach { it.onSessionStarted(this) }
+            lifecycleObservers.forEach {
+                it.onSessionStarted(this)
+            }
             sessionListeners.dispatch {
                 it.onSessionStarted(this)
             }
@@ -237,7 +238,9 @@ internal class DefaultSession @Inject constructor(
         stopSync()
         stopAnyBackgroundSync()
         uiHandler.post {
-            lifecycleObservers.forEach { it.onClearCache(this) }
+            lifecycleObservers.forEach {
+                it.onClearCache(this)
+            }
             sessionListeners.dispatch {
                 it.onClearCache(this)
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
index 29368debc3..82a8f79fd5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionCoroutineScopeHolder.kt
@@ -37,8 +37,7 @@ internal class SessionCoroutineScopeHolder @Inject constructor(): SessionLifecyc
         scope.cancelChildren()
     }
 
-    private fun CoroutineScope.cancelChildren(){
+    private fun CoroutineScope.cancelChildren() {
         coroutineContext.cancelChildren(CancellationException("Closing session"))
     }
-
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 82187ecdd3..31a589ce3f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -1745,7 +1745,6 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun onSaveActionClicked(action: EventSharedAction.Save) {
-
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
                 && !checkPermissions(PERMISSIONS_FOR_WRITING_FILES, requireActivity(), saveActionActivityResultLauncher)) {
             sharedActionViewModel.pendingAction = action
diff --git a/vector/src/main/java/im/vector/app/features/session/SessionListener.kt b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
index aaed15f12f..7b7be550cb 100644
--- a/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
+++ b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
@@ -44,5 +44,4 @@ class SessionListener @Inject constructor() : Session.Listener {
     override fun onClearCache(session: Session) {
         session.coroutineScope.coroutineContext.cancelChildren()
     }
-
 }

From 7465ac2ef6fa09086e11332c152cb6bf6d619a9a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 26 Apr 2021 17:34:58 +0200
Subject: [PATCH 212/350] Add just me space flow Initial commit

---
 .../vector/app/features/home/HomeActivity.kt  | 17 +++++++++--
 .../features/navigation/DefaultNavigator.kt   | 29 ++++++++++++-------
 .../app/features/navigation/Navigator.kt      |  8 ++++-
 .../features/spaces/SpaceCreationActivity.kt  | 11 ++++++-
 .../create/ChoosePrivateSpaceTypeFragment.kt  |  3 +-
 .../spaces/create/CreateSpaceEvents.kt        |  2 +-
 .../spaces/create/CreateSpaceViewModel.kt     | 20 +++++++++++--
 7 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 5a7f2e2f8f..f01c27c30e 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -48,6 +48,7 @@ import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.disclaimer.showDisclaimerDialog
 import im.vector.app.features.matrixto.MatrixToBottomSheet
+import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.permalink.NavigationInterceptor
 import im.vector.app.features.permalink.PermalinkHandler
@@ -115,11 +116,21 @@ class HomeActivity :
         if (activityResult.resultCode == Activity.RESULT_OK) {
             val spaceId = SpaceCreationActivity.getCreatedSpaceId(activityResult.data)
             val defaultRoomId = SpaceCreationActivity.getDefaultRoomId(activityResult.data)
+            val isJustMe = SpaceCreationActivity.isJustMeSpace(activityResult.data)
             views.drawerLayout.closeDrawer(GravityCompat.START)
 
+            val postSwitchOption: Navigator.PostSwitchSpaceAction = if (defaultRoomId != null) {
+                Navigator.PostSwitchSpaceAction.OpenDefaultRoom(defaultRoomId, !isJustMe)
+            } else if (isJustMe) {
+                Navigator.PostSwitchSpaceAction.OpenAddExistingRooms
+            } else {
+                Navigator.PostSwitchSpaceAction.None
+            }
             // Here we want to change current space to the newly created one, and then immediately open the default room
             if (spaceId != null) {
-                navigator.switchToSpace(this, spaceId, defaultRoomId, true)
+                navigator.switchToSpace(context = this,
+                        spaceId = spaceId,
+                        postSwitchOption)
             }
         }
     }
@@ -267,7 +278,7 @@ class HomeActivity :
 
     private fun renderState(state: HomeActivityViewState) {
         when (val status = state.initialSyncProgressServiceStatus) {
-            is InitialSyncProgressService.Status.Idle        -> {
+            is InitialSyncProgressService.Status.Idle -> {
                 views.waitingView.root.isVisible = false
             }
             is InitialSyncProgressService.Status.Progressing -> {
@@ -494,7 +505,7 @@ class HomeActivity :
             }
 
             override fun switchToSpace(spaceId: String) {
-                navigator.switchToSpace(this@HomeActivity, spaceId, null, false)
+                navigator.switchToSpace(this@HomeActivity, spaceId, Navigator.PostSwitchSpaceAction.None)
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 73d8325bca..4ada274d77 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -74,6 +74,7 @@ import im.vector.app.features.share.SharedData
 import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
 import im.vector.app.features.spaces.SpaceExploreActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
+import im.vector.app.features.spaces.manage.SpaceManageActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgsBuilder
@@ -106,21 +107,27 @@ class DefaultNavigator @Inject constructor(
         startActivity(context, intent, buildTask)
     }
 
-    override fun switchToSpace(context: Context, spaceId: String, roomId: String?, openShareSheet: Boolean) {
+    override fun switchToSpace(context: Context, spaceId: String, postSwitchSpaceAction: Navigator.PostSwitchSpaceAction) {
         if (sessionHolder.getSafeActiveSession()?.getRoomSummary(spaceId) == null) {
             fatalError("Trying to open an unknown space $spaceId", vectorPreferences.failFast())
             return
         }
         appStateHandler.setCurrentSpace(spaceId)
-        if (roomId != null) {
-            val args = RoomDetailArgs(roomId, eventId = null, openShareSpaceForId = spaceId.takeIf { openShareSheet })
-            val intent = RoomDetailActivity.newIntent(context, args)
-            startActivity(context, intent, false)
-        } else {
-            // go back to home if we are showing room details?
-            // This is a bit ugly, but the navigator is supposed to know about the activity stack
-            if (context is RoomDetailActivity) {
-                context.finish()
+        when (postSwitchSpaceAction) {
+            Navigator.PostSwitchSpaceAction.None -> {
+                // go back to home if we are showing room details?
+                // This is a bit ugly, but the navigator is supposed to know about the activity stack
+                if (context is RoomDetailActivity) {
+                    context.finish()
+                }
+            }
+            Navigator.PostSwitchSpaceAction.OpenAddExistingRooms -> {
+                startActivity(context, SpaceManageActivity.newIntent(context, spaceId), false)
+            }
+            is Navigator.PostSwitchSpaceAction.OpenDefaultRoom -> {
+                val args = RoomDetailArgs(postSwitchSpaceAction.roomId, eventId = null, openShareSpaceForId = spaceId.takeIf { postSwitchSpaceAction.showShareSheet })
+                val intent = RoomDetailActivity.newIntent(context, args)
+                startActivity(context, intent, false)
             }
         }
     }
@@ -236,7 +243,7 @@ class DefaultNavigator @Inject constructor(
                 }
 
                 override fun switchToSpace(spaceId: String) {
-                    this@DefaultNavigator.switchToSpace(context, spaceId, null, openShareSheet = false)
+                    this@DefaultNavigator.switchToSpace(context, spaceId, Navigator.PostSwitchSpaceAction.None)
                 }
             }
             // TODO check if there is already one??
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 489cd37987..2302a749e7 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -38,7 +38,13 @@ interface Navigator {
 
     fun openRoom(context: Context, roomId: String, eventId: String? = null, buildTask: Boolean = false)
 
-    fun switchToSpace(context: Context, spaceId: String, roomId: String?, openShareSheet: Boolean)
+    sealed class PostSwitchSpaceAction {
+        object None : PostSwitchSpaceAction()
+        data class OpenDefaultRoom(val roomId: String, val showShareSheet: Boolean) : PostSwitchSpaceAction()
+        object OpenAddExistingRooms: PostSwitchSpaceAction()
+    }
+
+    fun switchToSpace(context: Context, spaceId: String, postSwitchSpaceAction: PostSwitchSpaceAction)
 
     fun openSpacePreview(context: Context, spaceId: String)
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 3e48a3dee3..21617a1259 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -36,6 +36,7 @@ import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
 import im.vector.app.features.spaces.create.CreateSpaceEvents
 import im.vector.app.features.spaces.create.CreateSpaceState
 import im.vector.app.features.spaces.create.CreateSpaceViewModel
+import im.vector.app.features.spaces.create.SpaceTopology
 import im.vector.app.features.spaces.create.SpaceType
 import javax.inject.Inject
 
@@ -61,7 +62,7 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
                 CreateSpaceState.Step.SetDetails -> {
                     navigateToFragment(ChooseSpaceTypeFragment::class.java)
                 }
-                CreateSpaceState.Step.AddRooms ->  {
+                CreateSpaceState.Step.AddRooms -> {
                     navigateToFragment(CreateSpaceDefaultRoomsFragment::class.java)
                 }
                 CreateSpaceState.Step.ChoosePrivateType -> {
@@ -106,6 +107,9 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
                     setResult(RESULT_OK, Intent().apply {
                         putExtra(RESULT_DATA_CREATED_SPACE_ID, it.spaceId)
                         putExtra(RESULT_DATA_DEFAULT_ROOM_ID, it.defaultRoomId)
+                        if (it.topology == SpaceTopology.JustMe) {
+                            putExtra(RESULT_DATA_CREATED_SPACE_IS_JUST_ME, true)
+                        }
                     })
                     finish()
                 }
@@ -155,6 +159,7 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
     companion object {
         private const val RESULT_DATA_CREATED_SPACE_ID = "RESULT_DATA_CREATED_SPACE_ID"
         private const val RESULT_DATA_DEFAULT_ROOM_ID = "RESULT_DATA_DEFAULT_ROOM_ID"
+        private const val RESULT_DATA_CREATED_SPACE_IS_JUST_ME = "RESULT_DATA_CREATED_SPACE_IS_JUST_ME"
 
         fun newIntent(context: Context): Intent {
             return Intent(context, SpaceCreationActivity::class.java).apply {
@@ -169,6 +174,10 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
         fun getDefaultRoomId(data: Intent?): String? {
             return data?.extras?.getString(RESULT_DATA_DEFAULT_ROOM_ID)
         }
+
+        fun isJustMeSpace(data: Intent?): Boolean {
+            return data?.extras?.getBoolean(RESULT_DATA_CREATED_SPACE_IS_JUST_ME, false) == true
+        }
     }
 
     override fun create(initialState: CreateSpaceState): CreateSpaceViewModel = viewModelFactory.create(initialState)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
index 26661b623f..196ec98d6b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/ChoosePrivateSpaceTypeFragment.kt
@@ -42,8 +42,7 @@ class ChoosePrivateSpaceTypeFragment @Inject constructor(
         super.onViewCreated(view, savedInstanceState)
 
         views.justMeButton.setOnClickListener(DebouncedClickListener({
-            vectorBaseActivity.notImplemented("Organize room as space is not yet implemented")
-//            sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.JustMe))
+            sharedViewModel.handle(CreateSpaceAction.SetSpaceTopology(SpaceTopology.JustMe))
         }))
 
         views.teammatesButton.setOnClickListener(DebouncedClickListener({
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
index 0023399612..c3fa2b2068 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceEvents.kt
@@ -24,7 +24,7 @@ sealed class CreateSpaceEvents : VectorViewEvents {
     object NavigateToAddRooms : CreateSpaceEvents()
     object NavigateToChoosePrivateType : CreateSpaceEvents()
     object Dismiss : CreateSpaceEvents()
-    data class FinishSuccess(val spaceId: String, val defaultRoomId: String?) : CreateSpaceEvents()
+    data class FinishSuccess(val spaceId: String, val defaultRoomId: String?, val topology: SpaceTopology?) : CreateSpaceEvents()
     data class ShowModalError(val errorMessage: String) : CreateSpaceEvents()
     object HideModalLoading : CreateSpaceEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index e61707e6a2..ef2f5029e7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -126,10 +126,12 @@ class CreateSpaceViewModel @AssistedInject constructor(
             SpaceTopology.JustMe -> {
                 setState {
                     copy(
-                            spaceTopology = SpaceTopology.JustMe
+                            spaceTopology = SpaceTopology.JustMe,
+                            defaultRooms = emptyMap()
                     )
                 }
                 // XXX finish and open the add rooms directly
+                handleNextFromDefaultRooms()
             }
             SpaceTopology.MeAndTeammates -> {
                 setState {
@@ -237,14 +239,26 @@ class CreateSpaceViewModel @AssistedInject constructor(
                         setState {
                             copy(creationResult = Success(result.spaceId))
                         }
-                        _viewEvents.post(CreateSpaceEvents.FinishSuccess(result.spaceId, result.childIds.firstOrNull()))
+                        _viewEvents.post(
+                                CreateSpaceEvents.FinishSuccess(
+                                        result.spaceId,
+                                        result.childIds.firstOrNull(),
+                                        state.spaceTopology
+                                )
+                        )
                     }
                     is CreateSpaceTaskResult.PartialSuccess -> {
                         // XXX what can we do here?
                         setState {
                             copy(creationResult = Success(result.spaceId))
                         }
-                        _viewEvents.post(CreateSpaceEvents.FinishSuccess(result.spaceId, result.childIds.firstOrNull()))
+                        _viewEvents.post(
+                                CreateSpaceEvents.FinishSuccess(
+                                        result.spaceId,
+                                        result.childIds.firstOrNull(),
+                                        state.spaceTopology
+                                )
+                        )
                     }
                     is CreateSpaceTaskResult.FailedToCreateSpace -> {
                         setState {

From 31ffa65fd068e5c5217f41b22ebef116368f9055 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 27 Apr 2021 14:15:52 +0200
Subject: [PATCH 213/350] Update add room screen as per design

---
 .../session/room/UpdatableLivePageResult.kt   |  8 ++
 .../room/summary/RoomSummaryDataSource.kt     | 23 ++++-
 .../spaces/manage/AddRoomListController.kt    | 46 ++++++++--
 .../spaces/manage/SpaceAddRoomFragment.kt     | 85 +++++++++++++++++--
 .../spaces/manage/SpaceAddRoomsViewModel.kt   | 28 +++++-
 5 files changed, 174 insertions(+), 16 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableLivePageResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableLivePageResult.kt
index 3bcca0c241..b83f57f5ef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableLivePageResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/UpdatableLivePageResult.kt
@@ -24,4 +24,12 @@ interface UpdatableLivePageResult {
     val livePagedList: LiveData<PagedList<RoomSummary>>
 
     fun updateQuery(builder: (RoomSummaryQueryParams) -> RoomSummaryQueryParams)
+
+    val liveBoundaries: LiveData<ResultBoundaries>
 }
+
+data class ResultBoundaries(
+        val frontLoaded: Boolean = false,
+        val endLoaded: Boolean = false,
+        val zeroItemLoaded: Boolean = false
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index d2bb51cbef..887219fdd8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -18,6 +18,7 @@
 package org.matrix.android.sdk.internal.session.room.summary
 
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
@@ -28,6 +29,7 @@ import io.realm.Sort
 import io.realm.kotlin.where
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.query.RoomCategoryFilter
+import org.matrix.android.sdk.api.session.room.ResultBoundaries
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
@@ -187,9 +189,25 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
             roomSummaryMapper.map(it)
         }
 
+        val boundaries = MutableLiveData(ResultBoundaries())
+
         val mapped = monarchy.findAllPagedWithChanges(
                 realmDataSourceFactory,
-                LivePagedListBuilder(dataSourceFactory, pagedListConfig)
+                LivePagedListBuilder(dataSourceFactory, pagedListConfig).also {
+                    it.setBoundaryCallback(object : PagedList.BoundaryCallback<RoomSummary>() {
+                        override fun onItemAtEndLoaded(itemAtEnd: RoomSummary) {
+                            boundaries.postValue(boundaries.value?.copy(frontLoaded = true))
+                        }
+
+                        override fun onItemAtFrontLoaded(itemAtFront: RoomSummary) {
+                            boundaries.postValue(boundaries.value?.copy(endLoaded = true))
+                        }
+
+                        override fun onZeroItemsLoaded() {
+                            boundaries.postValue(boundaries.value?.copy(zeroItemLoaded = true))
+                        }
+                    })
+                }
         )
 
         return object : UpdatableLivePageResult {
@@ -200,6 +218,9 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
                     roomSummariesQuery(it, builder.invoke(queryParams)).process(sortOrder)
                 }
             }
+
+            override val liveBoundaries: LiveData<ResultBoundaries>
+                get() = boundaries
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
index cc6ebe0f60..46ca2a6606 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
@@ -22,6 +22,8 @@ import com.airbnb.epoxy.paging.PagedListEpoxyController
 import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.core.utils.createUIHandler
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.RoomCategoryItem_
+import org.matrix.android.sdk.api.session.room.ResultBoundaries
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.util.toMatrixItem
@@ -54,6 +56,26 @@ class AddRoomListController @Inject constructor(
     var listener: Listener? = null
     var ignoreRooms: List<String>? = null
 
+    var initialLoadOccurred = false
+
+    fun boundaryChange(boundary: ResultBoundaries) {
+        val boundaryHasLoadedSomething = boundary.frontLoaded || boundary.zeroItemLoaded
+        if (initialLoadOccurred != boundaryHasLoadedSomething) {
+            initialLoadOccurred = boundaryHasLoadedSomething
+            requestForcedModelBuild()
+        }
+    }
+
+    var sectionName: String? = null
+        set(value) {
+            if (value != field) {
+                field = value
+                requestForcedModelBuild()
+            }
+        }
+
+    var totalSize: Int = 0
+
     var selectedItems: Map<String, Boolean> = emptyMap()
         set(value) {
             field = value
@@ -62,15 +84,29 @@ class AddRoomListController @Inject constructor(
         }
 
     override fun addModels(models: List<EpoxyModel<*>>) {
-        if (ignoreRooms == null) {
-            super.addModels(models)
+        val filteredModel = if (ignoreRooms == null) {
+            models
         } else {
-            super.addModels(
-                    models.filter {
-                        it !is RoomSelectionItem ||  !ignoreRooms!!.contains(it.matrixItem.id)
+            models.filter {
+                it !is RoomSelectionItem || !ignoreRooms!!.contains(it.matrixItem.id)
+            }
+        }
+        val somethingToShow = filteredModel.isNotEmpty() || !initialLoadOccurred
+        if (somethingToShow || filteredModel.isNotEmpty()) {
+            add(
+                    RoomCategoryItem_().apply {
+                        id("header")
+                        title(sectionName ?: "")
+                        expanded(true)
                     }
             )
         }
+        super.addModels(filteredModel)
+        if (!initialLoadOccurred) {
+            add(
+                    RoomSelectionPlaceHolderItem_().apply { id("loading") }
+            )
+        }
     }
 
     override fun buildItemModel(currentPosition: Int, item: RoomSummary?): EpoxyModel<*> {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
index dc55373b36..2143b31be7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
@@ -16,6 +16,9 @@
 
 package im.vector.app.features.spaces.manage
 
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
@@ -23,23 +26,30 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.ConcatAdapter
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.airbnb.epoxy.EpoxyViewHolder
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.jakewharton.rxbinding3.appcompat.queryTextChanges
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
-import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSpaceAddRoomsBinding
+import im.vector.app.features.home.room.list.RoomCategoryItem_
 import io.reactivex.rxkotlin.subscribeBy
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class SpaceAddRoomFragment @Inject constructor(
-        private val epoxyController: AddRoomListController,
+        private val spaceEpoxyController: AddRoomListController,
+        private val roomEpoxyController: AddRoomListController,
         private val viewModelFactory: SpaceAddRoomsViewModel.Factory
 ) : VectorBaseFragment<FragmentSpaceAddRoomsBinding>(),
         OnBackPressed, AddRoomListController.Listener, SpaceAddRoomsViewModel.Factory {
@@ -79,7 +89,8 @@ class SpaceAddRoomFragment @Inject constructor(
                 .disposeOnDestroyView()
 
         viewModel.selectionListLiveData.observe(viewLifecycleOwner) {
-            epoxyController.selectedItems = it
+            spaceEpoxyController.selectedItems = it
+            roomEpoxyController.selectedItems = it
             saveNeeded = it.values.any { it }
             invalidateOptionsMenu()
         }
@@ -89,7 +100,8 @@ class SpaceAddRoomFragment @Inject constructor(
         }.disposeOnDestroyView()
 
         viewModel.selectSubscribe(this, SpaceAddRoomsState::ignoreRooms) {
-            epoxyController.ignoreRooms = it
+            spaceEpoxyController.ignoreRooms = it
+            roomEpoxyController.ignoreRooms = it
         }.disposeOnDestroyView()
 
         viewModel.selectSubscribe(this, SpaceAddRoomsState::isSaving) {
@@ -142,16 +154,71 @@ class SpaceAddRoomFragment @Inject constructor(
 
     override fun onDestroyView() {
         views.roomList.cleanup()
-        epoxyController.listener = null
+        spaceEpoxyController.listener = null
+        roomEpoxyController.listener = null
         super.onDestroyView()
     }
 
     private fun setupRecyclerView() {
-        views.roomList.configureWith(epoxyController, showDivider = true)
-        epoxyController.listener = this
-        viewModel.updatableLivePageResult.livePagedList.observe(viewLifecycleOwner) {
-            epoxyController.submitList(it)
+        val concatAdapter = ConcatAdapter()
+        spaceEpoxyController.sectionName = getString(R.string.spaces_header)
+        roomEpoxyController.sectionName = getString(R.string.rooms_header)
+        spaceEpoxyController.listener = this
+        roomEpoxyController.listener = this
+
+        viewModel.updatableLiveSpacePageResult.liveBoundaries.observe(viewLifecycleOwner) {
+            spaceEpoxyController.boundaryChange(it)
         }
+        viewModel.updatableLiveSpacePageResult.livePagedList.observe(viewLifecycleOwner) {
+            spaceEpoxyController.totalSize = it.size
+            spaceEpoxyController.submitList(it)
+        }
+
+        viewModel.updatableLivePageResult.liveBoundaries.observe(viewLifecycleOwner) {
+            roomEpoxyController.boundaryChange(it)
+        }
+        viewModel.updatableLivePageResult.livePagedList.observe(viewLifecycleOwner) {
+            roomEpoxyController.totalSize = it.size
+            roomEpoxyController.submitList(it)
+        }
+
+        views.roomList.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        views.roomList.addItemDecoration(
+
+                object : DividerItemDecoration(context, VERTICAL) {
+                    val decorationDrawable = ContextCompat.getDrawable(requireContext(), R.drawable.divider_horizontal)
+
+                    override fun getDrawable(): Drawable? {
+                        return decorationDrawable
+                    }
+
+                    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+                        val position = parent.getChildAdapterPosition(view)
+                        val vh = parent.findViewHolderForAdapterPosition(position)
+                        val nextIsSectionOrFinal = parent.findViewHolderForAdapterPosition(position + 1)?.let {
+                            (it as? EpoxyViewHolder)?.model is RoomCategoryItem_
+                        } ?: true
+                        if (vh == null
+                                || (vh as? EpoxyViewHolder)?.model is RoomCategoryItem_
+                                || nextIsSectionOrFinal
+                        ) {
+                            outRect.setEmpty()
+                        } else {
+                            super.getItemOffsets(outRect, view, parent, state)
+                        }
+                    }
+
+                    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+                        super.onDraw(c, parent, state)
+                    }
+                }
+        )
+        views.roomList.setHasFixedSize(true)
+
+        concatAdapter.addAdapter(roomEpoxyController.adapter)
+        concatAdapter.addAdapter(spaceEpoxyController.adapter)
+
+        views.roomList.adapter = concatAdapter
     }
 
     override fun onBackPressed(toolbarButton: Boolean): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index e12aa14e83..5b1674d44a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -40,6 +40,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 
 class AddRoomError(val errorList: Map<String, Throwable>) : Throwable() {
@@ -53,11 +54,31 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
         private val session: Session
 ) : VectorViewModel<SpaceAddRoomsState, SpaceAddRoomActions, SpaceAddRoomsViewEvents>(initialState) {
 
-    val updatableLivePageResult: UpdatableLivePageResult by lazy {
+    val updatableLiveSpacePageResult: UpdatableLivePageResult by lazy {
         session.getFilteredPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
                     this.excludeType = null
+                    this.includeType = listOf(RoomType.SPACE)
+                    this.activeSpaceId = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
+                    this.displayName = QueryStringValue.Contains(initialState.currentFilter, QueryStringValue.Case.INSENSITIVE)
+                },
+                pagedListConfig = PagedList.Config.Builder()
+                        .setPageSize(10)
+                        .setInitialLoadSizeHint(20)
+                        .setEnablePlaceholders(true)
+                        .setPrefetchDistance(10)
+                        .build(),
+                sortOrder = RoomSortOrder.NAME
+        )
+    }
+
+    val updatableLivePageResult: UpdatableLivePageResult by lazy {
+        session.getFilteredPagedRoomSummariesLive(
+                roomSummaryQueryParams {
+                    this.memberships = listOf(Membership.JOIN)
+                    this.excludeType = listOf(RoomType.SPACE)
+                    this.includeType = null
                     this.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
                     this.activeSpaceId = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
                     this.displayName = QueryStringValue.Contains(initialState.currentFilter, QueryStringValue.Case.INSENSITIVE)
@@ -116,6 +137,11 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
                             displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
                     )
                 }
+                updatableLiveSpacePageResult.updateQuery {
+                    it.copy(
+                            displayName = QueryStringValue.Contains(action.filter, QueryStringValue.Case.INSENSITIVE)
+                    )
+                }
                 setState {
                     copy(
                             currentFilter = action.filter

From f89a7496aa4acdcc08cfc40ce1a9c6fc6b5f1942 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 28 Apr 2021 14:52:15 +0200
Subject: [PATCH 214/350] Add action to create new room

---
 .../features/navigation/DefaultNavigator.kt   |  6 +++-
 .../createroom/CreateRoomFragment.kt          |  3 +-
 .../createroom/CreateRoomViewModel.kt         | 22 +++++++++++---
 .../createroom/CreateRoomViewState.kt         |  6 ++--
 .../spaces/SpaceSettingsMenuBottomSheet.kt    |  3 +-
 .../spaces/manage/SpaceAddRoomFragment.kt     |  6 ++--
 .../spaces/manage/SpaceManageActivity.kt      | 26 +++++++++++++++-
 .../manage/SpaceManageSharedViewModel.kt      |  1 +
 .../spaces/manage/SpaceManagedSharedAction.kt |  1 +
 .../manage/SpaceManagedSharedViewEvents.kt    |  1 +
 .../res/layout/fragment_space_add_rooms.xml   | 30 +++++++++----------
 11 files changed, 77 insertions(+), 28 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 4ada274d77..735a29afa4 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -125,7 +125,11 @@ class DefaultNavigator @Inject constructor(
                 startActivity(context, SpaceManageActivity.newIntent(context, spaceId), false)
             }
             is Navigator.PostSwitchSpaceAction.OpenDefaultRoom -> {
-                val args = RoomDetailArgs(postSwitchSpaceAction.roomId, eventId = null, openShareSpaceForId = spaceId.takeIf { postSwitchSpaceAction.showShareSheet })
+                val args = RoomDetailArgs(
+                        postSwitchSpaceAction.roomId,
+                        eventId = null,
+                        openShareSpaceForId = spaceId.takeIf { postSwitchSpaceAction.showShareSheet }
+                )
                 val intent = RoomDetailActivity.newIntent(context, args)
                 startActivity(context, intent, false)
             }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
index 5a9e3a13aa..d7b4cb4dad 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -47,7 +47,8 @@ import javax.inject.Inject
 
 @Parcelize
 data class CreateRoomArgs(
-        val initialName: String
+        val initialName: String,
+        val parentSpaceId: String? = null
 ) : Parcelable
 
 class CreateRoomFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index a86f06b142..952f08c380 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -42,8 +42,9 @@ import org.matrix.android.sdk.api.session.room.failure.CreateRoomFailure
 import org.matrix.android.sdk.api.session.room.model.RoomDirectoryVisibility
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
+import timber.log.Timber
 
-class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: CreateRoomViewState,
+class CreateRoomViewModel @AssistedInject constructor(@Assisted val initialState: CreateRoomViewState,
                                                       private val session: Session,
                                                       private val rawService: RawService
 ) : VectorViewModel<CreateRoomViewState, CreateRoomAction, CreateRoomViewEvents>(initialState) {
@@ -133,7 +134,8 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr
 
             CreateRoomViewState(
                     isEncrypted = adminE2EByDefault,
-                    hsAdminHasDisabledE2E = !adminE2EByDefault
+                    hsAdminHasDisabledE2E = !adminE2EByDefault,
+                    parentSpaceId = initialState.parentSpaceId
             )
         }
 
@@ -228,9 +230,21 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr
 
         // TODO: Should this be non-cancellable?
         viewModelScope.launch {
-            val result = runCatching { session.createRoom(createRoomParams) }
-            result.fold(
+            runCatching { session.createRoom(createRoomParams) }.fold(
                     { roomId ->
+
+                        if (initialState.parentSpaceId != null) {
+                            // add it as a child
+                            try {
+                                val via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
+                                session.spaceService()
+                                        .getSpace(initialState.parentSpaceId)
+                                        ?.addChildren(roomId, viaServers = via, order = null)
+                            } catch (failure: Throwable) {
+                                Timber.w(failure, "Failed to add as a child")
+                            }
+                        }
+
                         setState {
                             copy(asyncCreateRoomRequest = Success(roomId))
                         }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
index 6bc19dfa20..f060e998ad 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
@@ -32,11 +32,13 @@ data class CreateRoomViewState(
         val disableFederation: Boolean = false,
         val homeServerName: String = "",
         val hsAdminHasDisabledE2E: Boolean = false,
-        val asyncCreateRoomRequest: Async<String> = Uninitialized
+        val asyncCreateRoomRequest: Async<String> = Uninitialized,
+        val parentSpaceId: String?
 ) : MvRxState {
 
     constructor(args: CreateRoomArgs) : this(
-            roomName = args.initialName
+            roomName = args.initialName,
+            parentSpaceId = args.parentSpaceId
     )
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index 82337a3600..5a1d80c240 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -117,7 +117,8 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
         }
 
         views.addRooms.views.bottomSheetActionClickableZone.debouncedClicks {
-            startActivity(SpaceManageActivity.newIntent(requireContext(), spaceArgs.spaceId))
+            dismiss()
+            startActivity(SpaceManageActivity.newIntent(requireActivity(), spaceArgs.spaceId))
         }
 
         views.leaveSpace.views.bottomSheetActionClickableZone.debouncedClicks {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
index 2143b31be7..9a25e79f85 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
@@ -112,9 +112,9 @@ class SpaceAddRoomFragment @Inject constructor(
             }
         }.disposeOnDestroyView()
 
-//        views.createNewRoom.debouncedClicks {
-//            sharedActionViewModel.post(RoomDirectorySharedAction.CreateRoom)
-//        }
+        views.createNewRoom.debouncedClicks {
+            sharedViewModel.handle(SpaceManagedSharedAction.CreateRoom)
+        }
 
         viewModel.observeViewEvents {
             when (it) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
index 25c659e66f..47c8982643 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
@@ -25,9 +25,14 @@ import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
+import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
+import im.vector.app.features.roomdirectory.createroom.CreateRoomArgs
+import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
 import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
 
@@ -39,6 +44,7 @@ data class SpaceManageArgs(
 class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceManageSharedViewModel.Factory {
 
     @Inject lateinit var sharedViewModelFactory: SpaceManageSharedViewModel.Factory
+    private lateinit var sharedDirectoryActionViewModel: RoomDirectorySharedActionViewModel
 
     override fun injectWith(injector: ScreenComponent) {
         injector.inject(this)
@@ -53,9 +59,20 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        sharedDirectoryActionViewModel = viewModelProvider.get(RoomDirectorySharedActionViewModel::class.java)
+        sharedDirectoryActionViewModel
+                .observe()
+                .subscribe { sharedAction ->
+                    when (sharedAction) {
+                        is RoomDirectorySharedAction.Back,
+                        is RoomDirectorySharedAction.Close -> finish()
+                    }
+                }
+                .disposeOnDestroy()
+
+        val args = intent?.getParcelableExtra<SpaceManageArgs>(MvRx.KEY_ARG)
         if (isFirstCreation()) {
             val simpleName = SpaceAddRoomFragment::class.java.simpleName
-            val args = intent?.getParcelableExtra<SpaceManageArgs>(MvRx.KEY_ARG)
             if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
                 supportFragmentManager.commitTransaction {
                     replace(R.id.simpleFragmentContainer,
@@ -78,6 +95,13 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
                 SpaceManagedSharedViewEvents.ShowLoading -> {
                     views.simpleActivityWaitingView.isVisible = true
                 }
+                SpaceManagedSharedViewEvents.NavigateToCreateRoom -> {
+                    addFragmentToBackstack(
+                            R.id.simpleFragmentContainer,
+                            CreateRoomFragment::class.java,
+                            CreateRoomArgs("", parentSpaceId = args?.spaceId)
+                    )
+                }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
index 1d8612f084..24110c081a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
@@ -54,6 +54,7 @@ class SpaceManageSharedViewModel @AssistedInject constructor(
             }
             SpaceManagedSharedAction.HideLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading)
             SpaceManagedSharedAction.ShowLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading)
+            SpaceManagedSharedAction.CreateRoom ->  _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToCreateRoom)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
index 59e2742379..1c0de1041b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
@@ -22,4 +22,5 @@ sealed class SpaceManagedSharedAction : VectorViewModelAction {
     object HandleBack : SpaceManagedSharedAction()
     object ShowLoading : SpaceManagedSharedAction()
     object HideLoading : SpaceManagedSharedAction()
+    object CreateRoom : SpaceManagedSharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
index 067592b6ce..0cf6bcaee1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
@@ -22,4 +22,5 @@ sealed class SpaceManagedSharedViewEvents : VectorViewEvents {
     object Finish : SpaceManagedSharedViewEvents()
     object ShowLoading : SpaceManagedSharedViewEvents()
     object HideLoading : SpaceManagedSharedViewEvents()
+    object NavigateToCreateRoom : SpaceManagedSharedViewEvents()
 }
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 23b2807151..6619d06cca 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -82,21 +82,21 @@
             app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
             app:queryHint="@string/search_hint_room_name" />
 
-        <!--        <com.google.android.material.button.MaterialButton-->
-        <!--            android:id="@+id/createNewRoom"-->
-        <!--            style="@style/VectorButtonStyleText"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginStart="16dp"-->
-        <!--            android:layout_marginTop="8dp"-->
-        <!--            android:layout_marginBottom="8dp"-->
-        <!--            android:minHeight="@dimen/layout_touch_size"-->
-        <!--            android:text="@string/create_new_room"-->
-        <!--            app:icon="@drawable/ic_plus_circle"-->
-        <!--            app:iconPadding="13dp"-->
-        <!--            app:iconTint="@color/riotx_accent"-->
-        <!--            app:layout_constraintStart_toStartOf="parent"-->
-        <!--            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar" />-->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/createNewRoom"
+            style="@style/VectorButtonStyleText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:minHeight="@dimen/layout_touch_size"
+            android:text="@string/create_new_room"
+            app:icon="@drawable/ic_plus_circle"
+            app:iconPadding="13dp"
+            app:iconTint="@color/riotx_accent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

From 30d7c73b2dba086401589e7c14096bbe8ffc3939 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 29 Apr 2021 11:56:57 +0200
Subject: [PATCH 215/350] code review

---
 .../features/roomdirectory/createroom/CreateRoomViewModel.kt  | 4 ++--
 .../im/vector/app/features/spaces/SpaceCreationActivity.kt    | 4 +---
 .../vector/app/features/spaces/create/CreateSpaceViewModel.kt | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 952f08c380..4eb05fb697 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -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 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 rawService: RawService
 ) : VectorViewModel<CreateRoomViewState, CreateRoomAction, CreateRoomViewEvents>(initialState) {
@@ -236,7 +236,7 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted val initialState
                         if (initialState.parentSpaceId != null) {
                             // add it as a child
                             try {
-                                val via = session.sessionParams.homeServerHost?.let { listOf(it) } ?: emptyList()
+                                val via = session.sessionParams.homeServerHost?.let { listOf(it) }.orEmpty()
                                 session.spaceService()
                                         .getSpace(initialState.parentSpaceId)
                                         ?.addChildren(roomId, viaServers = via, order = null)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
index 21617a1259..bc06d1a52b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceCreationActivity.kt
@@ -107,9 +107,7 @@ class SpaceCreationActivity : SimpleFragmentActivity(), CreateSpaceViewModel.Fac
                     setResult(RESULT_OK, Intent().apply {
                         putExtra(RESULT_DATA_CREATED_SPACE_ID, it.spaceId)
                         putExtra(RESULT_DATA_DEFAULT_ROOM_ID, it.defaultRoomId)
-                        if (it.topology == SpaceTopology.JustMe) {
-                            putExtra(RESULT_DATA_CREATED_SPACE_IS_JUST_ME, true)
-                        }
+                        putExtra(RESULT_DATA_CREATED_SPACE_IS_JUST_ME, it.topology == SpaceTopology.JustMe)
                     })
                     finish()
                 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
index ef2f5029e7..9881232f4d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
@@ -130,7 +130,6 @@ class CreateSpaceViewModel @AssistedInject constructor(
                             defaultRooms = emptyMap()
                     )
                 }
-                // XXX finish and open the add rooms directly
                 handleNextFromDefaultRooms()
             }
             SpaceTopology.MeAndTeammates -> {

From 55f1f56fec7b6fcecb968d0e13c2a3a250e8da65 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 29 Apr 2021 12:14:55 +0200
Subject: [PATCH 216/350] `master` branch has been renamed to `main` Also in
 project vector-im/jitsi_libre_maven

---
 CHANGES.md          | 8 ++++++++
 build.gradle        | 2 +-
 vector/build.gradle | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8a193e762c..44eadc423d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,14 @@ Test:
 
 Other changes:
  - New store descriptions
+ - `master` branch has been renamed to `main`. To apply change to your dev environment, run:
+```sh
+git branch -m master main
+git fetch origin
+git branch -u origin/main main
+# And optionally
+git remote prune origin
+```
 
 Changes in Element 1.1.6 (2021-04-16)
 ===================================================
diff --git a/build.gradle b/build.gradle
index 537a78992d..25734e3b09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,7 @@ allprojects {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         // Jitsi repo
         maven {
-            url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.1.0"
+            url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-3.1.0"
             // Note: to test Jitsi release you can use a local file like this:
             // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.1.0"
         }
diff --git a/vector/build.gradle b/vector/build.gradle
index 7569e0c32f..3ecdcea524 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -64,9 +64,9 @@ static def gitBranchName() {
     }
 }
 
-// For Google Play build, build on any other branch than master will have a "-dev" suffix
+// For Google Play build, build on any other branch than main will have a "-dev" suffix
 static def getGplayVersionSuffix() {
-    if (gitBranchName() == "master") {
+    if (gitBranchName() == "main") {
         return ""
     } else {
         return "-dev"
@@ -119,7 +119,7 @@ android {
         renderscriptSupportModeEnabled true
 
         // `develop` branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode.
-        // Other branches (master, features, etc.) will have version code based on application version.
+        // Other branches (main, features, etc.) will have version code based on application version.
         versionCode project.getVersionCode()
 
         // Required for sonar analysis

From ab68903d7fc92b7942306b9631b639a463b5b5f2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 29 Apr 2021 15:47:31 +0200
Subject: [PATCH 217/350] Fix wording issue (#3242)

---
 CHANGES.md                             | 1 +
 vector/src/main/res/values/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 44eadc423d..74b008bfc4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ Bugfix 🐛:
  - Fix color issues when the system theme is changed (#2738)
  - Fix issues on Android 11 (#3067)
  - Fix issue when opening encrypted files (#3186)
+ - Fix wording issue (#3242)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 26367cb9a5..c7153df6e4 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2378,7 +2378,7 @@
 
     <string name="login_server_title">Select a server</string>
     <string name="login_server_text">Just like email, accounts have one home, although you can talk to anyone</string>
-    <string name="login_server_matrix_org_text">Join millions free on the largest public server</string>
+    <string name="login_server_matrix_org_text">Join millions for free on the largest public server</string>
     <string name="login_server_modular_text">Premium hosting for organisations</string>
     <string name="login_server_modular_learn_more">Learn more</string>
     <string name="login_server_other_title">Other</string>

From d28c6039c0ed9799e96eba0e23d1143f4e7e657c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 29 Apr 2021 17:06:46 +0200
Subject: [PATCH 218/350] Fix issue in string template

---
 vector/src/main/res/values-lv/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 4e3055b472..0a13e92972 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -2033,7 +2033,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="template_settings_opt_in_of_analytics_prompt">Lūdzu, ieslēdziet analītiku, lai palīdzētu mums uzlabot ${app_name}.</string>
     <string name="template_settings_opt_in_of_analytics_summary">${app_name} apkopo anonīmu analītiku, lai ļautu mums uzlabot aplikāciju.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Iedot atļauju</string>
-    <string name="template_startup_notification_fdroid_battery_optim_message">${App_name} ir nepieciešams fona savienojums, lai spētu laicīgi piegādāt notifikācijas.
+    <string name="template_startup_notification_fdroid_battery_optim_message">${app_name} ir nepieciešams fona savienojums, lai spētu laicīgi piegādāt notifikācijas.
 \nNākamajā ekrānā tiks piedāvāts atļaut ${app_name}, lai vienmēr darbotos fonā, lūdzu piekrītat.</string>
     <string name="startup_notification_fdroid_battery_optim_title">Fona savienojums</string>
     <string name="startup_notification_privacy_button_other">Izvēlaties citu opciju</string>
@@ -2068,12 +2068,12 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Salabot Play Servisus</string>
     <string name="error_threepid_auth_failed">Pārliecinieties, ka esat nospiedis uz saites e-pasta ziņojumā, ko esam nosūtījuši jums.</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimizēts akumulatoram</string>
-    <string name="template_settings_background_fdroid_sync_mode_battery_description">${App_name} sinhronizēsies fonā, tā lai ietaupītu telefona bateriju.
+    <string name="template_settings_background_fdroid_sync_mode_battery_description">${app_name} sinhronizēsies fonā, tā lai ietaupītu telefona bateriju.
 \nAtkarībā no ierīces baterijas stāvokļa, sinhronizāciju var atcelt operētājsistēma.</string>
     <string name="settings_notification_privacy_need_permission">Aplikācijai vajag atļauju, lai strādātu fonā</string>
     <string name="settings_notification_privacy_reduced">Samazināts privātums</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorēt optimizāciju</string>
-    <string name="template_settings_troubleshoot_test_battery_success">${App_name} neietekmē akumulatora optimizācija.</string>
+    <string name="template_settings_troubleshoot_test_battery_success">${app_name} neietekmē akumulatora optimizācija.</string>
     <string name="settings_troubleshoot_test_battery_title">Akumulatora Optimizācija</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Ieslēgt Aplikācijas palaišanu kopā ar telefonu</string>
     <string name="settings_troubleshoot_test_play_services_title">Play Servisu Pārbaude</string>

From 90f4a9490dacb549113348d551ab694362193bcb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 29 Apr 2021 17:33:14 +0200
Subject: [PATCH 219/350] Fix lint issues

---
 vector/src/main/res/values-ja/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index c1f95326cb..69aaecc085 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -1216,7 +1216,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">1つ以上のテストが失敗しました。調査に役立つバグレポートを送信してください。</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">1つ以上のテストが失敗しました。提案された修正を試してください。</string>
     <string name="settings_troubleshoot_diagnostic_success_status">基本的な診断はOKです。 それでも通知が届かない場合は、調査に役立つバグレポートを送信してください。</string>
-    <string name="settings_troubleshoot_diagnostic_running_status">実行中... (%1$dの %2$d)</string>
+    <string name="settings_troubleshoot_diagnostic_running_status">実行中… (%1$dの %2$d)</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">テストを実行する</string>
     <string name="settings_troubleshoot_diagnostic">診断トラブルシューティング</string>
     <string name="settings_notification_by_event">イベントごとの通知の優先順位</string>
@@ -1436,7 +1436,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     <string name="power_level_default">デフォルト</string>
     <string name="power_level_moderator">モデレーター</string>
     <string name="power_level_admin">管理者</string>
-    <string name="notice_widget_jitsi_modified_by_you">あなたが %1$sがビデオ会議を変更しました</string>
+    <string name="notice_widget_jitsi_modified_by_you">あなたががビデオ会議を変更しました</string>
     <string name="notice_widget_jitsi_modified">%1$sがビデオ会議を変更しました</string>
     <string name="notice_widget_jitsi_added_by_you">ビデオ会議を開始しました</string>
     <string name="notice_widget_jitsi_removed_by_you">ビデオ会議を終了しました</string>

From 33337bd77292c7dec2cf4365bf14a7b51f9dc3fe Mon Sep 17 00:00:00 2001
From: Toby Murray <toby.murray@protonmail.com>
Date: Fri, 30 Apr 2021 00:47:57 -0400
Subject: [PATCH 220/350] Allow cleartext to some LAN domains

This functionality exists in the desktop client, so hoping to mirror that as much as Android allows

This addresses a number of the use cases touched on in #1793. Enabling clear text to various official and standard LAN-only domains means it's easier to develop the Android application, as a Matrix server can be deployed locally without much fuss anywhere on the developer's LAN. This can reduce the reliance on a DNS or SSL certificates when neither are really relevant to the functionality of the client/server. In particular, managing SSL certs without a public domain is a pain in the butt.

At the same time, this does not significantly diminish the security of Element Android, as at the current time these domains are either explicitly not valid TLDs or conventionally not TLDs (so would be an unexpected change if they were to become so). In the event e.g. `.home` becomes a TLD, it would be appropriate to remove it from this list.
---
 CHANGES.md                                          |  1 +
 vector/src/main/res/xml/network_security_config.xml | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 74b008bfc4..112c0c0d61 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -38,6 +38,7 @@ git branch -u origin/main main
 # And optionally
 git remote prune origin
 ```
+ - Allow cleartext (non-SSL) connections to Matrix servers on LAN hosts (#3166)
 
 Changes in Element 1.1.6 (2021-04-16)
 ===================================================
diff --git a/vector/src/main/res/xml/network_security_config.xml b/vector/src/main/res/xml/network_security_config.xml
index 4bf79f16ba..b9f3d03986 100644
--- a/vector/src/main/res/xml/network_security_config.xml
+++ b/vector/src/main/res/xml/network_security_config.xml
@@ -13,6 +13,16 @@
         <domain includeSubdomains="true">10.0.2.2</domain>
         <!-- Onion services -->
         <domain includeSubdomains="true">onion</domain>
+
+        <!-- Domains that are used for LANs -->
+        <!-- These are IANA recognized special use domain names, see https://www.iana.org/assignments/special-use-domain-names/special-use-domain-names.xhtml -->
+        <domain includeSubdomains="true">home.arpa</domain>
+        <domain includeSubdomains="true">local</domain> <!-- Note this has been reserved for use with mDNS -->
+        <domain includeSubdomains="true">test</domain>
+        <!-- These are observed in the wild either by convention or RFCs that have not been accepted, and are not currently TLDs -->
+        <domain includeSubdomains="true">home</domain>
+        <domain includeSubdomains="true">lan</domain>
+        <domain includeSubdomains="true">localdomain</domain>
     </domain-config>
 
     <debug-overrides>

From 61800765128972ad61e7ebacc0687b7beeb33274 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Apr 2021 10:48:48 +0200
Subject: [PATCH 221/350] Delete and react to stickers (#3250)

---
 CHANGES.md                                        |  1 +
 .../vector/app/core/extensions/TimelineEvent.kt   |  6 ++++--
 .../timeline/action/MessageActionsViewModel.kt    | 15 +++++++--------
 .../helper/MessageInformationDataFactory.kt       |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 74b008bfc4..fc73cf5f48 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Features ✨:
 
 Improvements 🙌:
  - Add ability to install APK from directly from Element (#2381)
+ - Delete and react to stickers (#3250)
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
diff --git a/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
index 63e35c1c0f..48e3a488ed 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
@@ -21,6 +21,8 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 
 fun TimelineEvent.canReact(): Boolean {
-    // Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment
-    return root.getClearType() == EventType.MESSAGE && root.sendState == SendState.SYNCED && !root.isRedacted()
+    // Only event of type EventType.MESSAGE or EventType.STICKER are supported for the moment
+    return root.getClearType() in listOf(EventType.MESSAGE, EventType.STICKER)
+            && root.sendState == SendState.SYNCED
+            && !root.isRedacted()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index a3f647871b..98df69d3fb 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -394,7 +394,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun canReply(event: TimelineEvent, messageContent: MessageContent?, actionPermissions: ActionPermissions): Boolean {
-        // Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment
+        // Only event of type EventType.MESSAGE are supported for the moment
         if (event.root.getClearType() != EventType.MESSAGE) return false
         if (!actionPermissions.canSendMessage) return false
         return when (messageContent?.msgType) {
@@ -410,7 +410,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun canQuote(event: TimelineEvent, messageContent: MessageContent?, actionPermissions: ActionPermissions): Boolean {
-        // Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment
+        // Only event of type EventType.MESSAGE are supported for the moment
         if (event.root.getClearType() != EventType.MESSAGE) return false
         if (!actionPermissions.canSendMessage) return false
         return when (messageContent?.msgType) {
@@ -425,8 +425,8 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun canRedact(event: TimelineEvent, actionPermissions: ActionPermissions): Boolean {
-        // Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment
-        if (event.root.getClearType() != EventType.MESSAGE) return false
+        // Only event of type EventType.MESSAGE are supported for the moment
+        if (event.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER)) return false
         // Message sent by the current user can always be redacted
         if (event.root.senderId == session.myUserId) return true
         // Check permission for messages sent by other users
@@ -440,14 +440,13 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun canViewReactions(event: TimelineEvent): Boolean {
-        // Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment
-        if (event.root.getClearType() != EventType.MESSAGE) return false
-        // TODO if user is admin or moderator
+        // Only event of type EventType.MESSAGE and EventType.STICKER are supported for the moment
+        if (event.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER)) return false
         return event.annotations?.reactionsSummary?.isNotEmpty() ?: false
     }
 
     private fun canEdit(event: TimelineEvent, myUserId: String, actionPermissions: ActionPermissions): Boolean {
-        // Only event of type Event.EVENT_TYPE_MESSAGE are supported for the moment
+        // Only event of type EventType.MESSAGE are supported for the moment
         if (event.root.getClearType() != EventType.MESSAGE) return false
         if (!actionPermissions.canSendMessage) return false
         // TODO if user is admin or moderator
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 14dd311265..b1e438dff1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -66,7 +66,7 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                 addDaySeparator
                         || event.senderInfo.avatarUrl != nextEvent?.senderInfo?.avatarUrl
                         || event.senderInfo.disambiguatedDisplayName != nextEvent?.senderInfo?.disambiguatedDisplayName
-                        || (nextEvent.root.getClearType() != EventType.MESSAGE && nextEvent.root.getClearType() != EventType.ENCRYPTED)
+                        || nextEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED)
                         || isNextMessageReceivedMoreThanOneHourAgo
                         || isTileTypeMessage(nextEvent)
 

From 589be8b15f1a379dffcde9a7f92c69d14cbb948e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 30 Apr 2021 11:56:45 +0200
Subject: [PATCH 222/350] Update
 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt

---
 .../home/room/detail/timeline/action/MessageActionsViewModel.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 98df69d3fb..b9c368ebdc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -425,7 +425,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
     }
 
     private fun canRedact(event: TimelineEvent, actionPermissions: ActionPermissions): Boolean {
-        // Only event of type EventType.MESSAGE are supported for the moment
+        // Only event of type EventType.MESSAGE or EventType.STICKER are supported for the moment
         if (event.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER)) return false
         // Message sent by the current user can always be redacted
         if (event.root.senderId == session.myUserId) return true

From 47aa787ecb91aab8e0729b44bee650360bb6262b Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 1 May 2021 09:29:31 +0200
Subject: [PATCH 223/350] Fix missing sender information after edits

Fixes https://github.com/vector-im/element-android/issues/3184
---
 CHANGES.md                                                   | 1 +
 .../android/sdk/api/session/room/timeline/TimelineEvent.kt   | 5 +++++
 .../detail/timeline/helper/MessageInformationDataFactory.kt  | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 1c0b7284b0..c40c66a0b2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ Bugfix 🐛:
  - Fix issues on Android 11 (#3067)
  - Fix issue when opening encrypted files (#3186)
  - Fix wording issue (#3242)
+ - Fix missing sender information after edits (#3184)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
index 32f6b94cd8..4a6462477d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
@@ -21,6 +21,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.getRelationContent
+import org.matrix.android.sdk.api.session.events.model.isEdition
 import org.matrix.android.sdk.api.session.events.model.isReply
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
@@ -151,6 +152,10 @@ fun TimelineEvent.isReply(): Boolean {
     return root.isReply()
 }
 
+fun TimelineEvent.isEdition(): Boolean {
+    return root.isEdition()
+}
+
 fun TimelineEvent.getTextEditableContent(): String? {
     val lastContent = getLastMessageContent()
     return if (isReply()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index b1e438dff1..124b196f72 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -39,6 +39,7 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.hasBeenEdited
+import org.matrix.android.sdk.api.session.room.timeline.isEdition
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 import javax.inject.Inject
 
@@ -69,6 +70,7 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
                         || nextEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED)
                         || isNextMessageReceivedMoreThanOneHourAgo
                         || isTileTypeMessage(nextEvent)
+                        || nextEvent.isEdition()
 
         val time = dateFormatter.format(event.root.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
         val e2eDecoration = getE2EDecoration(event)

From e3204c32a1360ec1678de4359a43e748a235c69d Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 1 May 2021 11:35:39 +0200
Subject: [PATCH 224/350] Fix updating read marker automatically

Co-authored-by: Benoit Marty <benoitm@matrix.org>
---
 CHANGES.md                                                      | 1 +
 .../vector/app/features/home/room/detail/RoomDetailViewModel.kt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index c40c66a0b2..027b9e8416 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Bugfix 🐛:
  - Fix issue when opening encrypted files (#3186)
  - Fix wording issue (#3242)
  - Fix missing sender information after edits (#3184)
+ - Fix read marker not updating automatically (#3267)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index d64acb9afb..1dd13bf481 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -550,7 +550,7 @@ class RoomDetailViewModel @AssistedInject constructor(
     private fun stopTrackingUnreadMessages() {
         if (trackUnreadMessages.getAndSet(false)) {
             mostRecentDisplayedEvent?.root?.eventId?.also {
-                viewModelScope.launch {
+                session.coroutineScope.launch {
                     tryOrNull { room.setReadMarker(it) }
                 }
             }

From 0a9fdea26de5dff22876b653b89bae32e66bad34 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 3 May 2021 00:27:28 +0200
Subject: [PATCH 225/350] https://github.com/Piasy/BigImageViewer is now hosted
 on mavenCentral()

---
 CHANGES.md   | 1 +
 build.gradle | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 74b008bfc4..7fd985c849 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ SDK API changes ⚠️:
 
 Build 🧱:
  - Upgrade to gradle 7
+ - https://github.com/Piasy/BigImageViewer is now hosted on mavenCentral()
 
 Test:
  -
diff --git a/build.gradle b/build.gradle
index 25734e3b09..faf0fcf0b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,12 +50,6 @@ allprojects {
                 includeGroupByRegex 'nl\\.dionsegijn'
             }
         }
-        maven {
-            url "https://dl.bintray.com/piasy/maven"
-            content {
-                includeGroupByRegex "com\\.github\\.piasy"
-            }
-        }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         // Jitsi repo
         maven {
@@ -64,6 +58,7 @@ allprojects {
             // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.1.0"
         }
         google()
+        mavenCentral()
         jcenter()
     }
 

From 01d857bbcefe1492453337398cb44d5d9707a8f0 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 30 Apr 2021 15:07:37 +0000
Subject: [PATCH 226/350] Translated using Weblate (Italian)

Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
---
 vector/src/main/res/values-it/strings.xml | 79 +++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 2438b5d2ce..542ab5783b 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2735,4 +2735,83 @@
     <string name="initial_sync_start_server_computing">Sinc. iniziale:
 \nIn attesa di risposta dal server…</string>
     <string name="event_status_sent_message">Messaggio inviato</string>
+    <string name="labs_use_restricted_join_rule_desc">L\'avviso richiede il supporto del server e una versione di stanza sperimentale</string>
+    <string name="labs_use_restricted_join_rule">Spazio sperimentale - stanza riservata.</string>
+    <string name="you_are_invited">Sei invitato</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Gli spazi sono modi di raggruppare stanze e persone per lavoro, divertimento o solo per te stesso.</string>
+    <string name="spaces_beta_welcome_to_spaces">Benvenuti negli spazi!</string>
+    <string name="space_add_existing_rooms">Aggiungi stanze e spazi esistenti</string>
+    <string name="space_leave_prompt_msg">Vuoi veramente uscire dallo spazio\?</string>
+    <string name="leave_space">Esci dallo spazio</string>
+    <string name="space_add_child_title">Aggiungi stanze</string>
+    <string name="space_explore_activity_title">Esplora stanze</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d persona che conosci si è già unita</item>
+        <item quantity="other">%d persone che conosci si sono già unite</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Benvenuti a %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Non sei ancora in nessuna stanza. Sotto trovi alcune stanze consigliate, ma puoi vederne altre con il pulsante verde in fondo a destra.</string>
+    <string name="room_alias_preview_not_found">Questo alias non è accessibile al momento.
+\nRiprova più tardi, o chiedi ad un amministratore della stanza di controllare se hai l\'accesso.</string>
+    <string name="join_anyway">Unisciti comunque</string>
+    <string name="join_space">Unisciti ad uno spazio</string>
+    <string name="create_space">Crea spazio</string>
+    <string name="skip_for_now">Salta per adesso</string>
+    <string name="share_space_link_message">Unisciti al mio spazio %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">Non faranno parte di %s</string>
+    <string name="invite_just_to_this_room">Solo in questa stanza</string>
+    <string name="invite_to_space_with_name_desc">Potranno esplorare %s</string>
+    <string name="invite_to_space_with_name">Invita in %s</string>
+    <string name="invite_by_link">Condividi collegamento</string>
+    <string name="invite_by_mxid">Invita per nome utente</string>
+    <string name="invite_by_email">Invita per email</string>
+    <string name="invite_people_to_your_space_desc">Ci sei solo tu al momento. %s sarà ancora meglio con gli altri.</string>
+    <string name="invite_people_menu">Invita persone</string>
+    <string name="invite_people_to_your_space">Invita persone nel tuo spazio</string>
+    <string name="create_space_topic_hint">Descrizione</string>
+    <string name="create_spaces_loading_message">Creazione spazio…</string>
+    <string name="create_spaces_default_public_random_room_name">Casuale</string>
+    <string name="create_spaces_default_public_room_name">Generale</string>
+    <string name="create_spaces_room_private_header_desc">Creiamo una stanza per ognuno di esse. Puoi aggiungerne altre in seguito, incluse quelle già esistenti.</string>
+    <string name="create_spaces_room_private_header">Su quali cose stai lavorando\?</string>
+    <string name="create_spaces_room_public_header_desc">Creeremo delle stanze per ognuno di essi. Puoi aggiungerne altre in seguito.</string>
+    <string name="create_spaces_room_public_header">Di quali argomenti vorresti parlare in %s\?</string>
+    <string name="create_space_error_empty_field_space_name">Dagli un nome per continuare.</string>
+    <string name="create_spaces_details_private_header">Aggiungi alcuni dettagli per aiutare le persone ad identificarlo. Puoi modificarli in qualsiasi momento.</string>
+    <string name="create_spaces_details_public_header">Aggiungi alcuni dettagli per renderlo più distinguibile. Puoi modificarli in qualsiasi momento.</string>
+    <string name="activity_create_space_title">Crea uno spazio</string>
+    <string name="space_type_private_desc">Solo su invito, consigliato per te o i team</string>
+    <string name="space_type_private">Privato</string>
+    <string name="space_type_public_desc">Aperto a tutti, consigliato per le comunità</string>
+    <string name="space_type_public">Pubblico</string>
+    <string name="create_spaces_private_teammates">Uno spazio privato per te e i tuoi compagni</string>
+    <string name="create_spaces_me_and_teammates">Io e i miei compagni</string>
+    <string name="create_spaces_organise_rooms">Uno spazio privato per organizzare le tue stanze</string>
+    <string name="create_spaces_just_me">Solo io</string>
+    <string name="create_spaces_make_sure_access">Assicurati che le persone giuste abbiano accesso a %s. Puoi cambiarlo in seguito.</string>
+    <string name="create_spaces_who_are_you_working_with">Con chi stai lavorando\?</string>
+    <string name="create_spaces_join_info_help">Per unirti ad uno spazio esistente, ti serve un invito.</string>
+    <string name="create_spaces_you_can_change_later">Puoi cambiarlo in seguito</string>
+    <string name="create_spaces_choose_type_label">Che tipo di spazio vuoi creare\?</string>
+    <string name="create_spaces_type_header">Gli spazi sono un nuovo modo di raggruppare stanze e persone</string>
+    <string name="your_private_space">Il tuo spazio privato</string>
+    <string name="your_public_space">Il tuo spazio pubblico</string>
+    <string name="add_space">Aggiungi spazio</string>
+    <string name="command_description_leave_room">Esci dalla stanza con un dato ID (o dalla stanza attuale se vuoto)</string>
+    <string name="command_description_join_space">Unisciti allo spazio con un dato ID</string>
+    <string name="command_description_create_space">Crea uno spazio</string>
+    <string name="a11y_unchecked">Non controllato</string>
+    <string name="search_hint_room_name">Cerca nome</string>
+    <string name="room_settings_room_access_restricted_description">Chiunque in uno spazio con questa stanza può trovarla ed entrarci. Solo gli amministratori della stanza possono aggiungerla ad uno spazio.</string>
+    <string name="room_settings_room_access_restricted_title">Spazi</string>
+    <string name="room_settings_room_access_public_description">Chiunque può trovarla ed entrare</string>
+    <string name="room_settings_room_access_public_title">Pubblica</string>
+    <string name="room_settings_room_access_private_description">Solo le persone invitate possono trovarla ed entrare</string>
+    <string name="room_settings_room_access_private_title">Privata</string>
+    <string name="room_settings_room_access_entry_unknown">Impostazione di accesso sconosciuta (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Chiunque può bussare alla porta, poi i membri possono accettare o rifiutare</string>
+    <string name="room_settings_guest_access_title">Permetti l\'ingresso agli ospiti</string>
+    <string name="spaces_header">Spazi</string>
+    <string name="spaces_invited_header">Inviti</string>
+    <string name="suggested_header">Stanze suggerite</string>
 </resources>
\ No newline at end of file

From 9e1a24eaf9620006fbbba3e86e49912437b92597 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 30 Apr 2021 06:04:30 +0000
Subject: [PATCH 227/350] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
---
 vector/src/main/res/values-zh-rTW/strings.xml | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index bd628d9bdb..beff6c35fd 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2622,4 +2622,82 @@
     <string name="settings_room_directory_show_all_rooms">顯示帶有明確內容的聊天室</string>
     <string name="settings_category_room_directory">聊天室目錄</string>
     <string name="event_status_sent_message">訊息已傳送</string>
+    <string name="labs_use_restricted_join_rule_desc">警告需要伺服器支援與實驗性聊天室版本</string>
+    <string name="labs_use_restricted_join_rule">實驗性空間 - 受限制的聊天室。</string>
+    <string name="you_are_invited">您被邀請了</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">空間是將聊天室與夥伴依工作、娛樂或是您自己的喜好分組的方式。</string>
+    <string name="spaces_beta_welcome_to_spaces">歡迎使用空間！</string>
+    <string name="space_add_existing_rooms">新增既有的聊天室與空間</string>
+    <string name="space_leave_prompt_msg">您確定您想要離開空間嗎？</string>
+    <string name="leave_space">離開空間</string>
+    <string name="space_add_child_title">新增聊天室</string>
+    <string name="space_explore_activity_title">探索聊天室</string>
+    <plurals name="space_people_you_know">
+        <item quantity="other">您認識的 %d 個人已加入</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">歡迎來到 %1$s，%2$s。</string>
+    <string name="suggested_rooms_pills_on_empty_text">您還沒有任何聊天室。下面是一些建議的聊天室，但您可以透過右下角的按鈕檢視更多。</string>
+    <string name="room_alias_preview_not_found">目前無法存取此別名。
+\n請稍後再試，或要求聊天室管理員檢查您是否有權存取。</string>
+    <string name="join_anyway">無論如何都要加入</string>
+    <string name="join_space">加入空間</string>
+    <string name="create_space">建立空間</string>
+    <string name="skip_for_now">現在略過</string>
+    <string name="share_space_link_message">加入我的空間 %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">他們不會是 %s 的一部分</string>
+    <string name="invite_just_to_this_room">剛到此聊天室</string>
+    <string name="invite_to_space_with_name_desc">他們將可以探索 %s</string>
+    <string name="invite_to_space_with_name">邀請至 %s</string>
+    <string name="invite_by_link">分享連結</string>
+    <string name="invite_by_mxid">透過使用者名稱邀請</string>
+    <string name="invite_by_email">透過電子郵件邀請</string>
+    <string name="invite_people_to_your_space_desc">此刻只有您。%s 與其他人一起會更好。</string>
+    <string name="invite_people_menu">邀請夥伴</string>
+    <string name="invite_people_to_your_space">邀請夥伴進入您的空間</string>
+    <string name="create_space_topic_hint">描述</string>
+    <string name="create_spaces_loading_message">正在建立空間……</string>
+    <string name="create_spaces_default_public_random_room_name">隨機</string>
+    <string name="create_spaces_default_public_room_name">一般</string>
+    <string name="create_spaces_room_private_header_desc">讓我們為每個主題建立一個聊天室。您也可以稍後再新增，包含既有的。</string>
+    <string name="create_spaces_room_private_header">您在忙些什麼？</string>
+    <string name="create_spaces_room_public_header_desc">我們將會為此建立聊天室。您也可以在稍後新增更多。</string>
+    <string name="create_spaces_room_public_header">您希望在 %s 中進行哪些討論？</string>
+    <string name="create_space_error_empty_field_space_name">為它命名以繼續。</string>
+    <string name="create_spaces_details_private_header">新增一些詳細資訊以協助人們識別。您隨時可以變更這些資訊。</string>
+    <string name="create_spaces_details_public_header">加入一些詳細資訊以協助其脫穎而出。您隨時都可以變更這些資料。</string>
+    <string name="activity_create_space_title">建立空間</string>
+    <string name="space_type_private_desc">僅邀請，最適合您自己或團隊</string>
+    <string name="space_type_private">私人</string>
+    <string name="space_type_public_desc">對任何人開放，最適合社群</string>
+    <string name="space_type_public">公開</string>
+    <string name="create_spaces_private_teammates">供您與您的隊友使用的私人空間</string>
+    <string name="create_spaces_me_and_teammates">我與隊友</string>
+    <string name="create_spaces_organise_rooms">用來整理您聊天室的私人空間</string>
+    <string name="create_spaces_just_me">只有我</string>
+    <string name="create_spaces_make_sure_access">確定合適的人有權存取 %s。您可以在稍後變更。</string>
+    <string name="create_spaces_who_are_you_working_with">您與誰一起工作？</string>
+    <string name="create_spaces_join_info_help">要加入既有的空間，您需要邀請。</string>
+    <string name="create_spaces_you_can_change_later">您可以稍後再更改</string>
+    <string name="create_spaces_choose_type_label">您想要建立哪種類型的空間？</string>
+    <string name="create_spaces_type_header">空間是一種將聊天室與人們分組的新方式</string>
+    <string name="your_private_space">您的私人空間</string>
+    <string name="your_public_space">您的公開空間</string>
+    <string name="add_space">新增空間</string>
+    <string name="command_description_leave_room">離開有指定 id 的聊天室（如果是 null 的話則為目前聊天室）</string>
+    <string name="command_description_join_space">使用指定的 id 加入空間</string>
+    <string name="command_description_create_space">建立空間</string>
+    <string name="a11y_unchecked">未檢查</string>
+    <string name="search_hint_room_name">搜尋名稱</string>
+    <string name="room_settings_room_access_restricted_description">擁有此聊天室空間中的任何人都可以尋找並加入。僅此聊天是的管理員可以將其新增到空間中。</string>
+    <string name="room_settings_room_access_restricted_title">空間</string>
+    <string name="room_settings_room_access_public_description">任何人都可以尋找聊天室並加入</string>
+    <string name="room_settings_room_access_public_title">公開</string>
+    <string name="room_settings_room_access_private_description">僅被邀請的夥伴可以尋找並加入</string>
+    <string name="room_settings_room_access_private_title">私人</string>
+    <string name="room_settings_room_access_entry_unknown">未知的存取設定 (%s)</string>
+    <string name="room_settings_room_access_entry_knock">任何人都可以要求加入聊天室，成員可以接受或回絕</string>
+    <string name="room_settings_guest_access_title">允許訪客加入</string>
+    <string name="spaces_header">空間</string>
+    <string name="spaces_invited_header">邀請</string>
+    <string name="suggested_header">建議的聊天室</string>
 </resources>
\ No newline at end of file

From 01d02018522a992d3b2ec5cc35bd91115a94601c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 29 Apr 2021 21:44:15 +0000
Subject: [PATCH 228/350] Translated using Weblate (Estonian)

Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
---
 .../android/et/changelogs/40101040.txt        |  2 +
 .../android/et/changelogs/40101050.txt        |  2 +
 .../android/et/changelogs/40101060.txt        |  2 +
 .../metadata/android/et/full_description.txt  | 47 +++++++++++--------
 .../metadata/android/et/short_description.txt |  2 +-
 fastlane/metadata/android/et/title.txt        |  2 +-
 6 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 fastlane/metadata/android/et/changelogs/40101040.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/40101050.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/40101060.txt

diff --git a/fastlane/metadata/android/et/changelogs/40101040.txt b/fastlane/metadata/android/et/changelogs/40101040.txt
new file mode 100644
index 0000000000..2e7849db9e
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: jõudluse parandused ja pisikohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/et/changelogs/40101050.txt b/fastlane/metadata/android/et/changelogs/40101050.txt
new file mode 100644
index 0000000000..9aa2f4e10c
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: kiirparandused versioon 1.1.4 jaoks.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/et/changelogs/40101060.txt b/fastlane/metadata/android/et/changelogs/40101060.txt
new file mode 100644
index 0000000000..0577bf452d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: kiirparandused versioon 1.1.5 jaoks.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/et/full_description.txt b/fastlane/metadata/android/et/full_description.txt
index 7c7f7195a8..ee0adef9ac 100644
--- a/fastlane/metadata/android/et/full_description.txt
+++ b/fastlane/metadata/android/et/full_description.txt
@@ -1,30 +1,39 @@
-Element on uut tüüpi suhtlus- ja koostöörakendus, mis:
+Element on nii suhtlus- ja koostöörakendus, mis sobib ideaalselt rühmavestlusteks kaugtöö ajal. Läbiv krüptimine on kasutusel sõnumivahetuseks, videokõnedeks, häälkõnedeks ja failide jagamiseks.
 
-1. Võimaldab täielikku kontrolli privaatsuse üle
-2. Võimaldab suhelda kõigiga Matrixi võrgus ja isegi väljaspool seda, olles integreeritud selliste rakendustega nagu Slack
-3. Kaitseb sind reklaamide ja andmekogumise eest
-4. Tagab turvalisuse läbiva krüptimise abil, kasutades risttunnustamist vestlejate tuvastamiseks
+<b>Element pakub muu hulgas selliseid võimalusi</b>
+- moodsad võrgupõhised suhtlusvahendid
+- läbivalt krüptitud sõnumid võimaldavad turvalist suhtlust, sealhulgas kaugtöötajatega
+- Matrix'i protokollil põhinev hajutatud suhtlusvõrk
+- projektide jaoks vajalike failide jagamine turvaliselt ja krüptitult
+- VoIP'i põhised videokõned ja ekraani jagamine
+- lihtne lõimimine harjumispäraste võrgupõhiste koostöövahenditega, projektihalduse rakendustega, VoIP-teenustega ja muude ühistöörakendustega
 
-Element erineb täielikult teistest sõnumside- ja koostöörakendustest, kuna see on detsentraliseeritud ja avatud lähtekoodiga.
+Element erineb teistest sõnumi- ja koostöörakendustest. Tema aluseks on Matrix - avatud võrk turvalise ja hajutatud suhtluse jaoks.
 
-Element võimaldab ise hostida - või valida hosti -, et oleks tagatud privaatsus ja kontroll oma andmete ja vestluste üle. Element annab ka juurdepääsu avatud võrgule, nii et te ei pea vaid Elemendi kasutajatega rääkima. Ning kogu süsteem on väga turvaline.
+<b>Privaatsus ja krüptitud sõnumivahetus</b>
+Element tagab, et sa ei ole seotud reklaamidega, andmekogumisega ja suletud süsteemidega. Kasutades läbivat krüptimist ja risttunnustamisel põhinevat verifitseerimist on sinu sõnumid, andmed, kahepoolsed videokõned ja häälkõned turvatud.
 
-Element töötab Matrixil - avatud, detsentraliseeritud suhtlus-standardil.
+Lubades suhelda turvaliselt ükspuha kellega Matrix'i võrgus või muude ärikeskondades kasutatavate koostöörakendustega nagu Slack, jätab Element sulle kontrolli oma privaatsuse üle.
 
-Võimaldades valida, kes vestlusi korraldab, annab Element annab kontrolli sinule. Rakendust Element saad kasutada mitmel viisil.
+<b>Võid kasutada Element'i jaoks oma serverid</b>
+Kui vajad suuremat kontrolli oma suhtluse ja andmete üle, siis võid kasutada oma serverit või tellida teenuse ükspuha missuguselt Matrix'i-teenuse pakkujalt. Matrix on standard avatud lähtekoodil põhineva detsentraliseeritud suhtluse jaoks.
 
-1. Tasuta konto Matrixi arendajate hostitud avalikus serveris matrix.org või vali tuhandete avalike serverite hulgast, mida haldavad vabatahtlikud
-2. Hosti oma kontot ise, paigaldades serveri oma riistvarale
-3. Registreeruge serveris olevale kontole, tellides Element Matrix Services teenuseplatvormi
+<b>Andmed on Sinu omad</b>
+Sina otsustad seda, kus hoiad oma sõnumeid ja andmeid. Ning seejuures puudub andmekaevandamise risk ja ligipääs kolmandatele osapooltele.
 
-<b> Miks valida element? </b>
+Element annab kontrolli sinule valikuga mitme võimaluse vahel:
+1. tasuta konto Matrix'i arendajate hostitud avalikus serveris matrix.org või vali tuhandete avalike serverite hulgast, mida haldavad vabatahtlikud
+2. hosti oma kontot ise, paigaldades serveri oma IT-taristule
+3. telli tasuline kasutajakonto Element Matrix Services teenuseplatvormilt
 
-<b> KONTROLL ANDMETE ÜLE</b>: otsustad ise, kus oma andmeid ja sõnumeid hoida. Need kuuluvad sulle ja sinu käes on kontroll, mitte mõne MEGAFIRMA käes, mis andmeid oma kasuks kaevandab või kolmandatele isikutele juurdepääsu annab.
+<b>Avatud suhtlus ja koostöö</b>
+Saad vestelda kõigi teistega Matrix'i võrgus, olenemata sellest, kas nad kasutavad Elementi või mõnda muud Matrixi rakendust ja isegi kui nad kasutavad mõnda teistsugust suhtlussüsteemi.
 
-<b> AVATUD SUHTLUS JA KOOSTÖÖ </b>: saad vestelda kõigi teistega Matrixi võrgus, olenemata sellest, kas nad kasutavad Elementi või mõnda muud Matrixi rakendust, ja isegi kui nad kasutavad teistsugust suhtlussüsteemi nagu Slack, IRC või XMPP.
+<b>Üliturvaline</b>
+Tõeline läbiv krüptimine (ainult vestluses osalejad saavad sõnumeid lugeda) ja risttunnustamine vestluses osalejate tuvastamiseks.
 
-<b> ÜLITURVALINE </b>: tõeline läbiv krüptimine (ainult vestluses osalejad saavad sõnumeid lugeda) ja risttunnustamine vestluses osalejate tuvastamiseks.
+<b>Kõik suhtlusvõimalused</b>
+Sõnumid, hääl- ja videokõned, failide jagamine, ekraani jagamine ja terve hulk lõiminguid, roboteid ja vidinaid. Loo tubasid, kogukondi, hoia ühendust ja saa asjad aetud.
 
-<b> KÕIK SUHTLUSVÕIMALUSED</b>: sõnumid, hääl- ja videokõned, failide jagamine, ekraani jagamine ja terve hulk lõiminguid, roboteid ja vidinaid. Loo tubasid, kogukondi, hoia ühendust ja saa asjad aetud.
-
-<b> KÕIKJAL, KUS VIIBITE</b>: saad suhelda kõigis oma seadmetes ja ka veebis aadressil https://app.element.io ning sealjuures täielikult sünkroonitud sõnumite ajalooga.
+<b>Jätka sealt, kus pooleli jäid</b>
+Saad suhelda kõigis oma seadmetes ja ka veebis aadressil https://app.element.io ning sealjuures täielikult sünkroonitud sõnumite ajalooga.
diff --git a/fastlane/metadata/android/et/short_description.txt b/fastlane/metadata/android/et/short_description.txt
index 4075c1f7cf..5352464a7a 100644
--- a/fastlane/metadata/android/et/short_description.txt
+++ b/fastlane/metadata/android/et/short_description.txt
@@ -1 +1 @@
-Turvalised ning hajutatud vestlused ja VoIP-kõned. Sinu suhtlus on üliturvaline.
+Vestlus- ja koostöörakendus: krüptitud sõnumid, rühmavestlused ja videokõned
diff --git a/fastlane/metadata/android/et/title.txt b/fastlane/metadata/android/et/title.txt
index f74f9ff18f..b0bf39ba23 100644
--- a/fastlane/metadata/android/et/title.txt
+++ b/fastlane/metadata/android/et/title.txt
@@ -1 +1 @@
-Element (varem Riot.im)
+Element - turvaline sõnumiklient

From 6bc7ee0d96fe65a9fa1a93a6051fb24ac6675218 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Thu, 29 Apr 2021 19:44:07 +0000
Subject: [PATCH 229/350] Translated using Weblate (French)

Currently translated at 97.8% (2386 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 9fb80f67a7..d74a9f8a39 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2680,4 +2680,27 @@
     <string name="settings_room_directory_show_all_rooms">Afficher les salons au contenu choquant</string>
     <string name="settings_category_room_directory">Répertoire des salons</string>
     <string name="event_status_sent_message">Message envoyé</string>
+    <string name="create_spaces_you_can_change_later">Vous pouvez changer ceci plus tard</string>
+    <string name="create_spaces_choose_type_label">Quel type d’espace voulez-vous créer \?</string>
+    <string name="create_spaces_type_header">Les espaces sont un nouveau moyen de regrouper les salons et les personnes</string>
+    <string name="your_private_space">Votre espace privé</string>
+    <string name="your_public_space">Votre espace public</string>
+    <string name="add_space">Ajouter un espace</string>
+    <string name="command_description_leave_room">Partir du salon correspondant à l’identifiant donné (ou le salon actuel si aucun n’est fourni)</string>
+    <string name="command_description_join_space">Rejoindre l’espace avec l’identifiant donné</string>
+    <string name="command_description_create_space">Créer un espace</string>
+    <string name="a11y_unchecked">Décoché</string>
+    <string name="search_hint_room_name">Rechercher par nom</string>
+    <string name="room_settings_room_access_restricted_description">Tout membre d’un espace contenant ce salon peut le trouver et le rejoindre. Seuls les administrateurs de ce salon peuvent l’ajouter à un espace.</string>
+    <string name="room_settings_room_access_restricted_title">Espaces</string>
+    <string name="room_settings_room_access_public_description">Tout le monde peut trouver ce salon et le rejoindre</string>
+    <string name="room_settings_room_access_public_title">Public</string>
+    <string name="room_settings_room_access_private_description">Seules les personnes invitées peuvent le trouver et le rejoindre</string>
+    <string name="room_settings_room_access_private_title">Privé</string>
+    <string name="room_settings_room_access_entry_unknown">Paramètre d’accès inconnu (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Tout le monde peut frapper à la porte du salon, les membres peuvent accepter ou rejeter la demande</string>
+    <string name="room_settings_guest_access_title">Permettre l’accès aux visiteurs</string>
+    <string name="spaces_header">Espaces</string>
+    <string name="spaces_invited_header">Invitations</string>
+    <string name="suggested_header">Salons recommandés</string>
 </resources>
\ No newline at end of file

From 81213b07bb084cb5f6788a2e4830d913f0a74ef7 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Sun, 2 May 2021 14:41:40 +0000
Subject: [PATCH 230/350] Translated using Weblate (Swedish)

Currently translated at 98.4% (2399 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 36 +++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index c1be9f5678..8844c7ec20 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2673,4 +2673,40 @@
     <string name="event_status_a11y_sending">Skickar</string>
     <string name="settings_category_room_directory">Rumskatalog</string>
     <string name="event_status_sent_message">Meddelande skickat</string>
+    <string name="create_spaces_details_public_header">Lägg till några detaljer för att hjälpa det satt sticka ut. Du kan ändra dessa när som helst.</string>
+    <string name="activity_create_space_title">Skapa ett utrymme</string>
+    <string name="space_type_private_desc">Endast inbjudan, bäst för dig själv eller team</string>
+    <string name="space_type_private">Privat</string>
+    <string name="space_type_public_desc">Öppet för alla, bäst för gemenskaper</string>
+    <string name="space_type_public">Offentligt</string>
+    <string name="create_spaces_private_teammates">Ett privat utrymme for dig och dina teamkamrater</string>
+    <string name="create_spaces_me_and_teammates">Jag och mina teamkamrater</string>
+    <string name="create_spaces_organise_rooms">Att privat utrymme för att organisera dina rum</string>
+    <string name="create_spaces_just_me">Bara jag</string>
+    <string name="create_spaces_make_sure_access">Det till att rätt personer har åtkomst till %s. Du kan ändra detta senare.</string>
+    <string name="create_spaces_who_are_you_working_with">Vem jobbar du med\?</string>
+    <string name="create_spaces_join_info_help">För att gå med i ett existerande utrymme så behöver du en inbjudan.</string>
+    <string name="create_spaces_you_can_change_later">Detta kan ändras senare</string>
+    <string name="create_spaces_choose_type_label">Vilket sorts utrymme vill du skapa\?</string>
+    <string name="create_spaces_type_header">Utrymmen är ett nytt sätt att gruppera rum och personer</string>
+    <string name="your_private_space">Ditt privata utrymme</string>
+    <string name="your_public_space">Ditt offentliga utrymme</string>
+    <string name="add_space">Lägg till utrymme</string>
+    <string name="command_description_leave_room">Lämna rummet med det angivna ID:t (eller nuvarande rum om null)</string>
+    <string name="command_description_join_space">Gå med i utrymmet med det angivna ID:t</string>
+    <string name="command_description_create_space">Skapa ett utrymme</string>
+    <string name="a11y_unchecked">Okryssad</string>
+    <string name="search_hint_room_name">Sök efter namn</string>
+    <string name="room_settings_room_access_restricted_description">Vem som helst i ett utrymme med det här rummet kan hitta det och gå med. Bara administratörer för det här rummet kan lägga till det till ett utrymme.</string>
+    <string name="room_settings_room_access_restricted_title">Utrymmen</string>
+    <string name="room_settings_room_access_public_description">Vem som helst kan hitta rummet och gå med</string>
+    <string name="room_settings_room_access_public_title">Offentlig</string>
+    <string name="room_settings_room_access_private_description">Bara personer som bjuds in kan hitta och gå med</string>
+    <string name="room_settings_room_access_private_title">Privat</string>
+    <string name="room_settings_room_access_entry_unknown">Okänd åtkomstinställning (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Vem som helst kan knacka på, och medlemmar kan då acceptera eller avvisa</string>
+    <string name="room_settings_guest_access_title">Tillåt gäster att gå med</string>
+    <string name="spaces_header">Utrymmen</string>
+    <string name="spaces_invited_header">Inbjudningar</string>
+    <string name="suggested_header">Föreslagna rum</string>
 </resources>
\ No newline at end of file

From 278738a9d4ebf35f79b38f7d055f1fcd0aaeed57 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 30 Apr 2021 03:03:00 +0000
Subject: [PATCH 231/350] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
---
 .../android/zh-Hant/changelogs/40101040.txt   |  2 +
 .../android/zh-Hant/changelogs/40101050.txt   |  2 +
 .../android/zh-Hant/changelogs/40101060.txt   |  2 +
 .../android/zh-Hant/full_description.txt      | 47 +++++++++++--------
 .../android/zh-Hant/short_description.txt     |  2 +-
 fastlane/metadata/android/zh-Hant/title.txt   |  2 +-
 6 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 fastlane/metadata/android/zh-Hant/changelogs/40101040.txt
 create mode 100644 fastlane/metadata/android/zh-Hant/changelogs/40101050.txt
 create mode 100644 fastlane/metadata/android/zh-Hant/changelogs/40101060.txt

diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101040.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101040.txt
new file mode 100644
index 0000000000..1786691c42
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hant/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：效能改善與錯誤修復！
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101050.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101050.txt
new file mode 100644
index 0000000000..899ce72c9a
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hant/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：1.1.4 的快速修補
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/zh-Hant/changelogs/40101060.txt b/fastlane/metadata/android/zh-Hant/changelogs/40101060.txt
new file mode 100644
index 0000000000..838dc6d731
--- /dev/null
+++ b/fastlane/metadata/android/zh-Hant/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：1.1.5 的快速修補
+完整的變更紀錄：https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/zh-Hant/full_description.txt b/fastlane/metadata/android/zh-Hant/full_description.txt
index 2fdf6fa478..90c0eb4c4c 100644
--- a/fastlane/metadata/android/zh-Hant/full_description.txt
+++ b/fastlane/metadata/android/zh-Hant/full_description.txt
@@ -1,30 +1,39 @@
-Element 是一種新型態的即時通訊軟體與協作應用程式：
+Element 同時是安全的通訊軟體，也是生產力團隊協作應用程式，非常適合在遠端工作時進行群組聊天。此聊天應用程式使用了端到端加密來提供強大的視訊會議、檔案分享與語音通話。
 
-1. 自己的隱私自己掌控
-2. 讓您與任何在 Matrix 網路中的人通訊，甚至可與如 Slack 等的應用程式整合
-3. 保護您免受廣告、資料採礦與圍牆花園的侵害
-4. 透過端到端加密保護您，並使用交叉簽章來驗證其他人
+<b>Element 的功能包含了：</b>
+- 進階線上通訊工具
+- 完全加密的訊息，即使對於遠端工作者，也可以有更安全的公司通訊
+- 以 Matrix 開放原始碼框架為基礎的去中心化的聊天
+- 在管理專案時透過加密資料安全地分享檔案
+- 包含了 VoIP 與畫面分享的視訊聊天
+- 與您最喜歡的協作工具、專案管理工具、VoIP 服務與其他團隊訊息應用程式輕鬆整合
 
-Element 是去中心化且開放原始碼的應用程式，因此與其他即時通訊與協作軟體完全不同。
+Element 與其他訊息傳遞與協作應用程式完全不同。它在 Matrix（一個用於安全傳遞訊息與去中心化通訊的開放網路）上執行。其可以自架，讓使用者對他們的資料與訊息有最大的所有權與控制權。
 
-Element 讓您可以自架（或是自行選擇服務提供者）所以您擁有您資料與對話的隱私、所有權與控制權。它讓您可以存取開放的網路；因此，您不僅可以與其他 Matrix 使用者聊天。而且非常安全。
+<b>隱私與加密訊息傳遞</b>
+Element 保護您不受不想要的廣告、資料挖礦與圍牆花園侵擾。其也透過端到端加密與交叉簽章裝置驗證保護了您所有的資料，並提供一對一視訊以及語音通訊。
 
-Element 能作到這些事情是因為它在 Matrix 上執行，這是一個開放的去中心化通訊的標準。
+Element 透過與其他商業協作工具，如 Slack 等應用程式整合，讓您可以在控制您的隱私的同時，也可以與 Matrix 網路上的任何人安全地通訊。
 
-Element 讓您選擇您要在哪裡託管您的對話來將控制權還給您。在 Element 應用程式中，您可以選擇其他方式來託管：
+<b>Element 可以自架</b>
+為了可以完整控制您的敏感資料與對話，Element 可以自架，您也可以選擇任何以 Matrix 為基礎的服務提供商，開放原始碼、去中心化的通訊標準。Element 為您提供隱私、安全合規與整合活性。
 
-1. 在由 Matrix 開發者架設的 matrix.org 公開伺服器上取得免費的帳號，或是從數千個由志願者所架設的公開伺服器中選擇
-2. 在您自己的硬體上自行架設伺服器並建立帳號
-3. 訂閱 Element Matrix 服務託管平台並在自訂伺服氣上註冊帳號
+<b>擁有您的資料</b>
+您可以決定將您的資料與訊息儲存在何處。沒有資料挖礦或被第三方存取的風險。
 
-<b>為何選擇 Element？</b>
+Element 透過不同的方式讓您掌控一切：
+1. 在 Matrix 開發者架設的 matrix.org 公開伺服器上取得免費帳號，或是從數千個由志願者架設的公開伺服器中選擇
+2. 在您自己的 IT 基礎架構上執行伺服器來自行託管您的帳號
+3. 只要訂閱 Element Matrix Services 託管平台就可以在自訂的伺服器上註冊帳號
 
-<b>擁有您的資料</b>：您決定您的資料與訊息要放在哪裡。您擁有並控制它，而非某些科技巨頭會挖掘您的資料並將其售予第三方。
+<b>開放訊息傳遞與協作</b>
+您可以與 Matrix 網路上的任何人聊天，不論他們是使用 Element、其他 Matrix 應用程式或其他通訊應用程式。
 
-<b>開放的即時通訊與協作</b>：您可以與 Matrix 網路中的任何人聊天，不管他們是使用 Element 或其他 Matrix 應用程式都可以，或甚至是其他的訊息系統，如 Slack、IRC 或 XMPP 也都可以。
+<b>超級安全</b>
+真的端到端加密（僅有那些在對話中的可以解密訊息）以及交叉簽章裝置驗證。
 
-<b>超級安全</b>：即時的端到端加密（僅有參與對話的人可以解密訊息），以及交叉簽章以驗證對話參與者的裝置。
+<b>完整的通訊與整合Complete communication and integration</b>
+訊息傳遞、語音與視訊通話、檔案分享、畫面分享與超多的整合、機器人與小工具。建構聊天室、社群、保持聯絡並完成工作。
 
-<b>完整通訊</b>：即時通訊、語音與視訊通話、檔案分享、畫面分享與超多的整合、機器人與小工具。建立聊天室、保持聯繫並完成工作。
-
-<b>無論您身在何處</b>：無論您身在何處，都可以透過 https://app.element.io 來在所有裝置與網路上保持訊息歷史同步。
+<b>從上次離開的地方開始</b>
+無論您身在何處，都可以透過在您所有裝置與網頁 https://app.element.io 間完全同步的訊息歷史保持聯絡
diff --git a/fastlane/metadata/android/zh-Hant/short_description.txt b/fastlane/metadata/android/zh-Hant/short_description.txt
index 23bb82c04e..0d1f5bb7cd 100644
--- a/fastlane/metadata/android/zh-Hant/short_description.txt
+++ b/fastlane/metadata/android/zh-Hant/short_description.txt
@@ -1 +1 @@
-安全的去中心化聊天與 VoIP。確保您的資料不受第三方的影響。
+群組通訊軟體 - 訊息加密、群組聊天與視訊通話
diff --git a/fastlane/metadata/android/zh-Hant/title.txt b/fastlane/metadata/android/zh-Hant/title.txt
index 3be2260b73..47d8a6b3ad 100644
--- a/fastlane/metadata/android/zh-Hant/title.txt
+++ b/fastlane/metadata/android/zh-Hant/title.txt
@@ -1 +1 @@
-Element（曾名為 Riot.im）
+Element - 安全的通訊軟體

From ba1c50e2ee4a5aff528f337bc00770772c207273 Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Thu, 29 Apr 2021 20:48:04 +0000
Subject: [PATCH 232/350] Translated using Weblate (Czech)

Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
---
 vector/src/main/res/values-cs/strings.xml | 82 ++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 0b76b6c019..ae136a0274 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1724,7 +1724,7 @@
     <string name="login_splash_submit">Můžeme začít</string>
     <string name="login_server_title">Vybrat server</string>
     <string name="login_server_text">Jako email, účty mají jeden domov, ačkoli můžete mluvit s kýmkoli</string>
-    <string name="login_server_matrix_org_text">Přidejte se k miliónům svobodným na největším veřejném serveru</string>
+    <string name="login_server_matrix_org_text">Přidejte se bezplatně k miliónům na největším veřejném serveru</string>
     <string name="login_server_modular_text">Prémiový hosting pro organizace</string>
     <string name="login_server_modular_learn_more">Dozvědět se více</string>
     <string name="login_server_other_title">Další</string>
@@ -2724,4 +2724,84 @@
     <string name="settings_room_directory_show_all_rooms">Zobrazit místnosti s explicitním obsahem</string>
     <string name="settings_category_room_directory">Adresář místností</string>
     <string name="event_status_sent_message">Zpráva odeslána</string>
+    <string name="a11y_unchecked">Neoznačeno</string>
+    <string name="labs_use_restricted_join_rule">Experimentální, prostor - omezená místnost.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Prostory jsou způsob organizace místností a lidí k práci, zábavě anebo jen pro Vás.</string>
+    <string name="create_spaces_room_private_header_desc">Založme pro každé místnost. Později můžete přidat i další, včetně již existujících.</string>
+    <string name="create_spaces_room_private_header">Na jakých tématech pracujete\?</string>
+    <string name="create_spaces_room_public_header_desc">Založíme pro ně místnosti. Můžete přidat další později.</string>
+    <string name="create_spaces_details_private_header">Doplňte nějaké podrobnosti, aby jej lidé mohli identifikovat. Můžete je kdykoli změnit.</string>
+    <string name="create_spaces_type_header">Prostory jsou nový způsob organizace místností a lidí</string>
+    <string name="spaces_header">Prostory</string>
+    <string name="labs_use_restricted_join_rule_desc">Varování, nutná podpora serveru a experimentální verze místnosti</string>
+    <string name="you_are_invited">Jste zváni</string>
+    <string name="spaces_beta_welcome_to_spaces">Vítejte v prostorech!</string>
+    <string name="space_add_existing_rooms">Přidat existující místnosti a prostor</string>
+    <string name="space_leave_prompt_msg">Jste si jisti, že chcete opustit tento prostor\?</string>
+    <string name="leave_space">Opustit prostor</string>
+    <string name="space_add_child_title">Přidat místnosti</string>
+    <string name="space_explore_activity_title">Prozkoumat místnosti</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d známá osoba již vstoupila</item>
+        <item quantity="few">%d známé osoby již vstoupily</item>
+        <item quantity="other">%d známých osob již vstoupilo</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Vítejte v %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Zatím nejste v žádné místnosti. Níže uvádíme doporučené místnosti, ale můžete se podívat na další zeleným tlačítkem vpravo dole.</string>
+    <string name="room_alias_preview_not_found">Tento alias není v tuto chvíli přístupný.
+\nZkuste znovu později nebo se obraťte na správce místnosti, máte-li přístup.</string>
+    <string name="join_anyway">I tak vstoupit</string>
+    <string name="join_space">Vstoupit do prostoru</string>
+    <string name="create_space">Založit prostor</string>
+    <string name="skip_for_now">Nyní přeskočit</string>
+    <string name="share_space_link_message">Připojte se k mému prostoru %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">Nebudou součástí %s</string>
+    <string name="invite_just_to_this_room">Jen do této místnosti</string>
+    <string name="invite_to_space_with_name_desc">Budou moci %s prozkoumat</string>
+    <string name="invite_to_space_with_name">Pozvat do %s</string>
+    <string name="invite_by_link">Sdílet odkaz</string>
+    <string name="invite_by_mxid">Pozvat podle uživatelského jména</string>
+    <string name="invite_by_email">Pozvat emailem</string>
+    <string name="invite_people_to_your_space_desc">V tomto okamžiku jste to jen Vy. %s bude s dalšími lepší.</string>
+    <string name="invite_people_menu">Pozvat lidi</string>
+    <string name="invite_people_to_your_space">Pozvěte do svého prostoru lidi</string>
+    <string name="create_space_topic_hint">Popis</string>
+    <string name="create_spaces_loading_message">Zakládám prostor…</string>
+    <string name="create_spaces_default_public_random_room_name">Nahodilé</string>
+    <string name="create_spaces_default_public_room_name">Obecné</string>
+    <string name="create_spaces_room_public_header">Jaké diskuse si přejete vést v %s\?</string>
+    <string name="create_space_error_empty_field_space_name">Dejte prostoru jméno a pokračujte.</string>
+    <string name="create_spaces_details_public_header">Doplňte nějaké podrobnosti, aby prostor zaujal. Můžete je kdykoli změnit.</string>
+    <string name="activity_create_space_title">Založit prostor</string>
+    <string name="space_type_private_desc">Pouze na pozvání, nejlepší pro Vás nebo týmy</string>
+    <string name="space_type_private">Privátní</string>
+    <string name="space_type_public_desc">Otevřený pro všechny, nejlepší pro komunity</string>
+    <string name="space_type_public">Veřejný</string>
+    <string name="create_spaces_private_teammates">Privátní prostor pro Vás a Vaše kolegy</string>
+    <string name="create_spaces_me_and_teammates">Já a kolegové</string>
+    <string name="create_spaces_organise_rooms">Privátní prostor k organizaci Vašich místností</string>
+    <string name="create_spaces_just_me">Jen já</string>
+    <string name="create_spaces_make_sure_access">Ujistěte se, že ti správní lidé mají přístup do %s. Můžete změnit později.</string>
+    <string name="create_spaces_who_are_you_working_with">S kým pracujete\?</string>
+    <string name="create_spaces_join_info_help">K vstupu do existujícího prostoru potřebujete pozvání.</string>
+    <string name="create_spaces_you_can_change_later">Můžete změnit později</string>
+    <string name="create_spaces_choose_type_label">Jaký typ prostoru chcete založit\?</string>
+    <string name="your_private_space">Váš privátní prostor</string>
+    <string name="your_public_space">Váš veřejný prostor</string>
+    <string name="add_space">Přidat prostor</string>
+    <string name="command_description_leave_room">Opustit místnost s daným id (nebo nynější místnost pokud prázdné)</string>
+    <string name="command_description_join_space">Vstoupit do prostoru s daným id</string>
+    <string name="command_description_create_space">Založit prostor</string>
+    <string name="search_hint_room_name">Hledat jméno</string>
+    <string name="room_settings_room_access_restricted_description">Kdokoli v prostoru s touto místností ji může nalézt a vstoupit. Jen správci místnosti ji mohou připojit k prostoru.</string>
+    <string name="room_settings_room_access_restricted_title">Prostory</string>
+    <string name="room_settings_room_access_public_description">Kdokoli může místnost nalézt a vstoupit</string>
+    <string name="room_settings_room_access_public_title">Veřejná</string>
+    <string name="room_settings_room_access_private_description">Pouze pozvaní mohou místnost nalézt a vstoupit</string>
+    <string name="room_settings_room_access_private_title">Privátní</string>
+    <string name="room_settings_room_access_entry_unknown">Neznámé nastavení přístupu (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Každý může na místnost zaklepat, členové pak mohou přijmout či odmítnout</string>
+    <string name="room_settings_guest_access_title">Dovolit hostům vstoupit</string>
+    <string name="spaces_invited_header">Pozvání</string>
+    <string name="suggested_header">Doporučené místnosti</string>
 </resources>
\ No newline at end of file

From 9d81252e7bd7b765621c9e51c12c74a75096c766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 29 Apr 2021 20:38:25 +0000
Subject: [PATCH 233/350] Translated using Weblate (Estonian)

Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
---
 vector/src/main/res/values-et/strings.xml | 81 ++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index b2165af837..8047422a1f 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -991,7 +991,7 @@
     <string name="login_splash_submit">Alusta</string>
     <string name="login_server_title">Vali server</string>
     <string name="login_server_text">Nii nagu e-posti puhul, siis kasutajakonto asub ühes serveris, kuid saab suhelda kasutajatega üle ilma</string>
-    <string name="login_server_matrix_org_text">Liitu tasuta miljonite teistega suurimas tasuta Matrix\'i serveris</string>
+    <string name="login_server_matrix_org_text">Liitu tasuta miljonite teistega suurimas avalikus Matrix\'i serveris</string>
     <string name="login_server_modular_text">Tasuline Matrix\'i majutusteenus organisatsioonidele</string>
     <string name="login_server_modular_learn_more">Lisateave</string>
     <string name="login_server_other_title">Muud serverid</string>
@@ -2673,4 +2673,83 @@
     <string name="event_status_a11y_sending">Saadan</string>
     <string name="settings_category_room_directory">Jututubade kataloog</string>
     <string name="event_status_sent_message">Sõnum on saadetud</string>
+    <string name="labs_use_restricted_join_rule_desc">Hoiatus: eeldab serveripoolset tuge ning katselise jututoa versiooni kasutamist</string>
+    <string name="labs_use_restricted_join_rule">Katseline kogukonnakeskus - ligipääs on piiratud.</string>
+    <string name="you_are_invited">Sa oled saanud kutse</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Kogukonnakeskused on võimalus siduda jututubasid ja inimesi nii tööks, meelelahutuseks kui lihtsalt sinu jaoks.</string>
+    <string name="spaces_beta_welcome_to_spaces">Tere tulemast kasutama kogukonnakeskuseid!</string>
+    <string name="space_add_existing_rooms">Lisa olemasolevaid jututubasid ja kogukonnakeskuseid</string>
+    <string name="space_leave_prompt_msg">Kas oled kindel, et soovid lahkuda kogukonnakeskusest\?</string>
+    <string name="leave_space">Lahku kogukonnakeskusest</string>
+    <string name="space_add_child_title">Lisa jututuba</string>
+    <string name="space_explore_activity_title">Uuri jututubasid</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d sinu tuttav on juba liitunud</item>
+        <item quantity="other">%d sinu tuttavat on juba liitunud</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">%2$s, tere tulemast %1$s kogukonnakeskusesse.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Sa ei osale hetkel mitte ainsamaski jututoas. Järgnevas on mõned soovitused, aga sa leiad kogu loendi all paremal asuvast rohelisest nupust.</string>
+    <string name="room_alias_preview_not_found">Sellele jututoale puudub hetkel ligipääs.
+\nProovi hiljem uuesti või küsi jututoa haldajalt, kas sul on olemas selleks vajalikud õigused.</string>
+    <string name="join_anyway">Liitu ikkagi</string>
+    <string name="join_space">Liitu kogukonnakeskusega</string>
+    <string name="create_space">Loo kogukonnakeskus</string>
+    <string name="skip_for_now">Hetkel jäta vahele</string>
+    <string name="share_space_link_message">Palun liitu %1$s kogukonnakeskusega %2$s</string>
+    <string name="invite_just_to_this_room_desc">Nad ei saa osalema %s jututoas</string>
+    <string name="invite_just_to_this_room">Kutse vaid siia jututuppa</string>
+    <string name="invite_to_space_with_name_desc">Nad saavad tutvuda %s kogukonnakeskusega</string>
+    <string name="invite_to_space_with_name">Kutse kasutajale %s</string>
+    <string name="invite_by_link">Jaga linki</string>
+    <string name="invite_by_mxid">Kutsu kasutajanime alusel</string>
+    <string name="invite_by_email">Saada kutse e-kirjaga</string>
+    <string name="invite_people_to_your_space_desc">Hetkel oled siin vaid sina. Aga %s läheb aina paremaks, kui teised liituvad.</string>
+    <string name="invite_people_menu">Kutsu teisi kasutajaid</string>
+    <string name="invite_people_to_your_space">Kutsu inimesi oma kogukonnakeskusega liituma</string>
+    <string name="create_space_topic_hint">Kirjeldus</string>
+    <string name="create_spaces_loading_message">Loon kogukonnakeskust…</string>
+    <string name="create_spaces_default_public_random_room_name">Juhuslik</string>
+    <string name="create_spaces_default_public_room_name">Üldist</string>
+    <string name="create_spaces_room_private_header_desc">Loome nüüd igaühe jaoks jututoa. Sa võid neid ka hiljem lisada, sealhulgas olemasolevaid.</string>
+    <string name="create_spaces_room_private_header">Mis ettevõtmistega sa tegeled\?</string>
+    <string name="create_spaces_room_public_header_desc">Lisame selle jaoks ka jututoad. Sa saad neid veel hiljemgi lisada.</string>
+    <string name="create_spaces_room_public_header">Mis teemal sa sooviksid %s kogukonnakeskuses vestelda\?</string>
+    <string name="create_space_error_empty_field_space_name">Jätkamaks anna talle nimi.</string>
+    <string name="create_spaces_details_private_header">Tuvastamiseks palun lisa natuke teavet. Sa saad seda hiljem muuta ja täiendada.</string>
+    <string name="create_spaces_details_public_header">Eristumiseks palun lisa natuke teavet. Sa saad seda hiljem muuta ja täiendada.</string>
+    <string name="activity_create_space_title">Loo kogukonnakeskus</string>
+    <string name="space_type_private_desc">Liitumine vaid kutse alusel, sobib sulle ja sinu lähematele kaaslastele</string>
+    <string name="space_type_private">Privaatne</string>
+    <string name="space_type_public_desc">Avaliku ligipääsuga kogukonnakeskus</string>
+    <string name="space_type_public">Avalik</string>
+    <string name="create_spaces_private_teammates">Privaatne kogukonnakeskus sinu ja sinu kaasteeliste jaoks</string>
+    <string name="create_spaces_me_and_teammates">Mina ja minu kaasteelised</string>
+    <string name="create_spaces_organise_rooms">Privaatne kogukonnakeskus jututubade koondamiseks</string>
+    <string name="create_spaces_just_me">Vaid mina</string>
+    <string name="create_spaces_make_sure_access">Kontrolli, et vajalikel inimestel oleks ligipääs %s kogukonnakeskusesse. Sa võid seda hiljem muuta.</string>
+    <string name="create_spaces_who_are_you_working_with">Kellega sa koos töötad\?</string>
+    <string name="create_spaces_join_info_help">Olemasoleva kogukonnakeskusega liitumiseks vajad sa kutset.</string>
+    <string name="create_spaces_you_can_change_later">Sa võid seda hiljem muuta</string>
+    <string name="create_spaces_choose_type_label">Missugust kogukonnakeskust sooviksid sa luua\?</string>
+    <string name="create_spaces_type_header">Kogukonnakeskused on uus viis jututubade ja inimeste ühendamiseks</string>
+    <string name="your_private_space">Sinu privaatne kogukonnakeskus</string>
+    <string name="your_public_space">Sinu avalik kogukonnakeskus</string>
+    <string name="add_space">Lisa kogukonnakeskus</string>
+    <string name="command_description_leave_room">Lahku antud tunnusega jututoast (tunnuse puudumisel jututoast, kus hetkel asud)</string>
+    <string name="command_description_join_space">Liitu kogukonnakeskusega tema tunnuse alusel</string>
+    <string name="command_description_create_space">Loo kogukonnakeskus</string>
+    <string name="a11y_unchecked">Pole kontrollitud</string>
+    <string name="search_hint_room_name">Otsi nime alusel</string>
+    <string name="room_settings_room_access_restricted_description">Kõik sellise kogukonnakeskuse liikmed, kuhu see jututuba kuulub, võivad seda leida ja temaga liituda. Ainult selle jututoa haldajad võivad teda kogukonnakeskusesse liita.</string>
+    <string name="room_settings_room_access_restricted_title">Kogukonnakeskused</string>
+    <string name="room_settings_room_access_public_description">Kõik võivad jututuba leida ja sellega liituda</string>
+    <string name="room_settings_room_access_public_title">Avalik</string>
+    <string name="room_settings_room_access_private_description">Jututuba saab leida ja sellega liituda vaid kutsete alusel</string>
+    <string name="room_settings_room_access_private_title">Privaatne</string>
+    <string name="room_settings_room_access_entry_unknown">Tundmatu seadistus ligipääsuks (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Kõik võivad jututoa uksele koputada ning senised liikmed saavad uut liitumist lubada või keelata</string>
+    <string name="room_settings_guest_access_title">Luba külalistel liituda</string>
+    <string name="spaces_header">Kogukonnakeskused</string>
+    <string name="spaces_invited_header">Kutsed</string>
+    <string name="suggested_header">Soovitatud jututoad</string>
 </resources>
\ No newline at end of file

From ebfb4b4b9a0128649b8d45211fcc089da58aac43 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 30 Apr 2021 14:29:33 +0000
Subject: [PATCH 234/350] Translated using Weblate (Italian)

Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
---
 .../android/it/changelogs/40101040.txt        |  2 +
 .../android/it/changelogs/40101050.txt        |  2 +
 .../android/it/changelogs/40101060.txt        |  2 +
 .../metadata/android/it/full_description.txt  | 45 +++++++++++--------
 .../metadata/android/it/short_description.txt |  2 +-
 fastlane/metadata/android/it/title.txt        |  2 +-
 6 files changed, 35 insertions(+), 20 deletions(-)
 create mode 100644 fastlane/metadata/android/it/changelogs/40101040.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/40101050.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/40101060.txt

diff --git a/fastlane/metadata/android/it/changelogs/40101040.txt b/fastlane/metadata/android/it/changelogs/40101040.txt
new file mode 100644
index 0000000000..93aac046a1
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: prestazioni migliorate e correzione di errori!
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/it/changelogs/40101050.txt b/fastlane/metadata/android/it/changelogs/40101050.txt
new file mode 100644
index 0000000000..7fa5ba20df
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: correzioni per la 1.1.4
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/it/changelogs/40101060.txt b/fastlane/metadata/android/it/changelogs/40101060.txt
new file mode 100644
index 0000000000..d915bf2d8f
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: correzioni per la 1.1.5
+Cronologia completa: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/it/full_description.txt b/fastlane/metadata/android/it/full_description.txt
index b6f7cf449c..dd7716ffbf 100644
--- a/fastlane/metadata/android/it/full_description.txt
+++ b/fastlane/metadata/android/it/full_description.txt
@@ -1,30 +1,39 @@
-Element è un nuovo tipo di app di messaggistica e collaborazione che:
+Element è sia un messenger sicuro sia un'app collaborativa per team di produttività, ideale per chat di gruppo durante il lavoro da remoto. Questa app usa una crittografia end-to-end per fornire videoconferenze, condivisione di file e videochiamate.
 
-1. Ti mette al controllo per preservare la tua privacy
-2. Ti lascia comunicare con chiunque nella rete Matrix e oltre, integrandosi con app come Slack
-3. Ti protegge da pubblicità, raccolta di dati e piattaforme chiuse
-4. Ti protegge con la crittografia end-to-end, con la firma incrociata per verificare gli altri
+<b>Tra le caratteristiche di Element ci sono:</b>
+- Strumenti di comunicazione online avanzati
+- Messaggi totalmente cifrati per consentire comunicazioni aziendali più sicure, anche per i lavoratori remoti
+- Chat decentralizzate basate sull'infrastruttura open source Matrix
+- Condivisione sicura di file con dati crittografati durante la gestione dei progetti
+- Videochiamate con "Voice over IP" e condivisione dello schermo
+- Facile integrazione con i tuoi strumenti collaborativi online preferiti, strumenti di gestione progetti, servizi VoIP ed altre app di messaggistica tra team
 
-Element è completamente diverso dalle altre app di messaggistica e collaborazione perchè è decentralizzato e open source.
+Element è completamente diverso dalle altre app di messaggistica e collaborazione. Funziona su Matrix, una rete aperta per messaggi sicuri e comunicazioni decentralizzate. Può essere installato in locale per dare agli utenti il pieno possesso e controllo dei propri dati e messaggi.
 
-Element può essere gestito in locale - o puoi scegliere un host - in modo che tu abbia privacy, possesso e controllo dei tuoi dati e conversazioni. Ti dà accesso ad una rete aperta, quindi non sei limitato a parlare solo con altri utenti Element. Ed è molto sicuro.
+<b>Privacy e messaggi privati</b>
+Element ti protegge da pubblicità indesiderate, dalla raccolta di dati e dalle piattaforme chiuse. Protegge tutti i tuoi dati e comunicazioni uno-ad-uno, attraverso la crittografia end-to-end e la verifica a firma incrociata tra dispositivi.
 
-Element può fare tutto ciò perchè funziona su Matrix - lo standard per comunicazioni aperte e decentralizzate.
+Element ti dà il controllo della tua privacy consentendoti di comunicazre in modo sicuro con chiunque nella rete di Matrix, o con altri strumenti collaborativi aziendali, integrandosi con app come Slack.
 
-Element ti mette al controllo lasciandoti scegliere chi gestisce il server delle tue conversazioni. Dall'app Element, hai diverse opzioni:
+<b>Element può essere installato in locale</b>
+Per consentire un maggiore controllo dei tuoi dati sensibili e delle conversazioni, Element può essere gestito in locale o puoi scegliere un qualsiasi host basato su Matrix - lo standard per le comunicazioni open source e decentralizzate. Element ti offre privacy, conformità alla sicurezza e flessibilità di integrazione.
 
+<b>Possiedi i tuoi dati</b>
+Decidi tu dove tenere i tuoi dati e messaggi. Senza il rischio di raccolta di dati o accessi da terze parti.
+
+Element ti mette al controllo in diversi modi:
 1. Crea un account gratuito sul server pubblico matrix.org gestito dagli sviluppatori di Matrix, o scegli tra migliaia di server pubblici gestiti da volontari
-2. Gestisci autonomamente un account installando un server sul tuo hardware
+2. Gestisci autonomamente un account installando un server nella tua infrastruttura informatica
 3. Registra un account su un server personalizzato iscrivendoti alla piattaforma Element Matrix Services
 
-<b>Perchè scegliere Element?</b>
+<b>Messaggistica e collaborazioni aperte</b>
+Puoi chattare con chiunque nella rete Matrix, sia che stiano usando Element, un'altra app Matrix, o anche un'app di messaggistica diversa.
 
-<b>POSSIEDI I TUOI DATI</b>: decidi dove tenere i tuoi dati e messaggi. Sono tuoi e li controlli tu, non qualche MEGADITTA che raccoglie i tuoi dati o ne dà l'accesso a terze parti.
+<b>Super sicuro</b>
+Vera crittografia end-to-end (solo chi è nella conversazione può decifrare i messaggi) e verifica di dispositivi a firma incrociata.
 
-<b>MESSAGGISTICA E COLLABORAZIONE APERTE</b>: puoi chattare con chiunque nella rete Matrix, usando Element o un'altra app Matrix, o anche se si sta usando un sistema di messaggistica diverso come Slack, IRC o XMPP.
+<b>Comunicazioni ed integrazioni complete</b>
+Messaggi, chiamate audio e video, condivisione file e schermo, un vasto numero di integrazioni, bot e widget. Crea stanze, comunità, resta in contatto e porta a termine gli obiettivi.
 
-<b>SUPER SICURO</b>: vera crittografia end-to-end (solo chi è nella conversazione può decifrare i messaggi) e firma incrociata per verificare i dispositivi dei partecipanti.
-
-<b>COMUNICAZIONE COMPLETA</b>: messaggi, chiamate audio e video, condivisione file e schermo, un vasto numero di integrazioni, bot e widget. Crea stanze, comunità, resta in contatto e porta a termine gli impegni.
-
-<b>OVUNQUE TU SIA</b>: resta in contatto ovunque tu sia con la cronologia dei messaggi sincronizzata tra tutti i tuoi dispositivi e in rete su https://app.element.io.
+<b>Riprendi da dove ti eri fermato</b>
+Resta in contatto ovunque tu sia con la cronologia dei messaggi sincronizzata tra tutti i tuoi dispositivi e in rete su https://app.element.io
diff --git a/fastlane/metadata/android/it/short_description.txt b/fastlane/metadata/android/it/short_description.txt
index 8c0c8fbee0..5050d0c1c5 100644
--- a/fastlane/metadata/android/it/short_description.txt
+++ b/fastlane/metadata/android/it/short_description.txt
@@ -1 +1 @@
-Chat e VoIP decentralizzati sicuri. Tieni lontani i tuoi dati dalle terze parti.
+Messenger di gruppo - messaggi cifrati, chat di gruppo e videochiamate
diff --git a/fastlane/metadata/android/it/title.txt b/fastlane/metadata/android/it/title.txt
index 54e3b456c7..c426a480d3 100644
--- a/fastlane/metadata/android/it/title.txt
+++ b/fastlane/metadata/android/it/title.txt
@@ -1 +1 @@
-Element (ex Riot.im)
+Element - Messaggi sicuri

From a77bcb549286f61ffe6e38dd07774d318c058457 Mon Sep 17 00:00:00 2001
From: Vancha <tjipke@tutanota.com>
Date: Mon, 3 May 2021 08:03:59 +0000
Subject: [PATCH 235/350] Translated using Weblate (Frisian)

Currently translated at 17.6% (430 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
---
 vector/src/main/res/values-fy/strings.xml | 333 ++++++++++++++++++++--
 1 file changed, 315 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index 0e2bad095a..52825a0e30 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -1,15 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="light_theme">Ljocht tema</string>
-    <string name="dark_theme">Donker tema</string>
+    <string name="dark_theme">Tsjuster tema</string>
     <string name="black_theme">Swart tema</string>
-
     <string name="notification_sync_init">Tsjinst inisjalisearje</string>
     <string name="notification_sync_in_progress">Syngronisearje…</string>
     <string name="notification_listening_for_events">Lústerje nei barrens</string>
     <string name="notification_noisy_notifications">Lûdsmeldingen</string>
     <string name="notification_silent_notifications">Stille meldingen</string>
-
     <string name="title_activity_home">Berjochten</string>
     <string name="title_activity_room">Petear</string>
     <string name="title_activity_settings">Ynstellingen</string>
@@ -21,7 +19,6 @@
     <string name="title_activity_keys_backup_setup">Kaaireservekopy</string>
     <string name="title_activity_keys_backup_restore">Kaaireservekopy brûke</string>
     <string name="title_activity_verify_device">Apparaat ferifiearje</string>
-
     <string name="keys_backup_is_not_finished_please_wait">Kaaireservekopy is noch net ree, in amerijke…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">As jo jo no ôfmelde, sille jo jo fersifere berjochten kwytreitsje</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Kaaireservekopy is dwaande. Asto dy no ôfmeldst, silsto de tagong ta dyn fersifere berjochten kwytreitsje.</string>
@@ -32,11 +29,8 @@
     <string name="are_you_sure">Binne jo wis\?</string>
     <string name="backup">Reservekopy meitsje</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Do silst de tagong ta dyn fersifere berjochten ferlieze, útsein asto earst in reservekopy fan dyn kaaien makkest eardatsto dy ôfmeldst.</string>
-
     <string name="dialog_title_third_party_licences">Lisinsjes fan tredde partijen</string>
-
     <string name="loading">Lade…</string>
-
     <string name="ok">Oké</string>
     <string name="cancel">Annulearje</string>
     <string name="save">Bewarje</string>
@@ -85,7 +79,6 @@
     <string name="ignore">Negearje</string>
     <string name="review">Beoardielje</string>
     <string name="decline">Wegerje</string>
-
     <string name="action_exit">Ofslute</string>
     <string name="actions">Aksjes</string>
     <string name="action_sign_out">Ofmelde</string>
@@ -101,27 +94,22 @@
     <string name="action_close">Slute</string>
     <string name="copied_to_clipboard">Nei klamboerd kopiearre</string>
     <string name="disable">Utskeakelje</string>
-
     <string name="dialog_title_confirmation">Befêstiging</string>
     <string name="dialog_title_warning">Warskôging</string>
     <string name="dialog_title_error">Flater</string>
-
     <string name="bottom_action_home">Start</string>
     <string name="bottom_action_favourites">Favoriten</string>
     <string name="bottom_action_people">Minsken</string>
     <string name="bottom_action_rooms">Petearen</string>
     <string name="bottom_action_groups">Mienskippen</string>
-
     <string name="home_filter_placeholder_home">Petearnammen filterje</string>
     <string name="home_filter_placeholder_favorites">Favoriten filterje</string>
     <string name="home_filter_placeholder_people">Persoanen filterje</string>
     <string name="home_filter_placeholder_rooms">Petearnammen filterje</string>
     <string name="home_filter_placeholder_groups">Mienskipsnammen filterje</string>
-
     <string name="invitations_header">Utnûgingen</string>
     <string name="low_priority_header">Lege prioriteit</string>
     <string name="system_alerts_header">Systeemmeldingen</string>
-
     <string name="direct_chats_header">Petearen</string>
     <string name="local_address_book_header">Lokale kontaktelist</string>
     <string name="user_directory_header">Brûkerskatalogus</string>
@@ -130,7 +118,6 @@
     <string name="template_no_contact_access_placeholder">Jo hawwe ${app_name} gjin tagong ta jo lokale kontakten jûn</string>
     <string name="no_result_placeholder">Gjin resultaten</string>
     <string name="people_no_identity_server">Gjin identiteitsserver konfigurearre.</string>
-
     <string name="rooms_header">Petearen</string>
     <string name="rooms_directory_header">Petearkatalogus</string>
     <string name="no_room_placeholder">Gjin petearen</string>
@@ -139,11 +126,9 @@
         <item quantity="one">1 brûker</item>
         <item quantity="other">%d brûkers</item>
     </plurals>
-
     <string name="groups_invite_header">Utnûgje</string>
     <string name="groups_header">Mienskippen</string>
     <string name="no_group_placeholder">Gjin groepen</string>
-
     <string name="send_bug_report_include_logs">Lochboek ferstjoere</string>
     <string name="send_bug_report_include_crash_logs">Ungeloklochboek ferstjoere</string>
     <string name="send_bug_report_include_screenshot">Skermôfdruk ferstjoere</string>
@@ -151,4 +136,316 @@
     <string name="send_bug_report_description">Beskriuw de flater. Wat hawwe jo dien\? Wat ferwachten jo dat der barre soe\? Wat is der echt bard\?</string>
     <string name="send_bug_report_description_in_english">Beskriuw it probleem yn it Ingelsk, wannear mooglik.</string>
     <string name="send_bug_report_placeholder">Beskriuw hjir jo probleem</string>
-</resources>
+    <string name="finish">Ôfrûnje</string>
+    <string name="keep_it_safe">Hâld it feilich</string>
+    <string name="bootstrap_finish_title">Do binst klear!</string>
+    <string name="bootstrap_save_key_description">Brûk disse %1$s as in feiligensnet, foar it gefal ast dyn %2$s ferjitst.</string>
+    <string name="call_notification_hangup">Ophingje</string>
+    <string name="call_notification_reject">Ferfalle litte</string>
+    <string name="call_notification_answer">Akseptearje</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Do hast it haadadres fan disse keamer fuortsmiten.</string>
+    <string name="notice_room_canonical_alias_no_change">%1$s hat it adres fan disse keamer feroare.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Do hast it adres fan disse keamer feroare.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Do binst fuort gien. Reden: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s is fuort gien. Reden: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Do hast de keamer ferlitten. Reden: %1$s</string>
+    <string name="notice_room_leave_with_reason">%1$s hat de keamer ferlitten. Reden: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Do binst de keamer yn kaam. Reden: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s is de keamer yn kaam. Reden: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Do binst de keamer yn kaam. Reden: %1$s</string>
+    <string name="notice_room_join_with_reason">%1$s is de keamer yn kaam. Reden: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s hat dy útnûge. Reden: %2$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Do hast %1$s útnûge. Reden: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s hat %2$s útnûge. Reden: %3$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Dyn útnûging. Reden: %1$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">%1$s harren útnûging. Reden: %2$s</string>
+    <string name="clear_timeline_send_queue">Ferstjoeringslist leech meitsje</string>
+    <string name="event_status_sending_message">Berjocht oan it fersjoeren…</string>
+    <string name="event_status_sent_message">Berjocht ferstjoerd</string>
+    <string name="initial_sync_start_importing_account_data">Inisjele Syngronisaasje:
+\nAkkount Data Binnenhelje</string>
+    <string name="initial_sync_start_importing_account_groups">Inisjele Syngronisaasje:
+\nMienskippen Binnenhelje</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Inisjele Syngronisaasje:
+\nOerblieuwne Keamers Binnenhelje</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Inisjele Syngronisaasje:
+\nKeamers Werst Foar Útnûge Binst Binnenhelje</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Inisjele Syngronisaasje:
+\nKeamers wer ast yn kaam binst binnenhelje</string>
+    <string name="initial_sync_start_importing_account_rooms">Inisjele Syngronisaasje:
+\nKeamers binnenhelje</string>
+    <string name="initial_sync_start_importing_account">Inisjele Syngronisaasje:
+\nAkkount importearje…</string>
+    <string name="initial_sync_start_downloading">Inisjele Syngronisaasje:
+\nData binnenhelje…</string>
+    <string name="initial_sync_start_server_computing">Inisjele Syngronisaasje:
+\nWachtsjend op reaksje fan tsjinner…</string>
+    <string name="room_displayname_empty_room_was">Lege keamer (wie %s)</string>
+    <string name="room_displayname_empty_room">Lege keamer</string>
+    <string name="medium_email">Email adres</string>
+    <string name="room_displayname_invite_from">Útnûging fan %s</string>
+    <string name="medium_phone_number">Tillefoan nûmer</string>
+    <string name="message_failed_to_upload">Upload fan ôfbylding mislearre</string>
+    <string name="notice_crypto_unable_to_decrypt">** Koe %s net ûntsiferje **</string>
+    <string name="could_not_redact">Koe net ynlûke</string>
+    <string name="power_level_custom_no_value">Oanpast</string>
+    <string name="power_level_custom">Oanpast (%1$d)</string>
+    <string name="power_level_default">Standert</string>
+    <string name="notice_widget_jitsi_modified_by_you">Do hast de fideo konferînsje oanpast</string>
+    <string name="power_level_admin">Behearder</string>
+    <string name="notice_event_redacted_by_with_reason">Berjocht fuortsmiten troch %1$s [reden: %2$s]</string>
+    <string name="notice_event_redacted_with_reason">Berjocht fuortsmiten [reden: %1$s]</string>
+    <string name="notice_event_redacted_by">Berjocht fuortsmiten troch %1$s</string>
+    <string name="notice_room_server_acl_updated_no_change">Gjin feroaringen.</string>
+    <string name="notice_room_server_acl_set_allowed">• Tsjinners dy foldoche oan %s bin tastien.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Do hast de ACLs foar de keamer opnij ynsteld.</string>
+    <string name="notice_room_server_acl_set_title">%s hat de ACLs foar disse keamer ynsteld.</string>
+    <string name="notice_room_update_by_you">Do hast disse keamer opwurdeare.</string>
+    <string name="notice_room_update">%s hat disse keamer upwurdeare.</string>
+    <string name="notice_end_to_end_by_you">Do hast end-to-end fersifering ynskakele (%1$s)</string>
+    <string name="notice_end_to_end">%1$s hat end-to-end fersifering ynskakele (%2$s)</string>
+    <string name="notice_room_visibility_unknown">ûnbekend (%s).</string>
+    <string name="notice_room_visibility_shared">Alle keamerleden.</string>
+    <string name="notice_room_visibility_joined">Olle keamerleden, fanôf it momint dot se de keamer ynkaam binne.</string>
+    <string name="notice_room_visibility_invited">Olle keamerleden, fanôf it momint dot se útnûge binne.</string>
+    <string name="summary_message">%1$s: %2$s</string>
+    <string name="space_type_public_desc">Iepen foar eltsenien, it beste foar mienskippen</string>
+    <string name="group_all_communities">Alle mienskippen</string>
+    <string name="community_id">Mienskips ID</string>
+    <string name="community_name">Mienskipsnamme</string>
+    <string name="create_community">Mienskip Oanmeitsje</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' is net in jildich mienskips ID</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Ûnjildich mienskips ID</string>
+    <string name="room_settings_add_new_group">Nije mienskips ID (b.v. +foo:matrix.org)</string>
+    <string name="settings_without_flair">Do binst op it momint net lid fan in mienskip.</string>
+    <string name="dialog_title_success">Sukses</string>
+    <string name="room_participants_invite_search_another_user">Brûkers ID, Namme of email</string>
+    <string name="room_participants_action_leave">Disse keamer ferlitte</string>
+    <string name="room_participants_create">Oanmeitsje</string>
+    <string name="room_participants_action_remove">Út disse keamer smite</string>
+    <string name="room_settings_enable_encryption_no_permission">Do hast gjin tastimming om enkripsje yn te skakeljen yn disse keamer.</string>
+    <string name="sound_device_phone">Tillefoan</string>
+    <string name="call_failed_dont_ask_again">My net wer freechje</string>
+    <string name="start_new_chat">Nij petear begjinne</string>
+    <string name="search">Sykje</string>
+    <string name="create_account">Akkount oanmeitsje</string>
+    <string name="username">Brûkersnamme</string>
+    <string name="logout">Útlogge</string>
+    <string name="login">Ynlogge</string>
+    <string name="read_receipt">Léze</string>
+    <string name="search_in_my_contacts">Yn mien kontakten sykje</string>
+    <string name="phone_book_perform_lookup">Om matrix kontakten sykje</string>
+    <string name="message_action_item_redact">Fuortsmite…</string>
+    <string name="share_confirm_room">Wolst dit taheaksel fersjoere nei %1$s\?</string>
+    <string name="send_attachment">Taheaksel ferstjoere</string>
+    <string name="settings_text_message_sent_wrong_code">De ferifikaasje koade is net jildich.</string>
+    <string name="settings_text_message_sent_hint">Koade</string>
+    <string name="settings_text_message_sent">In tekst berjocht is nei %s stjoerd. Graach de ferifikaasje koade ynfiere dyt der yn stiet.</string>
+    <string name="settings_discovery_bad_identity_server">Kin net ferbine mei identiteits tsjinner</string>
+    <string name="settings_discovery_enter_identity_server">Identiteits tsjinner URL ynfiere</string>
+    <string name="identity_server_consent_dialog_title">Emails en tillefoan nûmers ferstjoere</string>
+    <string name="settings_discovery_consent_action_give_consent">Tastimming jaan</string>
+    <string name="settings_discovery_consent_action_revoke">Tastimming wer ynlûke</string>
+    <string name="settings_discovery_consent_notice_off">Do hast gjin tastimming jûn emails en tillefoan nûmers nei disse identiteits tsjinner te stjoeren, om oare brûkers út dyn kontakten te finen.</string>
+    <string name="settings_discovery_consent_notice_on">Do hast tastimming jûn emails en tillefoan nûmers nei disse identiteits tsjinner te stjoeren, om oare brûkers út dyn kontakten te finen.</string>
+    <string name="settings_discovery_consent_title">Emails en tillefoan nûmers ferstjoere</string>
+    <string name="settings_discovery_mail_pending">Yn ôfwachting</string>
+    <string name="terms_description_for_integration_manager">Bots, brêgen, widgets en sticker paketten brûke</string>
+    <string name="terms_description_for_identity_server">Foar oaren fynber wéze</string>
+    <string name="message_view_edit_history">Feroarings Skiednis Besjen</string>
+    <string name="joining_room">Keamer binnen gean…</string>
+    <string name="creating_direct_room">Keamer wurd oanmakke…</string>
+    <string name="room_filtering_footer_create_new_room">Nije keamer oanmeitsje</string>
+    <string name="no_message_edits_found">Gjin feroaringen fûn</string>
+    <string name="edited_suffix">(feroare)</string>
+    <string name="send_file_step_idle">Wachtsjend…</string>
+    <string name="preference_root_help_about">Hulp &amp; Oer</string>
+    <string name="quick_reactions">Flugge Reaksjes</string>
+    <string name="settings_sdk_version">Matrix SDK Ferzje</string>
+    <string name="create_room_settings_section">Keamer ynstellings</string>
+    <string name="create_room_topic_hint">Ûnderwerp</string>
+    <string name="create_room_topic_section">Keamer ûnderwerp (opsjoneel)</string>
+    <string name="create_room_name_hint">Namme</string>
+    <string name="create_room_name_section">Keamer namme</string>
+    <string name="create_room_action_create">OANMEITSJE</string>
+    <string name="create_room_title">Nije Keamer</string>
+    <string name="fab_menu_create_chat">Direkte Berjochten</string>
+    <string name="fab_menu_create_room">Keamers</string>
+    <string name="room_preview_no_preview_join">Disse keamer kin net ynsjûn wurde. Wolst de keamer binnen gean\?</string>
+    <string name="room_preview_not_found">Disse keamer jout no gjin tagong.
+\nProbearje it letter noch ris in kear, of freechje in administrator om te sjen ast wol de nediche rjochten hast.</string>
+    <string name="template_room_preview_world_readable_room_not_supported_yet">Ynsjoch yn wrâld-lésbere keamers wurd noch net stipe troch ${app_name}</string>
+    <string name="room_preview_no_preview">Disse keamer kin net ynsjûn wurde</string>
+    <string name="please_wait">Graach efkes wachtsje…</string>
+    <string name="change_room_directory_network">Netwurk feroarje</string>
+    <string name="action_change">Feroarje</string>
+    <string name="error_no_network">Gjin netwurk. Kontroleerje dyn internet ferbyning.</string>
+    <string name="create_new_room">Nije Keamer Meitsje</string>
+    <string name="malformed_message">Net gûd foarme evenemint, kin net sjen litten wurde</string>
+    <string name="last_edited_info_message">Foar it letst feroare troch %1$s op %2$s</string>
+    <string name="event_redacted_by_user_reason">Evenemint troch brûker fuortsmiten</string>
+    <string name="settings_show_redacted">Fuortsmiten berjiochten sjen litte</string>
+    <string name="event_redacted">Berjocht fuortsmiten</string>
+    <string name="reactions">Reaksjes</string>
+    <string name="create_room_directory_title">Keamer List</string>
+    <string name="create_room_public_description">Eltsenien kin disse keamer binnen gean</string>
+    <string name="create_room_public_title">Iepenbier</string>
+    <string name="settings_preferences">Foarkarren</string>
+    <string name="send_suggestion">Sugestje dwaan</string>
+    <string name="room_preview_try_join_an_unknown_room_default">in keamer</string>
+    <string name="room_creation_title">Nij Petear</string>
+    <string name="preview">Ynsjen</string>
+    <string name="join">Meidwaan</string>
+    <string name="remove">Fuortsmite</string>
+    <string name="_continue">Troch gean</string>
+    <string name="no">NEE</string>
+    <string name="yes">JA</string>
+    <string name="permissions_rationale_popup_title">Informaasje</string>
+    <string name="call_resume_action">Troch gean</string>
+    <string name="room_info_room_topic">Keamer ûnderwerp</string>
+    <string name="room_info_room_name">Keamer namme</string>
+    <string name="today">Hjoerd</string>
+    <string name="yesterday">Juster</string>
+    <string name="compression_opt_list_small">Lyts</string>
+    <string name="compression_opt_list_medium">Gemiddeld</string>
+    <string name="compression_opt_list_large">Grut</string>
+    <string name="compression_opt_list_original">Orizineel</string>
+    <string name="compression_options">Ferstjoer as</string>
+    <plurals name="membership_changes">
+        <item quantity="one">%d lidmaatskip wiizige</item>
+        <item quantity="other">%d lidmaatskippen wiizige</item>
+    </plurals>
+    <string name="groups_list">Groepslist</string>
+    <string name="e2e_re_request_encryption_key_dialog_title">Oanfraach ferstjoerd</string>
+    <string name="e2e_re_request_encryption_key_sent">Kaai oanfraach ferstjoerd.</string>
+    <string name="login_error_login_email_not_yet">De email link wer oft noch net op klikt is</string>
+    <string name="login_error_user_in_use">Disse brûkersnamme wurd ol brûkt</string>
+    <string name="login_error_limit_exceeded">Der binne te folle oanfraachen festjoerd</string>
+    <string name="login_error_bad_json">Misfoarme JSON</string>
+    <string name="login_error_forbidden">Ûnjildiche brûkersnamme/wachtwurd</string>
+    <string name="login_error_ssl_handshake">Dyn apperaat brûkt in âlde ferzje fan it TLS feiligings protokol, kwetsber foar oanfallen, foar dyn feiligens kinst no net ferbine</string>
+    <string name="login_error_ssl_other">SSL Flater.</string>
+    <string name="login_error_homeserver_not_found">Kin de thústsjinner op disse URL net berikke, kontroleerje dit</string>
+    <string name="login_error_no_homeserver_found">Dit is net in jildich Matrix tsjinner adres</string>
+    <string name="login_error_unknown_host">Disse URL is net te berikken, kontroleerje dit</string>
+    <string name="login_error_invalid_home_server">Fier in jildiche URL yn</string>
+    <string name="login_error_unable_register">Kin net registreerje</string>
+    <string name="login_error_registration_network_error">Kin net registreerje: Netwurk flater</string>
+    <string name="login_error_unable_login">Kin net ynlogge</string>
+    <string name="auth_reset_password_error_unauthorized">Koe it email adres net ferifiëre: wês der wis fan dost op it linkje yn\'e email klikt hast</string>
+    <string name="auth_reset_password_email_validation_message">Der is een email nei %s stjoerd. Ost op it linkje klikt hast wot der yn stie, klikst hjir ûnder.</string>
+    <string name="auth_email_validation_message">Kontroleerje dyn email om troch te gean mei de registraasje</string>
+    <string name="auth_forgot_password">Wachtwurd fergetten\?</string>
+    <string name="auth_password_dont_match">Wachtwurden binne net gelyk</string>
+    <string name="auth_invalid_token">Ûnjildich token</string>
+    <string name="auth_missing_email_or_phone">Der mist een email adres of tillefoan nûmer</string>
+    <string name="auth_missing_phone">Tillefoan nûmer mist</string>
+    <string name="auth_missing_email">Email adres mist</string>
+    <string name="auth_email_already_defined">Dit email adres wurd ol brûkt.</string>
+    <string name="auth_invalid_phone">Dit sjucht der net út as in jildich tillefoan nûmer</string>
+    <string name="auth_opt_phone_number_placeholder">Tillefoan nûmer (opsjoneel)</string>
+    <string name="auth_phone_number_placeholder">Tillefoan nûmer</string>
+    <string name="auth_invalid_password">Wachtwurd te koart (min 6)</string>
+    <string name="auth_repeat_password_placeholder">Wachtwurd nog ris ynfiere</string>
+    <string name="auth_new_password_placeholder">Nij wachtwurd</string>
+    <string name="auth_login">Ynlogge</string>
+    <string name="call_switch_camera">Fan kamera wikselje</string>
+    <string name="option_take_video">Fideo nimme</string>
+    <string name="option_take_photo">Foto nimme</string>
+    <string name="option_take_photo_video">Foto of fideo nimme</string>
+    <string name="option_send_sticker">Stickers ferstjoere</string>
+    <string name="option_send_files">Triemen ferstjoere</string>
+    <string name="call_format_turn_hd_on">HD ynskakelje</string>
+    <string name="call_format_turn_hd_off">HD útskakelje</string>
+    <string name="call_camera_back">Efterkant</string>
+    <string name="call_camera_front">Foarkant</string>
+    <string name="go_on_with">troch gean mei…</string>
+    <string name="auth_user_name_placeholder">Brûkersnamme</string>
+    <string name="auth_missing_password">Wachtwurd mist</string>
+    <string name="auth_recaptcha_message">Disse Thús Tsjinner wol der graach wis fon wéze dost gjin robot bist</string>
+    <string name="auth_reset_password_missing_password">Der mat in nij wachtwurd ynfierd wurde.</string>
+    <string name="auth_reset_password_missing_email">It email adres dyt by dien akkount hjeard mat hjir ynfierd wurde.</string>
+    <string name="auth_reset_password_message">Om dyn wachtwurd opnij yn te stellen, mast it email adres dyt by dien account hjeard hjir ynfiere:</string>
+    <string name="auth_reset_password_next_step_button">Ik ha myn emailadres ferifiere</string>
+    <string name="auth_identity_server">Identiteits Tsjinner:</string>
+    <string name="auth_home_server">Thús Tsjinner:</string>
+    <string name="auth_username_in_use">Brûkernamme wurd ol brûkt</string>
+    <string name="settings_security_and_privacy">Feiligens &amp; Privacy</string>
+    <string name="room_widget_resource_grant_permission">Tastean</string>
+    <string name="room_settings_room_version_title">Keamer ferzje</string>
+    <string name="room_settings_category_advanced_title">Avanseare</string>
+    <string name="room_settings_room_access_restricted_title">Rômtes</string>
+    <string name="room_settings_room_access_public_description">Eltsenien kin de keamer fyne en der yn komme</string>
+    <string name="room_settings_read_history_entry_anyone">Eltsenien</string>
+    <string name="room_settings_guest_access_title">Gasten tastean om de keamer yn te gean</string>
+    <string name="room_alias_published_alias_main">Dit is it haad adres</string>
+    <string name="room_alias_main_address_hint">Haad adres</string>
+    <string name="room_settings_room_notifications_title">Notifikaasjes</string>
+    <string name="media_saving_period_1_month">1 moanne</string>
+    <string name="media_saving_period_1_week">1 wike</string>
+    <string name="media_saving_period_3_days">3 dagen</string>
+    <string name="media_saving_period_forever">Foar oltiid</string>
+    <string name="action_add">Tafoegje</string>
+    <string name="bottom_action_notification">Notifikaasjes</string>
+    <string name="create_spaces_default_public_room_name">Olgemien</string>
+    <string name="matrix_error">Matrix flater</string>
+    <string name="network_error">Netwurk flater</string>
+    <string name="unable_to_send_message">Kin it berjocht net ferstjoere</string>
+    <string name="notice_event_redacted">Berjocht fuortsmiten</string>
+    <string name="labs_use_restricted_join_rule_desc">Waskôging hat ûndersteuning fan\'e tsjinner en in eksperimintele keamer nedich</string>
+    <string name="labs_use_restricted_join_rule">Eksperiminteel Rômte - Beheinde Keamer.</string>
+    <string name="you_are_invited">Do bist útnûge</string>
+    <string name="notice_room_visibility_world_readable">eltsenien.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Do hast takomstige berjochten foar %1$s sichtber makke</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s hat takomstige berjochten foar %2$s sichtber makke</string>
+    <string name="notice_made_future_room_visibility_by_you">Do hast de takomstige keamer skiednis foar %1$s sichtber makke</string>
+    <string name="notice_made_future_room_visibility">%1$s hat de takomstige keamer skiednis foar %2$s sichtber makke</string>
+    <string name="notice_ended_call_by_you">Do hast it petear beënige.</string>
+    <string name="notice_ended_call">%s hat it petear beëinige.</string>
+    <string name="notice_answered_call_by_you">Do hast it petear beantwurde.</string>
+    <string name="notice_answered_call">%s hat it petear beantwurde.</string>
+    <string name="notice_call_candidates_by_you">Do hast data stjoerd om in petear op te setten.</string>
+    <string name="notice_call_candidates">%s hat data stjoerd om in petear op te setten.</string>
+    <string name="notice_placed_voice_call">%s hat in fideo petear oanmakke.</string>
+    <string name="notice_placed_video_call_by_you">Do hast in fideo petear oanmakke.</string>
+    <string name="notice_placed_video_call">%s hat in fideo petear oanmakke.</string>
+    <string name="notice_room_name_changed_by_you">Do hast de namme fan\'e keamer feroare nei: %1$s</string>
+    <string name="notice_room_name_changed">%1$s hat de namme fan\'e keamer feroare nei: %2$s</string>
+    <string name="notice_room_topic_changed_by_you">Do hast it ûnderwerp feroare nei: %1$s</string>
+    <string name="notice_room_topic_changed">%1$s hat it ûnderwerp feroare nei: %2$s</string>
+    <string name="notice_display_name_removed_by_you">Do hast dyn namme fuortsmiten (it wie %1$s)</string>
+    <string name="notice_display_name_removed">%1$s hat syn namme fuortsmiten (it wie %2$s)</string>
+    <string name="notice_display_name_changed_from_by_you">Do hast dyn namme fan %1$s nei %2$s feroare</string>
+    <string name="notice_display_name_changed_from">%1$s hat syn namme fan %2$s nei %3$s feroare</string>
+    <string name="notice_display_name_set_by_you">Do hast dyn namme nei %1$s feroare</string>
+    <string name="notice_display_name_set">%1$s hat syn namme nei %2$s feroare</string>
+    <string name="notice_room_withdraw_by_you">Do hast de útnûging foar %1$s wer ynlutsen</string>
+    <string name="notice_room_withdraw">%1$s hat de útnûging foar %2$s wer ynlutsen</string>
+    <string name="notice_room_ban_by_you">Do hast %1$s ferbonne</string>
+    <string name="notice_direct_room_join_by_you">Do bist de keamer yn kaam</string>
+    <string name="notice_room_ban">%1$s hat %2$s ferbonne</string>
+    <string name="notice_room_kick_by_you">Do hast %1$s der út skopt</string>
+    <string name="notice_room_kick">%1$s hat %2$s der út skopt</string>
+    <string name="notice_room_reject_by_you">Do hast de útnûging ôfwiisd</string>
+    <string name="notice_room_reject">%1$s hat de útnûging ôfwiisd</string>
+    <string name="notice_direct_room_leave_by_you">Do hast de keamer ferlitten</string>
+    <string name="notice_direct_room_leave">%1$s hat de keamer ferlitten</string>
+    <string name="notice_room_leave_by_you">Do hast de keamer ferlitten</string>
+    <string name="notice_room_leave">%1$s hat de keamer ferlitten</string>
+    <string name="notice_direct_room_join">%1$s is de keamer yn kaam</string>
+    <string name="notice_room_join_by_you">Do bist de keamer yn kaam</string>
+    <string name="notice_room_join">%1$s is de keamer yn kaam</string>
+    <string name="notice_room_invite_you">%1$s hat dy útnûge</string>
+    <string name="notice_room_invite_by_you">Do hast %1$s útnûge</string>
+    <string name="notice_room_invite">%1$s hat %2$s útnûge</string>
+    <string name="notice_direct_room_created_by_you">Do hast de diskusje oanmakke</string>
+    <string name="notice_direct_room_created">%1$s hat de diskusje oanmakke</string>
+    <string name="notice_room_created_by_you">Do hast de keamer oanmakke</string>
+    <string name="notice_room_created">%1$s hat de keamer oanmakke</string>
+    <string name="notice_room_invite_no_invitee_by_you">Dyn útnûging</string>
+    <string name="notice_room_invite_no_invitee">%s\'s útnûging</string>
+    <string name="summary_you_sent_sticker">Do hast in sticker stjoerd.</string>
+    <string name="summary_user_sent_sticker">%1$s hat in sticker stjoerd.</string>
+    <string name="summary_you_sent_image">Do hast in ôfbylding stjoerd.</string>
+    <string name="summary_user_sent_image">%1$s hat in ôfbylding stjoerd.</string>
+</resources>
\ No newline at end of file

From ee8ef585ce5dfb77a10486cd742b4f7c24504123 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Sun, 2 May 2021 13:26:01 +0000
Subject: [PATCH 236/350] Translated using Weblate (Swedish)

Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
---
 .../android/sv/changelogs/40101040.txt        |  2 +
 .../android/sv/changelogs/40101050.txt        |  2 +
 .../android/sv/changelogs/40101060.txt        |  2 +
 .../metadata/android/sv/full_description.txt  | 47 +++++++++++--------
 .../metadata/android/sv/short_description.txt |  2 +-
 fastlane/metadata/android/sv/title.txt        |  2 +-
 6 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 fastlane/metadata/android/sv/changelogs/40101040.txt
 create mode 100644 fastlane/metadata/android/sv/changelogs/40101050.txt
 create mode 100644 fastlane/metadata/android/sv/changelogs/40101060.txt

diff --git a/fastlane/metadata/android/sv/changelogs/40101040.txt b/fastlane/metadata/android/sv/changelogs/40101040.txt
new file mode 100644
index 0000000000..46a004ec54
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: prestandaförbättringar och buggfixar!
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/sv/changelogs/40101050.txt b/fastlane/metadata/android/sv/changelogs/40101050.txt
new file mode 100644
index 0000000000..158e2032b7
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: hotfixar för 1.1.4
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/sv/changelogs/40101060.txt b/fastlane/metadata/android/sv/changelogs/40101060.txt
new file mode 100644
index 0000000000..cc7a9b84b6
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: hotfixar för 1.1.5
+Full ändringslogg: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/sv/full_description.txt b/fastlane/metadata/android/sv/full_description.txt
index d130e9214a..5302976ed7 100644
--- a/fastlane/metadata/android/sv/full_description.txt
+++ b/fastlane/metadata/android/sv/full_description.txt
@@ -1,30 +1,39 @@
-Element är en ny sorts meddelande- och samarbetsapp som:
+Element är både en säker meddelandeapp och en samarbetsapp för produktivitet som är ideal för gruppchattar vid distansarbete. Appen använder totalsträckskryptering för att tillhandahålla kraftfulla videogruppsamtal, fildelning och röstsamtal.
 
-1. Sätter dig i kontroll för att kunna säkerställa ditt privatliv
-2. Låter dig kommunicera med vem som helst i Matrix-nätverket, och till och med bortom det genom integrationer med appar som Slack
-3. Skyddar dig från reklam, datainsamling och inlåsning
-4. Säkrar dig genom totalsträckskryptering, med korssingering för att verifiera andra
+<b>Elements funktioner inkluderar:</b>
+- Avancerade kommunikationsverktyg
+- Fullt krypterade meddelanden för att tillåta säkrare företagskommunikation, även för distansarbetare
+- Decentraliserad chatt baserad på det öppna ramverket Matrix
+- Säker fildelning med krypterad data vid hantering av projekt
+- Videochattar med Voice over IP och skärmdelning
+- Enkel integration med dina föredragna onlinesamarbetsverktyg, projektledningsverktyg, VoIP-tjänster och andra teammeddelandeappar
 
-Element skiljer sig helt från andra meddelande- och samarbetsappar genom att vara decentraliserad och öppen källkod.
+Element är helt olik andra meddelande- och samarbetsappar. Den använder Matrix, ett öppet nätverk för säkra meddelanden och decentraliserad kommunikation. Den låter dig driva en igen server för att ge användare maximalt ägandeskap över sin data och sina meddelanden.
 
-Element låter dig driva en egen server - eller välja en värd - så att du har sekretess, ägande och kontroll över din data och dina konversationer. Den ger dig tillgång till ett öppet nätverk; så att du inte kan prata bara med Element-användare. Och den är väldigt säker.
+<b>Sekretess och krypterade meddelanden</b>
+Element skyddar dig från oönskad reklam, datainsamling och inlåsning. Den skyddar även all din data, en-till-en-video- och röstkommunikation genom totalsträckskryptering och korssignerad enhetsverifiering.
 
-Element kan göra allt detta för att den använder Matrix - standarden för öppen decentraliserad kommunikation.
+Element sätter dig i kontroll över ditt privatliv och låter dig kommunicera säkert med vem som helst i Matrix-nätverket, eller andra samarbetsverktyg genom att integrera med appar som Slack.
 
-Element sätter dig i kontroll genom att låta dig välja att vara värd för dina konversationer. Från appen Element kan du välja att ansluta på följande sätt:
+<b>Du kan driva Element själv</b>
+För att tillåta större kontroll över din känsliga data och konversationer, så kan du lägga Element på en egen server eller använda valfri Matrix-baserad värd - standarden för open source-baserad, decentraliserad kommunikation. Element ger dig sekretess, säkerhetsefterlevnad och integrationsflexibilitet.
 
-1. Skaffa ett gratis konto på den publika servern på matrix.org, vilken drivs av Matrix-utvecklarna, eller välj bland tusentals offentliga servrar som drivs av volontärer
-2. Var värd för ditt eget konto genom att driva en server på din egen hårdvara
-3. Skapa ett konto på en anpassad server genom att registrera dig på värdplattformen Element Matrix Services
+<b>Äg din data</b>
+Du bestämmer vart du vill lagra din data och dina meddelanden, utan rist för datainsamling eller åtkomst av tredje parter.
 
-<b>Varför välja Element?</b>
+Element sätter dig i kontroll på olika sätt:
+1. Få ett gratiskonto på den offentliga servern matrix.org som drivas av Matrixutvecklarna, eller välj bland tusentals offentliga servrar som drivs av volontärer
+2. Självdriv ditt konto genom att driva en server på din egen IT-infrastruktur
+3. Skapa ett konto på en anpassad server genom att abonnera på värdplattformen Element Matrix Services
 
-<b>ÄG DIN DATA</b>: Du väljer var du vill ha din data och dina meddelanden. Du äger den och kontrollerar den, inte nåt stort företag som samlar in din data och ger den till tredje parter.
+<b>Öppen meddelandehantering och kommunikation</b>
+Du kan chatta med vem som helst i Matrix-nätverket, oavsett om de använder Matrix, en annan Matrix-app eller till och med en annan meddelandeapp.
 
-<b>ÖPPEN KOMMUNIKATION OCH ÖPPET SAMARBETE</b>: Du kan chatta med vem som helst på Matrix-nätverket, oavsett om de använder Element eller en annan Matrix-app, och till och med om de använder ett annat meddelandesystem som Slack, IRC eller XMPP.
+<b>Supersäker</b>
+Riktig totalsträckskryptering (bara de i konversationen kan avkryptera meddelanden), och korssignerad enhetsverifiering.
 
-<b>SUPERSÄKER</b>: Riktig totalsträckskryptering (bara de in konversationen kan avkryptera meddelandena), och korssingering för att verifiera konversationsmedlemmars enheter.
+<b>Komplett kommunikation och integration</b>
+Meddelanden, röst- och videosamtal, fildelning, skärmdelning och massa integrationer, bottar och widgets. Bygg rum och gemenskaper, håll kontakten och få saker gjorda.
 
-<b>KOMPLETT KOMMUNIKATION</b>: Meddelanden, röst- och videosamtal, fildelning, skärmdelning och massa integrationer, bottar och widgets. Skapa rum och gemenskaper, håll kontakten och få saker gjorda.
-
-<b>ÖVERALLT DÄR DU ÄR</b>: Håll kontakten vart du än befinner dig med fullständigt synkroniserad meddelandehistorik på alla dina enheter och på webben på https://app.element.io.
+<b>Fortsätt där du lämnade</b>
+Håll kontakten vart du än är med fullt synkroniserad meddelandehistorik på alla dina enheter och på webben på https://app.element.io
diff --git a/fastlane/metadata/android/sv/short_description.txt b/fastlane/metadata/android/sv/short_description.txt
index ddfc5dcbfb..c16da5c761 100644
--- a/fastlane/metadata/android/sv/short_description.txt
+++ b/fastlane/metadata/android/sv/short_description.txt
@@ -1 +1 @@
-Säker decentraliserad chatt och VoIP. Håll din data säker från tredje parter.
+Gruppmeddelandeapp - krypterade meddelanden, gruppchatt och videosamtal
diff --git a/fastlane/metadata/android/sv/title.txt b/fastlane/metadata/android/sv/title.txt
index 573e27fab9..4fc189de15 100644
--- a/fastlane/metadata/android/sv/title.txt
+++ b/fastlane/metadata/android/sv/title.txt
@@ -1 +1 @@
-Element (före detta Riot.im)
+Element - Säker meddelandeapp

From 318fbcd4f69f3bb3b21a3511f16af8dd01e3f171 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Sat, 1 May 2021 12:04:10 +0000
Subject: [PATCH 237/350] Translated using Weblate (Catalan)

Currently translated at 97.2% (2371 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
---
 vector/src/main/res/values-ca/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 812cb4b531..f87c4bdd21 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -2741,4 +2741,13 @@
     <string name="event_status_a11y_sent">Enviat</string>
     <string name="event_status_a11y_sending">Enviant</string>
     <string name="event_status_sent_message">Missatge enviat</string>
+    <string name="search_hint_room_name">Cerca nom</string>
+    <string name="room_settings_room_access_public_description">Qualsevol pot trobar la sala i unir-s\'hi</string>
+    <string name="room_settings_room_access_private_title">Privat</string>
+    <string name="room_settings_room_access_public_title">Públic</string>
+    <string name="room_settings_room_access_private_description">Només els convidats poden trobar-la i unir-s\'hi</string>
+    <string name="room_settings_room_access_entry_knock">Qualsevol pot demanar entrar a la sala, els participants poden acceptar-ho o rebutjar-ho</string>
+    <string name="room_settings_guest_access_title">Permet als convidats unir-se</string>
+    <string name="spaces_invited_header">Invitacions</string>
+    <string name="suggested_header">Sales suggerides</string>
 </resources>
\ No newline at end of file

From d744d1c6e86419a20bf7b423f135ef79ae4435c8 Mon Sep 17 00:00:00 2001
From: Zet <abidin24@disroot.org>
Date: Sat, 1 May 2021 00:04:00 +0000
Subject: [PATCH 238/350] Translated using Weblate (Arabic)

Currently translated at 37.6% (917 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
---
 vector/src/main/res/values-ar/strings.xml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 4e74426e9a..d82181d374 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -11,9 +11,9 @@
     <string name="notice_room_unban">رفعَ ⁨%1$s⁩ المنع عن ⁨%2$s⁩</string>
     <string name="notice_room_ban">منعَ ⁨%1$s⁩ ⁨%2$s⁩</string>
     <string name="notice_avatar_url_changed">غيّر ⁨%1$s⁩ صورته الشخصية</string>
-    <string name="notice_display_name_changed_from">إنَّ %1$s قد غيَّرَ اسمه الظاهر من %2$s إلى %3$s</string>
-    <string name="notice_display_name_removed">إنَّ %1$s قد أزالَ اسمه الظاهر (لقد كان %2$s)</string>
-    <string name="notice_room_topic_changed">إنَّ %1$s قد غيَّرَ الموضوع إلى: %2$s</string>
+    <string name="notice_display_name_changed_from">غيّر %1$s اسمه الظاهر من %2$s إلى %3$s</string>
+    <string name="notice_display_name_removed">أزال %1$s اسمه الظاهر (كان %2$s)</string>
+    <string name="notice_room_topic_changed">غيّر %1$s الموضوع إلى: %2$s</string>
     <string name="notice_room_name_changed">إنَّ %1$s قد غيَّرَ اسم الغُرفة إلى: %2$s</string>
     <string name="notice_answered_call">إنَّ %s قد أجابَ على المُكالمة.</string>
     <string name="notice_ended_call">إنَّ %s قد أنهى المُكالمة.</string>
@@ -74,10 +74,10 @@
     <string name="notice_room_ban_by_you">منعتَ ⁨%1$s⁩</string>
     <string name="notice_room_withdraw_by_you">سحبتَ الدعوة الموجّهة إلى ⁨%1$s⁩</string>
     <string name="notice_avatar_url_changed_by_you">غيّرتَ صورتك الشخصية</string>
-    <string name="notice_display_name_set_by_you">أنتَ قد عيَّنتَ اسمك الظاهر إلى %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">أنتَ قد غيّرتَ اسمك الظاهر من ⁨%1$s⁩ إلى ⁨%2$s⁩</string>
-    <string name="notice_display_name_removed_by_you">أنتَ قد أزلتَ اسمك الظاهر (لقد كان ⁨%1$s⁩)</string>
-    <string name="notice_room_topic_changed_by_you">أنتَ قد غيَّرتَ الموضوع إلى: ⁨%1$s⁩</string>
+    <string name="notice_display_name_set_by_you">عيَّنتَ اسمك الظاهر إلى %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">غيّرتَ اسمك الظاهر من ⁨%1$s⁩ إلى ⁨%2$s⁩</string>
+    <string name="notice_display_name_removed_by_you">أزلتَ اسمك الظاهر (كان ⁨%1$s⁩)</string>
+    <string name="notice_room_topic_changed_by_you">غيَّرتَ الموضوع إلى: ⁨%1$s⁩</string>
     <string name="notice_room_avatar_changed">إنَّ %1$s قد غيَّرَ صورة الغُرفة</string>
     <string name="notice_room_avatar_changed_by_you">أنتَ قد غيَّرتَ صورة الغُرفة</string>
     <string name="notice_room_name_changed_by_you">أنتَ قد غيَّرتَ اسم الغُرفة إلى: %1$s</string>
@@ -1128,4 +1128,11 @@
     <string name="title_activity_keys_backup_setup">نسخ إحتياطي للمفتاح</string>
     <string name="notification_sync_init">جاري إعداد الخدمة</string>
     <string name="system_theme">إفتراضي النظام</string>
+    <string name="notice_room_canonical_alias_set">غير %1$s عنوان الغرفة الى %2$s.</string>
+    <string name="event_status_sent_message">أُرسلت الرسالة</string>
+    <string name="initial_sync_start_downloading">المزامنة الأولية:
+\nينزل البيانات…</string>
+    <string name="initial_sync_start_server_computing">المزامنة الأولية:
+\nينتظر رد الخادم…</string>
+    <string name="notice_display_name_set">غير %1$s اسمه الى %2$s</string>
 </resources>
\ No newline at end of file

From accea83fb07155e4f784ba533d192cb0190bdc2e Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Sat, 1 May 2021 16:30:31 +0000
Subject: [PATCH 239/350] Translated using Weblate (German)

Currently translated at 97.3% (2374 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 1899bfdf59..84a436d4de 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2736,4 +2736,16 @@
     <string name="event_status_a11y_sending">Wird gesendet</string>
     <string name="event_status_sent_message">Nachricht gesendet</string>
     <string name="call_transfer_consult_first">Zuerst nachfragen</string>
+    <string name="space_type_private">Privat</string>
+    <string name="space_type_public">Öffentlich</string>
+    <string name="create_spaces_you_can_change_later">Du kannst dies später ändern</string>
+    <string name="a11y_unchecked">Ungeprüft</string>
+    <string name="room_settings_room_access_public_description">Jeder kann den Raum finden und beitreten</string>
+    <string name="room_settings_room_access_public_title">Öffentlich</string>
+    <string name="room_settings_room_access_private_description">Nur Eingeladene können es finden und beitreten</string>
+    <string name="room_settings_room_access_private_title">Privat</string>
+    <string name="room_settings_room_access_entry_unknown">Unbekannte Zugriffseinstellung (%s)</string>
+    <string name="room_settings_guest_access_title">Gäste erlauben beizutreten</string>
+    <string name="spaces_invited_header">Einladungen</string>
+    <string name="suggested_header">Vorgeschlagene Räume</string>
 </resources>
\ No newline at end of file

From d3316a1ce82c6acd09d6368fbad4449335abb25d Mon Sep 17 00:00:00 2001
From: Hakim Oubouali <hakim.oubouali@protonmail.com>
Date: Sat, 1 May 2021 05:29:04 +0000
Subject: [PATCH 240/350] Translated using Weblate (Central Atlas Tamazight)

Currently translated at 4.1% (100 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tzm/
---
 vector/src/main/res/values-tzm/strings.xml | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/res/values-tzm/strings.xml b/vector/src/main/res/values-tzm/strings.xml
index b8688a3c6b..3566c14f0d 100644
--- a/vector/src/main/res/values-tzm/strings.xml
+++ b/vector/src/main/res/values-tzm/strings.xml
@@ -6,7 +6,7 @@
     <string name="settings">Tisɣal</string>
     <string name="room_list_quick_actions_settings">Tisɣal</string>
     <string name="settings_text_message_sent_hint">Tangalt</string>
-    <string name="settings_profile_picture">Tawlaft n ifres</string>
+    <string name="settings_profile_picture">Tawlaft n yifres</string>
     <string name="room_settings_all_messages">Tuzinin maṛṛa</string>
     <string name="settings_general_title">Amatay</string>
     <string name="settings_theme">Asgum</string>
@@ -33,13 +33,13 @@
     <string name="room_permissions_change_settings">Ssenfel Tisɣal</string>
     <string name="global_retry">Rar</string>
     <string name="encryption_information_algorithm">Talgoritmet</string>
-    <string name="room_settings_addresses_pref_title">Tansa</string>
+    <string name="room_settings_addresses_pref_title">Tansawin</string>
     <string name="media_saving_period_forever">Abda</string>
     <string name="media_source_choose">Dɣer</string>
     <string name="compression_opt_list_choose">Dɣer</string>
     <string name="devices_delete_submit_button_label">Azen</string>
     <string name="room_sliding_menu_messages">Tuzinin</string>
-    <string name="room_recents_join">LKM</string>
+    <string name="room_recents_join">LKEM</string>
     <string name="tab_title_search_files">IFUYLA</string>
     <string name="search_hint">Rzu</string>
     <string name="room_details_files">Ifuyla</string>
@@ -50,7 +50,7 @@
         <item quantity="one">%das</item>
         <item quantity="other">%das</item>
     </plurals>
-    <string name="reject">Agey</string>
+    <string name="reject">Agy</string>
     <string name="join">Lkem</string>
     <string name="no">UHU</string>
     <string name="yes">YAH</string>
@@ -62,14 +62,14 @@
     <string name="read_receipt">Ɣer</string>
     <string name="bottom_action_notification">Tineɣmisin</string>
     <string name="dialog_title_error">Azgal</string>
-    <string name="action_close">Rgel</string>
+    <string name="action_close">Mdel</string>
     <string name="action_open">Ṛẓem</string>
     <string name="actions">Tigawin</string>
     <string name="action_exit">Ffeɣ</string>
-    <string name="decline">Agey</string>
+    <string name="decline">Agy</string>
     <string name="invite">Ɣer</string>
     <string name="or">neɣ</string>
-    <string name="ongoing_conference_call_video">Avidyu</string>
+    <string name="ongoing_conference_call_video">Afidyu</string>
     <string name="play_video">Ɣer</string>
     <string name="delete">Kkes</string>
     <string name="clear">Sfeḍ</string>
@@ -78,12 +78,29 @@
     <string name="download">Agem</string>
     <string name="resend">Ssifeḍ</string>
     <string name="send">Azen</string>
-    <string name="leave">Ffel</string>
+    <string name="leave">Ffeɣ</string>
     <string name="save">Ḥḍu</string>
     <string name="cancel">Sser</string>
     <string name="ok">WAX</string>
-    <string name="loading">Azdam…</string>
+    <string name="loading">Asali…</string>
     <string name="summary_you_sent_image">Tuzend yat twellaft.</string>
     <string name="summary_user_sent_image">yuzen %1$s yat twellafet.</string>
     <string name="summary_message">%1$s: %2$s</string>
+    <string name="tab_title_search_people">MIDDEN</string>
+    <string name="tab_title_search_messages">TUZININ</string>
+    <string name="ssl_logout_account">Ffeɣ</string>
+    <string name="room_participants_action_invite">Ɣer</string>
+    <string name="auth_skip">Nexxel</string>
+    <string name="auth_submit">Azen</string>
+    <string name="dialog_title_confirmation">Asentem</string>
+    <string name="call_notification_reject">Agy</string>
+    <string name="ignore">Ttu</string>
+    <string name="dismiss">Agy</string>
+    <string name="none">Awd yan</string>
+    <string name="redact">Sfeḍ</string>
+    <string name="stay">Qqim</string>
+    <string name="notice_room_ban_by_you">Tegdeld %1$s</string>
+    <string name="notice_room_ban">igdel %1$s %2$s</string>
+    <string name="notice_room_invite_by_you">Teɣrid-d i %1$s</string>
+    <string name="notice_room_invite">iɣra-d %1$s i %2$s</string>
 </resources>
\ No newline at end of file

From 72dcf5c65ef80812d68ef1659b8399108b4e6a6f Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Sat, 1 May 2021 16:26:57 +0000
Subject: [PATCH 241/350] Translated using Weblate (German)

Currently translated at 100.0% (18 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
---
 .../android/de/changelogs/40100110.txt        |  2 +-
 .../android/de/changelogs/40101040.txt        |  2 +
 .../android/de/changelogs/40101050.txt        |  2 +
 .../android/de/changelogs/40101060.txt        |  2 +
 .../metadata/android/de/full_description.txt  | 45 +++++++++++--------
 .../metadata/android/de/short_description.txt |  2 +-
 fastlane/metadata/android/de/title.txt        |  2 +-
 7 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 fastlane/metadata/android/de/changelogs/40101040.txt
 create mode 100644 fastlane/metadata/android/de/changelogs/40101050.txt
 create mode 100644 fastlane/metadata/android/de/changelogs/40101060.txt

diff --git a/fastlane/metadata/android/de/changelogs/40100110.txt b/fastlane/metadata/android/de/changelogs/40100110.txt
index 24bc6e518c..120f04a3f9 100644
--- a/fastlane/metadata/android/de/changelogs/40100110.txt
+++ b/fastlane/metadata/android/de/changelogs/40100110.txt
@@ -1,2 +1,2 @@
-Diese neue Version enthält hauptsächlich Verbesserungen der Benutzeroberfläche und der Handhabung. Du kannst jetzt ganz schnell Freund*innen einladen und DMs erstellen, indem du schlicht einen QR-Code scannst.
+Diese neue Version enthält hauptsächlich Verbesserungen der Benutzeroberfläche und der Handhabung. Du kannst jetzt ganz schnell Freunde einladen und DMs erstellen, indem du schlicht einen QR-Code scannst.
 Vollständige Versionshinweise: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/de/changelogs/40101040.txt b/fastlane/metadata/android/de/changelogs/40101040.txt
new file mode 100644
index 0000000000..eaa8db1409
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Leistungsverbesserung und Fehlerbehebungen!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/de/changelogs/40101050.txt b/fastlane/metadata/android/de/changelogs/40101050.txt
new file mode 100644
index 0000000000..de6352961a
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Wichtige Fehlerbehebungen für 1.1.4!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/de/changelogs/40101060.txt b/fastlane/metadata/android/de/changelogs/40101060.txt
new file mode 100644
index 0000000000..775c016b3d
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Hauptänderungen in dieser Version: Wichtige Fehlerbehebungen für 1.1.5!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/de/full_description.txt b/fastlane/metadata/android/de/full_description.txt
index 568ae61875..69343cf0e3 100644
--- a/fastlane/metadata/android/de/full_description.txt
+++ b/fastlane/metadata/android/de/full_description.txt
@@ -1,30 +1,39 @@
-Element ist eine neuartige Messaging- und Kollaborationsapp:
+Element ist mehr als ein sicherer Messenger. Es ist ein produktives Kolaborationsapp für das Team und eignet sich ideal für den Gruppenchat beim Arbeiten von zuhause aus. Mit eingebauter Ende-zu-Ende-Verschlüsselung ermöglicht Element umfangreiche und sichere Videokonferenzen, das Teilen von Dokumenten/Dateien und Videoanrufe.
 
-1. Volle Kontrolle über deine Privatssphäre
-2. Kommuniziere mit jedem aus dem Matrix-Netzwerk und mit der Integration von z.B. Slack sogar über Matrix hinaus
-3. Schutz vor Werbung, Datamining und geschlossenen Platformen
-4. Absicherung durch Ende-zu-Ende-Verschlüsselung, und Cross-Signing um andere zu verifizieren
+<b>Element enthält folgende Funktionen:</b>
+- Fortgeschrittene Werkzeuge für die Online-Kommunikation
+- Vollverschlüsselte Nachrichten um eine sichere Kommunikation innerhalb und außerhalb des Unternehmens zu ermöglichen
+- Dezentralisierte Chats basierend auf das quelloffene Matrix-Framework
+- Sichere und kontrollierte Dateienfreigabe durch verschlüsselte Daten beim verwalten von Projekten
+- Videochats über VoIP und Bildschirmübertragung
+- Einfache Einbindungen mit Ihren favorisierten Online-Kolaborationswerkzeugen, Projektverwaltungswerkzeugen, VoIP-Diensten und andere Kommunikationsapps für Ihren Team
 
-Element unterscheidet sich durch Dezentralität und Open Source deutlich von anderen Messaging- und Kollaborationsapps.
+Element unterscheidet sich deutlich von anderen Kommunikations- und Kollaborationsapps. Es läuft auf Matrix, ein offenes Netzwerk für eine sichere und dezentralisierte Kommunikation. Es erlaubt den Nutzern ihre eigenen Matrix-Dienste zu betreiben und gibt ihnen damit die vollständige Kontrolle und Besitz über ihre eigenen Daten und Nachrichten.
 
-Element ermöglicht es einen eigenen Server zu betreiben - oder einen beliebigen auszuwählen, sodass du nicht nur Privatssphäre gewinnst, sondern auch deine Daten und Konversationen in deiner Hand sind und du sie kontrollieren kannst. Du hast Zugriff auf ein offenes Netzwerk, und kannst daher nicht nur mit Element-Nutzern schreiben. Und es ist sehr sicher.
+<b>Privatsphäre/Datenschutz und verschlüsselte Kommunikation</b>
+Element schützt Ihnen vor unerwünschte Werbung, das Datenschürfen und geschlossene unentkommbare Dienste. Auch schützt es all Ihre Daten, Video und Sprachkommunikation unter vier Augen durch Ende-zu-Ende-Verschlüsselung und das Quersignieren von Geräten zur Verifizierung.
 
-Element ist zu all diesem in der Lage, weil es Matrix nutzt - einen Standard für offene, dezentrale Kommunikation.
+Element gibt Ihnen die Kontrolle über Ihre Privatsphäre, während es Ihnen ermöglicht mit jeden auf dem Matrix-Netzwerk oder andere geschäftliche Kollaborationswerkzeuge durch das Einbinden von Apps wie Slack sicher zu kommunizieren. 
 
-Element gibt dir die Kontrolle, indem es dir die Wahl darüber lässt, wer deine Konversationen hostet. In der Element-App kannst du zwischen verschiedenen Möglichkeiten auswählen:
+<b>Element kann man selber betreiben</b>
+Um mehr Kontrolle über Ihre sensiblen Daten und Konversationen zu ermöglichen, kann man Element selbst betreiben oder Sie wählen irgendeinen Matrix-basierten Dienst - der standard für quelloffene, dezentralisierte Kommunikation. Element gibt Ihnen Privatsphäre, Sicherheitskonformität und die Flexibilität zum Integrieren.
 
+<b>Besitzen Sie Ihre Daten</b>
+Sie entscheiden wo Sie Ihre Daten und Nachrichten aufbewahren, ohne das Risiko des Datenschürfens oder des Zugriffes Dritter.
+
+Element gibt Ihnen die Kontrolle durch verschiedene Wege:
 1. Kostenlos auf dem öffentlichen matrix.org Server registrieren, der von den Matrix-Entwicklern gehostet wird, oder wähle aus Tausenden von öffentlichen Servern, die von Freiwilligen gehostet werden
-2. Einen Konto auf einem eigenen Server auf eigener Hardware betreiben
+2. Einen Konto auf einem eigenen Server in der eigenen IT-Infrastruktur betreiben
 3. Einen Konto auf einem benutzerdefinierten Server erstellen, zum Beispiel durch ein Abonnement bei Element Matrix Services (kurz EMS)
 
-<b>Wieso Element nutzen?</b>
+<b>Offene Kommunikation und Zusammenarbeit</b>
+Sie können mit jeden auf dem Matrix-Netzwerk chatten, egal ob sie Element, eine Matrix-App oder sogar eine andere Kommunikationsapp nutzen.
 
-<b>BESITZE DEINE DATEN</b>: Du entscheidest wo deine Daten und Nachrichten gespeichert werden. Du besitzt und kontrollierst sie, anstatt ein Großkonzern, der deine Daten analysiert und Dritten Zugriff gibt.
+<b>Super sicher</b>
+Reale Ende-zu-Ende-Verschlüsselung (nur die Personen in der Konversation können die Nachricht entschüsseln) und Quersignierung von Geräten zur Verifizierung.
 
-<b>OFFENE KOMMUNIKATION UND KOLLABORATION</b>: Du kannst mit jedem im Matrix-Netzwerk schreiben, ob sie nun Element oder eine andere Matrix-App nutzen, oder gar ein anderes Kommunikationssystem wie z.B. Slack, IRC oder XMPP.
+<b>Vollständige Kommunikation und Integration</b>
+Kurznachrichten, Sprach- und Videoanrufe, kontrollierte Dateifreigaben, Bildschirmübertragungen und eine ganze Reihe an Integrationen, Bots and Widgets. Schaffe Räume, Gemeinschaften, bleibe auf dem Laufenden und erledige Sachen.
 
-<b>SUPER SICHER</b>: Echte Ende-zu-Ende-Verschlüsselung (nur Personen in der Konversation können die Nachrichten entschlüsseln), und Cross-Signing um die Geräte der anderen Personen zu verifizieren.
-
-<b>VOLLSTÄNDIGE KOMMUNIKATION</b>: Nachrichten, Telefonate und Videoanrufe, Teilen von Dateien oder dem eigenen Bildschirm und viele andere Integrationen, Bots und Widgets. Erstelle Räume, Communities, bleib in Kontakt und sei produktiv.
-
-<b>ÜBERALL WO DU BIST</b>: Bleib in Kontakt wo auch immer du bist - mit einem vollständig synchronisierten Nachrichtenverlauf über alle Geräte und im Netz auf https://app.element.io.
+<b>Das Stehengelassene später wieder aufgreifen</b>
+Bleibe auf dem Laufenden, egal wo Sie sind, mit vollständig synchronisierter Nachrichtenverlauf quer über all Ihrer Geräte und im Netz auf https://app.element.io
diff --git a/fastlane/metadata/android/de/short_description.txt b/fastlane/metadata/android/de/short_description.txt
index d2c30d4167..d27bd3ef12 100644
--- a/fastlane/metadata/android/de/short_description.txt
+++ b/fastlane/metadata/android/de/short_description.txt
@@ -1 +1 @@
-Sicherer dezentraler Chat und Telefonie. Schütze deine Daten vor Dritten.
+Gruppen-Messenger - verschlüsselte Kommunikation, Gruppenchat und Videoanrufe
diff --git a/fastlane/metadata/android/de/title.txt b/fastlane/metadata/android/de/title.txt
index ec25e8a631..6304f37925 100644
--- a/fastlane/metadata/android/de/title.txt
+++ b/fastlane/metadata/android/de/title.txt
@@ -1 +1 @@
-Element (zuvor Riot.im)
+Element - Sicherer Messenger

From 75a4455d15a33d3e8523e44134b9703c63f003da Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Apr 2021 12:03:54 +0200
Subject: [PATCH 242/350] reorder methods

---
 .../session/room/send/DefaultSendService.kt      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index 26a87557ff..7cc238fcc9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -109,14 +109,6 @@ internal class DefaultSendService @AssistedInject constructor(
                 .let { sendEvent(it) }
     }
 
-    override fun sendMedias(attachments: List<ContentAttachmentData>,
-                            compressBeforeSending: Boolean,
-                            roomIds: Set<String>): Cancelable {
-        return attachments.mapTo(CancelableBag()) {
-            sendMedia(it, compressBeforeSending, roomIds)
-        }
-    }
-
     override fun redactEvent(event: Event, reason: String?): Cancelable {
         // TODO manage media/attachements?
         val redactionEcho = localEchoEventFactory.createRedactEvent(roomId, event.eventId!!, reason)
@@ -240,6 +232,14 @@ internal class DefaultSendService @AssistedInject constructor(
         }
     }
 
+    override fun sendMedias(attachments: List<ContentAttachmentData>,
+                            compressBeforeSending: Boolean,
+                            roomIds: Set<String>): Cancelable {
+        return attachments.mapTo(CancelableBag()) {
+            sendMedia(it, compressBeforeSending, roomIds)
+        }
+    }
+
     override fun sendMedia(attachment: ContentAttachmentData,
                            compressBeforeSending: Boolean,
                            roomIds: Set<String>): Cancelable {

From a377a595b9dc60ae3770007a7b30f141144c93a0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Apr 2021 12:29:20 +0200
Subject: [PATCH 243/350] Cleanup file, this belongs to the main build.gradle
 file

---
 attachment-viewer/build.gradle | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 8db57a59af..0ac8ac4a9a 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -17,20 +17,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
-buildscript {
-    repositories {
-        maven {
-            url 'https://jitpack.io'
-            content {
-                // PhotoView
-                includeGroupByRegex 'com\\.github\\.chrisbanes'
-            }
-        }
-        jcenter()
-    }
-
-}
-
 android {
     compileSdkVersion 30
 

From 5e1c503d2e5be1a4dccde50b2c8a2a28fe01c06b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Apr 2021 14:04:56 +0200
Subject: [PATCH 244/350] Compress video before sending (#442)

---
 CHANGES.md                                    |  1 +
 build.gradle                                  |  4 +-
 matrix-sdk-android/build.gradle               |  3 +
 .../session/content/UploadContentWorker.kt    | 13 +++
 .../session/content/VideoCompressor.kt        | 83 +++++++++++++++++++
 .../attachments/ContentAttachmentData.kt      |  8 +-
 .../preview/AttachmentsPreviewFragment.kt     | 12 ++-
 vector/src/main/res/values/strings.xml        |  5 ++
 8 files changed, 123 insertions(+), 6 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt

diff --git a/CHANGES.md b/CHANGES.md
index 027b9e8416..553abdda8e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@ Features ✨:
 Improvements 🙌:
  - Add ability to install APK from directly from Element (#2381)
  - Delete and react to stickers (#3250)
+ - Compress video before sending (#442)
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
diff --git a/build.gradle b/build.gradle
index 25734e3b09..d9fb1542ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,9 +45,11 @@ allprojects {
                 // PFLockScreen-Android
                 includeGroupByRegex 'com\\.github\\.vector-im'
 
-                //Chat effects
+                // Chat effects
                 includeGroupByRegex 'com\\.github\\.jetradarmobile'
                 includeGroupByRegex 'nl\\.dionsegijn'
+                // LightCompressor
+                includeGroupByRegex 'com\\.github\\.AbedElazizShe'
             }
         }
         maven {
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index ea94d44346..57436813d5 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -168,6 +168,9 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
 
+    // Video compression
+    implementation 'com.github.AbedElazizShe:LightCompressor:0.9.0'
+
     // Phone number https://github.com/google/libphonenumber
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.22'
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 3b727690bf..660a0376e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -77,6 +77,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
     @Inject lateinit var fileService: DefaultFileService
     @Inject lateinit var cancelSendTracker: CancelSendTracker
     @Inject lateinit var imageCompressor: ImageCompressor
+    @Inject lateinit var videoCompressor: VideoCompressor
     @Inject lateinit var localEchoRepository: LocalEchoRepository
 
     override fun injectWith(injector: SessionComponent) {
@@ -170,6 +171,18 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                                 }
                             }
                             .also { filesToDelete.add(it) }
+                } else if (attachment.type == ContentAttachmentData.Type.VIDEO
+                        // Do not compress gif
+                        && attachment.mimeType != MimeTypes.Gif
+                        && params.compressBeforeSending) {
+                    fileToUpload = videoCompressor.compress(workingFile)
+                            .also { compressedFile ->
+                                // Get new Video size
+                                newAttachmentAttributes = NewAttachmentAttributes(
+                                        newFileSize = compressedFile.length()
+                                )
+                            }
+                            .also { filesToDelete.add(it) }
                 } else {
                     fileToUpload = workingFile
                     // Fix: OpenableColumns.SIZE may return -1 or 0
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
new file mode 100644
index 0000000000..78624bbbf9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.content
+
+import android.content.Context
+import com.abedelazizshe.lightcompressorlibrary.CompressionListener
+import com.abedelazizshe.lightcompressorlibrary.VideoCompressor
+import com.abedelazizshe.lightcompressorlibrary.VideoQuality
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.io.File
+import java.util.UUID
+import javax.inject.Inject
+
+internal class VideoCompressor @Inject constructor(private val context: Context) {
+    suspend fun compress(videoFile: File,
+                         quality: VideoQuality = VideoQuality.MEDIUM,
+                         isMinBitRateEnabled: Boolean = false,
+                         keepOriginalResolution: Boolean = true): File {
+        return withContext(Dispatchers.IO) {
+            val job = Job()
+            val destinationFile = createDestinationFile()
+
+            // Sadly it does not return the Job, the API is not ideal
+            VideoCompressor.start(
+                    context = null,
+                    srcUri = null,
+                    srcPath = videoFile.path,
+                    destPath = destinationFile.path,
+                    listener = object : CompressionListener {
+                        override fun onProgress(percent: Float) {
+                            Timber.d("Compressing: $percent%")
+                        }
+
+                        override fun onStart() {
+                            Timber.d("Compressing: start")
+                        }
+
+                        override fun onSuccess() {
+                            Timber.d("Compressing: success")
+                            job.complete()
+                        }
+
+                        override fun onFailure(failureMessage: String) {
+                            Timber.d("Compressing: failure: $failureMessage")
+                            job.completeExceptionally(Exception(failureMessage))
+                        }
+
+                        override fun onCancelled() {
+                            Timber.d("Compressing: cancel")
+                            job.cancel()
+                        }
+                    },
+                    quality = quality,
+                    isMinBitRateEnabled = isMinBitRateEnabled,
+                    keepOriginalResolution = keepOriginalResolution
+            )
+
+            job.join()
+            destinationFile
+        }
+    }
+
+    private fun createDestinationFile(): File {
+        return File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
index e35ab96365..0502f2b0ad 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt
@@ -21,15 +21,15 @@ import org.matrix.android.sdk.api.util.MimeTypes
 
 private val listOfPreviewableMimeTypes = listOf(
         MimeTypes.Jpeg,
-        MimeTypes.BadJpg,
         MimeTypes.Png,
         MimeTypes.Gif
 )
 
 fun ContentAttachmentData.isPreviewable(): Boolean {
-    // For now the preview only supports still image
-    return type == ContentAttachmentData.Type.IMAGE
-            && listOfPreviewableMimeTypes.contains(getSafeMimeType() ?: "")
+    // Preview supports image and video
+    return (type == ContentAttachmentData.Type.IMAGE
+            && listOfPreviewableMimeTypes.contains(getSafeMimeType() ?: ""))
+            || type == ContentAttachmentData.Type.VIDEO
 }
 
 data class GroupedContentAttachmentData(
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
index cdb015e4da..9594f89a0e 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
@@ -139,7 +139,17 @@ class AttachmentsPreviewFragment @Inject constructor(
             attachmentBigPreviewController.setData(state)
             views.attachmentPreviewerBigList.scrollToPosition(state.currentAttachmentIndex)
             views.attachmentPreviewerMiniatureList.scrollToPosition(state.currentAttachmentIndex)
-            views.attachmentPreviewerSendImageOriginalSize.text = resources.getQuantityString(R.plurals.send_images_with_original_size, state.attachments.size)
+            views.attachmentPreviewerSendImageOriginalSize.text = getCheckboxText(state)
+        }
+    }
+
+    private fun getCheckboxText(state: AttachmentsPreviewViewState): CharSequence {
+        val nbImages = state.attachments.count { it.type == ContentAttachmentData.Type.IMAGE }
+        val nbVideos = state.attachments.count { it.type == ContentAttachmentData.Type.VIDEO }
+        return when {
+            nbVideos == 0 -> resources.getQuantityString(R.plurals.send_images_with_original_size, nbImages)
+            nbImages == 0 -> resources.getQuantityString(R.plurals.send_videos_with_original_size, nbVideos)
+            else          -> getString(R.string.send_images_and_video_with_original_size)
         }
     }
 
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index c7153df6e4..5dc21601a9 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2785,6 +2785,11 @@
         <item quantity="one">Send image with the original size</item>
         <item quantity="other">Send images with the original size</item>
     </plurals>
+    <plurals name="send_videos_with_original_size">
+        <item quantity="one">Send video with the original size</item>
+        <item quantity="other">Send videos with the original size</item>
+    </plurals>
+    <string name="send_images_and_video_with_original_size">Send media with the original size</string>
 
     <string name="delete_event_dialog_title">Confirm Removal</string>
     <string name="delete_event_dialog_content">Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.</string>

From 8ff65b381619a99ddfefe15d48d6139d6434b1dc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Apr 2021 14:24:49 +0200
Subject: [PATCH 245/350] Add a video indicator on the miniature (videos are
 now previewable)

---
 .../attachments/preview/AttachmentPreviewItems.kt     |  3 +++
 .../res/layout/item_attachment_miniature_preview.xml  | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt
index f715d0cb3f..ae18d2561d 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.attachments.preview
 
 import android.view.View
 import android.widget.ImageView
+import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.bumptech.glide.Glide
@@ -65,6 +66,7 @@ abstract class AttachmentMiniaturePreviewItem : AttachmentPreviewItem<Attachment
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.imageView.isChecked = checked
+        holder.miniatureVideoIndicator.isVisible = attachment.type == ContentAttachmentData.Type.VIDEO
         holder.view.setOnClickListener(clickListener)
     }
 
@@ -72,6 +74,7 @@ abstract class AttachmentMiniaturePreviewItem : AttachmentPreviewItem<Attachment
         override val imageView: CheckableImageView
             get() = miniatureImageView
         private val miniatureImageView by bind<CheckableImageView>(R.id.attachmentMiniatureImageView)
+        val miniatureVideoIndicator by bind<ImageView>(R.id.attachmentMiniatureVideoIndicator)
     }
 }
 
diff --git a/vector/src/main/res/layout/item_attachment_miniature_preview.xml b/vector/src/main/res/layout/item_attachment_miniature_preview.xml
index c52dc6cead..5f318127e7 100644
--- a/vector/src/main/res/layout/item_attachment_miniature_preview.xml
+++ b/vector/src/main/res/layout/item_attachment_miniature_preview.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
@@ -17,4 +18,14 @@
         android:scaleType="centerCrop"
         tools:src="@tools:sample/backgrounds/scenic" />
 
+    <ImageView
+        android:id="@+id/attachmentMiniatureVideoIndicator"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/a11y_video"
+        app:srcCompat="@drawable/ic_play_arrow"
+        app:tint="@color/white"
+        tools:ignore="MissingPrefix" />
+
 </androidx.cardview.widget.CardView>
\ No newline at end of file

From 4a23d3127149bc7ad8b0e1a88ca7b1b3fdcfb548 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Apr 2021 15:27:50 +0200
Subject: [PATCH 246/350] Fix regression on sending error indicator color

---
 .../java/im/vector/app/core/ui/views/SendStateImageView.kt   | 5 +++++
 vector/src/main/res/layout/item_timeline_event_base.xml      | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/ui/views/SendStateImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/SendStateImageView.kt
index 9acb82581f..308efe09b2 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/SendStateImageView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/SendStateImageView.kt
@@ -17,11 +17,13 @@
 package im.vector.app.core.ui.views
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.features.home.room.detail.timeline.item.SendStateDecoration
+import im.vector.app.features.themes.ThemeUtils
 
 class SendStateImageView @JvmOverloads constructor(
         context: Context,
@@ -39,16 +41,19 @@ class SendStateImageView @JvmOverloads constructor(
         isVisible = when (sendState) {
             SendStateDecoration.SENDING_NON_MEDIA -> {
                 setImageResource(R.drawable.ic_sending_message)
+                imageTintList = ColorStateList.valueOf(ThemeUtils.getColor(context, R.attr.riotx_text_tertiary))
                 contentDescription = context.getString(R.string.event_status_a11y_sending)
                 true
             }
             SendStateDecoration.SENT              -> {
                 setImageResource(R.drawable.ic_message_sent)
+                imageTintList = ColorStateList.valueOf(ThemeUtils.getColor(context, R.attr.riotx_text_tertiary))
                 contentDescription = context.getString(R.string.event_status_a11y_sent)
                 true
             }
             SendStateDecoration.FAILED            -> {
                 setImageResource(R.drawable.ic_sending_message_failed)
+                imageTintList = null
                 contentDescription = context.getString(R.string.event_status_a11y_failed)
                 true
             }
diff --git a/vector/src/main/res/layout/item_timeline_event_base.xml b/vector/src/main/res/layout/item_timeline_event_base.xml
index 0515ace033..282c3f6140 100644
--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@@ -145,8 +145,8 @@
         android:layout_marginBottom="4dp"
         android:contentDescription="@string/event_status_a11y_sending"
         android:src="@drawable/ic_sending_message"
-        android:tint="?riotx_text_tertiary"
         android:visibility="gone"
+        tools:tint="?riotx_text_tertiary"
         tools:visibility="visible" />
 
     <ProgressBar
@@ -154,11 +154,11 @@
         android:layout_width="@dimen/item_event_message_state_size"
         android:layout_height="@dimen/item_event_message_state_size"
         android:layout_alignBottom="@+id/viewStubContainer"
-        android:indeterminateTint="?riotx_text_secondary"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="4dp"
+        android:indeterminateTint="?riotx_text_secondary"
         android:tint="?riotx_text_tertiary"
         android:visibility="gone"
         tools:visibility="visible" />

From e108534a2a7a4bcd112fe561fe0b2523019837c5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Apr 2021 15:34:15 +0200
Subject: [PATCH 247/350] Improve file too big error detection and rendering
 (#3245)

---
 CHANGES.md                                    |  1 +
 .../sdk/api/session/events/model/Event.kt     | 12 +++++++
 .../tasks/SendVerificationMessageTask.kt      |  3 +-
 .../database/RealmSessionStoreMigration.kt    | 13 +++++--
 .../internal/database/mapper/EventMapper.kt   |  1 +
 .../internal/database/model/EventEntity.kt    |  3 ++
 .../internal/session/content/FileUploader.kt  | 21 +++++++++++
 .../session/content/UploadContentWorker.kt    |  4 ++-
 .../session/room/relation/EventEditor.kt      |  1 +
 .../session/room/send/LocalEchoRepository.kt  |  4 ++-
 .../MultipleEventSendingDispatcherWorker.kt   |  7 +++-
 .../session/room/send/SendEventWorker.kt      | 15 ++++++--
 .../android/sdk/internal/util/FailureExt.kt   | 36 +++++++++++++++++++
 .../vector/app/core/error/ErrorFormatter.kt   |  3 ++
 .../home/room/detail/RoomDetailViewEvents.kt  |  1 +
 .../home/room/detail/RoomDetailViewModel.kt   |  7 ++--
 .../action/MessageActionsEpoxyController.kt   |  9 ++++-
 vector/src/main/res/values/strings.xml        |  1 +
 18 files changed, 130 insertions(+), 12 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FailureExt.kt

diff --git a/CHANGES.md b/CHANGES.md
index 553abdda8e..d3e17e6980 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@ Improvements 🙌:
  - Add ability to install APK from directly from Element (#2381)
  - Delete and react to stickers (#3250)
  - Compress video before sending (#442)
+ - Improve file too big error detection (#3245)
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index 89b873febb..6400dd6444 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -28,6 +28,8 @@ import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.json.JSONObject
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.failure.MatrixError
 import timber.log.Timber
 
 typealias Content = JsonDict
@@ -90,6 +92,16 @@ data class Event(
     @Transient
     var sendState: SendState = SendState.UNKNOWN
 
+    @Transient
+    var sendStateDetails: String? = null
+
+    fun sendStateError(): MatrixError? {
+        return sendStateDetails?.let {
+            val matrixErrorAdapter = MoshiProvider.providesMoshi().adapter(MatrixError::class.java)
+            tryOrNull { matrixErrorAdapter.fromJson(it) }
+        }
+    }
+
     /**
      * The `age` value transcoded in a timestamp based on the device clock when the SDK received
      * the event from the home server.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
index d8b9d3cd86..7fa48c3da1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.task.Task
+import org.matrix.android.sdk.internal.util.toMatrixErrorStr
 import javax.inject.Inject
 
 internal interface SendVerificationMessageTask : Task<SendVerificationMessageTask.Params, String> {
@@ -55,7 +56,7 @@ internal class DefaultSendVerificationMessageTask @Inject constructor(
             localEchoRepository.updateSendState(localId, event.roomId, SendState.SENT)
             return response.eventId
         } catch (e: Throwable) {
-            localEchoRepository.updateSendState(localId, event.roomId, SendState.UNDELIVERED)
+            localEchoRepository.updateSendState(localId, event.roomId, SendState.UNDELIVERED, e.toMatrixErrorStr())
             throw e
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index ac72592a1e..05213b40e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -43,7 +43,7 @@ import javax.inject.Inject
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 10L
+        const val SESSION_STORE_SCHEMA_VERSION = 11L
     }
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@@ -59,6 +59,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         if (oldVersion <= 7) migrateTo8(realm)
         if (oldVersion <= 8) migrateTo9(realm)
         if (oldVersion <= 9) migrateTo10(realm)
+        if (oldVersion <= 10) migrateTo11(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -163,7 +164,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 ?.addRealmListField(EditAggregatedSummaryEntityFields.EDITIONS.`$`, editionOfEventSchema)
     }
 
-    fun migrateTo9(realm: DynamicRealm) {
+    private fun migrateTo9(realm: DynamicRealm) {
         Timber.d("Step 8 -> 9")
 
         realm.schema.get("RoomSummaryEntity")
@@ -201,7 +202,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 }
     }
 
-    fun migrateTo10(realm: DynamicRealm) {
+    private fun migrateTo10(realm: DynamicRealm) {
         Timber.d("Step 9 -> 10")
         realm.schema.create("SpaceChildSummaryEntity")
                 ?.addField(SpaceChildSummaryEntityFields.ORDER, String::class.java)
@@ -240,4 +241,10 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 ?.addRealmListField(RoomSummaryEntityFields.PARENTS.`$`, realm.schema.get("SpaceParentSummaryEntity")!!)
                 ?.addRealmListField(RoomSummaryEntityFields.CHILDREN.`$`, realm.schema.get("SpaceChildSummaryEntity")!!)
     }
+
+    private fun migrateTo11(realm: DynamicRealm) {
+        Timber.d("Step 10 -> 11")
+        realm.schema.get("EventEntity")
+                ?.addField(EventEntityFields.SEND_STATE_DETAILS, String::class.java)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
index a4a2fadd21..613b38e340 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
@@ -80,6 +80,7 @@ internal object EventMapper {
         ).also {
             it.ageLocalTs = eventEntity.ageLocalTs
             it.sendState = eventEntity.sendState
+            it.sendStateDetails = eventEntity.sendStateDetails
             eventEntity.decryptionResultJson?.let { json ->
                 try {
                     it.mxDecryptionResult = MoshiProvider.providesMoshi().adapter(OlmDecryptionResult::class.java).fromJson(json)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
index fe59f4fceb..fcb171c617 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import io.realm.RealmObject
 import io.realm.annotations.Index
+import org.matrix.android.sdk.api.failure.MatrixError
 
 internal open class EventEntity(@Index var eventId: String = "",
                                 @Index var roomId: String = "",
@@ -32,6 +33,8 @@ internal open class EventEntity(@Index var eventId: String = "",
                                 @Index var stateKey: String? = null,
                                 var originServerTs: Long? = null,
                                 @Index var sender: String? = null,
+                                // Can contain a serialized MatrixError
+                                var sendStateDetails: String? = null,
                                 var age: Long? = 0,
                                 var unsignedData: String? = null,
                                 var redacts: String? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index 8fa595db30..f3974487f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -31,12 +31,16 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import okio.BufferedSink
 import okio.source
 import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
+import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.internal.di.Authenticated
 import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
 import org.matrix.android.sdk.internal.network.ProgressRequestBody
 import org.matrix.android.sdk.internal.network.awaitResponse
 import org.matrix.android.sdk.internal.network.toFailure
+import org.matrix.android.sdk.internal.session.homeserver.DefaultHomeServerCapabilitiesService
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
@@ -46,6 +50,7 @@ import javax.inject.Inject
 internal class FileUploader @Inject constructor(@Authenticated
                                                 private val okHttpClient: OkHttpClient,
                                                 private val globalErrorReceiver: GlobalErrorReceiver,
+                                                private val homeServerCapabilitiesService: DefaultHomeServerCapabilitiesService,
                                                 private val context: Context,
                                                 contentUrlResolver: ContentUrlResolver,
                                                 moshi: Moshi) {
@@ -57,6 +62,22 @@ internal class FileUploader @Inject constructor(@Authenticated
                            filename: String?,
                            mimeType: String?,
                            progressListener: ProgressRequestBody.Listener? = null): ContentUploadResponse {
+        // Check size limit
+        // DO NOT COMMIT: 5 Mo
+        val maxUploadFileSize = 5 * 1024 * 1024L // homeServerCapabilitiesService.getHomeServerCapabilities().maxUploadFileSize
+
+        if (maxUploadFileSize != HomeServerCapabilities.MAX_UPLOAD_FILE_SIZE_UNKNOWN
+                && file.length() > maxUploadFileSize) {
+            // Known limitation and file too big for the server, save the pain to upload it
+            throw Failure.ServerError(
+                    error = MatrixError(
+                            code = MatrixError.M_TOO_LARGE,
+                            message = "Cannot upload files larger than ${maxUploadFileSize / 1048576L}mb"
+                    ),
+                    httpCode = 413
+            )
+        }
+
         val uploadBody = object : RequestBody() {
             override fun contentLength() = file.length()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 660a0376e3..bc7d846e55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -41,6 +41,7 @@ import org.matrix.android.sdk.internal.session.room.send.CancelSendTracker
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoIdentifiers
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
+import org.matrix.android.sdk.internal.util.toMatrixErrorStr
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
@@ -129,6 +130,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                 }
             }
 
+            // TODO Send the Thumbnail after the main content, because the main content can fail if too large.
             val uploadThumbnailResult = dealWithThumbnail(params)
 
             val progressListener = object : ProgressRequestBody.Listener {
@@ -304,7 +306,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         return Result.success(
                 WorkerParamsFactory.toData(
                         params.copy(
-                                lastFailureMessage = failure.localizedMessage
+                                lastFailureMessage = failure.toMatrixErrorStr()
                         )
                 )
         )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
index 5fe06287d2..a666d40fc3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/EventEditor.kt
@@ -99,6 +99,7 @@ internal class EventEditor @Inject constructor(private val eventSenderProcessor:
             entity.age = editedEventEntity.age
             entity.originServerTs = editedEventEntity.originServerTs
             entity.sendState = editedEventEntity.sendState
+            entity.sendStateDetails = editedEventEntity.sendStateDetails
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
index 70245cbd5e..e98e5646af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
@@ -87,7 +87,7 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
         }
     }
 
-    fun updateSendState(eventId: String, roomId: String?, sendState: SendState) {
+    fun updateSendState(eventId: String, roomId: String?, sendState: SendState, sendStateDetails: String? = null) {
         Timber.v("## SendEvent: [${System.currentTimeMillis()}] Update local state of $eventId to ${sendState.name}")
         timelineInput.onLocalEchoUpdated(roomId = roomId ?: "", eventId = eventId, sendState = sendState)
         updateEchoAsync(eventId) { realm, sendingEventEntity ->
@@ -96,6 +96,7 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
             } else {
                 sendingEventEntity.sendState = sendState
             }
+            sendingEventEntity.sendStateDetails = sendStateDetails
             roomSummaryUpdater.updateSendingInformation(realm, sendingEventEntity.roomId)
         }
     }
@@ -161,6 +162,7 @@ internal class LocalEchoRepository @Inject constructor(@SessionDatabase private
             val timelineEvents = TimelineEventEntity.where(realm, roomId, eventIds).findAll()
             timelineEvents.forEach {
                 it.root?.sendState = sendState
+                it.root?.sendStateDetails = null
             }
             roomSummaryUpdater.updateSendingInformation(realm, roomId)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
index bc307bc74f..e889f1a61b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
@@ -55,7 +55,12 @@ internal class MultipleEventSendingDispatcherWorker(context: Context, params: Wo
 
     override fun doOnError(params: Params): Result {
         params.localEchoIds.forEach { localEchoIds ->
-            localEchoRepository.updateSendState(localEchoIds.eventId, localEchoIds.roomId, SendState.UNDELIVERED)
+            localEchoRepository.updateSendState(
+                    eventId = localEchoIds.eventId,
+                    roomId = localEchoIds.roomId,
+                    sendState = SendState.UNDELIVERED,
+                    sendStateDetails = params.lastFailureMessage
+            )
         }
 
         return super.doOnError(params)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
index d55dce57af..cd7911910d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.internal.crypto.tasks.SendEventTask
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.session.SessionComponent
+import org.matrix.android.sdk.internal.util.toMatrixErrorStr
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import timber.log.Timber
@@ -77,7 +78,12 @@ internal class SendEventWorker(context: Context,
         }
 
         if (params.lastFailureMessage != null) {
-            localEchoRepository.updateSendState(event.eventId, event.roomId, SendState.UNDELIVERED)
+            localEchoRepository.updateSendState(
+                    eventId = event.eventId,
+                    roomId = event.roomId,
+                    sendState = SendState.UNDELIVERED,
+                    sendStateDetails = params.lastFailureMessage
+            )
             // Transmit the error
             return Result.success(inputData)
                     .also { Timber.e("Work cancelled due to input error from parent") }
@@ -90,7 +96,12 @@ internal class SendEventWorker(context: Context,
         } catch (exception: Throwable) {
             if (/*currentAttemptCount >= MAX_NUMBER_OF_RETRY_BEFORE_FAILING ||**/ !exception.shouldBeRetried()) {
                 Timber.e("## SendEvent: [${System.currentTimeMillis()}]  Send event Failed cannot retry ${params.eventId} > ${exception.localizedMessage}")
-                localEchoRepository.updateSendState(event.eventId, event.roomId, SendState.UNDELIVERED)
+                localEchoRepository.updateSendState(
+                        eventId = event.eventId,
+                        roomId = event.roomId,
+                        sendState = SendState.UNDELIVERED,
+                        sendStateDetails = exception.toMatrixErrorStr()
+                )
                 Result.success()
             } else {
                 Timber.e("## SendEvent: [${System.currentTimeMillis()}]  Send event Failed schedule retry ${params.eventId} > ${exception.localizedMessage}")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FailureExt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FailureExt.kt
new file mode 100644
index 0000000000..8c78feeac3
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FailureExt.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.util
+
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.internal.di.MoshiProvider
+
+/**
+ * Try to extract and serialize a MatrixError, or default to localizedMessage
+ */
+internal fun Throwable.toMatrixErrorStr(): String {
+    return (this as? Failure.ServerError)
+            ?.let {
+                // Serialize the MatrixError in this case
+                val adapter = MoshiProvider.providesMoshi().adapter(MatrixError::class.java)
+                tryOrNull { adapter.toJson(error) }
+            }
+            ?: localizedMessage
+            ?: "error"
+}
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index d7f003574c..0a724b62c6 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -78,6 +78,9 @@ class DefaultErrorFormatter @Inject constructor(
                     throwable.error.code == MatrixError.M_LIMIT_EXCEEDED             -> {
                         limitExceededError(throwable.error)
                     }
+                    throwable.error.code == MatrixError.M_TOO_LARGE                  -> {
+                        stringProvider.getString(R.string.error_file_too_big_simple)
+                    }
                     throwable.error.code == MatrixError.M_THREEPID_NOT_FOUND         -> {
                         stringProvider.getString(R.string.login_reset_password_error_not_found)
                     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
index b326700d5e..0a9ffd83ab 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
@@ -54,6 +54,7 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
     object ShowWaitingView : RoomDetailViewEvents()
     object HideWaitingView : RoomDetailViewEvents()
 
+    // TODO Remove
     data class FileTooBigError(
             val filename: String,
             val fileSizeInBytes: Long,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 1dd13bf481..e5e9b2c7d3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -79,7 +79,6 @@ import org.matrix.android.sdk.api.session.events.model.isTextMessage
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.file.FileService
-import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -292,7 +291,6 @@ class RoomDetailViewModel @AssistedInject constructor(
             is RoomDetailAction.HandleTombstoneEvent -> handleTombstoneEvent(action)
             is RoomDetailAction.ResendMessage -> handleResendEvent(action)
             is RoomDetailAction.RemoveFailedEcho -> handleRemove(action)
-            is RoomDetailAction.ResendAll -> handleResendAll()
             is RoomDetailAction.MarkAllAsRead -> handleMarkAllAsRead()
             is RoomDetailAction.ReportContent -> handleReportContent(action)
             is RoomDetailAction.IgnoreUser -> handleIgnoreUser(action)
@@ -1107,6 +1105,10 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleSendMedia(action: RoomDetailAction.SendMedia) {
+        room.sendMedias(action.attachments, action.compressBeforeSending, emptySet())
+
+        /*
+        TODO Cleanup this error is now managed by the SDK
         val attachments = action.attachments
         val homeServerCapabilities = session.getHomeServerCapabilities()
         val maxUploadFileSize = homeServerCapabilities.maxUploadFileSize
@@ -1124,6 +1126,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                 ))
             }
         }
+        */
     }
 
     private fun handleEventVisible(action: RoomDetailAction.TimelineEventTurnsVisible) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index 30587e6659..d62083de30 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -28,6 +28,7 @@ import im.vector.app.core.epoxy.bottomsheet.bottomSheetMessagePreviewItem
 import im.vector.app.core.epoxy.bottomsheet.bottomSheetQuickReactionsItem
 import im.vector.app.core.epoxy.bottomsheet.bottomSheetSendStateItem
 import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.AvatarRenderer
@@ -38,6 +39,7 @@ import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovement
 import im.vector.app.features.home.room.detail.timeline.tools.linkify
 import im.vector.app.features.media.ImageContentRenderer
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.room.send.SendState
 import javax.inject.Inject
 
@@ -50,6 +52,7 @@ class MessageActionsEpoxyController @Inject constructor(
         private val fontProvider: EmojiCompatFontProvider,
         private val imageContentRenderer: ImageContentRenderer,
         private val dimensionConverter: DimensionConverter,
+        private val errorFormatter: ErrorFormatter,
         private val dateFormatter: VectorDateFormatter
 ) : TypedEpoxyController<MessageActionState>() {
 
@@ -74,10 +77,14 @@ class MessageActionsEpoxyController @Inject constructor(
         // Send state
         val sendState = state.sendState()
         if (sendState?.hasFailed().orFalse()) {
+            // Get more details about the error
+            val errorMessage = state.timelineEvent()?.root?.sendStateError()
+                    ?.let { errorFormatter.toHumanReadable(Failure.ServerError(it, 0)) }
+                    ?: stringProvider.getString(R.string.unable_to_send_message)
             bottomSheetSendStateItem {
                 id("send_state")
                 showProgress(false)
-                text(stringProvider.getString(R.string.unable_to_send_message))
+                text(errorMessage)
                 drawableStart(R.drawable.ic_warning_badge)
             }
         } else if (sendState?.isSending().orFalse()) {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 5dc21601a9..eadc0db1f4 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2295,6 +2295,7 @@
         <item quantity="other">%d users read</item>
     </plurals>
 
+    <string name="error_file_too_big_simple">"The file is too large to upload."</string>
     <string name="error_file_too_big">"The file '%1$s' (%2$s) is too large to upload. The limit is %3$s."</string>
 
     <string name="error_attachment">"An error occurred while retrieving the attachment."</string>

From e1e4b035321a47af851f0f3a8d6103afb06f2b28 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Apr 2021 17:14:11 +0200
Subject: [PATCH 248/350] Do not serialize "soft_logout"

---
 .../java/org/matrix/android/sdk/api/failure/MatrixError.kt     | 2 +-
 .../matrix/android/sdk/internal/network/RetrofitExtensions.kt  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
index 3820a442aa..73b0fe0a7c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
@@ -41,7 +41,7 @@ data class MatrixError(
         // For M_LIMIT_EXCEEDED
         @Json(name = "retry_after_ms") val retryAfterMillis: Long? = null,
         // For M_UNKNOWN_TOKEN
-        @Json(name = "soft_logout") val isSoftLogout: Boolean = false,
+        @Json(name = "soft_logout") val isSoftLogout: Boolean? = null,
         // For M_INVALID_PEPPER
         // {"error": "pepper does not match 'erZvr'", "lookup_pepper": "pQgMS", "algorithm": "sha256", "errcode": "M_INVALID_PEPPER"}
         @Json(name = "lookup_pepper") val newLookupPepper: String? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
index 7132b4ff7a..2116063626 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.failure.MatrixError
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.ResponseBody
+import org.matrix.android.sdk.api.extensions.orFalse
 import retrofit2.HttpException
 import retrofit2.Response
 import timber.log.Timber
@@ -91,7 +92,7 @@ private fun toFailure(errorBody: ResponseBody?, httpCode: Int, globalErrorReceiv
             } else if (httpCode == HttpURLConnection.HTTP_UNAUTHORIZED /* 401 */
                     && matrixError.code == MatrixError.M_UNKNOWN_TOKEN) {
                 // Also send this error to the globalErrorReceiver, for a global management
-                globalErrorReceiver?.handleGlobalError(GlobalError.InvalidToken(matrixError.isSoftLogout))
+                globalErrorReceiver?.handleGlobalError(GlobalError.InvalidToken(matrixError.isSoftLogout.orFalse()))
             }
 
             return Failure.ServerError(matrixError, httpCode)

From 52133095876e249fc890a1ca14e4d8710ee638d8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 30 Apr 2021 17:22:55 +0200
Subject: [PATCH 249/350] Send the Thumbnail after the main content, for the
 case the main content fails if too large.

---
 .../session/content/UploadContentWorker.kt    | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index bc7d846e55..f8b58e3ad3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -111,7 +111,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         val attachment = params.attachment
         val filesToDelete = mutableListOf<File>()
 
-        try {
+        return try {
             val inputStream = context.contentResolver.openInputStream(attachment.queryUri)
                     ?: return Result.success(
                             WorkerParamsFactory.toData(
@@ -130,9 +130,6 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                 }
             }
 
-            // TODO Send the Thumbnail after the main content, because the main content can fail if too large.
-            val uploadThumbnailResult = dealWithThumbnail(params)
-
             val progressListener = object : ProgressRequestBody.Listener {
                 override fun onProgress(current: Long, total: Long) {
                     notifyTracker(params) {
@@ -147,7 +144,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
 
             var uploadedFileEncryptedFileInfo: EncryptedFileInfo? = null
 
-            return try {
+            try {
                 val fileToUpload: File
                 var newAttachmentAttributes = NewAttachmentAttributes(
                         params.attachment.width?.toInt(),
@@ -232,6 +229,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                     Timber.e(failure, "## FileService: Failed to update file cache")
                 }
 
+                val uploadThumbnailResult = dealWithThumbnail(params)
+
                 handleSuccess(params,
                         contentUploadResponse.contentUri,
                         uploadedFileEncryptedFileInfo,
@@ -244,7 +243,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
             }
         } catch (e: Exception) {
             Timber.e(e, "## FileService: ERROR")
-            return handleFailure(params, e)
+            handleFailure(params, e)
         } finally {
             // Delete all temporary files
             filesToDelete.forEach {
@@ -275,19 +274,23 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                             Timber.v("Encrypt thumbnail")
                             notifyTracker(params) { contentUploadStateTracker.setEncryptingThumbnail(it) }
                             val encryptionResult = MXEncryptedAttachments.encryptAttachment(thumbnailData.bytes.inputStream(), thumbnailData.mimeType)
-                            val contentUploadResponse = fileUploader.uploadByteArray(encryptionResult.encryptedByteArray,
-                                    "thumb_${params.attachment.name}",
-                                    MimeTypes.OctetStream,
-                                    thumbnailProgressListener)
+                            val contentUploadResponse = fileUploader.uploadByteArray(
+                                    byteArray = encryptionResult.encryptedByteArray,
+                                    filename = "thumb_${params.attachment.name}",
+                                    mimeType = MimeTypes.OctetStream,
+                                    progressListener = thumbnailProgressListener
+                            )
                             UploadThumbnailResult(
                                     contentUploadResponse.contentUri,
                                     encryptionResult.encryptedFileInfo
                             )
                         } else {
-                            val contentUploadResponse = fileUploader.uploadByteArray(thumbnailData.bytes,
-                                    "thumb_${params.attachment.name}",
-                                    thumbnailData.mimeType,
-                                    thumbnailProgressListener)
+                            val contentUploadResponse = fileUploader.uploadByteArray(
+                                    byteArray = thumbnailData.bytes,
+                                    filename = "thumb_${params.attachment.name}",
+                                    mimeType = thumbnailData.mimeType,
+                                    progressListener = thumbnailProgressListener
+                            )
                             UploadThumbnailResult(
                                     contentUploadResponse.contentUri,
                                     null

From d6b6768f41a41efc588d0467c9d5fb9462c4a844 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 30 Apr 2021 17:34:40 +0200
Subject: [PATCH 250/350] Cleanup

---
 .../internal/database/model/EventEntity.kt    |  1 -
 .../internal/session/content/FileUploader.kt  |  3 +--
 .../home/room/detail/RoomDetailFragment.kt    | 14 -------------
 .../home/room/detail/RoomDetailViewEvents.kt  |  7 -------
 .../home/room/detail/RoomDetailViewModel.kt   | 21 -------------------
 5 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
index fcb171c617..c9edbcd889 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
@@ -22,7 +22,6 @@ import org.matrix.android.sdk.internal.crypto.algorithms.olm.OlmDecryptionResult
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import io.realm.RealmObject
 import io.realm.annotations.Index
-import org.matrix.android.sdk.api.failure.MatrixError
 
 internal open class EventEntity(@Index var eventId: String = "",
                                 @Index var roomId: String = "",
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index f3974487f7..2626f96708 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -63,8 +63,7 @@ internal class FileUploader @Inject constructor(@Authenticated
                            mimeType: String?,
                            progressListener: ProgressRequestBody.Listener? = null): ContentUploadResponse {
         // Check size limit
-        // DO NOT COMMIT: 5 Mo
-        val maxUploadFileSize = 5 * 1024 * 1024L // homeServerCapabilitiesService.getHomeServerCapabilities().maxUploadFileSize
+        val maxUploadFileSize = homeServerCapabilitiesService.getHomeServerCapabilities().maxUploadFileSize
 
         if (maxUploadFileSize != HomeServerCapabilities.MAX_UPLOAD_FILE_SIZE_UNKNOWN
                 && file.length() > maxUploadFileSize) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 31a589ce3f..365277b63a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -101,7 +101,6 @@ import im.vector.app.core.utils.Debouncer
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.core.utils.KeyboardStateUtils
 import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES
-import im.vector.app.core.utils.TextUtils
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.core.utils.copyToClipboard
@@ -381,7 +380,6 @@ class RoomDetailFragment @Inject constructor(
                 is RoomDetailViewEvents.ActionFailure                    -> displayRoomDetailActionFailure(it)
                 is RoomDetailViewEvents.ShowMessage                      -> showSnackWithMessage(it.message)
                 is RoomDetailViewEvents.NavigateToEvent                  -> navigateToEvent(it)
-                is RoomDetailViewEvents.FileTooBigError                  -> displayFileTooBigError(it)
                 is RoomDetailViewEvents.DownloadFileState                -> handleDownloadFileState(it)
                 is RoomDetailViewEvents.JoinRoomCommandSuccess           -> handleJoinedToAnotherRoom(it)
                 is RoomDetailViewEvents.SendMessageResult                -> renderSendMessageResult(it)
@@ -749,18 +747,6 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-    private fun displayFileTooBigError(action: RoomDetailViewEvents.FileTooBigError) {
-        AlertDialog.Builder(requireActivity())
-                .setTitle(R.string.dialog_title_error)
-                .setMessage(getString(R.string.error_file_too_big,
-                        action.filename,
-                        TextUtils.formatFileSize(requireContext(), action.fileSizeInBytes),
-                        TextUtils.formatFileSize(requireContext(), action.homeServerLimitInBytes)
-                ))
-                .setPositiveButton(R.string.ok, null)
-                .show()
-    }
-
     private fun handleDownloadFileState(action: RoomDetailViewEvents.DownloadFileState) {
         val activity = requireActivity()
         if (action.throwable != null) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
index 0a9ffd83ab..4d1e62da7e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
@@ -54,13 +54,6 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
     object ShowWaitingView : RoomDetailViewEvents()
     object HideWaitingView : RoomDetailViewEvents()
 
-    // TODO Remove
-    data class FileTooBigError(
-            val filename: String,
-            val fileSizeInBytes: Long,
-            val homeServerLimitInBytes: Long
-    ) : RoomDetailViewEvents()
-
     data class DownloadFileState(
             val mimeType: String?,
             val file: File?,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index e5e9b2c7d3..52779c863d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -1106,27 +1106,6 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     private fun handleSendMedia(action: RoomDetailAction.SendMedia) {
         room.sendMedias(action.attachments, action.compressBeforeSending, emptySet())
-
-        /*
-        TODO Cleanup this error is now managed by the SDK
-        val attachments = action.attachments
-        val homeServerCapabilities = session.getHomeServerCapabilities()
-        val maxUploadFileSize = homeServerCapabilities.maxUploadFileSize
-
-        if (maxUploadFileSize == HomeServerCapabilities.MAX_UPLOAD_FILE_SIZE_UNKNOWN) {
-            // Unknown limitation
-            room.sendMedias(attachments, action.compressBeforeSending, emptySet())
-        } else {
-            when (val tooBigFile = attachments.find { it.size > maxUploadFileSize }) {
-                null -> room.sendMedias(attachments, action.compressBeforeSending, emptySet())
-                else -> _viewEvents.post(RoomDetailViewEvents.FileTooBigError(
-                        tooBigFile.name ?: tooBigFile.queryUri.toString(),
-                        tooBigFile.size,
-                        maxUploadFileSize
-                ))
-            }
-        }
-        */
     }
 
     private fun handleEventVisible(action: RoomDetailAction.TimelineEventTurnsVisible) {

From 765380ab95eeb13b968df7e2c58c9748a00e37df Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sat, 1 May 2021 11:05:07 +0200
Subject: [PATCH 251/350] Fix potential issue with video message conten

---
 .../session/content/UploadContentWorker.kt        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index f8b58e3ad3..4dec8a9c78 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -176,10 +176,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                         && params.compressBeforeSending) {
                     fileToUpload = videoCompressor.compress(workingFile)
                             .also { compressedFile ->
-                                // Get new Video size
-                                newAttachmentAttributes = NewAttachmentAttributes(
-                                        newFileSize = compressedFile.length()
-                                )
+                                // Get new Video file size. For now video dimensions are not updated
+                                newAttachmentAttributes = newAttachmentAttributes.copy(newFileSize = compressedFile.length())
                             }
                             .also { filesToDelete.add(it) }
                 } else {
@@ -346,8 +344,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
             val messageContent: MessageContent? = event.asDomain().content.toModel()
             val updatedContent = when (messageContent) {
                 is MessageImageContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes)
-                is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo,
-                        newAttachmentAttributes.newFileSize)
+                is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo, newAttachmentAttributes)
                 is MessageFileContent  -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 is MessageAudioContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 else                   -> messageContent
@@ -378,14 +375,16 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                                            encryptedFileInfo: EncryptedFileInfo?,
                                            thumbnailUrl: String?,
                                            thumbnailEncryptedFileInfo: EncryptedFileInfo?,
-                                           size: Long): MessageVideoContent {
+                                           newAttachmentAttributes: NewAttachmentAttributes?): MessageVideoContent {
         return copy(
                 url = if (encryptedFileInfo == null) url else null,
                 encryptedFileInfo = encryptedFileInfo?.copy(url = url),
                 videoInfo = videoInfo?.copy(
                         thumbnailUrl = if (thumbnailEncryptedFileInfo == null) thumbnailUrl else null,
                         thumbnailFile = thumbnailEncryptedFileInfo?.copy(url = thumbnailUrl),
-                        size = size
+                        width = newAttachmentAttributes?.newWidth ?: videoInfo.width,
+                        height = newAttachmentAttributes?.newHeight ?: videoInfo.height,
+                        size = newAttachmentAttributes?.newFileSize ?: videoInfo.size
                 )
         )
     }

From e510de1cccf8fda19cabdb8e535731b433a1194d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sat, 1 May 2021 13:34:46 +0200
Subject: [PATCH 252/350] Display video/image compression progress

---
 .../content/ContentUploadStateTracker.kt      |  2 +
 .../DefaultContentUploadStateTracker.kt       | 10 +++
 .../session/content/UploadContentWorker.kt    |  9 ++-
 .../session/content/VideoCompressor.kt        |  5 ++
 .../helper/ContentUploadStateTrackerBinder.kt | 65 ++++++++++++-------
 vector/src/main/res/values/strings.xml        |  2 +
 6 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
index 924da6c19b..ec63eb0be2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
@@ -31,6 +31,8 @@ interface ContentUploadStateTracker {
     sealed class State {
         object Idle : State()
         object EncryptingThumbnail : State()
+        object CompressingImage : State()
+        data class CompressingVideo(val percent: Float) : State()
         data class UploadingThumbnail(val current: Long, val total: Long) : State()
         data class Encrypting(val current: Long, val total: Long) : State()
         data class Uploading(val current: Long, val total: Long) : State()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
index 754f12bd68..17e0a930c1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
@@ -78,6 +78,16 @@ internal class DefaultContentUploadStateTracker @Inject constructor() : ContentU
         updateState(key, progressData)
     }
 
+    internal fun setCompressingImage(key: String) {
+        val progressData = ContentUploadStateTracker.State.CompressingImage
+        updateState(key, progressData)
+    }
+
+    internal fun setCompressingVideo(key: String, percent: Float) {
+        val progressData = ContentUploadStateTracker.State.CompressingVideo(percent)
+        updateState(key, progressData)
+    }
+
     internal fun setProgress(key: String, current: Long, total: Long) {
         val progressData = ContentUploadStateTracker.State.Uploading(current, total)
         updateState(key, progressData)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 4dec8a9c78..380f8ee9d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -21,6 +21,7 @@ import android.graphics.BitmapFactory
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -156,6 +157,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                         // Do not compress gif
                         && attachment.mimeType != MimeTypes.Gif
                         && params.compressBeforeSending) {
+                    notifyTracker(params) { contentUploadStateTracker.setCompressingImage(it) }
+
                     fileToUpload = imageCompressor.compress(workingFile, MAX_IMAGE_SIZE, MAX_IMAGE_SIZE)
                             .also { compressedFile ->
                                 // Get new Bitmap size
@@ -174,7 +177,11 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                         // Do not compress gif
                         && attachment.mimeType != MimeTypes.Gif
                         && params.compressBeforeSending) {
-                    fileToUpload = videoCompressor.compress(workingFile)
+                    fileToUpload = videoCompressor.compress(workingFile, object: ProgressListener {
+                        override fun onProgress(progress: Int, total: Int) {
+                            notifyTracker(params) { contentUploadStateTracker.setCompressingVideo(it, progress.toFloat()) }
+                        }
+                    })
                             .also { compressedFile ->
                                 // Get new Video file size. For now video dimensions are not updated
                                 newAttachmentAttributes = newAttachmentAttributes.copy(newFileSize = compressedFile.length())
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
index 78624bbbf9..8d3425d0cf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
@@ -23,6 +23,7 @@ import com.abedelazizshe.lightcompressorlibrary.VideoQuality
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.listeners.ProgressListener
 import timber.log.Timber
 import java.io.File
 import java.util.UUID
@@ -30,6 +31,7 @@ import javax.inject.Inject
 
 internal class VideoCompressor @Inject constructor(private val context: Context) {
     suspend fun compress(videoFile: File,
+                         progressListener: ProgressListener?,
                          quality: VideoQuality = VideoQuality.MEDIUM,
                          isMinBitRateEnabled: Boolean = false,
                          keepOriginalResolution: Boolean = true): File {
@@ -46,14 +48,17 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
                     listener = object : CompressionListener {
                         override fun onProgress(percent: Float) {
                             Timber.d("Compressing: $percent%")
+                            progressListener?.onProgress(percent.toInt(), 100)
                         }
 
                         override fun onStart() {
                             Timber.d("Compressing: start")
+                            progressListener?.onProgress(0, 100)
                         }
 
                         override fun onSuccess() {
                             Timber.d("Compressing: success")
+                            progressListener?.onProgress(100, 100)
                             job.complete()
                         }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
index 8216d36ac9..2dd94ff244 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
@@ -25,6 +25,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ScreenScope
 import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.utils.TextUtils
 import im.vector.app.features.home.room.detail.timeline.MessageColorProvider
 import org.matrix.android.sdk.api.session.content.ContentUploadStateTracker
@@ -70,6 +71,9 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
                                           private val messageColorProvider: MessageColorProvider,
                                           private val errorFormatter: ErrorFormatter) : ContentUploadStateTracker.UpdateListener {
 
+    private val progressBar: ProgressBar = progressLayout.findViewById(R.id.mediaProgressBar)
+    private val progressTextView: TextView = progressLayout.findViewById(R.id.mediaProgressTextView)
+
     override fun onUpdate(state: ContentUploadStateTracker.State) {
         when (state) {
             is ContentUploadStateTracker.State.Idle                -> handleIdle()
@@ -79,19 +83,19 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
             is ContentUploadStateTracker.State.Uploading           -> handleProgress(state)
             is ContentUploadStateTracker.State.Failure             -> handleFailure(/*state*/)
             is ContentUploadStateTracker.State.Success             -> handleSuccess()
-        }
+            is ContentUploadStateTracker.State.CompressingImage    -> handleCompressingImage()
+            is ContentUploadStateTracker.State.CompressingVideo    -> handleCompressingVideo(state)
+        }.exhaustive
     }
 
     private fun handleIdle() {
         if (isLocalFile) {
             progressLayout.isVisible = true
-            val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
-            val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView)
-            progressBar?.isVisible = true
-            progressBar?.isIndeterminate = true
-            progressBar?.progress = 0
-            progressTextView?.text = progressLayout.context.getString(R.string.send_file_step_idle)
-            progressTextView?.setTextColor(messageColorProvider.getMessageTextColor(SendState.UNSENT))
+            progressBar.isVisible = true
+            progressBar.isIndeterminate = true
+            progressBar.progress = 0
+            progressTextView.text = progressLayout.context.getString(R.string.send_file_step_idle)
+            progressTextView.setTextColor(messageColorProvider.getMessageTextColor(SendState.UNSENT))
         } else {
             progressLayout.isVisible = false
         }
@@ -113,38 +117,51 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
         doHandleProgress(R.string.send_file_step_sending_file, state.current, state.total)
     }
 
+    private fun handleCompressingImage() {
+        progressLayout.visibility = View.VISIBLE
+        progressBar.isVisible = true
+        progressBar.isIndeterminate = true
+        progressTextView.isVisible = true
+        progressTextView.text = progressLayout.context.getString(R.string.send_file_step_compressing_image)
+        progressTextView.setTextColor(messageColorProvider.getMessageTextColor(SendState.SENDING))
+    }
+
+    private fun handleCompressingVideo(state: ContentUploadStateTracker.State.CompressingVideo) {
+        progressLayout.visibility = View.VISIBLE
+        progressBar.isVisible = true
+        progressBar.isIndeterminate = false
+        progressBar.progress = state.percent.toInt()
+        progressTextView.isVisible = true
+        progressTextView.text = progressLayout.context.getString(R.string.send_file_step_compressing_video, state.percent.toInt())
+        progressTextView.setTextColor(messageColorProvider.getMessageTextColor(SendState.SENDING))
+    }
+
     private fun doHandleEncrypting(resId: Int, current: Long, total: Long) {
         progressLayout.visibility = View.VISIBLE
         val percent = if (total > 0) (100L * (current.toFloat() / total.toFloat())) else 0f
-        val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
-        val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView)
-        progressBar?.isIndeterminate = false
-        progressBar?.progress = percent.toInt()
+        progressBar.isIndeterminate = false
+        progressBar.progress = percent.toInt()
         progressTextView.isVisible = true
-        progressTextView?.text = progressLayout.context.getString(resId)
-        progressTextView?.setTextColor(messageColorProvider.getMessageTextColor(SendState.ENCRYPTING))
+        progressTextView.text = progressLayout.context.getString(resId)
+        progressTextView.setTextColor(messageColorProvider.getMessageTextColor(SendState.ENCRYPTING))
     }
 
     private fun doHandleProgress(resId: Int, current: Long, total: Long) {
         progressLayout.visibility = View.VISIBLE
         val percent = 100L * (current.toFloat() / total.toFloat())
-        val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
-        val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView)
-        progressBar?.isVisible = true
-        progressBar?.isIndeterminate = false
-        progressBar?.progress = percent.toInt()
+        progressBar.isVisible = true
+        progressBar.isIndeterminate = false
+        progressBar.progress = percent.toInt()
         progressTextView.isVisible = true
-        progressTextView?.text = progressLayout.context.getString(resId,
+        progressTextView.text = progressLayout.context.getString(resId,
                 TextUtils.formatFileSize(progressLayout.context, current, true),
                 TextUtils.formatFileSize(progressLayout.context, total, true))
-        progressTextView?.setTextColor(messageColorProvider.getMessageTextColor(SendState.SENDING))
+        progressTextView.setTextColor(messageColorProvider.getMessageTextColor(SendState.SENDING))
     }
 
     private fun handleFailure(/*state: ContentUploadStateTracker.State.Failure*/) {
         progressLayout.visibility = View.VISIBLE
-        val progressBar = progressLayout.findViewById<ProgressBar>(R.id.mediaProgressBar)
-        val progressTextView = progressLayout.findViewById<TextView>(R.id.mediaProgressTextView)
-        progressBar?.isVisible = false
+        progressBar.isVisible = false
         // Do not show the message it's too technical for users, and unfortunate when upload is cancelled
         // in the middle by turning airplane mode for example
         progressTextView.isVisible = false
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index eadc0db1f4..55a46a2d35 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2174,6 +2174,8 @@
     <string name="send_file_step_sending_thumbnail">Sending thumbnail (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">Encrypting file…</string>
     <string name="send_file_step_sending_file">Sending file (%1$s / %2$s)</string>
+    <string name="send_file_step_compressing_image">Compressing image…</string>
+    <string name="send_file_step_compressing_video">Compressing video %d%%</string>
 
     <string name="downloading_file">Downloading file %1$s…</string>
     <string name="downloaded_file">File %1$s has been downloaded!</string>

From d7cbae7c4730917ff2498ffa72a64d43e9f2a219 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sat, 1 May 2021 14:14:59 +0200
Subject: [PATCH 253/350] Fix a regression with video size

---
 .../sdk/internal/session/content/UploadContentWorker.kt      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 380f8ee9d1..7404485cc8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -389,8 +389,9 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                 videoInfo = videoInfo?.copy(
                         thumbnailUrl = if (thumbnailEncryptedFileInfo == null) thumbnailUrl else null,
                         thumbnailFile = thumbnailEncryptedFileInfo?.copy(url = thumbnailUrl),
-                        width = newAttachmentAttributes?.newWidth ?: videoInfo.width,
-                        height = newAttachmentAttributes?.newHeight ?: videoInfo.height,
+                        // FIXME for now, the video size is not updated, but if it was, this code is not working.
+                        // width = newAttachmentAttributes?.newWidth ?: videoInfo.width,
+                        // height = newAttachmentAttributes?.newHeight ?: videoInfo.height,
                         size = newAttachmentAttributes?.newFileSize ?: videoInfo.size
                 )
         )

From 570cffd3ed84eab5bb7b124365c1c0dec7d40492 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 3 May 2021 13:36:15 +0200
Subject: [PATCH 254/350] Fix small copy paste error

---
 .../vector/app/features/home/room/detail/RoomDetailFragment.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 365277b63a..09f17c3367 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -972,7 +972,7 @@ class RoomDetailFragment @Inject constructor(
 
     private val attachmentFileActivityResultLauncher = registerStartForActivityResult {
         if (it.resultCode == Activity.RESULT_OK) {
-            attachmentsHelper.onImageResult(it.data)
+            attachmentsHelper.onFileResult(it.data)
         }
     }
 

From 30a54cfdbc342fd165b8337f42eb2cbefd3f9cc3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 3 May 2021 13:47:42 +0200
Subject: [PATCH 255/350] User can now select video when selecting Gallery to
 send attachments to a room

---
 CHANGES.md                                    |   1 +
 .../im/vector/lib/multipicker/MediaPicker.kt  | 124 ++++++++++++++++++
 .../im/vector/lib/multipicker/MultiPicker.kt  |   2 +
 .../entity/MultiPickerImageType.kt            |   8 +-
 .../entity/MultiPickerMediaType.kt            |  23 ++++
 .../entity/MultiPickerVideoType.kt            |   8 +-
 .../features/attachments/AttachmentsHelper.kt |   8 +-
 .../features/attachments/AttachmentsMapper.kt |   9 ++
 .../home/room/detail/RoomDetailFragment.kt    |   6 +-
 9 files changed, 174 insertions(+), 15 deletions(-)
 create mode 100644 multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt
 create mode 100644 multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerMediaType.kt

diff --git a/CHANGES.md b/CHANGES.md
index d3e17e6980..01f5aa31a1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Improvements 🙌:
  - Delete and react to stickers (#3250)
  - Compress video before sending (#442)
  - Improve file too big error detection (#3245)
+ - User can now select video when selecting Gallery to send attachments to a room
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt
new file mode 100644
index 0000000000..76929b52bd
--- /dev/null
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.multipicker
+
+import android.content.Context
+import android.content.Intent
+import android.media.MediaMetadataRetriever
+import android.provider.MediaStore
+import im.vector.lib.multipicker.entity.MultiPickerBaseMediaType
+import im.vector.lib.multipicker.entity.MultiPickerImageType
+import im.vector.lib.multipicker.entity.MultiPickerVideoType
+import im.vector.lib.multipicker.utils.ImageUtils
+
+/**
+ * Image/Video Picker implementation
+ */
+class MediaPicker : Picker<MultiPickerBaseMediaType>() {
+
+    /**
+     * Call this function from onActivityResult(int, int, Intent).
+     * Returns selected image/video files or empty list if user did not select any files.
+     */
+    override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseMediaType> {
+        val mediaList = mutableListOf<MultiPickerBaseMediaType>()
+
+        getSelectedUriList(data).forEach { selectedUri ->
+            val projection = arrayOf(
+                    MediaStore.Images.Media.DISPLAY_NAME,
+                    MediaStore.Images.Media.SIZE,
+                    MediaStore.Images.Media.MIME_TYPE
+            )
+
+            context.contentResolver.query(
+                    selectedUri,
+                    projection,
+                    null,
+                    null,
+                    null
+            )?.use { cursor ->
+                val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
+                val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
+                val mimeTypeColumn = cursor.getColumnIndex(MediaStore.Images.Media.MIME_TYPE)
+
+                if (cursor.moveToNext()) {
+                    val name = cursor.getString(nameColumn)
+                    val size = cursor.getLong(sizeColumn)
+                    val mimeType = cursor.getString(mimeTypeColumn)
+
+                    if (mimeType.isMimeTypeVideo()) {
+                        var duration = 0L
+                        var width = 0
+                        var height = 0
+                        var orientation = 0
+
+                        context.contentResolver.openFileDescriptor(selectedUri, "r")?.use { pfd ->
+                            val mediaMetadataRetriever = MediaMetadataRetriever()
+                            mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
+                            duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
+                            width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
+                            height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: 0
+                            orientation = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)?.toInt() ?: 0
+                        }
+
+                        mediaList.add(
+                                MultiPickerVideoType(
+                                        name,
+                                        size,
+                                        context.contentResolver.getType(selectedUri),
+                                        selectedUri,
+                                        width,
+                                        height,
+                                        orientation,
+                                        duration
+                                )
+                        )
+                    } else {
+                        // Assume it's an image
+                        val bitmap = ImageUtils.getBitmap(context, selectedUri)
+                        val orientation = ImageUtils.getOrientation(context, selectedUri)
+
+                        mediaList.add(
+                                MultiPickerImageType(
+                                        name,
+                                        size,
+                                        context.contentResolver.getType(selectedUri),
+                                        selectedUri,
+                                        bitmap?.width ?: 0,
+                                        bitmap?.height ?: 0,
+                                        orientation
+                                )
+                        )
+                    }
+                }
+            }
+        }
+        return mediaList
+    }
+
+    override fun createIntent(): Intent {
+        return Intent(Intent.ACTION_GET_CONTENT).apply {
+            addCategory(Intent.CATEGORY_OPENABLE)
+            putExtra(Intent.EXTRA_ALLOW_MULTIPLE, !single)
+            type = "video/*, image/*"
+            val mimeTypes = arrayOf("image/*", "video/*")
+            putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
+        }
+    }
+
+    private fun String?.isMimeTypeVideo() = this?.startsWith("video/") == true
+}
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
index 7e639a9bd3..f7ed4e5cd9 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
@@ -20,6 +20,7 @@ class MultiPicker<T> {
 
     companion object Type {
         val IMAGE by lazy { MultiPicker<ImagePicker>() }
+        val MEDIA by lazy { MultiPicker<MediaPicker>() }
         val FILE by lazy { MultiPicker<FilePicker>() }
         val VIDEO by lazy { MultiPicker<VideoPicker>() }
         val AUDIO by lazy { MultiPicker<AudioPicker>() }
@@ -31,6 +32,7 @@ class MultiPicker<T> {
             return when (type) {
                 IMAGE   -> ImagePicker() as T
                 VIDEO   -> VideoPicker() as T
+                MEDIA   -> MediaPicker() as T
                 FILE    -> FilePicker() as T
                 AUDIO   -> AudioPicker() as T
                 CONTACT -> ContactPicker() as T
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt
index a3f30fc0d5..9efae715cd 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt
@@ -23,7 +23,7 @@ data class MultiPickerImageType(
         override val size: Long,
         override val mimeType: String?,
         override val contentUri: Uri,
-        val width: Int,
-        val height: Int,
-        val orientation: Int
-) : MultiPickerBaseType
+        override val width: Int,
+        override val height: Int,
+        override val orientation: Int
+) : MultiPickerBaseMediaType
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerMediaType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerMediaType.kt
new file mode 100644
index 0000000000..9357e22a74
--- /dev/null
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerMediaType.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.multipicker.entity
+
+interface MultiPickerBaseMediaType : MultiPickerBaseType {
+    val width: Int
+    val height: Int
+    val orientation: Int
+}
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt
index 0015052c7c..20eb844c8a 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt
@@ -23,8 +23,8 @@ data class MultiPickerVideoType(
         override val size: Long,
         override val mimeType: String?,
         override val contentUri: Uri,
-        val width: Int,
-        val height: Int,
-        val orientation: Int,
+        override val width: Int,
+        override val height: Int,
+        override val orientation: Int,
         val duration: Long
-) : MultiPickerBaseType
+) : MultiPickerBaseMediaType
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
index d4efb22eb8..a9fcd353db 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
@@ -77,10 +77,10 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
     }
 
     /**
-     * Starts the process for handling image picking
+     * Starts the process for handling image/video picking
      */
     fun selectGallery(activityResultLauncher: ActivityResultLauncher<Intent>) {
-        MultiPicker.get(MultiPicker.IMAGE).startWith(activityResultLauncher)
+        MultiPicker.get(MultiPicker.MEDIA).startWith(activityResultLauncher)
     }
 
     /**
@@ -133,9 +133,9 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
                 }
     }
 
-    fun onImageResult(data: Intent?) {
+    fun onMediaResult(data: Intent?) {
         callback.onContentAttachmentsReady(
-                MultiPicker.get(MultiPicker.IMAGE)
+                MultiPicker.get(MultiPicker.MEDIA)
                         .getSelectedFiles(context, data)
                         .map { it.toContentAttachmentData() }
         )
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
index 4e8dcaacb7..7f8021ea72 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.attachments
 
 import im.vector.lib.multipicker.entity.MultiPickerAudioType
+import im.vector.lib.multipicker.entity.MultiPickerBaseMediaType
 import im.vector.lib.multipicker.entity.MultiPickerBaseType
 import im.vector.lib.multipicker.entity.MultiPickerContactType
 import im.vector.lib.multipicker.entity.MultiPickerFileType
@@ -69,6 +70,14 @@ private fun MultiPickerBaseType.mapType(): ContentAttachmentData.Type {
     }
 }
 
+fun MultiPickerBaseMediaType.toContentAttachmentData(): ContentAttachmentData {
+    return when (this) {
+        is MultiPickerImageType -> toContentAttachmentData()
+        is MultiPickerVideoType -> toContentAttachmentData()
+        else                    -> throw IllegalStateException("Unknown media type")
+    }
+}
+
 fun MultiPickerImageType.toContentAttachmentData(): ContentAttachmentData {
     if (mimeType == null) Timber.w("No mimeType")
     return ContentAttachmentData(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 09f17c3367..f78dad4e16 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -988,9 +988,9 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-    private val attachmentImageActivityResultLauncher = registerStartForActivityResult {
+    private val attachmentMediaActivityResultLauncher = registerStartForActivityResult {
         if (it.resultCode == Activity.RESULT_OK) {
-            attachmentsHelper.onImageResult(it.data)
+            attachmentsHelper.onMediaResult(it.data)
         }
     }
 
@@ -1991,7 +1991,7 @@ class RoomDetailFragment @Inject constructor(
         when (type) {
             AttachmentTypeSelectorView.Type.CAMERA  -> attachmentsHelper.openCamera(requireContext(), attachmentPhotoActivityResultLauncher)
             AttachmentTypeSelectorView.Type.FILE    -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentImageActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentMediaActivityResultLauncher)
             AttachmentTypeSelectorView.Type.AUDIO   -> attachmentsHelper.selectAudio(attachmentAudioActivityResultLauncher)
             AttachmentTypeSelectorView.Type.CONTACT -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
             AttachmentTypeSelectorView.Type.STICKER -> roomDetailViewModel.handle(RoomDetailAction.SelectStickerAttachment)

From d9ffce7e0d1150b6522667cf23cd5faf459ac466 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 3 May 2021 16:59:32 +0200
Subject: [PATCH 256/350] Add option to record a video from the camera Replace
 #2411

---
 CHANGES.md                                    |   1 +
 .../lib/multipicker/CameraVideoPicker.kt      | 126 ++++++++++++++++++
 .../im/vector/lib/multipicker/MultiPicker.kt  |   2 +
 .../app/core/dialogs/PhotoOrVideoDialog.kt    | 118 ++++++++++++++++
 .../features/attachments/AttachmentsHelper.kt |  34 ++++-
 .../home/room/detail/RoomDetailFragment.kt    |  17 ++-
 .../features/settings/VectorPreferences.kt    |  20 +++
 .../VectorSettingsPreferencesFragment.kt      |  26 ++++
 .../main/res/layout/dialog_photo_or_video.xml |  52 ++++++++
 vector/src/main/res/values/strings.xml        |   3 +
 .../res/xml/vector_settings_preferences.xml   |  17 ++-
 11 files changed, 404 insertions(+), 12 deletions(-)
 create mode 100644 multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
 create mode 100644 vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
 create mode 100644 vector/src/main/res/layout/dialog_photo_or_video.xml

diff --git a/CHANGES.md b/CHANGES.md
index 01f5aa31a1..7a596066aa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
  - Compress video before sending (#442)
  - Improve file too big error detection (#3245)
  - User can now select video when selecting Gallery to send attachments to a room
+ - Add option to record a video from the camera
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
new file mode 100644
index 0000000000..e7faf9e83c
--- /dev/null
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.multipicker
+
+import android.content.Context
+import android.content.Intent
+import android.media.MediaMetadataRetriever
+import android.net.Uri
+import android.provider.MediaStore
+import androidx.activity.result.ActivityResultLauncher
+import androidx.core.content.FileProvider
+import im.vector.lib.multipicker.entity.MultiPickerVideoType
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+/**
+ * Implementation of taking a video with Camera
+ */
+class CameraVideoPicker {
+
+    /**
+     * Start camera by using a ActivityResultLauncher
+     * @return Uri of taken photo or null if the operation is cancelled.
+     */
+    fun startWithExpectingFile(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>): Uri? {
+        val videoUri = createVideoUri(context)
+        val intent = createIntent().apply {
+            putExtra(MediaStore.EXTRA_OUTPUT, videoUri)
+        }
+        activityResultLauncher.launch(intent)
+        return videoUri
+    }
+
+    /**
+     * Call this function from onActivityResult(int, int, Intent).
+     * @return Taken photo or null if request code is wrong
+     * or result code is not Activity.RESULT_OK
+     * or user cancelled the operation.
+     */
+    fun getTakenVideo(context: Context, videoUri: Uri): MultiPickerVideoType? {
+        val projection = arrayOf(
+                MediaStore.Images.Media.DISPLAY_NAME,
+                MediaStore.Images.Media.SIZE,
+                MediaStore.Images.Media.MIME_TYPE
+        )
+
+        context.contentResolver.query(
+                videoUri,
+                projection,
+                null,
+                null,
+                null
+        )?.use { cursor ->
+            val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
+            val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
+
+            if (cursor.moveToNext()) {
+                val name = cursor.getString(nameColumn)
+                val size = cursor.getLong(sizeColumn)
+                var duration = 0L
+                var width = 0
+                var height = 0
+                var orientation = 0
+
+                context.contentResolver.openFileDescriptor(videoUri, "r")?.use { pfd ->
+                    val mediaMetadataRetriever = MediaMetadataRetriever()
+                    mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
+                    duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
+                    width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
+                    height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: 0
+                    orientation = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)?.toInt() ?: 0
+                }
+
+                return MultiPickerVideoType(
+                        name,
+                        size,
+                        context.contentResolver.getType(videoUri),
+                        videoUri,
+                        width,
+                        height,
+                        orientation,
+                        duration
+                )
+            }
+        }
+        return null
+    }
+
+    private fun createIntent(): Intent {
+        return Intent(MediaStore.ACTION_VIDEO_CAPTURE)
+    }
+
+    companion object {
+        fun createVideoUri(context: Context): Uri {
+            val file = createVideoFile(context)
+            val authority = context.packageName + ".multipicker.fileprovider"
+            return FileProvider.getUriForFile(context, authority, file)
+        }
+
+        private fun createVideoFile(context: Context): File {
+            val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
+            val storageDir: File = context.filesDir
+            return File.createTempFile(
+                    "${timeStamp}_", /* prefix */
+                    ".mp4", /* suffix */
+                    storageDir /* directory */
+            )
+        }
+    }
+}
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
index f7ed4e5cd9..6ce50f622a 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
@@ -26,6 +26,7 @@ class MultiPicker<T> {
         val AUDIO by lazy { MultiPicker<AudioPicker>() }
         val CONTACT by lazy { MultiPicker<ContactPicker>() }
         val CAMERA by lazy { MultiPicker<CameraPicker>() }
+        val CAMERA_VIDEO by lazy { MultiPicker<CameraVideoPicker>() }
 
         @Suppress("UNCHECKED_CAST")
         fun <T> get(type: MultiPicker<T>): T {
@@ -37,6 +38,7 @@ class MultiPicker<T> {
                 AUDIO   -> AudioPicker() as T
                 CONTACT -> ContactPicker() as T
                 CAMERA  -> CameraPicker() as T
+                CAMERA_VIDEO  -> CameraVideoPicker() as T
                 else    -> throw IllegalArgumentException("Unsupported type $type")
             }
         }
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
new file mode 100644
index 0000000000..d9188397d8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/dialogs/PhotoOrVideoDialog.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.dialogs
+
+import android.app.Activity
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import im.vector.app.R
+import im.vector.app.databinding.DialogPhotoOrVideoBinding
+import im.vector.app.features.settings.VectorPreferences
+
+class PhotoOrVideoDialog(
+        private val activity: Activity,
+        private val vectorPreferences: VectorPreferences
+) {
+
+    interface PhotoOrVideoDialogListener {
+        fun takePhoto()
+        fun takeVideo()
+    }
+
+    interface PhotoOrVideoDialogSettingsListener {
+        fun onUpdated()
+    }
+
+    fun show(listener: PhotoOrVideoDialogListener) {
+        when (vectorPreferences.getTakePhotoVideoMode()) {
+            VectorPreferences.TAKE_PHOTO_VIDEO_MODE_PHOTO -> listener.takePhoto()
+            VectorPreferences.TAKE_PHOTO_VIDEO_MODE_VIDEO -> listener.takeVideo()
+            /* VectorPreferences.TAKE_PHOTO_VIDEO_MODE_ALWAYS_ASK */
+            else                                          -> {
+                val dialogLayout = activity.layoutInflater.inflate(R.layout.dialog_photo_or_video, null)
+                val views = DialogPhotoOrVideoBinding.bind(dialogLayout)
+
+                // Show option to set as default in this case
+                views.dialogPhotoOrVideoAsDefault.isVisible = true
+                // Always default to photo
+                views.dialogPhotoOrVideoPhoto.isChecked = true
+
+                AlertDialog.Builder(activity)
+                        .setTitle(R.string.option_take_photo_video)
+                        .setView(dialogLayout)
+                        .setPositiveButton(R.string._continue) { _, _ ->
+                            submit(views, vectorPreferences, listener)
+                        }
+                        .setNegativeButton(R.string.cancel, null)
+                        .show()
+            }
+        }
+    }
+
+    private fun submit(views: DialogPhotoOrVideoBinding,
+                       vectorPreferences: VectorPreferences,
+                       listener: PhotoOrVideoDialogListener) {
+        val mode = if (views.dialogPhotoOrVideoPhoto.isChecked) {
+            VectorPreferences.TAKE_PHOTO_VIDEO_MODE_PHOTO
+        } else {
+            VectorPreferences.TAKE_PHOTO_VIDEO_MODE_VIDEO
+        }
+
+        if (views.dialogPhotoOrVideoAsDefault.isChecked) {
+            vectorPreferences.setTakePhotoVideoMode(mode)
+        }
+
+        when (mode) {
+            VectorPreferences.TAKE_PHOTO_VIDEO_MODE_PHOTO -> listener.takePhoto()
+            VectorPreferences.TAKE_PHOTO_VIDEO_MODE_VIDEO -> listener.takeVideo()
+        }
+    }
+
+    fun showForSettings(listener: PhotoOrVideoDialogSettingsListener) {
+        val currentMode = vectorPreferences.getTakePhotoVideoMode()
+
+        val dialogLayout = activity.layoutInflater.inflate(R.layout.dialog_photo_or_video, null)
+        val views = DialogPhotoOrVideoBinding.bind(dialogLayout)
+
+        // Show option for always ask in this case
+        views.dialogPhotoOrVideoAlwaysAsk.isVisible = true
+        // Always default to photo
+        views.dialogPhotoOrVideoPhoto.isChecked = currentMode == VectorPreferences.TAKE_PHOTO_VIDEO_MODE_PHOTO
+        views.dialogPhotoOrVideoVideo.isChecked = currentMode == VectorPreferences.TAKE_PHOTO_VIDEO_MODE_VIDEO
+        views.dialogPhotoOrVideoAlwaysAsk.isChecked = currentMode == VectorPreferences.TAKE_PHOTO_VIDEO_MODE_ALWAYS_ASK
+
+        AlertDialog.Builder(activity)
+                .setTitle(R.string.option_take_photo_video)
+                .setView(dialogLayout)
+                .setPositiveButton(R.string.save) { _, _ ->
+                    submitSettings(views)
+                    listener.onUpdated()
+                }
+                .setNegativeButton(R.string.cancel, null)
+                .show()
+    }
+
+    private fun submitSettings(views: DialogPhotoOrVideoBinding) {
+        vectorPreferences.setTakePhotoVideoMode(
+                when {
+                    views.dialogPhotoOrVideoPhoto.isChecked -> VectorPreferences.TAKE_PHOTO_VIDEO_MODE_PHOTO
+                    views.dialogPhotoOrVideoVideo.isChecked -> VectorPreferences.TAKE_PHOTO_VIDEO_MODE_VIDEO
+                    else                                    -> VectorPreferences.TAKE_PHOTO_VIDEO_MODE_ALWAYS_ASK
+                }
+        )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
index a9fcd353db..28760bf52f 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
@@ -15,12 +15,15 @@
  */
 package im.vector.app.features.attachments
 
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.activity.result.ActivityResultLauncher
+import im.vector.app.core.dialogs.PhotoOrVideoDialog
 import im.vector.app.core.platform.Restorable
+import im.vector.app.features.settings.VectorPreferences
 import im.vector.lib.multipicker.MultiPicker
 import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
@@ -91,10 +94,21 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
     }
 
     /**
-     * Starts the process for handling capture image picking
+     * Starts the process for handling image/video capture. Can open a dialog
      */
-    fun openCamera(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>) {
-        captureUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(context, activityResultLauncher)
+    fun openCamera(activity: Activity,
+                   vectorPreferences: VectorPreferences,
+                   cameraActivityResultLauncher: ActivityResultLauncher<Intent>,
+                   cameraVideoActivityResultLauncher: ActivityResultLauncher<Intent>) {
+        PhotoOrVideoDialog(activity, vectorPreferences).show(object : PhotoOrVideoDialog.PhotoOrVideoDialogListener {
+            override fun takePhoto() {
+                captureUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(context, cameraActivityResultLauncher)
+            }
+
+            override fun takeVideo() {
+                captureUri = MultiPicker.get(MultiPicker.CAMERA_VIDEO).startWithExpectingFile(context, cameraVideoActivityResultLauncher)
+            }
+        })
     }
 
     /**
@@ -141,7 +155,7 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
         )
     }
 
-    fun onPhotoResult() {
+    fun onCameraResult() {
         captureUri?.let { captureUri ->
             MultiPicker.get(MultiPicker.CAMERA)
                     .getTakenPhoto(context, captureUri)
@@ -153,6 +167,18 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
         }
     }
 
+    fun onCameraVideoResult() {
+        captureUri?.let { captureUri ->
+            MultiPicker.get(MultiPicker.CAMERA_VIDEO)
+                    .getTakenVideo(context, captureUri)
+                    ?.let {
+                        callback.onContentAttachmentsReady(
+                                listOf(it).map { it.toContentAttachmentData() }
+                        )
+                    }
+        }
+    }
+
     fun onVideoResult(data: Intent?) {
         callback.onContentAttachmentsReady(
                 MultiPicker.get(MultiPicker.VIDEO)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index f78dad4e16..cabd69ecf9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -994,9 +994,15 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-    private val attachmentPhotoActivityResultLauncher = registerStartForActivityResult {
+    private val attachmentCameraActivityResultLauncher = registerStartForActivityResult {
         if (it.resultCode == Activity.RESULT_OK) {
-            attachmentsHelper.onPhotoResult()
+            attachmentsHelper.onCameraResult()
+        }
+    }
+
+    private val attachmentCameraVideoActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onCameraVideoResult()
         }
     }
 
@@ -1989,7 +1995,12 @@ class RoomDetailFragment @Inject constructor(
 
     private fun launchAttachmentProcess(type: AttachmentTypeSelectorView.Type) {
         when (type) {
-            AttachmentTypeSelectorView.Type.CAMERA  -> attachmentsHelper.openCamera(requireContext(), attachmentPhotoActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.CAMERA  -> attachmentsHelper.openCamera(
+                    activity = requireActivity(),
+                    vectorPreferences = vectorPreferences,
+                    cameraActivityResultLauncher = attachmentCameraActivityResultLauncher,
+                    cameraVideoActivityResultLauncher = attachmentCameraVideoActivityResultLauncher
+            )
             AttachmentTypeSelectorView.Type.FILE    -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
             AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentMediaActivityResultLauncher)
             AttachmentTypeSelectorView.Type.AUDIO   -> attachmentsHelper.selectAudio(attachmentAudioActivityResultLauncher)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 8c6edccda8..b44d44aba0 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -193,6 +193,13 @@ class VectorPreferences @Inject constructor(private val context: Context) {
 
         private const val SETTINGS_UNKNOWN_DEVICE_DISMISSED_LIST = "SETTINGS_UNKNWON_DEVICE_DISMISSED_LIST"
 
+        private const val TAKE_PHOTO_VIDEO_MODE = "TAKE_PHOTO_VIDEO_MODE"
+
+        // Possible values for TAKE_PHOTO_VIDEO_MODE
+        const val TAKE_PHOTO_VIDEO_MODE_ALWAYS_ASK = 0
+        const val TAKE_PHOTO_VIDEO_MODE_PHOTO = 1
+        const val TAKE_PHOTO_VIDEO_MODE_VIDEO = 2
+
         // Background sync modes
 
         // some preferences keys must be kept after a logout
@@ -948,4 +955,17 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     fun labsUseExperimentalRestricted(): Boolean {
         return defaultPrefs.getBoolean(SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE, false)
     }
+
+    /*
+     * Photo / video picker
+     */
+    fun getTakePhotoVideoMode(): Int {
+        return defaultPrefs.getInt(TAKE_PHOTO_VIDEO_MODE, TAKE_PHOTO_VIDEO_MODE_ALWAYS_ASK)
+    }
+
+    fun setTakePhotoVideoMode(mode: Int) {
+        return defaultPrefs.edit {
+            putInt(TAKE_PHOTO_VIDEO_MODE, mode)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index e895e54a20..6f7e9c27ca 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -23,6 +23,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.view.children
 import androidx.preference.Preference
 import im.vector.app.R
+import im.vector.app.core.dialogs.PhotoOrVideoDialog
 import im.vector.app.core.extensions.restart
 import im.vector.app.core.preference.VectorListPreference
 import im.vector.app.core.preference.VectorPreference
@@ -45,6 +46,9 @@ class VectorSettingsPreferencesFragment @Inject constructor(
     private val textSizePreference by lazy {
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_INTERFACE_TEXT_SIZE_KEY)!!
     }
+    private val takePhotoOrVideoPreference by lazy {
+        findPreference<VectorPreference>("SETTINGS_INTERFACE_TAKE_PHOTO_VIDEO")!!
+    }
 
     override fun bindPref() {
         // user interface preferences
@@ -123,6 +127,28 @@ class VectorSettingsPreferencesFragment @Inject constructor(
                 false
             }
         }
+
+        // Take photo or video
+        updateTakePhotoOrVideoPreferenceSummary()
+        takePhotoOrVideoPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+            PhotoOrVideoDialog(requireActivity(), vectorPreferences).showForSettings(object: PhotoOrVideoDialog.PhotoOrVideoDialogSettingsListener {
+                override fun onUpdated() {
+                    updateTakePhotoOrVideoPreferenceSummary()
+                }
+            })
+            true
+        }
+    }
+
+    private fun updateTakePhotoOrVideoPreferenceSummary() {
+        takePhotoOrVideoPreference.summary = getString(
+                when (vectorPreferences.getTakePhotoVideoMode()) {
+                    VectorPreferences.TAKE_PHOTO_VIDEO_MODE_PHOTO -> R.string.option_take_photo
+                    VectorPreferences.TAKE_PHOTO_VIDEO_MODE_VIDEO -> R.string.option_take_video
+                    /* VectorPreferences.TAKE_PHOTO_VIDEO_MODE_ALWAYS_ASK */
+                    else                                          -> R.string.option_always_ask
+                }
+        )
     }
 
     // ==============================================================================================================
diff --git a/vector/src/main/res/layout/dialog_photo_or_video.xml b/vector/src/main/res/layout/dialog_photo_or_video.xml
new file mode 100644
index 0000000000..bc6839738e
--- /dev/null
+++ b/vector/src/main/res/layout/dialog_photo_or_video.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingStart="?dialogPreferredPadding"
+    android:paddingTop="12dp"
+    android:paddingEnd="?dialogPreferredPadding"
+    android:paddingBottom="12dp">
+
+    <RadioGroup
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/dialog_photo_or_video_photo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/option_take_photo"
+            tools:checked="true" />
+
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/dialog_photo_or_video_video"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="180dp"
+            android:text="@string/option_take_video" />
+
+        <!-- Displayed only form the settings -->
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/dialog_photo_or_video_always_ask"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="180dp"
+            android:text="@string/option_always_ask"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+    </RadioGroup>
+
+    <!-- Displayed only form the timeline -->
+    <com.google.android.material.checkbox.MaterialCheckBox
+        android:id="@+id/dialog_photo_or_video_as_default"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/use_as_default_and_do_not_ask_again"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 55a46a2d35..bfd91a6707 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -575,6 +575,9 @@
     <string name="option_take_photo_video">Take photo or video</string>
     <string name="option_take_photo">Take photo</string>
     <string name="option_take_video">Take video</string>
+    <string name="option_always_ask">Always ask</string>
+
+    <string name="use_as_default_and_do_not_ask_again">Use as default and do not ask again</string>
 
     <!-- No sticker application dialog -->
     <string name="no_sticker_application_dialog_content">You don’t currently have any stickerpacks enabled.\n\nAdd some now?</string>
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 1d39791ad8..1be192e0f5 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <im.vector.app.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_USER_INTERFACE_KEY"
@@ -55,6 +56,12 @@
             android:summary="@string/settings_show_emoji_keyboard_summary"
             android:title="@string/settings_show_emoji_keyboard" />
 
+        <im.vector.app.core.preference.VectorPreference
+            android:key="SETTINGS_INTERFACE_TAKE_PHOTO_VIDEO"
+            android:persistent="false"
+            android:title="@string/option_take_photo_video"
+            tools:summary="@string/option_always_ask" />
+
     </im.vector.app.core.preference.VectorPreferenceCategory>
 
     <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_category_timeline">
@@ -185,10 +192,10 @@
 
     <im.vector.app.core.preference.VectorPreferenceCategory android:title="@string/settings_category_room_directory">
 
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:key="SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS"
-        android:summary="@string/settings_room_directory_show_all_rooms_summary"
-        android:title="@string/settings_room_directory_show_all_rooms" />
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:key="SETTINGS_ROOM_DIRECTORY_SHOW_ALL_PUBLIC_ROOMS"
+            android:summary="@string/settings_room_directory_show_all_rooms_summary"
+            android:title="@string/settings_room_directory_show_all_rooms" />
 
     </im.vector.app.core.preference.VectorPreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file

From f7949100a74c40c56b47089636442a80aff9daaa Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 3 May 2021 19:44:11 +0200
Subject: [PATCH 257/350] Sent video does not contains duration (#3272) When
 using the file picker (and not the media picker). Now when using the file
 picker, we detect the mime type and we send the correct event Also some code
 duplication

---
 CHANGES.md                                    |   1 +
 .../im/vector/lib/multipicker/AudioPicker.kt  |  46 +-----
 .../im/vector/lib/multipicker/CameraPicker.kt |  37 +----
 .../lib/multipicker/CameraVideoPicker.kt      |  49 +-----
 .../im/vector/lib/multipicker/FilePicker.kt   |  46 ++++--
 .../im/vector/lib/multipicker/ImagePicker.kt  |  44 +----
 .../im/vector/lib/multipicker/MediaPicker.kt  |  87 ++--------
 .../im/vector/lib/multipicker/VideoPicker.kt  |  55 +------
 .../multipicker/utils/ContentResolverUtil.kt  | 152 ++++++++++++++++++
 .../lib/multipicker/utils/MimeTypeUtil.kt     |  21 +++
 .../features/attachments/AttachmentsMapper.kt |  10 ++
 11 files changed, 237 insertions(+), 311 deletions(-)
 create mode 100644 multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
 create mode 100644 multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt

diff --git a/CHANGES.md b/CHANGES.md
index 7a596066aa..a48156ac4e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,7 @@ Bugfix 🐛:
  - Fix wording issue (#3242)
  - Fix missing sender information after edits (#3184)
  - Fix read marker not updating automatically (#3267)
+ - Sent video does not contains duration (#3272)
 
 Translations 🗣:
  -
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
index e8970d72ef..739bda7004 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
@@ -18,9 +18,8 @@ package im.vector.lib.multipicker
 
 import android.content.Context
 import android.content.Intent
-import android.media.MediaMetadataRetriever
-import android.provider.MediaStore
 import im.vector.lib.multipicker.entity.MultiPickerAudioType
+import im.vector.lib.multipicker.utils.toMultiPickerAudioType
 
 /**
  * Audio file picker implementation
@@ -32,48 +31,9 @@ class AudioPicker : Picker<MultiPickerAudioType>() {
      * Returns selected audio files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerAudioType> {
-        val audioList = mutableListOf<MultiPickerAudioType>()
-
-        getSelectedUriList(data).forEach { selectedUri ->
-            val projection = arrayOf(
-                    MediaStore.Audio.Media.DISPLAY_NAME,
-                    MediaStore.Audio.Media.SIZE
-            )
-
-            context.contentResolver.query(
-                    selectedUri,
-                    projection,
-                    null,
-                    null,
-                    null
-            )?.use { cursor ->
-                val nameColumn = cursor.getColumnIndex(MediaStore.Audio.Media.DISPLAY_NAME)
-                val sizeColumn = cursor.getColumnIndex(MediaStore.Audio.Media.SIZE)
-
-                if (cursor.moveToNext()) {
-                    val name = cursor.getString(nameColumn)
-                    val size = cursor.getLong(sizeColumn)
-                    var duration = 0L
-
-                    context.contentResolver.openFileDescriptor(selectedUri, "r")?.use { pfd ->
-                        val mediaMetadataRetriever = MediaMetadataRetriever()
-                        mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
-                        duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
-                    }
-
-                    audioList.add(
-                            MultiPickerAudioType(
-                                    name,
-                                    size,
-                                    context.contentResolver.getType(selectedUri),
-                                    selectedUri,
-                                    duration
-                            )
-                    )
-                }
-            }
+        return getSelectedUriList(data).mapNotNull { selectedUri ->
+            selectedUri.toMultiPickerAudioType(context)
         }
-        return audioList
     }
 
     override fun createIntent(): Intent {
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
index 64df788e53..b1442a56e1 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
@@ -23,7 +23,7 @@ import android.provider.MediaStore
 import androidx.activity.result.ActivityResultLauncher
 import androidx.core.content.FileProvider
 import im.vector.lib.multipicker.entity.MultiPickerImageType
-import im.vector.lib.multipicker.utils.ImageUtils
+import im.vector.lib.multipicker.utils.toMultiPickerImageType
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -54,40 +54,7 @@ class CameraPicker {
      * or user cancelled the operation.
      */
     fun getTakenPhoto(context: Context, photoUri: Uri): MultiPickerImageType? {
-        val projection = arrayOf(
-                MediaStore.Images.Media.DISPLAY_NAME,
-                MediaStore.Images.Media.SIZE
-        )
-
-        context.contentResolver.query(
-                photoUri,
-                projection,
-                null,
-                null,
-                null
-        )?.use { cursor ->
-            val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
-            val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
-
-            if (cursor.moveToNext()) {
-                val name = cursor.getString(nameColumn)
-                val size = cursor.getLong(sizeColumn)
-
-                val bitmap = ImageUtils.getBitmap(context, photoUri)
-                val orientation = ImageUtils.getOrientation(context, photoUri)
-
-                return MultiPickerImageType(
-                        name,
-                        size,
-                        context.contentResolver.getType(photoUri),
-                        photoUri,
-                        bitmap?.width ?: 0,
-                        bitmap?.height ?: 0,
-                        orientation
-                )
-            }
-        }
-        return null
+        return photoUri.toMultiPickerImageType(context)
     }
 
     private fun createIntent(): Intent {
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
index e7faf9e83c..76342b6e2e 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
@@ -18,12 +18,12 @@ package im.vector.lib.multipicker
 
 import android.content.Context
 import android.content.Intent
-import android.media.MediaMetadataRetriever
 import android.net.Uri
 import android.provider.MediaStore
 import androidx.activity.result.ActivityResultLauncher
 import androidx.core.content.FileProvider
 import im.vector.lib.multipicker.entity.MultiPickerVideoType
+import im.vector.lib.multipicker.utils.toMultiPickerVideoType
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -54,52 +54,7 @@ class CameraVideoPicker {
      * or user cancelled the operation.
      */
     fun getTakenVideo(context: Context, videoUri: Uri): MultiPickerVideoType? {
-        val projection = arrayOf(
-                MediaStore.Images.Media.DISPLAY_NAME,
-                MediaStore.Images.Media.SIZE,
-                MediaStore.Images.Media.MIME_TYPE
-        )
-
-        context.contentResolver.query(
-                videoUri,
-                projection,
-                null,
-                null,
-                null
-        )?.use { cursor ->
-            val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
-            val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
-
-            if (cursor.moveToNext()) {
-                val name = cursor.getString(nameColumn)
-                val size = cursor.getLong(sizeColumn)
-                var duration = 0L
-                var width = 0
-                var height = 0
-                var orientation = 0
-
-                context.contentResolver.openFileDescriptor(videoUri, "r")?.use { pfd ->
-                    val mediaMetadataRetriever = MediaMetadataRetriever()
-                    mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
-                    duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
-                    width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
-                    height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: 0
-                    orientation = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)?.toInt() ?: 0
-                }
-
-                return MultiPickerVideoType(
-                        name,
-                        size,
-                        context.contentResolver.getType(videoUri),
-                        videoUri,
-                        width,
-                        height,
-                        orientation,
-                        duration
-                )
-            }
-        }
-        return null
+        return videoUri.toMultiPickerVideoType(context)
     }
 
     private fun createIntent(): Intent {
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
index 39bd93d03e..ec98152aa7 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
@@ -19,41 +19,55 @@ package im.vector.lib.multipicker
 import android.content.Context
 import android.content.Intent
 import android.provider.OpenableColumns
+import im.vector.lib.multipicker.entity.MultiPickerBaseType
 import im.vector.lib.multipicker.entity.MultiPickerFileType
+import im.vector.lib.multipicker.utils.isMimeTypeAudio
+import im.vector.lib.multipicker.utils.isMimeTypeImage
+import im.vector.lib.multipicker.utils.isMimeTypeVideo
+import im.vector.lib.multipicker.utils.toMultiPickerAudioType
+import im.vector.lib.multipicker.utils.toMultiPickerImageType
+import im.vector.lib.multipicker.utils.toMultiPickerVideoType
 
 /**
  * Implementation of selecting any type of files
  */
-class FilePicker : Picker<MultiPickerFileType>() {
+class FilePicker : Picker<MultiPickerBaseType>() {
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
      * Returns selected files or empty list if user did not select any files.
      */
-    override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerFileType> {
-        val fileList = mutableListOf<MultiPickerFileType>()
+    override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseType> {
+        return getSelectedUriList(data).mapNotNull { selectedUri ->
+            val type = context.contentResolver.getType(selectedUri)
 
-        getSelectedUriList(data).forEach { selectedUri ->
-            context.contentResolver.query(selectedUri, null, null, null, null)
-                    ?.use { cursor ->
-                        val nameColumn = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-                        val sizeColumn = cursor.getColumnIndex(OpenableColumns.SIZE)
-                        if (cursor.moveToFirst()) {
-                            val name = cursor.getString(nameColumn)
-                            val size = cursor.getLong(sizeColumn)
+            when {
+                type.isMimeTypeVideo() -> selectedUri.toMultiPickerVideoType(context)
+                type.isMimeTypeImage() -> selectedUri.toMultiPickerImageType(context)
+                type.isMimeTypeAudio() -> selectedUri.toMultiPickerAudioType(context)
+                else                   -> {
+                    // Other files
+                    context.contentResolver.query(selectedUri, null, null, null, null)
+                            ?.use { cursor ->
+                                val nameColumn = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+                                val sizeColumn = cursor.getColumnIndex(OpenableColumns.SIZE)
+                                if (cursor.moveToFirst()) {
+                                    val name = cursor.getString(nameColumn)
+                                    val size = cursor.getLong(sizeColumn)
 
-                            fileList.add(
                                     MultiPickerFileType(
                                             name,
                                             size,
                                             context.contentResolver.getType(selectedUri),
                                             selectedUri
                                     )
-                            )
-                        }
-                    }
+                                } else {
+                                    null
+                                }
+                            }
+                }
+            }
         }
-        return fileList
     }
 
     override fun createIntent(): Intent {
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
index ce73058039..4cc2352109 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
@@ -18,9 +18,8 @@ package im.vector.lib.multipicker
 
 import android.content.Context
 import android.content.Intent
-import android.provider.MediaStore
 import im.vector.lib.multipicker.entity.MultiPickerImageType
-import im.vector.lib.multipicker.utils.ImageUtils
+import im.vector.lib.multipicker.utils.toMultiPickerImageType
 
 /**
  * Image Picker implementation
@@ -32,46 +31,9 @@ class ImagePicker : Picker<MultiPickerImageType>() {
      * Returns selected image files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerImageType> {
-        val imageList = mutableListOf<MultiPickerImageType>()
-
-        getSelectedUriList(data).forEach { selectedUri ->
-            val projection = arrayOf(
-                    MediaStore.Images.Media.DISPLAY_NAME,
-                    MediaStore.Images.Media.SIZE
-            )
-
-            context.contentResolver.query(
-                    selectedUri,
-                    projection,
-                    null,
-                    null,
-                    null
-            )?.use { cursor ->
-                val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
-                val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
-
-                if (cursor.moveToNext()) {
-                    val name = cursor.getString(nameColumn)
-                    val size = cursor.getLong(sizeColumn)
-
-                    val bitmap = ImageUtils.getBitmap(context, selectedUri)
-                    val orientation = ImageUtils.getOrientation(context, selectedUri)
-
-                    imageList.add(
-                            MultiPickerImageType(
-                                    name,
-                                    size,
-                                    context.contentResolver.getType(selectedUri),
-                                    selectedUri,
-                                    bitmap?.width ?: 0,
-                                    bitmap?.height ?: 0,
-                                    orientation
-                            )
-                    )
-                }
-            }
+        return getSelectedUriList(data).mapNotNull { selectedUri ->
+            selectedUri.toMultiPickerImageType(context)
         }
-        return imageList
     }
 
     override fun createIntent(): Intent {
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt
index 76929b52bd..c58abde694 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt
@@ -18,12 +18,10 @@ package im.vector.lib.multipicker
 
 import android.content.Context
 import android.content.Intent
-import android.media.MediaMetadataRetriever
-import android.provider.MediaStore
 import im.vector.lib.multipicker.entity.MultiPickerBaseMediaType
-import im.vector.lib.multipicker.entity.MultiPickerImageType
-import im.vector.lib.multipicker.entity.MultiPickerVideoType
-import im.vector.lib.multipicker.utils.ImageUtils
+import im.vector.lib.multipicker.utils.isMimeTypeVideo
+import im.vector.lib.multipicker.utils.toMultiPickerImageType
+import im.vector.lib.multipicker.utils.toMultiPickerVideoType
 
 /**
  * Image/Video Picker implementation
@@ -35,79 +33,16 @@ class MediaPicker : Picker<MultiPickerBaseMediaType>() {
      * Returns selected image/video files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseMediaType> {
-        val mediaList = mutableListOf<MultiPickerBaseMediaType>()
+        return getSelectedUriList(data).mapNotNull { selectedUri ->
+            val mimeType = context.contentResolver.getType(selectedUri)
 
-        getSelectedUriList(data).forEach { selectedUri ->
-            val projection = arrayOf(
-                    MediaStore.Images.Media.DISPLAY_NAME,
-                    MediaStore.Images.Media.SIZE,
-                    MediaStore.Images.Media.MIME_TYPE
-            )
-
-            context.contentResolver.query(
-                    selectedUri,
-                    projection,
-                    null,
-                    null,
-                    null
-            )?.use { cursor ->
-                val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
-                val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
-                val mimeTypeColumn = cursor.getColumnIndex(MediaStore.Images.Media.MIME_TYPE)
-
-                if (cursor.moveToNext()) {
-                    val name = cursor.getString(nameColumn)
-                    val size = cursor.getLong(sizeColumn)
-                    val mimeType = cursor.getString(mimeTypeColumn)
-
-                    if (mimeType.isMimeTypeVideo()) {
-                        var duration = 0L
-                        var width = 0
-                        var height = 0
-                        var orientation = 0
-
-                        context.contentResolver.openFileDescriptor(selectedUri, "r")?.use { pfd ->
-                            val mediaMetadataRetriever = MediaMetadataRetriever()
-                            mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
-                            duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
-                            width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
-                            height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: 0
-                            orientation = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)?.toInt() ?: 0
-                        }
-
-                        mediaList.add(
-                                MultiPickerVideoType(
-                                        name,
-                                        size,
-                                        context.contentResolver.getType(selectedUri),
-                                        selectedUri,
-                                        width,
-                                        height,
-                                        orientation,
-                                        duration
-                                )
-                        )
-                    } else {
-                        // Assume it's an image
-                        val bitmap = ImageUtils.getBitmap(context, selectedUri)
-                        val orientation = ImageUtils.getOrientation(context, selectedUri)
-
-                        mediaList.add(
-                                MultiPickerImageType(
-                                        name,
-                                        size,
-                                        context.contentResolver.getType(selectedUri),
-                                        selectedUri,
-                                        bitmap?.width ?: 0,
-                                        bitmap?.height ?: 0,
-                                        orientation
-                                )
-                        )
-                    }
-                }
+            if (mimeType.isMimeTypeVideo()) {
+                selectedUri.toMultiPickerVideoType(context)
+            } else {
+                // Assume it's an image
+                selectedUri.toMultiPickerImageType(context)
             }
         }
-        return mediaList
     }
 
     override fun createIntent(): Intent {
@@ -119,6 +54,4 @@ class MediaPicker : Picker<MultiPickerBaseMediaType>() {
             putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
         }
     }
-
-    private fun String?.isMimeTypeVideo() = this?.startsWith("video/") == true
 }
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
index dada9ac5bd..6b6bc52c1b 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
@@ -18,9 +18,8 @@ package im.vector.lib.multipicker
 
 import android.content.Context
 import android.content.Intent
-import android.media.MediaMetadataRetriever
-import android.provider.MediaStore
 import im.vector.lib.multipicker.entity.MultiPickerVideoType
+import im.vector.lib.multipicker.utils.toMultiPickerVideoType
 
 /**
  * Video Picker implementation
@@ -32,57 +31,9 @@ class VideoPicker : Picker<MultiPickerVideoType>() {
      * Returns selected video files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerVideoType> {
-        val videoList = mutableListOf<MultiPickerVideoType>()
-
-        getSelectedUriList(data).forEach { selectedUri ->
-            val projection = arrayOf(
-                    MediaStore.Video.Media.DISPLAY_NAME,
-                    MediaStore.Video.Media.SIZE
-            )
-
-            context.contentResolver.query(
-                    selectedUri,
-                    projection,
-                    null,
-                    null,
-                    null
-            )?.use { cursor ->
-                val nameColumn = cursor.getColumnIndex(MediaStore.Video.Media.DISPLAY_NAME)
-                val sizeColumn = cursor.getColumnIndex(MediaStore.Video.Media.SIZE)
-
-                if (cursor.moveToNext()) {
-                    val name = cursor.getString(nameColumn)
-                    val size = cursor.getLong(sizeColumn)
-                    var duration = 0L
-                    var width = 0
-                    var height = 0
-                    var orientation = 0
-
-                    context.contentResolver.openFileDescriptor(selectedUri, "r")?.use { pfd ->
-                        val mediaMetadataRetriever = MediaMetadataRetriever()
-                        mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
-                        duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
-                        width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
-                        height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: 0
-                        orientation = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)?.toInt() ?: 0
-                    }
-
-                    videoList.add(
-                            MultiPickerVideoType(
-                                    name,
-                                    size,
-                                    context.contentResolver.getType(selectedUri),
-                                    selectedUri,
-                                    width,
-                                    height,
-                                    orientation,
-                                    duration
-                            )
-                    )
-                }
-            }
+        return getSelectedUriList(data).mapNotNull { selectedUri ->
+            selectedUri.toMultiPickerVideoType(context)
         }
-        return videoList
     }
 
     override fun createIntent(): Intent {
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt b/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
new file mode 100644
index 0000000000..a1982b0bbc
--- /dev/null
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.multipicker.utils
+
+import android.content.Context
+import android.media.MediaMetadataRetriever
+import android.net.Uri
+import android.provider.MediaStore
+import im.vector.lib.multipicker.entity.MultiPickerAudioType
+import im.vector.lib.multipicker.entity.MultiPickerImageType
+import im.vector.lib.multipicker.entity.MultiPickerVideoType
+
+internal fun Uri.toMultiPickerImageType(context: Context): MultiPickerImageType? {
+    val projection = arrayOf(
+            MediaStore.Images.Media.DISPLAY_NAME,
+            MediaStore.Images.Media.SIZE
+    )
+
+    return context.contentResolver.query(
+            this,
+            projection,
+            null,
+            null,
+            null
+    )?.use { cursor ->
+        val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
+        val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
+
+        if (cursor.moveToNext()) {
+            val name = cursor.getString(nameColumn)
+            val size = cursor.getLong(sizeColumn)
+
+            val bitmap = ImageUtils.getBitmap(context, this)
+            val orientation = ImageUtils.getOrientation(context, this)
+
+            MultiPickerImageType(
+                    name,
+                    size,
+                    context.contentResolver.getType(this),
+                    this,
+                    bitmap?.width ?: 0,
+                    bitmap?.height ?: 0,
+                    orientation
+            )
+        } else {
+            null
+        }
+    }
+}
+
+internal fun Uri.toMultiPickerVideoType(context: Context): MultiPickerVideoType? {
+    val projection = arrayOf(
+            MediaStore.Video.Media.DISPLAY_NAME,
+            MediaStore.Video.Media.SIZE
+    )
+
+    return context.contentResolver.query(
+            this,
+            projection,
+            null,
+            null,
+            null
+    )?.use { cursor ->
+        val nameColumn = cursor.getColumnIndex(MediaStore.Video.Media.DISPLAY_NAME)
+        val sizeColumn = cursor.getColumnIndex(MediaStore.Video.Media.SIZE)
+
+        if (cursor.moveToNext()) {
+            val name = cursor.getString(nameColumn)
+            val size = cursor.getLong(sizeColumn)
+            var duration = 0L
+            var width = 0
+            var height = 0
+            var orientation = 0
+
+            context.contentResolver.openFileDescriptor(this, "r")?.use { pfd ->
+                val mediaMetadataRetriever = MediaMetadataRetriever()
+                mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
+                duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
+                width = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
+                height = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt() ?: 0
+                orientation = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION)?.toInt() ?: 0
+            }
+
+            MultiPickerVideoType(
+                    name,
+                    size,
+                    context.contentResolver.getType(this),
+                    this,
+                    width,
+                    height,
+                    orientation,
+                    duration
+            )
+        } else {
+            null
+        }
+    }
+}
+
+internal fun Uri.toMultiPickerAudioType(context: Context): MultiPickerAudioType? {
+    val projection = arrayOf(
+            MediaStore.Audio.Media.DISPLAY_NAME,
+            MediaStore.Audio.Media.SIZE
+    )
+
+    return context.contentResolver.query(
+            this,
+            projection,
+            null,
+            null,
+            null
+    )?.use { cursor ->
+        val nameColumn = cursor.getColumnIndex(MediaStore.Audio.Media.DISPLAY_NAME)
+        val sizeColumn = cursor.getColumnIndex(MediaStore.Audio.Media.SIZE)
+
+        if (cursor.moveToNext()) {
+            val name = cursor.getString(nameColumn)
+            val size = cursor.getLong(sizeColumn)
+            var duration = 0L
+
+            context.contentResolver.openFileDescriptor(this, "r")?.use { pfd ->
+                val mediaMetadataRetriever = MediaMetadataRetriever()
+                mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
+                duration = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLong() ?: 0L
+            }
+
+            MultiPickerAudioType(
+                    name,
+                    size,
+                    context.contentResolver.getType(this),
+                    this,
+                    duration
+            )
+        } else {
+            null
+        }
+    }
+}
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt b/multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt
new file mode 100644
index 0000000000..fc82d03dc5
--- /dev/null
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.lib.multipicker.utils
+
+internal fun String?.isMimeTypeImage() = this?.startsWith("image/") == true
+internal fun String?.isMimeTypeVideo() = this?.startsWith("video/") == true
+internal fun String?.isMimeTypeAudio() = this?.startsWith("audio/") == true
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
index 7f8021ea72..2229455dfe 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt
@@ -70,6 +70,16 @@ private fun MultiPickerBaseType.mapType(): ContentAttachmentData.Type {
     }
 }
 
+fun MultiPickerBaseType.toContentAttachmentData(): ContentAttachmentData {
+    return when (this) {
+        is MultiPickerImageType -> toContentAttachmentData()
+        is MultiPickerVideoType -> toContentAttachmentData()
+        is MultiPickerAudioType -> toContentAttachmentData()
+        is MultiPickerFileType  -> toContentAttachmentData()
+        else                    -> throw IllegalStateException("Unknown file type")
+    }
+}
+
 fun MultiPickerBaseMediaType.toContentAttachmentData(): ContentAttachmentData {
     return when (this) {
         is MultiPickerImageType -> toContentAttachmentData()

From 12c4f3c6f77faaeca456dd15ec4c44a10623ffcd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 3 May 2021 20:25:49 +0200
Subject: [PATCH 258/350] Fix video thumbnail not displayed in when replying
 and in bottom sheet Also create some extensions for future use

---
 .../sdk/api/session/room/model/message/FileInfo.kt   |  7 +++++++
 .../sdk/api/session/room/model/message/ImageInfo.kt  |  7 +++++++
 .../api/session/room/model/message/LocationInfo.kt   |  7 +++++++
 .../sdk/api/session/room/model/message/VideoInfo.kt  |  7 +++++++
 .../detail/timeline/factory/MessageItemFactory.kt    |  4 ++--
 .../timeline/image/ImageContentRendererFactory.kt    | 12 +++++++-----
 .../features/media/RoomEventsAttachmentProvider.kt   |  7 +++----
 .../uploads/media/RoomUploadsMediaFragment.kt        |  4 ++--
 .../uploads/media/UploadsMediaController.kt          |  3 ++-
 9 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
index e85bb0800a..f21074096e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
@@ -47,3 +47,10 @@ data class FileInfo(
          */
         @Json(name = "thumbnail_file") val thumbnailFile: EncryptedFileInfo? = null
 )
+
+/**
+ * Get the url of the encrypted thumbnail or of the thumbnail
+ */
+fun FileInfo.getThumbnailUrl(): String? {
+        return thumbnailFile?.url ?: thumbnailUrl
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
index 048febec39..deadcc3f34 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
@@ -57,3 +57,10 @@ data class ImageInfo(
          */
         @Json(name = "thumbnail_file") val thumbnailFile: EncryptedFileInfo? = null
 )
+
+/**
+ * Get the url of the encrypted thumbnail or of the thumbnail
+ */
+fun ImageInfo.getThumbnailUrl(): String? {
+        return thumbnailFile?.url ?: thumbnailUrl
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt
index a6908dce5b..a76c3c5b64 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt
@@ -37,3 +37,10 @@ data class LocationInfo(
          */
         @Json(name = "thumbnail_file") val thumbnailFile: EncryptedFileInfo? = null
 )
+
+/**
+ * Get the url of the encrypted thumbnail or of the thumbnail
+ */
+fun LocationInfo.getThumbnailUrl(): String? {
+        return thumbnailFile?.url ?: thumbnailUrl
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
index 8379ee9338..8a36c26313 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
@@ -62,3 +62,10 @@ data class VideoInfo(
          */
         @Json(name = "thumbnail_file") val thumbnailFile: EncryptedFileInfo? = null
 )
+
+/**
+ * Get the url of the encrypted thumbnail or of the thumbnail
+ */
+fun VideoInfo.getThumbnailUrl(): String? {
+        return thumbnailFile?.url ?: thumbnailUrl
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 0f214ffb13..63770e4538 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -85,6 +85,7 @@ import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_BUTTONS
 import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_POLL
 import org.matrix.android.sdk.api.session.room.model.message.getFileName
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.model.message.getThumbnailUrl
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
@@ -337,8 +338,7 @@ class MessageItemFactory @Inject constructor(
                 eventId = informationData.eventId,
                 filename = messageContent.body,
                 mimeType = messageContent.mimeType,
-                url = messageContent.videoInfo?.thumbnailFile?.url
-                        ?: messageContent.videoInfo?.thumbnailUrl,
+                url = messageContent.videoInfo?.getThumbnailUrl(),
                 elementToDecrypt = messageContent.videoInfo?.thumbnailFile?.toElementToDecrypt(),
                 height = messageContent.videoInfo?.height,
                 maxHeight = maxHeight,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/image/ImageContentRendererFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/image/ImageContentRendererFactory.kt
index 7ff184f664..2ad58df3b8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/image/ImageContentRendererFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/image/ImageContentRendererFactory.kt
@@ -23,6 +23,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.model.message.getThumbnailUrl
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 
@@ -45,15 +46,16 @@ fun TimelineEvent.buildImageContentRendererData(maxHeight: Int): ImageContentRen
                 }
         root.isVideoMessage() -> root.getClearContent().toModel<MessageVideoContent>()
                 ?.let { messageVideoContent ->
+                    val videoInfo = messageVideoContent.videoInfo
                     ImageContentRenderer.Data(
                             eventId = eventId,
                             filename = messageVideoContent.body,
-                            mimeType = messageVideoContent.mimeType,
-                            url = messageVideoContent.getFileUrl(),
-                            elementToDecrypt = messageVideoContent.encryptedFileInfo?.toElementToDecrypt(),
-                            height = messageVideoContent.videoInfo?.height,
+                            mimeType = videoInfo?.thumbnailInfo?.mimeType,
+                            url = videoInfo?.getThumbnailUrl(),
+                            elementToDecrypt = videoInfo?.thumbnailFile?.toElementToDecrypt(),
+                            height = videoInfo?.thumbnailInfo?.height,
                             maxHeight = maxHeight,
-                            width = messageVideoContent.videoInfo?.width,
+                            width = videoInfo?.thumbnailInfo?.width,
                             maxWidth = maxHeight * 2,
                             allowNonMxcUrls = false
                     )
diff --git a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
index 976f13df58..fc6d5a1f22 100644
--- a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.model.message.getThumbnailUrl
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
@@ -78,8 +79,7 @@ class RoomEventsAttachmentProvider(
                         eventId = it.eventId,
                         filename = content.body,
                         mimeType = content.mimeType,
-                        url = content.videoInfo?.thumbnailFile?.url
-                                ?: content.videoInfo?.thumbnailUrl,
+                        url = content.videoInfo?.getThumbnailUrl(),
                         elementToDecrypt = content.videoInfo?.thumbnailFile?.toElementToDecrypt(),
                         height = content.videoInfo?.height,
                         maxHeight = -1,
@@ -102,8 +102,7 @@ class RoomEventsAttachmentProvider(
                         data = data,
                         thumbnail = AttachmentInfo.Image(
                                 uid = it.eventId,
-                                url = content.videoInfo?.thumbnailFile?.url
-                                        ?: content.videoInfo?.thumbnailUrl ?: "",
+                                url = content.videoInfo?.getThumbnailUrl() ?: "",
                                 data = thumbnailData
 
                         )
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
index fe6dc86165..a7f7dbfe98 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
@@ -50,6 +50,7 @@ import im.vector.app.features.roomprofile.uploads.RoomUploadsViewState
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.model.message.getThumbnailUrl
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import javax.inject.Inject
 
@@ -141,8 +142,7 @@ class RoomUploadsMediaFragment @Inject constructor(
                             eventId = it.eventId,
                             filename = content.body,
                             mimeType = content.mimeType,
-                            url = content.videoInfo?.thumbnailFile?.url
-                                    ?: content.videoInfo?.thumbnailUrl,
+                            url = content.videoInfo?.getThumbnailUrl(),
                             elementToDecrypt = content.videoInfo?.thumbnailFile?.toElementToDecrypt(),
                             height = content.videoInfo?.height,
                             maxHeight = -1,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
index 2a77e65b9e..f8dff345bb 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
 import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.model.message.getThumbnailUrl
 import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import javax.inject.Inject
@@ -131,7 +132,7 @@ class UploadsMediaController @Inject constructor(
                 eventId = eventId,
                 filename = messageContent.body,
                 mimeType = messageContent.mimeType,
-                url = messageContent.videoInfo?.thumbnailFile?.url ?: messageContent.videoInfo?.thumbnailUrl,
+                url = messageContent.videoInfo?.getThumbnailUrl(),
                 elementToDecrypt = messageContent.videoInfo?.thumbnailFile?.toElementToDecrypt(),
                 height = messageContent.videoInfo?.height,
                 maxHeight = itemSize,

From 9d225b78269e86196e3ad96a9c6cdb8671a8fa31 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 3 May 2021 21:12:17 +0200
Subject: [PATCH 259/350] Fixed!

---
 .../sdk/internal/session/content/UploadContentWorker.kt      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 7404485cc8..380f8ee9d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -389,9 +389,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                 videoInfo = videoInfo?.copy(
                         thumbnailUrl = if (thumbnailEncryptedFileInfo == null) thumbnailUrl else null,
                         thumbnailFile = thumbnailEncryptedFileInfo?.copy(url = thumbnailUrl),
-                        // FIXME for now, the video size is not updated, but if it was, this code is not working.
-                        // width = newAttachmentAttributes?.newWidth ?: videoInfo.width,
-                        // height = newAttachmentAttributes?.newHeight ?: videoInfo.height,
+                        width = newAttachmentAttributes?.newWidth ?: videoInfo.width,
+                        height = newAttachmentAttributes?.newHeight ?: videoInfo.height,
                         size = newAttachmentAttributes?.newFileSize ?: videoInfo.size
                 )
         )

From 4189db0f89aacf47b66bd4bb6f69c8de0e295f98 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 10:50:31 +0200
Subject: [PATCH 260/350] Use Junit import

---
 .../sdk/internal/util/GraphUtilsTest.kt       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/GraphUtilsTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/GraphUtilsTest.kt
index 618f6f4714..d28192a282 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/GraphUtilsTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/util/GraphUtilsTest.kt
@@ -16,14 +16,14 @@
 
 package org.matrix.android.sdk.internal.util
 
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.MatrixTest
 import org.matrix.android.sdk.internal.session.room.summary.Graph
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
-import kotlin.test.assertTrue
 
 @FixMethodOrder(MethodSorters.JVM)
 class GraphUtilsTest : MatrixTest {
@@ -44,7 +44,7 @@ class GraphUtilsTest : MatrixTest {
 
         val backEdges = graph.findBackwardEdges(graph.getOrCreateNode("E"))
 
-        assertTrue(backEdges.isEmpty(), "There should not be any cycle in this graphs")
+        assertTrue("There should not be any cycle in this graphs", backEdges.isEmpty())
     }
 
     @Test
@@ -68,21 +68,21 @@ class GraphUtilsTest : MatrixTest {
         val backEdges = graph.findBackwardEdges(graph.getOrCreateNode("E"))
         System.out.println(backEdges.joinToString(" | ") { "${it.source.name} -> ${it.destination.name}" })
 
-        assertTrue(backEdges.size == 2, "There should be 2 backward edges not ${backEdges.size}")
+        assertEquals("There should be 2 backward edges not ${backEdges.size}", 2, backEdges.size)
 
         val edge1 = backEdges.find { it.source.name == "C" }
-        assertNotNull(edge1, "There should be a back edge from C")
-        assertEquals("E", edge1.destination.name, "There should be a back edge C -> E")
+        assertNotNull("There should be a back edge from C", edge1)
+        assertEquals("There should be a back edge C -> E", "E", edge1!!.destination.name)
 
         val edge2 = backEdges.find { it.source.name == "B" }
-        assertNotNull(edge2, "There should be a back edge from B")
-        assertEquals("B", edge2.destination.name, "There should be a back edge C -> C")
+        assertNotNull("There should be a back edge from B", edge2)
+        assertEquals("There should be a back edge C -> C", "B", edge2!!.destination.name)
 
         // clean the graph
         val acyclicGraph = graph.withoutEdges(backEdges)
         System.out.println(acyclicGraph.toString())
 
-        assertTrue(acyclicGraph.findBackwardEdges(acyclicGraph.getOrCreateNode("E")).isEmpty(), "There should be no backward edges")
+        assertTrue("There should be no backward edges", acyclicGraph.findBackwardEdges(acyclicGraph.getOrCreateNode("E")).isEmpty())
 
         val flatten = acyclicGraph.flattenDestination()
 
@@ -93,7 +93,7 @@ class GraphUtilsTest : MatrixTest {
         assertTrue(flattenParentsB.contains(acyclicGraph.getOrCreateNode("A")))
 
         val flattenParentsE = flatten[acyclicGraph.getOrCreateNode("E")]
-        assertTrue(flattenParentsE!!.size == 3)
+        assertEquals(3, flattenParentsE!!.size)
         assertTrue(flattenParentsE.contains(acyclicGraph.getOrCreateNode("A")))
         assertTrue(flattenParentsE.contains(acyclicGraph.getOrCreateNode("C")))
         assertTrue(flattenParentsE.contains(acyclicGraph.getOrCreateNode("D")))

From ee7518bf5149e8aebb97309092c3ec58c0044f0c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 10:51:07 +0200
Subject: [PATCH 261/350] Dependabot missed this one (?)

---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index ea94d44346..a6e730e795 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -187,7 +187,7 @@ dependencies {
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    androidTestImplementation 'org.amshove.kluent:kluent-android:1.61'
+    androidTestImplementation 'org.amshove.kluent:kluent-android:1.65'
     androidTestImplementation 'io.mockk:mockk-android:1.11.0'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"

From 6347564365a686ee8a2575b7a11202e75b376918 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 12:17:43 +0200
Subject: [PATCH 262/350] Change the library to compress video for licensing
 reason

---
 build.gradle                                  |  2 -
 matrix-sdk-android/build.gradle               |  2 +-
 .../session/content/VideoCompressor.kt        | 55 +++++++------------
 3 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/build.gradle b/build.gradle
index d9fb1542ec..b5be9be768 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,8 +48,6 @@ allprojects {
                 // Chat effects
                 includeGroupByRegex 'com\\.github\\.jetradarmobile'
                 includeGroupByRegex 'nl\\.dionsegijn'
-                // LightCompressor
-                includeGroupByRegex 'com\\.github\\.AbedElazizShe'
             }
         }
         maven {
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 57436813d5..be1bbe85cb 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -169,7 +169,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
 
     // Video compression
-    implementation 'com.github.AbedElazizShe:LightCompressor:0.9.0'
+    implementation 'com.otaliastudios:transcoder:0.10.3'
 
     // Phone number https://github.com/google/libphonenumber
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.22'
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
index 8d3425d0cf..8eb3e96fc9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
@@ -17,9 +17,8 @@
 package org.matrix.android.sdk.internal.session.content
 
 import android.content.Context
-import com.abedelazizshe.lightcompressorlibrary.CompressionListener
-import com.abedelazizshe.lightcompressorlibrary.VideoCompressor
-import com.abedelazizshe.lightcompressorlibrary.VideoQuality
+import com.otaliastudios.transcoder.Transcoder
+import com.otaliastudios.transcoder.TranscoderListener
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
@@ -31,51 +30,39 @@ import javax.inject.Inject
 
 internal class VideoCompressor @Inject constructor(private val context: Context) {
     suspend fun compress(videoFile: File,
-                         progressListener: ProgressListener?,
-                         quality: VideoQuality = VideoQuality.MEDIUM,
-                         isMinBitRateEnabled: Boolean = false,
-                         keepOriginalResolution: Boolean = true): File {
+                         progressListener: ProgressListener?): File {
         return withContext(Dispatchers.IO) {
             val job = Job()
             val destinationFile = createDestinationFile()
 
-            // Sadly it does not return the Job, the API is not ideal
-            VideoCompressor.start(
-                    context = null,
-                    srcUri = null,
-                    srcPath = videoFile.path,
-                    destPath = destinationFile.path,
-                    listener = object : CompressionListener {
-                        override fun onProgress(percent: Float) {
-                            Timber.d("Compressing: $percent%")
-                            progressListener?.onProgress(percent.toInt(), 100)
+            Timber.d("Compressing: start")
+            progressListener?.onProgress(0, 100)
+
+            Transcoder.into(destinationFile.path)
+                    .addDataSource(videoFile.path)
+                    .setListener(object: TranscoderListener {
+                        override fun onTranscodeProgress(progress: Double) {
+                            Timber.d("Compressing: $progress%")
+                            progressListener?.onProgress((progress * 100).toInt(), 100)
                         }
 
-                        override fun onStart() {
-                            Timber.d("Compressing: start")
-                            progressListener?.onProgress(0, 100)
-                        }
-
-                        override fun onSuccess() {
+                        override fun onTranscodeCompleted(successCode: Int) {
                             Timber.d("Compressing: success")
                             progressListener?.onProgress(100, 100)
                             job.complete()
                         }
 
-                        override fun onFailure(failureMessage: String) {
-                            Timber.d("Compressing: failure: $failureMessage")
-                            job.completeExceptionally(Exception(failureMessage))
-                        }
-
-                        override fun onCancelled() {
+                        override fun onTranscodeCanceled() {
                             Timber.d("Compressing: cancel")
                             job.cancel()
                         }
-                    },
-                    quality = quality,
-                    isMinBitRateEnabled = isMinBitRateEnabled,
-                    keepOriginalResolution = keepOriginalResolution
-            )
+
+                        override fun onTranscodeFailed(exception: Throwable) {
+                            Timber.d("Compressing: failure: ${exception.localizedMessage}")
+                            job.completeExceptionally(exception)
+                        }
+                    })
+                    .transcode()
 
             job.join()
             destinationFile

From bcf6dcbf7022e29e16e10c2c3aa2dcfb9d78c93f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 12:47:21 +0200
Subject: [PATCH 263/350] Compute new video dimension after compression

---
 .../session/content/UploadContentWorker.kt    | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 380f8ee9d1..4b84b9f9c5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -18,6 +18,8 @@ package org.matrix.android.sdk.internal.session.content
 
 import android.content.Context
 import android.graphics.BitmapFactory
+import android.media.MediaMetadataRetriever
+import androidx.core.net.toUri
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.extensions.tryOrNull
@@ -183,8 +185,25 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                         }
                     })
                             .also { compressedFile ->
-                                // Get new Video file size. For now video dimensions are not updated
-                                newAttachmentAttributes = newAttachmentAttributes.copy(newFileSize = compressedFile.length())
+                                var compressedWidth = 0
+                                var compressedHeight = 0
+
+                                tryOrNull {
+                                    context.contentResolver.openFileDescriptor(compressedFile.toUri(), "r")?.use { pfd ->
+                                        val mediaMetadataRetriever = MediaMetadataRetriever()
+                                        mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
+                                        compressedWidth = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
+                                        compressedHeight = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt()
+                                                ?: 0
+                                    }
+                                }
+
+                                // Get new Video file size and dimensions
+                                newAttachmentAttributes = newAttachmentAttributes.copy(
+                                        newFileSize = compressedFile.length(),
+                                        newWidth = compressedWidth.takeIf { it != 0 } ?: newAttachmentAttributes.newWidth,
+                                        newHeight = compressedHeight.takeIf { it != 0 } ?: newAttachmentAttributes.newHeight
+                                )
                             }
                             .also { filesToDelete.add(it) }
                 } else {

From c502e971a12e7f833bfdb2076887ba0040846db2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 13:35:03 +0200
Subject: [PATCH 264/350] Use Long for size like for the other models
 (FileInfo, AudioInfo, VideoInfo)

---
 .../android/sdk/api/session/room/model/message/ImageInfo.kt     | 2 +-
 .../android/sdk/internal/session/content/UploadContentWorker.kt | 2 +-
 .../sdk/internal/session/room/send/DefaultSendService.kt        | 2 +-
 .../sdk/internal/session/room/send/LocalEchoEventFactory.kt     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
index deadcc3f34..c38ef5bc27 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
@@ -40,7 +40,7 @@ data class ImageInfo(
         /**
          * Size of the image in bytes.
          */
-        @Json(name = "size") val size: Int = 0,
+        @Json(name = "size") val size: Long = 0,
 
         /**
          * Metadata about the image referred to in thumbnail_url.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 4b84b9f9c5..305d7b9e70 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -392,7 +392,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                 info = info?.copy(
                         width = newAttachmentAttributes?.newWidth ?: info.width,
                         height = newAttachmentAttributes?.newHeight ?: info.height,
-                        size = newAttachmentAttributes?.newFileSize?.toInt() ?: info.size
+                        size = newAttachmentAttributes?.newFileSize ?: info.size
                 )
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index 7cc238fcc9..449189e6b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -141,7 +141,7 @@ internal class DefaultSendService @AssistedInject constructor(
                 is MessageImageContent -> {
                     // The image has not yet been sent
                     val attachmentData = ContentAttachmentData(
-                            size = messageContent.info!!.size.toLong(),
+                            size = messageContent.info!!.size,
                             mimeType = messageContent.info.mimeType!!,
                             width = messageContent.info.width.toLong(),
                             height = messageContent.info.height.toLong(),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index 432a4af062..c1ad6205c3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -244,7 +244,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                         mimeType = attachment.getSafeMimeType(),
                         width = width?.toInt() ?: 0,
                         height = height?.toInt() ?: 0,
-                        size = attachment.size.toInt()
+                        size = attachment.size
                 ),
                 url = attachment.queryUri.toString()
         )

From edbfc2e2e923ab20db3425ad0090d7b7318825cd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 13:50:49 +0200
Subject: [PATCH 265/350] Add details about events with attachment in the
 bottomsheet

---
 .../BottomSheetMessagePreviewItem.kt          |  5 +
 .../im/vector/app/core/utils/TextUtils.kt     | 12 +++
 .../app/features/call/webrtc/WebRtcCall.kt    | 12 +--
 .../action/MessageActionsEpoxyController.kt   |  3 +
 .../timeline/format/EventDetailsFormatter.kt  | 92 +++++++++++++++++++
 .../item_bottom_sheet_message_preview.xml     | 23 ++++-
 6 files changed, 134 insertions(+), 13 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/EventDetailsFormatter.kt

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
index 5ff7a07e3c..f05e0843e8 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
@@ -46,6 +46,9 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
     @EpoxyAttribute
     lateinit var body: CharSequence
 
+    @EpoxyAttribute
+    var bodyDetails: CharSequence? = null
+
     @EpoxyAttribute
     var imageContentRenderer: ImageContentRenderer? = null
 
@@ -73,6 +76,7 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
         holder.imagePreview.isVisible = data != null
         holder.body.movementMethod = movementMethod
         holder.body.text = body
+        holder.bodyDetails.setTextOrHide(bodyDetails)
         body.findPillsAndProcess(coroutineScope) { it.bind(holder.body) }
         holder.timestamp.setTextOrHide(time)
     }
@@ -86,6 +90,7 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
         val avatar by bind<ImageView>(R.id.bottom_sheet_message_preview_avatar)
         val sender by bind<TextView>(R.id.bottom_sheet_message_preview_sender)
         val body by bind<TextView>(R.id.bottom_sheet_message_preview_body)
+        val bodyDetails by bind<TextView>(R.id.bottom_sheet_message_preview_body_details)
         val timestamp by bind<TextView>(R.id.bottom_sheet_message_preview_timestamp)
         val imagePreview by bind<ImageView>(R.id.bottom_sheet_message_preview_image)
     }
diff --git a/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
index 84dd793172..992a85679c 100644
--- a/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
@@ -19,6 +19,7 @@ package im.vector.app.core.utils
 import android.content.Context
 import android.os.Build
 import android.text.format.Formatter
+import org.threeten.bp.Duration
 import java.util.TreeMap
 
 object TextUtils {
@@ -68,4 +69,15 @@ object TextUtils {
             Formatter.formatFileSize(context, normalizedSize)
         }
     }
+
+    fun formatDuration(duration: Duration): String {
+        val hours = duration.seconds / 3600
+        val minutes = (duration.seconds % 3600) / 60
+        val seconds = duration.seconds % 60
+        return if (hours > 0) {
+            String.format("%d:%02d:%02d", hours, minutes, seconds)
+        } else {
+            String.format("%02d:%02d", minutes, seconds)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
index 469fba4d5e..fcd6bf0a77 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -21,6 +21,7 @@ import android.hardware.camera2.CameraManager
 import androidx.core.content.getSystemService
 import im.vector.app.core.services.CallService
 import im.vector.app.core.utils.CountUpTimer
+import im.vector.app.core.utils.TextUtils.formatDuration
 import im.vector.app.features.call.CameraEventsHandlerAdapter
 import im.vector.app.features.call.CameraProxy
 import im.vector.app.features.call.CameraType
@@ -829,17 +830,6 @@ class WebRtcCall(val mxCall: MxCall,
         }
     }
 
-    private fun formatDuration(duration: Duration): String {
-        val hours = duration.seconds / 3600
-        val minutes = (duration.seconds % 3600) / 60
-        val seconds = duration.seconds % 60
-        return if (hours > 0) {
-            String.format("%d:%02d:%02d", hours, minutes, seconds)
-        } else {
-            String.format("%02d:%02d", minutes, seconds)
-        }
-    }
-
     // MxCall.StateListener
 
     override fun onStateUpdate(call: MxCall) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index d62083de30..dcbc2c3293 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -33,6 +33,7 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.format.EventDetailsFormatter
 import im.vector.app.features.home.room.detail.timeline.image.buildImageContentRendererData
 import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration
 import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
@@ -53,6 +54,7 @@ class MessageActionsEpoxyController @Inject constructor(
         private val imageContentRenderer: ImageContentRenderer,
         private val dimensionConverter: DimensionConverter,
         private val errorFormatter: ErrorFormatter,
+        private val eventDetailsFormatter: EventDetailsFormatter,
         private val dateFormatter: VectorDateFormatter
 ) : TypedEpoxyController<MessageActionState>() {
 
@@ -71,6 +73,7 @@ class MessageActionsEpoxyController @Inject constructor(
             data(state.timelineEvent()?.buildImageContentRendererData(dimensionConverter.dpToPx(66)))
             userClicked { listener?.didSelectMenuAction(EventSharedAction.OpenUserProfile(state.informationData.senderId)) }
             body(state.messageBody.linkify(listener))
+            bodyDetails(eventDetailsFormatter.format(state.timelineEvent()?.root))
             time(formattedDate)
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/EventDetailsFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/EventDetailsFormatter.kt
new file mode 100644
index 0000000000..d5b2367c15
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/EventDetailsFormatter.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.timeline.format
+
+import android.content.Context
+import im.vector.app.core.utils.TextUtils
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.isAudioMessage
+import org.matrix.android.sdk.api.session.events.model.isFileMessage
+import org.matrix.android.sdk.api.session.events.model.isImageMessage
+import org.matrix.android.sdk.api.session.events.model.isVideoMessage
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageFileContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.threeten.bp.Duration
+import javax.inject.Inject
+
+class EventDetailsFormatter @Inject constructor(
+        private val context: Context
+) {
+
+    fun format(event: Event?): CharSequence? {
+        event ?: return null
+
+        if (event.isRedacted()) {
+            return null
+        }
+
+        if (event.isEncrypted() && event.mxDecryptionResult == null) {
+            return null
+        }
+
+        return when {
+            event.isImageMessage() -> formatForImageMessage(event)
+            event.isVideoMessage() -> formatForVideoMessage(event)
+            event.isAudioMessage() -> formatForAudioMessage(event)
+            event.isFileMessage()  -> formatForFileMessage(event)
+            else                   -> null
+        }
+    }
+
+    /**
+     * Example: "1024 x 720 - 670 kB"
+     */
+    private fun formatForImageMessage(event: Event): CharSequence? {
+        return event.getClearContent().toModel<MessageImageContent>()?.info
+                ?.let { "${it.width} x ${it.height} - ${it.size.asFileSize()}" }
+    }
+
+    /**
+     * Example: "02:45 - 1024 x 720 - 670 kB"
+     */
+    private fun formatForVideoMessage(event: Event): CharSequence? {
+        return event.getClearContent().toModel<MessageVideoContent>()?.videoInfo
+                ?.let { "${it.duration.asDuration()} - ${it.width} x ${it.height} - ${it.size.asFileSize()}" }
+    }
+
+    /**
+     * Example: "02:45 - 670 kB"
+     */
+    private fun formatForAudioMessage(event: Event): CharSequence? {
+        return event.getClearContent().toModel<MessageAudioContent>()?.audioInfo
+                ?.let { "${it.duration.asDuration()} - ${it.size.asFileSize()}" }
+    }
+
+    /**
+     * Example: "670 kB - application/pdf"
+     */
+    private fun formatForFileMessage(event: Event): CharSequence? {
+        return event.getClearContent().toModel<MessageFileContent>()?.info
+                ?.let { "${it.size.asFileSize()} - ${it.mimeType}" }
+    }
+
+    private fun Long.asFileSize() = TextUtils.formatFileSize(context, this)
+    private fun Int.asDuration() = TextUtils.formatDuration(Duration.ofMillis(toLong()))
+}
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index afd96d5690..c2175d495e 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -76,10 +76,29 @@
         android:textColor="?riotx_text_secondary"
         android:textIsSelectable="false"
         android:textSize="14sp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_sheet_message_preview_body_details"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_image"
-        tools:text="Quis harum id autem cumque consequatur laboriosam aliquam sed. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. " />
+        app:layout_goneMarginBottom="4dp"
+        tools:text="Quis harum id autem cumque consequatur laboriosam aliquam sed. Sint accusamus dignissimos nobis ullam earum debitis aspernatur. Sint accusamus dignissimos nobis ullam earum debitis aspernatur." />
+
+    <TextView
+        android:id="@+id/bottom_sheet_message_preview_body_details"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_tertiary"
+        android:textIsSelectable="false"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/bottom_sheet_message_preview_body"
+        app:layout_constraintStart_toStartOf="@id/bottom_sheet_message_preview_body"
+        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message_preview_body"
+        tools:text="1080 x 1024 - 43s - 12kB"
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From 61380bf48a31a62379e1599a5ba985906b4115fe Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 15:28:52 +0200
Subject: [PATCH 266/350] Use Junit import

---
 .../sdk/internal/crypto/PreShareKeysTest.kt   | 12 ++---
 .../timeline/TimelineWithManyMembersTest.kt   |  3 +-
 .../sdk/session/space/SpaceCreationTest.kt    | 18 +++----
 .../sdk/session/space/SpaceHierarchyTest.kt   | 52 +++++++++----------
 4 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
index 122584142e..a2566c1414 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
@@ -18,6 +18,8 @@ package org.matrix.android.sdk.internal.crypto
 
 import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,8 +31,6 @@ import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
 import org.matrix.android.sdk.internal.crypto.model.event.RoomKeyContent
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
 
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -54,7 +54,7 @@ class PreShareKeysTest : InstrumentedTest {
                     && it.getClearType() == EventType.ROOM_KEY
         }
 
-        assertEquals(0, preShareCount, "Bob should not have receive any key from alice at this point")
+        assertEquals("Bob should not have receive any key from alice at this point", 0, preShareCount)
         Log.d("#Test", "Room Key Received from alice $preShareCount")
 
         // Force presharing of new outbound key
@@ -78,14 +78,14 @@ class PreShareKeysTest : InstrumentedTest {
         }
 
         val content = latest?.getClearContent().toModel<RoomKeyContent>()
-        assertNotNull(content, "Bob should have received and decrypted a room key event from alice")
-        assertEquals(e2eRoomID, content.roomId, "Wrong room")
+        assertNotNull("Bob should have received and decrypted a room key event from alice", content)
+        assertEquals("Wrong room", e2eRoomID, content!!.roomId)
         val megolmSessionId = content.sessionId!!
 
         val sharedIndex = aliceSession.cryptoService().getSharedWithInfo(e2eRoomID, megolmSessionId)
                 .getObject(bobSession.myUserId, bobSession.sessionParams.deviceId)
 
-        assertEquals(0, sharedIndex, "The session received by bob should match what alice sent")
+        assertEquals("The session received by bob should match what alice sent", 0, sharedIndex)
 
         // Just send a real message as test
         val sentEvent = mTestHelper.sendTextMessage(aliceSession.getRoom(e2eRoomID)!!, "Allo", 1).first()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt
index ff07cf1d1d..ace48cef77 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineWithManyMembersTest.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.session.room.timeline
 
+import org.junit.Assert.fail
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -29,7 +30,6 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
 import java.util.concurrent.CountDownLatch
-import kotlin.test.fail
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -80,6 +80,7 @@ class TimelineWithManyMembersTest : InstrumentedTest {
                                     return@createEventListener true
                                 } else {
                                     fail("User " + session.myUserId + " decrypted as " + body + " CryptoError: " + it.root.mCryptoError)
+                                    false
                                 }
                             } ?: return@createEventListener false
                 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 278762671b..3fec1145d1 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -18,6 +18,8 @@ package org.matrix.android.sdk.session.space
 
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -42,8 +44,6 @@ import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.space.JoinSpaceResult
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.SessionTestParams
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -68,8 +68,8 @@ class SpaceCreationTest : InstrumentedTest {
         assertEquals(topic, syncedSpace?.asRoom()?.roomSummary()?.topic, "Room topic should be set")
         // assertEquals(topic, syncedSpace.asRoom().roomSummary()?., "Room topic should be set")
 
-        assertNotNull(syncedSpace, "Space should be found by Id")
-        val creationEvent = syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_CREATE)
+        assertNotNull("Space should be found by Id", syncedSpace)
+        val creationEvent = syncedSpace!!.asRoom().getStateEvent(EventType.STATE_ROOM_CREATE)
         val createContent = creationEvent?.content.toModel<RoomCreateContent>()
         assertEquals(RoomType.SPACE, createContent?.type, "Room type should be space")
 
@@ -81,17 +81,17 @@ class SpaceCreationTest : InstrumentedTest {
                 toModel != null
             }
         }
-        assertEquals(100, powerLevelsContent?.eventsDefault, "Space-rooms should be created with a power level for events_default of 100")
+        assertEquals("Space-rooms should be created with a power level for events_default of 100", 100, powerLevelsContent?.eventsDefault)
 
         val guestAccess = syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_GUEST_ACCESS)?.content
                 ?.toModel<RoomGuestAccessContent>()?.guestAccess
 
-        assertEquals(GuestAccess.CanJoin, guestAccess, "Public space room should be peekable by guest")
+        assertEquals("Public space room should be peekable by guest", GuestAccess.CanJoin, guestAccess)
 
         val historyVisibility = syncedSpace.asRoom().getStateEvent(EventType.STATE_ROOM_HISTORY_VISIBILITY)?.content
                 ?.toModel<RoomHistoryVisibilityContent>()?.historyVisibility
 
-        assertEquals(RoomHistoryVisibility.WORLD_READABLE, historyVisibility, "Public space room should be world readable")
+        assertEquals("Public space room should be world readable", RoomHistoryVisibility.WORLD_READABLE, historyVisibility)
 
         commonTestHelper.signOutAndClose(session)
     }
@@ -178,7 +178,7 @@ class SpaceCreationTest : InstrumentedTest {
         // check if bob has joined automatically the first room
 
         val bobMembershipFirstRoom = bobSession.getRoom(firstChild)?.roomSummary()?.membership
-        assertEquals(Membership.JOIN, bobMembershipFirstRoom, "Bob should have joined this room")
+        assertEquals("Bob should have joined this room", Membership.JOIN, bobMembershipFirstRoom)
         RoomSummaryQueryParams.Builder()
 
         val spaceSummaryBobPov = bobSession.spaceService().getSpaceSummaries(roomSummaryQueryParams {
@@ -186,7 +186,7 @@ class SpaceCreationTest : InstrumentedTest {
             this.memberships = listOf(Membership.JOIN)
         }).firstOrNull()
 
-        assertEquals(2, spaceSummaryBobPov?.spaceChildren?.size ?: -1, "Unexpected number of children")
+        assertEquals("Unexpected number of children", 2, spaceSummaryBobPov?.spaceChildren?.size ?: -1)
 
         commonTestHelper.signOutAndClose(aliceSession)
         commonTestHelper.signOutAndClose(bobSession)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index 2fed7e338e..383108e633 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -23,6 +23,9 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -36,9 +39,6 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.SessionTestParams
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
-import kotlin.test.assertTrue
 
 @RunWith(JUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -84,11 +84,11 @@ class SpaceHierarchyTest : InstrumentedTest {
         }
 
         assertNotNull(parents)
-        assertEquals(1, parents.size)
+        assertEquals(1, parents!!.size)
         assertEquals(spaceName, parents.first().roomSummary?.name)
 
         assertNotNull(canonicalParents)
-        assertEquals(1, canonicalParents.size)
+        assertEquals(1, canonicalParents!!.size)
         assertEquals(spaceName, canonicalParents.first().roomSummary?.name)
     }
 
@@ -133,9 +133,9 @@ class SpaceHierarchyTest : InstrumentedTest {
             val canonicalParents = session.getRoom(it.first)?.roomSummary()?.spaceParents?.filter { it.canonical == true }
 
             assertNotNull(parents)
-            assertEquals(1, parents.size, "Unexpected number of parent")
-            assertEquals(spaceName, parents.first().roomSummary?.name, "Unexpected parent name ")
-            assertEquals(if (it.second) 1 else 0, canonicalParents?.size ?: 0, "Parent of ${it.first} should be canonical ${it.second}")
+            assertEquals("Unexpected number of parent", 1, parents!!.size)
+            assertEquals("Unexpected parent name", spaceName, parents.first().roomSummary?.name)
+            assertEquals("Parent of ${it.first} should be canonical ${it.second}", if (it.second) 1 else 0, canonicalParents?.size ?: 0)
         }
     }
 
@@ -178,21 +178,21 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         val allRooms = session.getRoomSummaries(roomSummaryQueryParams { excludeType = listOf(RoomType.SPACE) })
 
-        assertEquals(9, allRooms.size, "Unexpected number of rooms")
+        assertEquals("Unexpected number of rooms", 9, allRooms.size)
 
         val orphans = session.getFlattenRoomSummaryChildrenOf(null)
 
-        assertEquals(2, orphans.size, "Unexpected number of orphan rooms")
-        assertTrue(orphans.indexOfFirst { it.roomId == orphan1 } != -1, "O1 should be an orphan")
-        assertTrue(orphans.indexOfFirst { it.roomId == orphan2 } != -1, "O2 should be an orphan ${orphans.map { it.name }}")
+        assertEquals("Unexpected number of orphan rooms", 2, orphans.size)
+        assertTrue("O1 should be an orphan", orphans.any { it.roomId == orphan1 })
+        assertTrue("O2 should be an orphan ${orphans.map { it.name }}", orphans.any { it.roomId == orphan2 })
 
         val aChildren = session.getFlattenRoomSummaryChildrenOf(spaceAInfo.spaceId)
 
-        assertEquals(4, aChildren.size, "Unexpected number of flatten child rooms")
-        assertTrue(aChildren.indexOfFirst { it.name == "A1" } != -1, "A1 should be a child of A")
-        assertTrue(aChildren.indexOfFirst { it.name == "A2" } != -1, "A2 should be a child of A")
-        assertTrue(aChildren.indexOfFirst { it.name == "C1" } != -1, "CA should be a grand child of A")
-        assertTrue(aChildren.indexOfFirst { it.name == "C2" } != -1, "A1 should be a grand child of A")
+        assertEquals("Unexpected number of flatten child rooms", 4, aChildren.size)
+        assertTrue("A1 should be a child of A", aChildren.any { it.name == "A1" })
+        assertTrue("A2 should be a child of A", aChildren.any { it.name == "A2" })
+        assertTrue("CA should be a grand child of A", aChildren.any { it.name == "C1" })
+        assertTrue("A1 should be a grand child of A", aChildren.any { it.name == "C2" })
 
         // Add a non canonical child and check that it does not appear as orphan
         val a3 = runBlocking {
@@ -205,7 +205,7 @@ class SpaceHierarchyTest : InstrumentedTest {
         }
 
         val orphansUpdate = session.getFlattenRoomSummaryChildrenOf(null)
-        assertEquals(2, orphansUpdate.size, "Unexpected number of orphan rooms ${orphansUpdate.map { it.name }}")
+        assertEquals("Unexpected number of orphan rooms ${orphansUpdate.map { it.name }}", 2, orphansUpdate.size)
     }
 
     @Test
@@ -242,11 +242,11 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         val aChildren = session.getFlattenRoomSummaryChildrenOf(spaceAInfo.spaceId)
 
-        assertEquals(4, aChildren.size, "Unexpected number of flatten child rooms ${aChildren.map { it.name }}")
-        assertTrue(aChildren.indexOfFirst { it.name == "A1" } != -1, "A1 should be a child of A")
-        assertTrue(aChildren.indexOfFirst { it.name == "A2" } != -1, "A2 should be a child of A")
-        assertTrue(aChildren.indexOfFirst { it.name == "C1" } != -1, "CA should be a grand child of A")
-        assertTrue(aChildren.indexOfFirst { it.name == "C2" } != -1, "A1 should be a grand child of A")
+        assertEquals("Unexpected number of flatten child rooms ${aChildren.map { it.name }}", 4, aChildren.size)
+        assertTrue("A1 should be a child of A", aChildren.any { it.name == "A1" })
+        assertTrue("A2 should be a child of A", aChildren.any { it.name == "A2" })
+        assertTrue("CA should be a grand child of A", aChildren.any { it.name == "C1" })
+        assertTrue("A1 should be a grand child of A", aChildren.any { it.name == "C2" })
     }
 
     @Test
@@ -282,9 +282,7 @@ class SpaceHierarchyTest : InstrumentedTest {
                 override fun onChanged(children: List<RoomSummary>?) {
 //                    Log.d("## TEST", "Space A flat children update : ${children?.map { it.name }}")
                     System.out.println("## TEST | Space A flat children update : ${children?.map { it.name }}")
-                    if (children?.indexOfFirst { it.name == "C1" } != -1
-                            && children?.indexOfFirst { it.name == "C2" } != -1
-                    ) {
+                    if (children?.any { it.name == "C1" } == true && children.any { it.name == "C2" }) {
                         // B1 has been added live!
                         latch.countDown()
                         flatAChildren.removeObserver(this)
@@ -409,6 +407,6 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         val rootSpaces = session.spaceService().getRootSpaceSummaries()
 
-        assertEquals(2, rootSpaces.size, "Unexpected number of root spaces ${rootSpaces.map { it.name }}")
+        assertEquals("Unexpected number of root spaces ${rootSpaces.map { it.name }}", 2, rootSpaces.size)
     }
 }

From d8bdf8e625d62126b6c5eac838b02ed054359311 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 17:24:48 +0200
Subject: [PATCH 267/350] Rename file (ktlint)

---
 .../{MultiPickerMediaType.kt => MultiPickerBaseMediaType.kt}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename multipicker/src/main/java/im/vector/lib/multipicker/entity/{MultiPickerMediaType.kt => MultiPickerBaseMediaType.kt} (100%)

diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerMediaType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt
similarity index 100%
rename from multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerMediaType.kt
rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt

From fb42b869ddbfb1913ee9f8404ab270276986d8e7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 17:31:04 +0200
Subject: [PATCH 268/350] Fix false positive with lint

---
 .../detail/timeline/helper/ContentUploadStateTrackerBinder.kt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
index 2dd94ff244..75570a67a0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home.room.detail.timeline.helper
 
+import android.annotation.SuppressLint
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ProgressBar
@@ -126,12 +127,15 @@ private class ContentMediaProgressUpdater(private val progressLayout: ViewGroup,
         progressTextView.setTextColor(messageColorProvider.getMessageTextColor(SendState.SENDING))
     }
 
+    // Add SuppressLint to fix a false positive
+    @SuppressLint("StringFormatMatches")
     private fun handleCompressingVideo(state: ContentUploadStateTracker.State.CompressingVideo) {
         progressLayout.visibility = View.VISIBLE
         progressBar.isVisible = true
         progressBar.isIndeterminate = false
         progressBar.progress = state.percent.toInt()
         progressTextView.isVisible = true
+        // False positive is here...
         progressTextView.text = progressLayout.context.getString(R.string.send_file_step_compressing_video, state.percent.toInt())
         progressTextView.setTextColor(messageColorProvider.getMessageTextColor(SendState.SENDING))
     }

From efc08b376bff6d8bba7c2f11801172f4fc0e7277 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 22:50:42 +0200
Subject: [PATCH 269/350] Transcoder.transcode() already operated on a
 background thread

---
 .../session/content/VideoCompressor.kt        | 71 ++++++++++---------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
index 8eb3e96fc9..712ee94f2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
@@ -31,42 +31,43 @@ import javax.inject.Inject
 internal class VideoCompressor @Inject constructor(private val context: Context) {
     suspend fun compress(videoFile: File,
                          progressListener: ProgressListener?): File {
-        return withContext(Dispatchers.IO) {
-            val job = Job()
-            val destinationFile = createDestinationFile()
-
-            Timber.d("Compressing: start")
-            progressListener?.onProgress(0, 100)
-
-            Transcoder.into(destinationFile.path)
-                    .addDataSource(videoFile.path)
-                    .setListener(object: TranscoderListener {
-                        override fun onTranscodeProgress(progress: Double) {
-                            Timber.d("Compressing: $progress%")
-                            progressListener?.onProgress((progress * 100).toInt(), 100)
-                        }
-
-                        override fun onTranscodeCompleted(successCode: Int) {
-                            Timber.d("Compressing: success")
-                            progressListener?.onProgress(100, 100)
-                            job.complete()
-                        }
-
-                        override fun onTranscodeCanceled() {
-                            Timber.d("Compressing: cancel")
-                            job.cancel()
-                        }
-
-                        override fun onTranscodeFailed(exception: Throwable) {
-                            Timber.d("Compressing: failure: ${exception.localizedMessage}")
-                            job.completeExceptionally(exception)
-                        }
-                    })
-                    .transcode()
-
-            job.join()
-            destinationFile
+        val destinationFile = withContext(Dispatchers.IO) {
+            createDestinationFile()
         }
+
+        val job = Job()
+
+        Timber.d("Compressing: start")
+        progressListener?.onProgress(0, 100)
+
+        Transcoder.into(destinationFile.path)
+                .addDataSource(videoFile.path)
+                .setListener(object : TranscoderListener {
+                    override fun onTranscodeProgress(progress: Double) {
+                        Timber.d("Compressing: $progress%")
+                        progressListener?.onProgress((progress * 100).toInt(), 100)
+                    }
+
+                    override fun onTranscodeCompleted(successCode: Int) {
+                        Timber.d("Compressing: success")
+                        progressListener?.onProgress(100, 100)
+                        job.complete()
+                    }
+
+                    override fun onTranscodeCanceled() {
+                        Timber.d("Compressing: cancel")
+                        job.cancel()
+                    }
+
+                    override fun onTranscodeFailed(exception: Throwable) {
+                        Timber.d("Compressing: failure: ${exception.localizedMessage}")
+                        job.completeExceptionally(exception)
+                    }
+                })
+                .transcode()
+
+        job.join()
+        return destinationFile
     }
 
     private fun createDestinationFile(): File {

From 2a411ccf6c746fa3a46162a038eb0b9f528012b6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 23:12:58 +0200
Subject: [PATCH 270/350] Handle properly the case where the video compression
 is not necessary

---
 .../session/content/UploadContentWorker.kt    | 48 +++++++++++--------
 .../session/content/VideoCompressionResult.kt | 24 ++++++++++
 .../session/content/VideoCompressor.kt        | 28 +++++++++--
 3 files changed, 75 insertions(+), 25 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 305d7b9e70..15c6d243d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -179,33 +179,41 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                         // Do not compress gif
                         && attachment.mimeType != MimeTypes.Gif
                         && params.compressBeforeSending) {
-                    fileToUpload = videoCompressor.compress(workingFile, object: ProgressListener {
+                    fileToUpload = videoCompressor.compress(workingFile, object : ProgressListener {
                         override fun onProgress(progress: Int, total: Int) {
                             notifyTracker(params) { contentUploadStateTracker.setCompressingVideo(it, progress.toFloat()) }
                         }
                     })
-                            .also { compressedFile ->
-                                var compressedWidth = 0
-                                var compressedHeight = 0
+                            .let { videoCompressionResult ->
+                                when (videoCompressionResult) {
+                                    is VideoCompressionResult.Success -> {
+                                        val compressedFile = videoCompressionResult.compressedFile
+                                        var compressedWidth: Int? = null
+                                        var compressedHeight: Int? = null
 
-                                tryOrNull {
-                                    context.contentResolver.openFileDescriptor(compressedFile.toUri(), "r")?.use { pfd ->
-                                        val mediaMetadataRetriever = MediaMetadataRetriever()
-                                        mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
-                                        compressedWidth = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt() ?: 0
-                                        compressedHeight = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt()
-                                                ?: 0
+                                        tryOrNull {
+                                            context.contentResolver.openFileDescriptor(compressedFile.toUri(), "r")?.use { pfd ->
+                                                val mediaMetadataRetriever = MediaMetadataRetriever()
+                                                mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
+                                                compressedWidth = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt()
+                                                compressedHeight = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt()
+                                            }
+                                        }
+
+                                        // Get new Video file size and dimensions
+                                        newAttachmentAttributes = newAttachmentAttributes.copy(
+                                                newFileSize = compressedFile.length(),
+                                                newWidth = compressedWidth ?: newAttachmentAttributes.newWidth,
+                                                newHeight = compressedHeight ?: newAttachmentAttributes.newHeight
+                                        )
+                                        compressedFile
+                                                .also { filesToDelete.add(it) }
+                                    }
+                                    is VideoCompressionResult.CompressionNotNeeded -> {
+                                        workingFile
                                     }
                                 }
-
-                                // Get new Video file size and dimensions
-                                newAttachmentAttributes = newAttachmentAttributes.copy(
-                                        newFileSize = compressedFile.length(),
-                                        newWidth = compressedWidth.takeIf { it != 0 } ?: newAttachmentAttributes.newWidth,
-                                        newHeight = compressedHeight.takeIf { it != 0 } ?: newAttachmentAttributes.newHeight
-                                )
                             }
-                            .also { filesToDelete.add(it) }
                 } else {
                     fileToUpload = workingFile
                     // Fix: OpenableColumns.SIZE may return -1 or 0
@@ -371,7 +379,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
             val updatedContent = when (messageContent) {
                 is MessageImageContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes)
                 is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo, newAttachmentAttributes)
-                is MessageFileContent  -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
+                is MessageFileContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 is MessageAudioContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 else                   -> messageContent
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt
new file mode 100644
index 0000000000..b1362317ba
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.content
+
+import java.io.File
+
+internal sealed class VideoCompressionResult {
+    data class Success(val compressedFile: File) : VideoCompressionResult()
+    object CompressionNotNeeded : VideoCompressionResult()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
index 712ee94f2f..53113e2d86 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
@@ -29,8 +29,9 @@ import java.util.UUID
 import javax.inject.Inject
 
 internal class VideoCompressor @Inject constructor(private val context: Context) {
+
     suspend fun compress(videoFile: File,
-                         progressListener: ProgressListener?): File {
+                         progressListener: ProgressListener?): VideoCompressionResult {
         val destinationFile = withContext(Dispatchers.IO) {
             createDestinationFile()
         }
@@ -40,6 +41,7 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
         Timber.d("Compressing: start")
         progressListener?.onProgress(0, 100)
 
+        var result: Int = -1
         Transcoder.into(destinationFile.path)
                 .addDataSource(videoFile.path)
                 .setListener(object : TranscoderListener {
@@ -49,8 +51,8 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
                     }
 
                     override fun onTranscodeCompleted(successCode: Int) {
-                        Timber.d("Compressing: success")
-                        progressListener?.onProgress(100, 100)
+                        Timber.d("Compressing: success: $successCode")
+                        result = successCode
                         job.complete()
                     }
 
@@ -60,14 +62,30 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
                     }
 
                     override fun onTranscodeFailed(exception: Throwable) {
-                        Timber.d("Compressing: failure: ${exception.localizedMessage}")
+                        Timber.w(exception, "Compressing: failure")
                         job.completeExceptionally(exception)
                     }
                 })
                 .transcode()
 
         job.join()
-        return destinationFile
+
+        progressListener?.onProgress(100, 100)
+
+        return when (result) {
+            Transcoder.SUCCESS_TRANSCODED -> {
+                VideoCompressionResult.Success(destinationFile)
+            }
+            Transcoder.SUCCESS_NOT_NEEDED -> {
+                // Delete now the temporary file
+                withContext(Dispatchers.IO) {
+                    destinationFile.delete()
+                }
+                VideoCompressionResult.CompressionNotNeeded
+            }
+            else                          ->
+                throw IllegalStateException("Unknown result: $result")
+        }
     }
 
     private fun createDestinationFile(): File {

From 9e4f1147f437e23173fd5cbb85279ee7c985a86b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 23:26:06 +0200
Subject: [PATCH 271/350] Fix an issue with the layout
 dialog_photo_or_video.xml on Dark theme. Light theme does not use .Bridge, so
 no reason to use it for Dark theme. I hope there will be no regression
 though...

---
 vector/src/main/res/values/theme_dark.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 5d22683b82..d5b8a40cbb 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -3,7 +3,7 @@
 
     <!-- DARK THEME COLORS -->
 
-    <style name="AppTheme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar.Bridge">
+    <style name="AppTheme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar">
         <!-- Riotx attribute for palette -->
         <item name="riotx_background">@color/riotx_background_dark</item>
         <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_dark</item>

From 42b8f74f5eec0cd39555240038069c96e5ed65f9 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Tue, 4 May 2021 20:03:15 +0000
Subject: [PATCH 272/350] Translated using Weblate (German)

Currently translated at 97.4% (2375 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 84a436d4de..12c36ba7b7 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2748,4 +2748,5 @@
     <string name="room_settings_guest_access_title">Gäste erlauben beizutreten</string>
     <string name="spaces_invited_header">Einladungen</string>
     <string name="suggested_header">Vorgeschlagene Räume</string>
+    <string name="spaces_header">Spaces</string>
 </resources>
\ No newline at end of file

From e4e9707ab7ba9b59030c717a86d3c9e38e6ddd04 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Tue, 4 May 2021 19:34:23 +0000
Subject: [PATCH 273/350] Translated using Weblate (French)

Currently translated at 99.9% (2437 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 55 +++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index d74a9f8a39..acd069818d 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2703,4 +2703,59 @@
     <string name="spaces_header">Espaces</string>
     <string name="spaces_invited_header">Invitations</string>
     <string name="suggested_header">Salons recommandés</string>
+    <string name="labs_use_restricted_join_rule">Espace expérimental – salon restreint.</string>
+    <string name="you_are_invited">Vous êtes invité</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Les espaces sont un moyen de regrouper les salons et personnes pour travailler, s’amuser, ou juste pour vous-même.</string>
+    <string name="spaces_beta_welcome_to_spaces">Bienvenue dans les espaces !</string>
+    <string name="space_add_existing_rooms">Ajouter des salons et espaces existants</string>
+    <string name="space_leave_prompt_msg">Voulez-vous vraiment quitter l’espace \?</string>
+    <string name="leave_space">Quitter l’espace</string>
+    <string name="space_add_child_title">Ajouter des salons</string>
+    <string name="space_explore_activity_title">Parcourir les salons</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d personne que vous connaissez en fait partie</item>
+        <item quantity="other">%d personnes que vous connaissez en font partie</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Bienvenue dans %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Vous ne faites partie d’aucun salon pour l’instant. Vous trouverez ci-dessous les salons recommandés, mais vous pouvez en voir plus avec le bouton vert en bas à droite.</string>
+    <string name="room_alias_preview_not_found">Cet alias n’est pas accessible en ce moment.
+\nRéessayez plus tard, ou demandez à un administrateur de ce salon de vérifier que vous pouvez y accéder.</string>
+    <string name="join_anyway">Rejoindre quand même</string>
+    <string name="join_space">Rejoindre l’espace</string>
+    <string name="create_space">Créer un espace</string>
+    <string name="skip_for_now">Passer pour l’instant</string>
+    <string name="share_space_link_message">Rejoignez mon espace %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">Ne fera pas partie de %s</string>
+    <string name="invite_just_to_this_room">Seulement ce salon</string>
+    <string name="invite_to_space_with_name_desc">Permettra de parcourir les salons de %s</string>
+    <string name="invite_to_space_with_name">Inviter dans %s</string>
+    <string name="invite_by_link">Partager le lien</string>
+    <string name="invite_by_mxid">Inviter par nom d’utilisateur</string>
+    <string name="invite_by_email">Inviter par e-mail</string>
+    <string name="invite_people_to_your_space_desc">Vous êtes seul pour l’instant. %s sera plus agréable avec de la compagnie.</string>
+    <string name="invite_people_to_your_space">Invitez des personnes dans votre espace</string>
+    <string name="invite_people_menu">Inviter des personnes</string>
+    <string name="create_space_topic_hint">Description</string>
+    <string name="create_spaces_loading_message">Création de l’espace…</string>
+    <string name="create_spaces_default_public_random_room_name">Aléatoire</string>
+    <string name="create_spaces_default_public_room_name">Général</string>
+    <string name="create_spaces_room_private_header_desc">Créons un salon pour chacun d’entre eux. Vous pourrez en ajouter plus tard, y compris certains déjà existant.</string>
+    <string name="create_spaces_room_private_header">Sur quels projets travaillez-vous \?</string>
+    <string name="create_spaces_room_public_header_desc">Nous allons créer les salons pour ces sujets. Vous pourrez en ajouter d’autres plus tard.</string>
+    <string name="create_spaces_room_public_header">De quoi allez vous parler dans %s \?</string>
+    <string name="create_space_error_empty_field_space_name">Donnez lui un nom pour poursuivre.</string>
+    <string name="create_spaces_details_private_header">Ajoutez quelques informations pour renforcer son identité. Vous pourrez changer ceci plus tard.</string>
+    <string name="create_spaces_details_public_header">Ajoutez quelques informations pour l’aider à se démarquer. Vous pourrez changer ceci plus tard.</string>
+    <string name="activity_create_space_title">Créer un espace</string>
+    <string name="space_type_private_desc">Sur invitation, idéal pour vous-même ou les équipes</string>
+    <string name="space_type_private">Privé</string>
+    <string name="space_type_public_desc">Ouvert à tous, idéal pour les communautés</string>
+    <string name="space_type_public">Public</string>
+    <string name="create_spaces_private_teammates">Un espace privé pour vous et votre équipe</string>
+    <string name="create_spaces_me_and_teammates">Moi et mon équipe</string>
+    <string name="create_spaces_organise_rooms">Un espace privé pour organiser vos salons</string>
+    <string name="create_spaces_just_me">Seulement moi</string>
+    <string name="create_spaces_make_sure_access">Assurez-vous que les accès à %s sont accordés aux bonnes personnes. Vous pourrez changer ceci plus tard.</string>
+    <string name="create_spaces_who_are_you_working_with">Avec qui travaillez-vous \?</string>
+    <string name="create_spaces_join_info_help">Pour rejoindre un espace existant, il vous faut une invitation.</string>
 </resources>
\ No newline at end of file

From 89a08ca2a03aca44df07086b0e22baac89144670 Mon Sep 17 00:00:00 2001
From: Vancha <tjipke@tutanota.com>
Date: Tue, 4 May 2021 10:19:35 +0000
Subject: [PATCH 274/350] Translated using Weblate (Frisian)

Currently translated at 23.5% (573 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
---
 vector/src/main/res/values-fy/strings.xml | 146 ++++++++++++++++++++++
 1 file changed, 146 insertions(+)

diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index 52825a0e30..582f678e81 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -448,4 +448,150 @@
     <string name="summary_user_sent_sticker">%1$s hat in sticker stjoerd.</string>
     <string name="summary_you_sent_image">Do hast in ôfbylding stjoerd.</string>
     <string name="summary_user_sent_image">%1$s hat in ôfbylding stjoerd.</string>
+    <string name="no_valid_google_play_services_apk">Gjin jildiche Google Play Services APK fûn. Notifikaasjes kinne wol ris net wurkje.</string>
+    <string name="x_plus">%d+</string>
+    <string name="plus_x">+%d</string>
+    <string name="generic_label_and_value">%1$s: %2$s</string>
+    <string name="generic_label">%1$s:</string>
+    <string name="show_info_area_only_errors">Allinich foar flaters</string>
+    <string name="show_info_area_messages_and_errors">Foar berjochten en flaters</string>
+    <string name="show_info_area_always">Ivich</string>
+    <string name="settings_info_area_show">Informaasje krite sjen litte</string>
+    <string name="merged_events_collapse">ynteare</string>
+    <string name="merged_events_expand">útteare</string>
+    <string name="unknown_error">Sorry, in flater die sich foar</string>
+    <string name="resource_limit_hard_contact">Graach %s om disse tsjinst brûken te blieuwen.</string>
+    <string name="room_tombstone_predecessor_link">Klik hjir om âldere berjochten te besjen</string>
+    <string name="room_tombstone_continuation_description">Disse keamer is in trochsetting fan in oar petear</string>
+    <string name="room_tombstone_continuation_link">It petear giet hjir troch</string>
+    <string name="room_tombstone_versioned_description">Disse keamer is ferfong en is net mear aktyf</string>
+    <string name="error_empty_field_your_password">Graach dyn wachtwurd ynfiere.</string>
+    <string name="error_empty_field_enter_user_name">Graach in brûkersnamme ynfiere.</string>
+    <string name="deactivate_account_submit">Akkount Útskeakelje</string>
+    <string name="deactivate_account_prompt_password">Om troch te gean, fier dyn wachtwurd yn:</string>
+    <string name="deactivate_account_delete_checkbox">Graach alle berjochten ferjitte dyt ik ferstjoerd ha wannear myn akkount útskeakele is (Warskôging: hjir troch kin oare brûkers in ûnfolslein byld fan konversaasjes krijge)</string>
+    <string name="deactivate_account_title">Akkount Deaktivearje</string>
+    <string name="dialog_user_consent_submit">No besjen</string>
+    <string name="dialog_user_consent_content">Om de %1$s thústsjinner brûken te blieuwen mast de betingsten besjen en befestigje.</string>
+    <string name="forget_room">Keamer ferjitte</string>
+    <string name="reason_colon">Reden: %1$s</string>
+    <string name="has_been_banned">Do binst út %1$s weiballe troch %2$s</string>
+    <string name="identity_server_set_default_submit">%1$s Brûke</string>
+    <string name="call_ring">Skilje…</string>
+    <string name="call_transfer_users_tab_title">Brûkers</string>
+    <string name="command_description_emote">Aksje sjen litte</string>
+    <string name="notice_member_no_changes_by_you">Do hast neat feroare</string>
+    <string name="notice_room_topic_removed_by_you">Do hast it keamer ûnderwerp fuortsmiten</string>
+    <string name="notice_room_topic_removed">%1$s hat it keamer ûnderwerp fuortsmiten</string>
+    <string name="notice_room_name_removed_by_you">Do hast de keamer namme fuortsmiten</string>
+    <string name="notice_room_name_removed">%1$s hat de keamer namme fuortsmiten</string>
+    <string name="notice_room_kick_with_reason">%1$s hat %2$s der út skopt. Reden: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Do hast %1$s fuortskopt. Reden: %2$s</string>
+    <string name="notice_direct_room_update_by_you">Do hast hjir fernijd.</string>
+    <string name="notice_direct_room_update">%s is hjir fernijd.</string>
+    <string name="notice_placed_voice_call_by_you">Do hast skille.</string>
+    <string name="choose_locale_loading_locales">Beskikbere talen ophelje…</string>
+    <string name="choose_locale_other_locales_title">Oare beskikbere talen</string>
+    <string name="command_description_topic">Jou it ûnderwerp fan de keamer oan</string>
+    <string name="report_content_spam">Dit is spam</string>
+    <string name="uploads_files_no_result">Der befyne sich gjin triemen yn disse keamer</string>
+    <string name="uploads_files_title">TRIEMEN</string>
+    <string name="uploads_media_no_result">Der befynt sich gjin media yn disse keamer</string>
+    <string name="uploads_media_title">MEDIA</string>
+    <string name="rotate_and_crop_screen_title">Omdraaie en bysnije</string>
+    <string name="attachment_type_sticker">Sticker</string>
+    <string name="attachment_type_audio">Lûd</string>
+    <string name="attachment_type_camera">Kamera</string>
+    <string name="attachment_type_contact">Kontakt</string>
+    <string name="attachment_type_file">Triem</string>
+    <string name="attachment_type_dialog_title">Ôfbylding tafoege út</string>
+    <string name="error_attachment">In flater die sich foar wylst it taheaksel ophelle waard.</string>
+    <string name="a11y_jump_to_bottom">Spring nei it ein</string>
+    <string name="a11y_hide_password">Wachtwurd net sjen litte</string>
+    <string name="a11y_image">Ôfbylding</string>
+    <string name="a11y_create_room">Nije keamer oanmeitsje</string>
+    <string name="a11y_open_chat">Petear iepenje</string>
+    <string name="a11y_video">Fideo</string>
+    <string name="settings_select_language">Taal útsykje</string>
+    <string name="settings_interface_language">Taal</string>
+    <string name="disabled_integration_dialog_content">Skakel \'integraasjes tastean\' yn Ynstellings yn om dit te dwaan.</string>
+    <string name="disabled_integration_dialog_title">Integraasjes bin útskakele</string>
+    <string name="settings_integration_manager">Integraasje Behearder</string>
+    <string name="settings_integration_allow">Integraasje tastean</string>
+    <string name="settings_identity_server">Identiteits Tsjinner</string>
+    <string name="settings_home_server">Thús Tsjinner</string>
+    <string name="settings_logged_in">Ynloggd as</string>
+    <string name="devices_delete_submit_button_label">Ferstjoere</string>
+    <string name="devices_delete_pswd">Wachtwurd:</string>
+    <string name="devices_delete_dialog_title">Authentikaasje</string>
+    <string name="devices_delete_dialog_text">Disse operaasje hat oanfullende authentikaasje nedich.
+\nFier dyn wachtwurd yn om troch te gean.</string>
+    <string name="devices_details_last_seen_title">Foar it letst sjûn</string>
+    <string name="devices_details_device_name">Iepenbiere Namme Feroarje</string>
+    <string name="devices_details_name_title">Iepenbiere Namme</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="devices_details_dialog_title">Sesje informaasje</string>
+    <string name="settings_data_save_mode">Databesparjende modus</string>
+    <string name="startup_notification_fdroid_battery_optim_button_grant">Tastimming jaan</string>
+    <string name="startup_notification_privacy_button_other">In oare opsje kieze</string>
+    <string name="startup_notification_privacy_button_grant">Tastimming jaan</string>
+    <string name="settings_discovery_manage">Dyn sichtberens ynstellings beheare.</string>
+    <string name="settings_discovery_category">Sichtberens</string>
+    <string name="settings_opt_in_of_analytics_ok">Ja, ik wol graach helpe!</string>
+    <string name="settings_phone_number">Tillefoan nûmer</string>
+    <string name="settings_general_title">Algemien</string>
+    <string name="settings_devices_list">Sesjes</string>
+    <string name="settings_pin_unread_messages">Keamers mei net lézen berjochten festsette</string>
+    <string name="settings_rageshake">Lilkensskodzje</string>
+    <string name="settings_developer_mode_summary">De ûntwikkelders modus jout ûnsichtbere funksjes frei, en kin de applikaasje minder stabiel meitsje. Allinich foar ûntwikkelders!</string>
+    <string name="settings_developer_mode">Ûntwikkelders modus</string>
+    <string name="resource_limit_contact_action">Kontakt Opnimme Mei Behearder</string>
+    <string name="report_content_inappropriate">Dit is tapasselik</string>
+    <string name="pause_video">Skoftsje</string>
+    <string name="play_video">Ôfspylje</string>
+    <string name="identity_server_set_alternative_submit">Ferstjoere</string>
+    <string name="identity_server_not_defined">Do brûkst gjin Identiteits Tsjinner</string>
+    <string name="sas_error_unknown">Ûnbekende flater</string>
+    <string name="sas_verification_request_notification_channel">Interactieve Sesje Ferifikaasje</string>
+    <string name="sas_cancelled_by_me">De ferifikaasje is ôfbrutsen.
+\nReden: %s</string>
+    <string name="sas_cancelled_by_other">De oare partij hat de ferifikaasje ôfbrutsen.
+\n%s</string>
+    <string name="sas_cancelled_dialog_title">Oanfraach Ôfbrutsen</string>
+    <string name="sas_verification_request_notification_channel_title">Kaai Ferifikaasje</string>
+    <string name="sas_legacy_verification_button_title">Brûk ferâldere ferifikaasje.</string>
+    <string name="sas_verifying_keys">Wurd der neat sjen litten\? Net eltse kliïnt kin mei interactieve ferifikaasje oerwei. Brûk ferâldere ferifikaasje.</string>
+    <string name="sas_incoming_request_notif_title">Ferifikaasje oanfraach</string>
+    <string name="sas_incoming_request_notif_content">%s wol dyn sesje ferifiearje</string>
+    <string name="sas_verified_successful_description">Feilige berjochten mei disse brûker binne ein-oant-ein fersifere, en kin net troch tredde partijen lézen wurde.</string>
+    <string name="sas_verified_successful">Do hast disse sesje mei sukses ferifieare.</string>
+    <string name="sas_verified">Ferifieare!</string>
+    <string name="sas_waiting_for_partner">Oan it wachtsjen op partner om te befêstigjen …</string>
+    <string name="sas_view_request_action">Oanfraach besjen</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Biometry ynskakelje</string>
+    <string name="settings_security_pin_code_title">PIN ynskakelje</string>
+    <string name="settings_security_application_protection_screen_title">Feiligens ynstelle</string>
+    <string name="settings_security_application_protection_summary">Tagong befeiligje troch in PIN en biometry te brûken.</string>
+    <string name="settings_security_application_protection_title">Tagong befeiligje</string>
+    <string name="auth_pin_forgot">PIN fergetten\?</string>
+    <string name="auth_pin_title">Dyn PIN ynfiere</string>
+    <string name="create_pin_confirm_title">PIN befestigje</string>
+    <string name="create_pin_title">Brûk in PIN foar feiligens</string>
+    <string name="too_many_pin_failures">Te folle flaters, do binst útlogd</string>
+    <string name="room_alias_local_address_add">Lokaal adres tafoege</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">Ik ha in kopy makke</string>
+    <string name="keys_backup_setup_step3_please_make_copy">Graach in kopy meitsje</string>
+    <string name="keys_backup_setup_override_stop">Ophâlde</string>
+    <string name="keys_backup_setup_step3_button_title">Klear</string>
+    <string name="keys_backup_setup_step2_text_title">Feiligje dyn reservekopy mei in Wachtwurdssin.</string>
+    <string name="keys_backup_setup_step1_manual_export">Kaaien mei de hân eksportearje</string>
+    <string name="keys_backup_setup_step1_advanced">(Avanseare)</string>
+    <string name="keys_backup_setup_step1_title">Reitsje dyn fersifere gegevens nea kwyt</string>
+    <string name="keys_backup_no_session_error">Gjin Matrix sesje beskikber</string>
+    <string name="template_keys_backup_passphrase_not_empty_error_message">Graach de wachtwurdssin fuortsmite ast wolst dot ${app_name} in nije herstel kaai foar dy oanmakket.</string>
+    <string name="passphrase_empty_error_message">Graach in wachtwurdssin ynfiere</string>
+    <string name="passphrase_passphrase_does_not_match">Wachtwurdssin komt net oerien</string>
+    <string name="passphrase_enter_passphrase">Wachtwurdssin ynfiere</string>
+    <string name="passphrase_confirm_passphrase">Wachtwurdssin befestigje</string>
+    <string name="passphrase_create_passphrase">Wachtwurdssin oanmeitsje</string>
 </resources>
\ No newline at end of file

From 0d041cbf1184ea0454de687202e972c157ef2f0b Mon Sep 17 00:00:00 2001
From: Andrejs <tlpbu@droplar.com>
Date: Tue, 4 May 2021 05:12:18 +0000
Subject: [PATCH 275/350] Translated using Weblate (Latvian)

Currently translated at 84.1% (2051 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/lv/
---
 vector/src/main/res/values-lv/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 0a13e92972..6e2503a8b5 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -358,7 +358,7 @@
     <string name="black_theme">Melna tēma</string>
     <string name="notification_sync_in_progress">Sinhronizācija…</string>
     <string name="notification_listening_for_events">Notikumu monitorings</string>
-    <string name="notification_noisy_notifications">Skaņi paziņojumi</string>
+    <string name="notification_noisy_notifications">Skaņas paziņojumi</string>
     <string name="notification_silent_notifications">Klusi paziņojumi</string>
     <string name="title_activity_bug_report">Kļūdas atskaite</string>
     <string name="title_activity_group_details">Kopienas informācija</string>
@@ -1749,7 +1749,7 @@ Nākotnē šī pārbaudes procedūra plānota sarežģītāka.</string>
 \n
 \nMēs iesakām jums nekavējoties nomainīt paroli un atiestatīšanas atslēgu iestatījumos.</string>
     <string name="refresh">Atsvaidzināt</string>
-    <string name="share_confirm_room">Vai vēlaties sūtīt šo pielikumu uz %1$s\?</string>
+    <string name="share_confirm_room">Vai vēlaties sūtīt šo pielikumu %1$s\?</string>
     <string name="enter_secret_storage_passphrase_warning">Brīdinājums:</string>
     <string name="new_signin">Jauna pierakstīšanās</string>
     <string name="settings_account_data">Konta dati</string>

From abd8e987b813e6d13cc0a6388fa978247c78c703 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Mon, 3 May 2021 08:27:17 +0000
Subject: [PATCH 276/350] Translated using Weblate (Albanian)

Currently translated at 99.4% (2425 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
---
 vector/src/main/res/values-sq/strings.xml | 78 +++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index ef68551dc8..543061a8eb 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2662,4 +2662,82 @@
 \nPo shkarkohen të dhëna…</string>
     <string name="initial_sync_start_server_computing">Njëkohësimi Fillestar:
 \nPo pritet për përgjigje nga shërbyesi…</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Hapësirat janë mënyra për të grupuar dhoma dhe persona për punë, zbavitje ose thjesht për veten tuaj.</string>
+    <string name="labs_use_restricted_join_rule_desc">Sinjalizimi lyp mbulim nga shërbyesi dhe version eksperimental dhome</string>
+    <string name="labs_use_restricted_join_rule">Hapësirë Eksperimentale - Dhomë e Kufizuar.</string>
+    <string name="you_are_invited">Jeni ftuar</string>
+    <string name="spaces_beta_welcome_to_spaces">Mirë se vini te Hapësira!</string>
+    <string name="space_add_existing_rooms">Shtoni dhoma ekzistuese dhe hapësira</string>
+    <string name="space_leave_prompt_msg">Jeni i sigurt se doni të dilni nga hapësira\?</string>
+    <string name="leave_space">Braktiseni Hapësirën</string>
+    <string name="space_add_child_title">Shtoni dhoma</string>
+    <string name="space_explore_activity_title">Eksploroni dhoma</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d person që e njihni është bërë pjesë tashmë</item>
+        <item quantity="other">%d persona që i njihni janë bërë pjesë tashmë</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Mirë se vini në %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Ende s’jeni në ndonjë nga dhomat. Më poshtë keni disa dhoma të sugjeruara, por mund të shihni më tepër, me butonin e gjelbër poshtë djathtas.</string>
+    <string name="room_alias_preview_not_found">Ky alias s’mund të përdoret tani.
+\nRiprovoni më vonë, ose kërkojini një përgjegjësi dhome të kontrollojë nëse keni leje për hyrje.</string>
+    <string name="join_anyway">Hyni, Sido Qoftë</string>
+    <string name="join_space">Hyni te Hapësirë</string>
+    <string name="create_space">Krijo Hapësirën</string>
+    <string name="skip_for_now">Hëpërhë anashkaloje</string>
+    <string name="share_space_link_message">Ejani në hapësirën time %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">S’do të jenë pjesë e %s</string>
+    <string name="invite_just_to_this_room">Thjesht te kjo dhomë</string>
+    <string name="invite_to_space_with_name_desc">Do të jenë në gjendje të eksplorojnë %s</string>
+    <string name="invite_to_space_with_name">Ftojeni në %s</string>
+    <string name="invite_by_link">Jepuni lidhjen</string>
+    <string name="invite_by_mxid">Ftoni përmes emri përdoruesi</string>
+    <string name="invite_by_email">Ftoni përmes email-i</string>
+    <string name="invite_people_to_your_space_desc">Vetëm ju, hëpërhë. %s do të jetë edhe më mirë me të tjerë.</string>
+    <string name="invite_people_menu">Ftoni njerëz</string>
+    <string name="invite_people_to_your_space">Ftoni njerëz te ekipi juaj</string>
+    <string name="create_space_topic_hint">Përshkrim</string>
+    <string name="create_spaces_loading_message">Po krijohe Hapësirë…</string>
+    <string name="create_spaces_default_public_random_room_name">Kuturu</string>
+    <string name="create_spaces_default_public_room_name">Të Përgjithshme</string>
+    <string name="create_spaces_room_private_header_desc">Le të krijojmë një dhomë për secilën prej tyre. Mund të shtoni të tjera më vonë, përfshi ato ekzistuese tashmë.</string>
+    <string name="create_spaces_room_private_header">Me çfarë po merreni\?</string>
+    <string name="create_spaces_room_public_header_desc">Do të krijojmë dhoma për to. Mund edhe të shtoni të tilla më vonë.</string>
+    <string name="create_spaces_room_public_header">Cilat janë disa nga gjërat që doni të diskutoni në %s\?</string>
+    <string name="create_space_error_empty_field_space_name">Jepini një emër që të vazhdohet.</string>
+    <string name="create_spaces_details_private_header">Shtoni ndonjë hollësi për të ndihmuar njerëzit ta identifikojnë. Mund t’i ndryshoni kur të doni.</string>
+    <string name="create_spaces_details_public_header">Shtoni ndonjë hollësi për të ndihmuar të dalë në pah. Këto mund t’i ndryshoni kur të doni.</string>
+    <string name="activity_create_space_title">Krijoni një hapësirë</string>
+    <string name="space_type_private_desc">Vetëm me ftesa, më e mira për ju ose ekipe</string>
+    <string name="space_type_private">Vetjake</string>
+    <string name="space_type_public_desc">E hapur për këdo, më e mira për bashkësi</string>
+    <string name="space_type_public">Publike</string>
+    <string name="create_spaces_private_teammates">Një hapësirë private për ju &amp; anëtarët e ekipit tuaj</string>
+    <string name="create_spaces_me_and_teammates">Unë dhe anëtarët e ekipit tim</string>
+    <string name="create_spaces_organise_rooms">Një hapësirë private për të sistemuar dhomat tuaja</string>
+    <string name="create_spaces_just_me">Unë vetëm</string>
+    <string name="create_spaces_make_sure_access">Siguroni që personat e duhur të kenë hyrje te %s. Këtë mund të ndryshoni më vonë.</string>
+    <string name="create_spaces_who_are_you_working_with">Me cilët po punoni\?</string>
+    <string name="create_spaces_join_info_help">Që të hyni në një hapësirë ekzistuese, ju duhet një ftesë.</string>
+    <string name="create_spaces_you_can_change_later">Këtë mund ta ndryshoni më vonë</string>
+    <string name="create_spaces_choose_type_label">Ç’lloj hapësire doni të krijoni\?</string>
+    <string name="create_spaces_type_header">Hapësirat janë një mënyrë e re për të grupuar dhoma dhe persona</string>
+    <string name="your_private_space">Hapësira juaj private</string>
+    <string name="your_public_space">Hapësira juaj publike</string>
+    <string name="add_space">Shtoni Hapësirë</string>
+    <string name="command_description_leave_room">Braktiseni dhomën me ID-në e dhënë (ose dhomën e tanishme, në qoftë nul)</string>
+    <string name="command_description_join_space">Hyni te Hapësira me ID-në e dhënë</string>
+    <string name="command_description_create_space">Krijoni një Hapësirë</string>
+    <string name="search_hint_room_name">Kërko Për Emër</string>
+    <string name="room_settings_room_access_restricted_description">Cilido në një hapësirë me këtë dhomë mund ta kërkojë dhe hyjë në të. Vetëm përgjegjësit e kësaj dhome mund ta shtojnë te një hapësirë.</string>
+    <string name="room_settings_room_access_restricted_title">Hapësira</string>
+    <string name="room_settings_room_access_public_description">Kushdo mund ta gjejë dhomën dhe të hyjë në të</string>
+    <string name="room_settings_room_access_public_title">Publike</string>
+    <string name="room_settings_room_access_private_description">Vetëm personat e ftuar mund ta gjejnë dhe hyjnë në të</string>
+    <string name="room_settings_room_access_private_title">Private</string>
+    <string name="room_settings_room_access_entry_unknown">Rregullim i panjohur hyrjesh (%s)</string>
+    <string name="room_settings_room_access_entry_knock">Në dhomë mund të trokasë cilido, anëtarët mandej mund ta pranojnë ose jo</string>
+    <string name="room_settings_guest_access_title">Lejo vizitorë të hyjnë</string>
+    <string name="spaces_header">Hapësira</string>
+    <string name="spaces_invited_header">Ftesa</string>
+    <string name="suggested_header">Dhoma të Këshilluara</string>
 </resources>
\ No newline at end of file

From 51ea772579abccae9b34969f50e72bd7a3768690 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Tue, 4 May 2021 07:57:20 +0000
Subject: [PATCH 277/350] Translated using Weblate (Swedish)

Currently translated at 99.0% (2416 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 8844c7ec20..45dbe5d4f4 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2709,4 +2709,21 @@
     <string name="spaces_header">Utrymmen</string>
     <string name="spaces_invited_header">Inbjudningar</string>
     <string name="suggested_header">Föreslagna rum</string>
+    <string name="invite_to_space_with_name">Bjud in till %s</string>
+    <string name="invite_by_link">Dela länk</string>
+    <string name="invite_by_mxid">Bjud in med användarnamn</string>
+    <string name="invite_by_email">Bjud in via e-post</string>
+    <string name="invite_people_to_your_space_desc">Det är bara du här för tillfället. %s kommer att vara ännu bättre med fler.</string>
+    <string name="invite_people_to_your_space">Bjud in personer till ditt utrymme</string>
+    <string name="invite_people_menu">Bjud in personer</string>
+    <string name="create_space_topic_hint">Beskrivning</string>
+    <string name="create_spaces_loading_message">Skapar utrymme…</string>
+    <string name="create_spaces_default_public_random_room_name">Slumpmässigt</string>
+    <string name="create_spaces_default_public_room_name">Allmänt</string>
+    <string name="create_spaces_room_private_header_desc">Låt oss skapa ett rum för varje. Du kan lägga till fler senare också, även redan existerande.</string>
+    <string name="create_spaces_room_private_header">Vad för saker jobbar du med\?</string>
+    <string name="create_spaces_room_public_header_desc">Vi kommer att skapa rum för dem. Du kan lägga till fler senare.</string>
+    <string name="create_spaces_room_public_header">Vad är några diskussioner du vill ha i %s\?</string>
+    <string name="create_space_error_empty_field_space_name">Ge det ett namn för att fortsätta.</string>
+    <string name="create_spaces_details_private_header">Lägg till några detaljer för att hjälpa folk att identifiera det. Du kan ändra dessa när som helst.</string>
 </resources>
\ No newline at end of file

From ad1832efbc5faab24eada925b370d36b23cacd33 Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Mon, 3 May 2021 20:53:17 +0000
Subject: [PATCH 278/350] Translated using Weblate (Czech)

Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
---
 fastlane/metadata/android/cs/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/cs/changelogs/40101030.txt | 2 ++
 fastlane/metadata/android/cs/changelogs/40101040.txt | 2 ++
 fastlane/metadata/android/cs/changelogs/40101050.txt | 2 ++
 fastlane/metadata/android/cs/changelogs/40101060.txt | 2 ++
 fastlane/metadata/android/cs/short_description.txt   | 2 +-
 fastlane/metadata/android/cs/title.txt               | 2 +-
 7 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/cs/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/cs/changelogs/40101030.txt
 create mode 100644 fastlane/metadata/android/cs/changelogs/40101040.txt
 create mode 100644 fastlane/metadata/android/cs/changelogs/40101050.txt
 create mode 100644 fastlane/metadata/android/cs/changelogs/40101060.txt

diff --git a/fastlane/metadata/android/cs/changelogs/40101020.txt b/fastlane/metadata/android/cs/changelogs/40101020.txt
new file mode 100644
index 0000000000..5e90e49daa
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: vylepšení výkonnosti a opravy chyb!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/cs/changelogs/40101030.txt b/fastlane/metadata/android/cs/changelogs/40101030.txt
new file mode 100644
index 0000000000..0e624ba6d1
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: vylepšení výkonnosti a opravy chyb!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/cs/changelogs/40101040.txt b/fastlane/metadata/android/cs/changelogs/40101040.txt
new file mode 100644
index 0000000000..1818c92ba8
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: vylepšení výkonnosti a opravy chyb!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/cs/changelogs/40101050.txt b/fastlane/metadata/android/cs/changelogs/40101050.txt
new file mode 100644
index 0000000000..3e33cd8d07
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: nutné opravy pro 1.1.4
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/cs/changelogs/40101060.txt b/fastlane/metadata/android/cs/changelogs/40101060.txt
new file mode 100644
index 0000000000..d148a9bc37
--- /dev/null
+++ b/fastlane/metadata/android/cs/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: nutné opravy chyb pro 1.1.5!
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/cs/short_description.txt b/fastlane/metadata/android/cs/short_description.txt
index a654a9ea6a..d14ac49efa 100644
--- a/fastlane/metadata/android/cs/short_description.txt
+++ b/fastlane/metadata/android/cs/short_description.txt
@@ -1 +1 @@
-Zabezpečený decentralizovaný chat a VoIP. Uchovejte svá data v bezpečí.
+Skupinový messenger - šifrovaná komunikace, skupinový chat a video hovory
diff --git a/fastlane/metadata/android/cs/title.txt b/fastlane/metadata/android/cs/title.txt
index 76943289ad..2fedfecb15 100644
--- a/fastlane/metadata/android/cs/title.txt
+++ b/fastlane/metadata/android/cs/title.txt
@@ -1 +1 @@
-Element (dříve Riot.im)
+Element - bezpečný messenger

From b05f53453a8441076193827c5c587ec3b1526850 Mon Sep 17 00:00:00 2001
From: Vancha <tjipke@tutanota.com>
Date: Tue, 4 May 2021 07:48:53 +0000
Subject: [PATCH 279/350] Translated using Weblate (Frisian)

Currently translated at 94.4% (17 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fy/
---
 fastlane/metadata/android/fy/changelogs/40100100.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40100110.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40100120.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40100130.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40100140.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40100150.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40100160.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40100170.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40101000.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40101010.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40101020.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40101030.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40101040.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40101050.txt | 2 ++
 fastlane/metadata/android/fy/changelogs/40101060.txt | 2 ++
 fastlane/metadata/android/fy/short_description.txt   | 1 +
 fastlane/metadata/android/fy/title.txt               | 1 +
 17 files changed, 32 insertions(+)
 create mode 100644 fastlane/metadata/android/fy/changelogs/40100100.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40100110.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40100120.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40100130.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40100140.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40100150.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40100160.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40100170.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40101000.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40101010.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40101020.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40101030.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40101040.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40101050.txt
 create mode 100644 fastlane/metadata/android/fy/changelogs/40101060.txt
 create mode 100644 fastlane/metadata/android/fy/short_description.txt
 create mode 100644 fastlane/metadata/android/fy/title.txt

diff --git a/fastlane/metadata/android/fy/changelogs/40100100.txt b/fastlane/metadata/android/fy/changelogs/40100100.txt
new file mode 100644
index 0000000000..dc2eda9234
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100100.txt
@@ -0,0 +1,2 @@
+Disse nije ferzje bestjit foar in grut diel út breksoplossings en ferbetteringen. Berjochten stjoere giet no in soad flugger.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.10
diff --git a/fastlane/metadata/android/fy/changelogs/40100110.txt b/fastlane/metadata/android/fy/changelogs/40100110.txt
new file mode 100644
index 0000000000..8249b5c409
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100110.txt
@@ -0,0 +1,2 @@
+Disse nije ferzje bestjit foar in grut diel út brûkersinterfaasje en brûkersûnderfingsferbetteringen. No kinst freonen útnûgje, en gau DM's meitsje troch QR koades te scannen.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.11
diff --git a/fastlane/metadata/android/fy/changelogs/40100120.txt b/fastlane/metadata/android/fy/changelogs/40100120.txt
new file mode 100644
index 0000000000..9605ce2a75
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100120.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: URL ynsjen, nij emoji toetseboerd, nij keamer ynstellings moochlikheden, en snie foar kryst.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.12
diff --git a/fastlane/metadata/android/fy/changelogs/40100130.txt b/fastlane/metadata/android/fy/changelogs/40100130.txt
new file mode 100644
index 0000000000..ebc7285193
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100130.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: URL ynsjen, nij emoji toetseboerd, nij keamer ynstellings moochlikheden, en snie foar kryst.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.13
diff --git a/fastlane/metadata/android/fy/changelogs/40100140.txt b/fastlane/metadata/android/fy/changelogs/40100140.txt
new file mode 100644
index 0000000000..6886848889
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100140.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Keamer fjochten feroarje, automatysk ljocht/tsjuster tema, en breksferbetteringen.
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.14
diff --git a/fastlane/metadata/android/fy/changelogs/40100150.txt b/fastlane/metadata/android/fy/changelogs/40100150.txt
new file mode 100644
index 0000000000..d291da0475
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100150.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Stipe foar sosjaal ynlogge!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.15
diff --git a/fastlane/metadata/android/fy/changelogs/40100160.txt b/fastlane/metadata/android/fy/changelogs/40100160.txt
new file mode 100644
index 0000000000..eb2be2d09c
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100160.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Stipe foar sosjaal ynlogge!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.15 and https://github.com/vector-im/element-android/releases/tag/v1.0.16
diff --git a/fastlane/metadata/android/fy/changelogs/40100170.txt b/fastlane/metadata/android/fy/changelogs/40100170.txt
new file mode 100644
index 0000000000..281b087584
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.0.17
diff --git a/fastlane/metadata/android/fy/changelogs/40101000.txt b/fastlane/metadata/android/fy/changelogs/40101000.txt
new file mode 100644
index 0000000000..a860b7b468
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101000.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: VoIP (lûds en video skilje yn DM) ferbetteringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/fy/changelogs/40101010.txt b/fastlane/metadata/android/fy/changelogs/40101010.txt
new file mode 100644
index 0000000000..2369fc4d22
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101010.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Prestaasje feroaringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.1
diff --git a/fastlane/metadata/android/fy/changelogs/40101020.txt b/fastlane/metadata/android/fy/changelogs/40101020.txt
new file mode 100644
index 0000000000..13aa172071
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101020.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Prestaasje feroaringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.2
diff --git a/fastlane/metadata/android/fy/changelogs/40101030.txt b/fastlane/metadata/android/fy/changelogs/40101030.txt
new file mode 100644
index 0000000000..595cbdf104
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101030.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Prestaasje feroaringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.3
diff --git a/fastlane/metadata/android/fy/changelogs/40101040.txt b/fastlane/metadata/android/fy/changelogs/40101040.txt
new file mode 100644
index 0000000000..e86e7ce3e3
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: Prestaasje feroaringen en breksoplossings!
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/fy/changelogs/40101050.txt b/fastlane/metadata/android/fy/changelogs/40101050.txt
new file mode 100644
index 0000000000..fdf5f98eb7
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: feroaringen foar 1.1.4
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/fy/changelogs/40101060.txt b/fastlane/metadata/android/fy/changelogs/40101060.txt
new file mode 100644
index 0000000000..47ac5692d5
--- /dev/null
+++ b/fastlane/metadata/android/fy/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Haadferoaring yn disse ferzje: feroaringen foar 1.1.5
+Folsleine feroaringslist: https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/fy/short_description.txt b/fastlane/metadata/android/fy/short_description.txt
new file mode 100644
index 0000000000..ddc559b59c
--- /dev/null
+++ b/fastlane/metadata/android/fy/short_description.txt
@@ -0,0 +1 @@
+Groepsberjochtetsjinst - fersifere berjochten, groeps petearen en fideo skilje
diff --git a/fastlane/metadata/android/fy/title.txt b/fastlane/metadata/android/fy/title.txt
new file mode 100644
index 0000000000..c4b5b596fc
--- /dev/null
+++ b/fastlane/metadata/android/fy/title.txt
@@ -0,0 +1 @@
+Element - Feilige Berjochtetsjinst

From 8d528299180ab0eb27877dc3f4cf20dc2c0bfdfb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 5 May 2021 10:49:57 +0200
Subject: [PATCH 280/350] Fix issue in logs

---
 .../session/content/UploadContentWorker.kt       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 15c6d243d3..f0a861587e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -224,7 +224,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
 
                 val encryptedFile: File?
                 val contentUploadResponse = if (params.isEncrypted) {
-                    Timber.v("## FileService: Encrypt file")
+                    Timber.v("## Encrypt file")
 
                     encryptedFile = File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
                             .also { filesToDelete.add(it) }
@@ -236,18 +236,18 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                                 }
                             }
 
-                    Timber.v("## FileService: Uploading file")
+                    Timber.v("## Uploading file")
 
                     fileUploader
                             .uploadFile(encryptedFile, attachment.name, MimeTypes.OctetStream, progressListener)
                 } else {
-                    Timber.v("## FileService: Clear file")
+                    Timber.v("## Clear file")
                     encryptedFile = null
                     fileUploader
                             .uploadFile(fileToUpload, attachment.name, attachment.getSafeMimeType(), progressListener)
                 }
 
-                Timber.v("## FileService: Update cache storage for ${contentUploadResponse.contentUri}")
+                Timber.v("## Update cache storage for ${contentUploadResponse.contentUri}")
                 try {
                     fileService.storeDataFor(
                             mxcUrl = contentUploadResponse.contentUri,
@@ -256,9 +256,9 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                             originalFile = workingFile,
                             encryptedFile = encryptedFile
                     )
-                    Timber.v("## FileService: cache storage updated")
+                    Timber.v("## cache storage updated")
                 } catch (failure: Throwable) {
-                    Timber.e(failure, "## FileService: Failed to update file cache")
+                    Timber.e(failure, "## Failed to update file cache")
                 }
 
                 val uploadThumbnailResult = dealWithThumbnail(params)
@@ -270,11 +270,11 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                         uploadThumbnailResult?.uploadedThumbnailEncryptedFileInfo,
                         newAttachmentAttributes)
             } catch (t: Throwable) {
-                Timber.e(t, "## FileService: ERROR ${t.localizedMessage}")
+                Timber.e(t, "## ERROR ${t.localizedMessage}")
                 handleFailure(params, t)
             }
         } catch (e: Exception) {
-            Timber.e(e, "## FileService: ERROR")
+            Timber.e(e, "## ERROR")
             handleFailure(params, e)
         } finally {
             // Delete all temporary files

From 62207f02f0eaf5cedc6bd5e0d3f67917388aa964 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 5 May 2021 10:53:52 +0200
Subject: [PATCH 281/350] Properly handle the compression cancellation

It should never occur though
---
 .../session/content/UploadContentWorker.kt    |  5 +++--
 .../session/content/VideoCompressionResult.kt |  1 +
 .../session/content/VideoCompressor.kt        | 19 ++++++++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index f0a861587e..6a7d265308 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -186,7 +186,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                     })
                             .let { videoCompressionResult ->
                                 when (videoCompressionResult) {
-                                    is VideoCompressionResult.Success -> {
+                                    is VideoCompressionResult.Success           -> {
                                         val compressedFile = videoCompressionResult.compressedFile
                                         var compressedWidth: Int? = null
                                         var compressedHeight: Int? = null
@@ -209,7 +209,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                                         compressedFile
                                                 .also { filesToDelete.add(it) }
                                     }
-                                    is VideoCompressionResult.CompressionNotNeeded -> {
+                                    VideoCompressionResult.CompressionNotNeeded,
+                                    VideoCompressionResult.CompressionCancelled -> {
                                         workingFile
                                     }
                                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt
index b1362317ba..6d576a79a3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt
@@ -21,4 +21,5 @@ import java.io.File
 internal sealed class VideoCompressionResult {
     data class Success(val compressedFile: File) : VideoCompressionResult()
     object CompressionNotNeeded : VideoCompressionResult()
+    object CompressionCancelled : VideoCompressionResult()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
index 53113e2d86..297e453087 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
@@ -70,6 +70,15 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
 
         job.join()
 
+        if (job.isCancelled) {
+            Timber.w("Compressing: Job cancelled")
+            // Delete now the temporary file
+            deleteFile(destinationFile)
+            // We do not throw a CancellationException, because it's not critical, we will try to send the original file
+            // Anyway this should never occurs, since we never cancel the return value of transcode()
+            return VideoCompressionResult.CompressionCancelled
+        }
+
         progressListener?.onProgress(100, 100)
 
         return when (result) {
@@ -78,9 +87,7 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
             }
             Transcoder.SUCCESS_NOT_NEEDED -> {
                 // Delete now the temporary file
-                withContext(Dispatchers.IO) {
-                    destinationFile.delete()
-                }
+                deleteFile(destinationFile)
                 VideoCompressionResult.CompressionNotNeeded
             }
             else                          ->
@@ -88,6 +95,12 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
         }
     }
 
+    private suspend fun deleteFile(file: File) {
+        withContext(Dispatchers.IO) {
+            file.delete()
+        }
+    }
+
     private fun createDestinationFile(): File {
         return File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
     }

From 590d8fc8493ec22dd034c29dd9dfcde3dbce14b3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 11:12:06 +0200
Subject: [PATCH 282/350] Also test the effect of completeExceptionally()

---
 .../session/content/UploadContentWorker.kt    |  5 ++--
 .../session/content/VideoCompressionResult.kt |  1 +
 .../session/content/VideoCompressor.kt        | 29 +++++++++++++++----
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 6a7d265308..822c53cc9b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -210,7 +210,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                                                 .also { filesToDelete.add(it) }
                                     }
                                     VideoCompressionResult.CompressionNotNeeded,
-                                    VideoCompressionResult.CompressionCancelled -> {
+                                    VideoCompressionResult.CompressionCancelled,
+                                    is VideoCompressionResult.CompressionFailed -> {
                                         workingFile
                                     }
                                 }
@@ -380,7 +381,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
             val updatedContent = when (messageContent) {
                 is MessageImageContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes)
                 is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo, newAttachmentAttributes)
-                is MessageFileContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
+                is MessageFileContent  -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 is MessageAudioContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 else                   -> messageContent
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt
index 6d576a79a3..87d5c7e6a3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressionResult.kt
@@ -22,4 +22,5 @@ internal sealed class VideoCompressionResult {
     data class Success(val compressedFile: File) : VideoCompressionResult()
     object CompressionNotNeeded : VideoCompressionResult()
     object CompressionCancelled : VideoCompressionResult()
+    data class CompressionFailed(val failure: Throwable) : VideoCompressionResult()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
index 297e453087..8749d1f84a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
@@ -42,6 +42,7 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
         progressListener?.onProgress(0, 100)
 
         var result: Int = -1
+        var failure: Throwable? = null
         Transcoder.into(destinationFile.path)
                 .addDataSource(videoFile.path)
                 .setListener(object : TranscoderListener {
@@ -63,6 +64,7 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
 
                     override fun onTranscodeFailed(exception: Throwable) {
                         Timber.w(exception, "Compressing: failure")
+                        failure = exception
                         job.completeExceptionally(exception)
                     }
                 })
@@ -70,13 +72,23 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
 
         job.join()
 
+        // Note: job is also cancelled if completeExceptionally() was called
         if (job.isCancelled) {
-            Timber.w("Compressing: Job cancelled")
             // Delete now the temporary file
             deleteFile(destinationFile)
-            // We do not throw a CancellationException, because it's not critical, we will try to send the original file
-            // Anyway this should never occurs, since we never cancel the return value of transcode()
-            return VideoCompressionResult.CompressionCancelled
+            return when (val finalFailure = failure) {
+                null -> {
+                    // We do not throw a CancellationException, because it's not critical, we will try to send the original file
+                    // Anyway this should never occurs, since we never cancel the return value of transcode()
+                    Timber.w("Compressing: A failure occurred")
+                    VideoCompressionResult.CompressionCancelled
+                }
+                else -> {
+                    // Compression failure can also be considered as not critical, but let the caller decide
+                    Timber.w("Compressing: Job cancelled")
+                    VideoCompressionResult.CompressionFailed(finalFailure)
+                }
+            }
         }
 
         progressListener?.onProgress(100, 100)
@@ -90,8 +102,13 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
                 deleteFile(destinationFile)
                 VideoCompressionResult.CompressionNotNeeded
             }
-            else                          ->
-                throw IllegalStateException("Unknown result: $result")
+            else                          -> {
+                // Should not happen...
+                // Delete now the temporary file
+                deleteFile(destinationFile)
+                Timber.w("Unknown result: $result")
+                VideoCompressionResult.CompressionFailed(IllegalStateException("Unknown result: $result"))
+            }
         }
     }
 

From e28556dd1b8557bdd2269e4f29c421f3319a3adf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 11:26:36 +0200
Subject: [PATCH 283/350] Create TemporaryFileCreator to avoid code duplication

---
 .../internal/session/content/FileUploader.kt  |  5 +--
 .../session/content/ImageCompressor.kt        | 27 +++++++--------
 .../session/content/UploadContentWorker.kt    |  7 ++--
 .../session/content/VideoCompressor.kt        | 15 +++-----
 .../sdk/internal/util/TemporaryFileCreator.kt | 34 +++++++++++++++++++
 5 files changed, 58 insertions(+), 30 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/TemporaryFileCreator.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index 2626f96708..6bb43d599c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -41,10 +41,10 @@ import org.matrix.android.sdk.internal.network.ProgressRequestBody
 import org.matrix.android.sdk.internal.network.awaitResponse
 import org.matrix.android.sdk.internal.network.toFailure
 import org.matrix.android.sdk.internal.session.homeserver.DefaultHomeServerCapabilitiesService
+import org.matrix.android.sdk.internal.util.TemporaryFileCreator
 import java.io.File
 import java.io.FileNotFoundException
 import java.io.IOException
-import java.util.UUID
 import javax.inject.Inject
 
 internal class FileUploader @Inject constructor(@Authenticated
@@ -52,6 +52,7 @@ internal class FileUploader @Inject constructor(@Authenticated
                                                 private val globalErrorReceiver: GlobalErrorReceiver,
                                                 private val homeServerCapabilitiesService: DefaultHomeServerCapabilitiesService,
                                                 private val context: Context,
+                                                private val temporaryFileCreator: TemporaryFileCreator,
                                                 contentUrlResolver: ContentUrlResolver,
                                                 moshi: Moshi) {
 
@@ -110,7 +111,7 @@ internal class FileUploader @Inject constructor(@Authenticated
         val inputStream = withContext(Dispatchers.IO) {
             context.contentResolver.openInputStream(uri)
         } ?: throw FileNotFoundException()
-        val workingFile = File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+        val workingFile = temporaryFileCreator.create()
         workingFile.outputStream().use {
             inputStream.copyTo(it)
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
index 1d6cd61060..9b01d0a00e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
@@ -16,19 +16,20 @@
 
 package org.matrix.android.sdk.internal.session.content
 
-import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Matrix
 import androidx.exifinterface.media.ExifInterface
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.internal.util.TemporaryFileCreator
 import timber.log.Timber
 import java.io.File
-import java.util.UUID
 import javax.inject.Inject
 
-internal class ImageCompressor @Inject constructor(private val context: Context) {
+internal class ImageCompressor @Inject constructor(
+        private val temporaryFileCreator: TemporaryFileCreator
+) {
     suspend fun compress(
             imageFile: File,
             desiredWidth: Int,
@@ -45,7 +46,7 @@ internal class ImageCompressor @Inject constructor(private val context: Context)
                 }
             } ?: return@withContext imageFile
 
-            val destinationFile = createDestinationFile()
+            val destinationFile = temporaryFileCreator.create()
 
             runCatching {
                 destinationFile.outputStream().use {
@@ -53,7 +54,7 @@ internal class ImageCompressor @Inject constructor(private val context: Context)
                 }
             }
 
-            return@withContext destinationFile
+            destinationFile
         }
     }
 
@@ -64,16 +65,16 @@ internal class ImageCompressor @Inject constructor(private val context: Context)
                     val orientation = exifInfo.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
                     val matrix = Matrix()
                     when (orientation) {
-                        ExifInterface.ORIENTATION_ROTATE_270      -> matrix.postRotate(270f)
-                        ExifInterface.ORIENTATION_ROTATE_180      -> matrix.postRotate(180f)
-                        ExifInterface.ORIENTATION_ROTATE_90       -> matrix.postRotate(90f)
+                        ExifInterface.ORIENTATION_ROTATE_270 -> matrix.postRotate(270f)
+                        ExifInterface.ORIENTATION_ROTATE_180 -> matrix.postRotate(180f)
+                        ExifInterface.ORIENTATION_ROTATE_90 -> matrix.postRotate(90f)
                         ExifInterface.ORIENTATION_FLIP_HORIZONTAL -> matrix.preScale(-1f, 1f)
-                        ExifInterface.ORIENTATION_FLIP_VERTICAL   -> matrix.preScale(1f, -1f)
-                        ExifInterface.ORIENTATION_TRANSPOSE       -> {
+                        ExifInterface.ORIENTATION_FLIP_VERTICAL -> matrix.preScale(1f, -1f)
+                        ExifInterface.ORIENTATION_TRANSPOSE -> {
                             matrix.preRotate(-90f)
                             matrix.preScale(-1f, 1f)
                         }
-                        ExifInterface.ORIENTATION_TRANSVERSE      -> {
+                        ExifInterface.ORIENTATION_TRANSVERSE -> {
                             matrix.preRotate(90f)
                             matrix.preScale(-1f, 1f)
                         }
@@ -116,8 +117,4 @@ internal class ImageCompressor @Inject constructor(private val context: Context)
             null
         }
     }
-
-    private fun createDestinationFile(): File {
-        return File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 822c53cc9b..751eb0c04b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -44,13 +44,13 @@ import org.matrix.android.sdk.internal.session.room.send.CancelSendTracker
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoIdentifiers
 import org.matrix.android.sdk.internal.session.room.send.LocalEchoRepository
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
+import org.matrix.android.sdk.internal.util.TemporaryFileCreator
 import org.matrix.android.sdk.internal.util.toMatrixErrorStr
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
 import org.matrix.android.sdk.internal.worker.SessionWorkerParams
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
 import timber.log.Timber
 import java.io.File
-import java.util.UUID
 import javax.inject.Inject
 
 private data class NewAttachmentAttributes(
@@ -83,6 +83,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
     @Inject lateinit var imageCompressor: ImageCompressor
     @Inject lateinit var videoCompressor: VideoCompressor
     @Inject lateinit var localEchoRepository: LocalEchoRepository
+    @Inject lateinit var temporaryFileCreator: TemporaryFileCreator
 
     override fun injectWith(injector: SessionComponent) {
         injector.inject(this)
@@ -125,7 +126,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                     )
 
             // always use a temporary file, it guaranties that we could report progress on upload and simplifies the flows
-            val workingFile = File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+            val workingFile = temporaryFileCreator.create()
                     .also { filesToDelete.add(it) }
             workingFile.outputStream().use { outputStream ->
                 inputStream.use { inputStream ->
@@ -228,7 +229,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                 val contentUploadResponse = if (params.isEncrypted) {
                     Timber.v("## Encrypt file")
 
-                    encryptedFile = File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+                    encryptedFile = temporaryFileCreator.create()
                             .also { filesToDelete.add(it) }
 
                     uploadedFileEncryptedFileInfo =
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
index 8749d1f84a..05aaf4e9f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
@@ -16,25 +16,24 @@
 
 package org.matrix.android.sdk.internal.session.content
 
-import android.content.Context
 import com.otaliastudios.transcoder.Transcoder
 import com.otaliastudios.transcoder.TranscoderListener
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.listeners.ProgressListener
+import org.matrix.android.sdk.internal.util.TemporaryFileCreator
 import timber.log.Timber
 import java.io.File
-import java.util.UUID
 import javax.inject.Inject
 
-internal class VideoCompressor @Inject constructor(private val context: Context) {
+internal class VideoCompressor @Inject constructor(
+        private val temporaryFileCreator: TemporaryFileCreator
+) {
 
     suspend fun compress(videoFile: File,
                          progressListener: ProgressListener?): VideoCompressionResult {
-        val destinationFile = withContext(Dispatchers.IO) {
-            createDestinationFile()
-        }
+        val destinationFile = temporaryFileCreator.create()
 
         val job = Job()
 
@@ -117,8 +116,4 @@ internal class VideoCompressor @Inject constructor(private val context: Context)
             file.delete()
         }
     }
-
-    private fun createDestinationFile(): File {
-        return File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/TemporaryFileCreator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/TemporaryFileCreator.kt
new file mode 100644
index 0000000000..2790ffba36
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/TemporaryFileCreator.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.util
+
+import android.content.Context
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.util.UUID
+import javax.inject.Inject
+
+internal class TemporaryFileCreator @Inject constructor(
+        private val context: Context
+) {
+    suspend fun create(): File {
+        return withContext(Dispatchers.IO) {
+            File.createTempFile(UUID.randomUUID().toString(), null, context.cacheDir)
+        }
+    }
+}

From b9b3832ee340f796781302bd8bd1c86410f9310e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 30 Apr 2021 11:59:10 +0200
Subject: [PATCH 284/350] Invite bottom sheet + fixes + beta tag

---
 .../java/im/vector/app/AppStateHandler.kt     |   3 +-
 .../im/vector/app/core/di/ScreenComponent.kt  |   2 +
 .../vector/app/features/home/HomeActivity.kt  |  13 +
 .../features/home/HomeActivitySharedAction.kt |   1 +
 .../matrixto/MatrixToRoomSpaceFragment.kt     |  21 +-
 .../features/spaces/SpaceInviteBottomSheet.kt | 231 ++++++++++
 .../app/features/spaces/SpaceListFragment.kt  |   1 +
 .../features/spaces/SpaceListViewEvents.kt    |   1 +
 .../features/spaces/SpacesListViewModel.kt    |   2 +-
 .../spaces/preview/SpacePreviewController.kt  |   7 +-
 .../spaces/preview/SpacePreviewFragment.kt    |   9 +-
 .../spaces/preview/SpacePreviewState.kt       |   3 +-
 .../spaces/preview/SpacePreviewViewEvents.kt  |   1 -
 .../spaces/preview/SpacePreviewViewModel.kt   |  49 ++-
 .../layout/bottom_sheet_invited_to_space.xml  |  76 ++++
 .../fragment_matrix_to_room_space_card.xml    | 415 ++++++++++--------
 .../src/main/res/layout/view_button_state.xml |   6 +-
 vector/src/main/res/values/strings.xml        |   1 +
 vector/src/main/res/values/styles_riot.xml    |   4 +-
 19 files changed, 617 insertions(+), 229 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt
 create mode 100644 vector/src/main/res/layout/bottom_sheet_invited_to_space.xml

diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 0df41d106d..a2a242a3d9 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -24,6 +24,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.utils.BehaviorDataSource
 import im.vector.app.features.ui.UiStateRepository
 import io.reactivex.disposables.CompositeDisposable
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.tryOrNull
@@ -68,7 +69,7 @@ class AppStateHandler @Inject constructor(
         val spaceSum = spaceId?.let { uSession?.getRoomSummary(spaceId) }
         selectedSpaceDataSource.post(Option.just(RoomGroupingMethod.BySpace(spaceSum)))
         if (spaceId != null) {
-            GlobalScope.launch {
+            GlobalScope.launch(Dispatchers.IO) {
                 tryOrNull {
                     uSession?.getRoom(spaceId)?.loadRoomMembersIfNeeded()
                 }
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index b6c75beb02..188e96d7dd 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -81,6 +81,7 @@ import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
 import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpaceExploreActivity
+import im.vector.app.features.spaces.SpaceInviteBottomSheet
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
 import im.vector.app.features.spaces.manage.SpaceManageActivity
 import im.vector.app.features.terms.ReviewTermsActivity
@@ -185,6 +186,7 @@ interface ScreenComponent {
     fun inject(bottomSheet: ShareSpaceBottomSheet)
     fun inject(bottomSheet: SpaceSettingsMenuBottomSheet)
     fun inject(bottomSheet: InviteRoomSpaceChooserBottomSheet)
+    fun inject(bottomSheet: SpaceInviteBottomSheet)
 
     /* ==========================================================================================
      * Others
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index f01c27c30e..28ee36604d 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -60,6 +60,7 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
+import im.vector.app.features.spaces.SpaceInviteBottomSheet
 import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
 import im.vector.app.features.themes.ThemeUtils
@@ -210,6 +211,18 @@ class HomeActivity :
                                     })
                                     .show(supportFragmentManager, "SPACE_SETTINGS")
                         }
+                        is HomeActivitySharedAction.OpenSpaceInvite -> {
+                            SpaceInviteBottomSheet.newInstance(sharedAction.spaceId, object : SpaceInviteBottomSheet.InteractionListener {
+                                override fun onAccept(spaceId: String) {
+                                    navigator.switchToSpace(this@HomeActivity, spaceId, Navigator.PostSwitchSpaceAction.None)
+                                }
+
+                                override fun onDecline(spaceId: String) {
+                                    // nop
+                                }
+                            })
+                                    .show(supportFragmentManager, "SPACE_INVITE")
+                        }
                     }.exhaustive
                 }
                 .disposeOnDestroy()
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
index db0a9ba9eb..d79f24fc4c 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
@@ -27,5 +27,6 @@ sealed class HomeActivitySharedAction : VectorSharedAction {
     data class OpenGroup(val clearFragment: Boolean) : HomeActivitySharedAction()
     object AddSpace : HomeActivitySharedAction()
     data class OpenSpacePreview(val spaceId: String) : HomeActivitySharedAction()
+    data class OpenSpaceInvite(val spaceId: String) : HomeActivitySharedAction()
     data class ShowSpaceSettings(val spaceId: String) : HomeActivitySharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 7d303cfc5e..7a5a740b93 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.Fail
@@ -71,8 +72,10 @@ class MatrixToRoomSpaceFragment @Inject constructor(
                     is RoomInfoResult.FullInfo     -> {
                         val matrixItem = peek.roomItem
                         if (peek.roomType == RoomType.SPACE) {
+                            views.matrixToBetaTag.isVisible = true
                             avatarRenderer.renderSpace(matrixItem, views.matrixToCardAvatar)
                         } else {
+                            views.matrixToBetaTag.isVisible = false
                             avatarRenderer.render(matrixItem, views.matrixToCardAvatar)
                         }
                         views.matrixToCardNameText.setTextOrHide(peek.name)
@@ -97,19 +100,19 @@ class MatrixToRoomSpaceFragment @Inject constructor(
                             Membership.LEAVE,
                             Membership.NONE   -> {
                                 views.matrixToCardMainButton.isVisible = true
-                                views.matrixToCardMainButton.text = getString(joinTextRes)
+                                views.matrixToCardMainButton.button.text = getString(joinTextRes)
                                 views.matrixToCardSecondaryButton.isVisible = false
                             }
                             Membership.INVITE -> {
                                 views.matrixToCardMainButton.isVisible = true
                                 views.matrixToCardSecondaryButton.isVisible = true
-                                views.matrixToCardMainButton.text = getString(joinTextRes)
-                                views.matrixToCardSecondaryButton.text = getString(R.string.decline)
+                                views.matrixToCardMainButton.button.text = getString(joinTextRes)
+                                views.matrixToCardSecondaryButton.button.text = getString(R.string.decline)
                             }
                             Membership.JOIN   -> {
                                 views.matrixToCardMainButton.isVisible = true
                                 views.matrixToCardSecondaryButton.isVisible = false
-                                views.matrixToCardMainButton.text = getString(R.string.action_open)
+                                views.matrixToCardMainButton.button.text = getString(R.string.action_open)
                             }
                             Membership.KNOCK,
                             Membership.BAN    -> {
@@ -126,7 +129,7 @@ class MatrixToRoomSpaceFragment @Inject constructor(
                         views.matrixToMemberPills.isVisible = false
                         views.matrixToCardDescText.setTextOrHide(getString(R.string.room_preview_no_preview))
 
-                        views.matrixToCardMainButton.text = getString(R.string.join_anyway)
+                        views.matrixToCardMainButton.button.text = getString(R.string.join_anyway)
                         views.matrixToCardSecondaryButton.isVisible = false
                     }
                     RoomInfoResult.NotFound        -> {
@@ -156,12 +159,10 @@ class MatrixToRoomSpaceFragment @Inject constructor(
             }
         }
 
+        val images = listOf(views.knownMember1, views.knownMember2, views.knownMember3, views.knownMember4, views.knownMember5)
+                .onEach { it.isGone = true }
         when (state.peopleYouKnow) {
             is Success -> {
-                views.matrixToCardPeopleYouKnowVisibility.isVisible = true
-                val images = listOf(views.knownMember1, views.knownMember2, views.knownMember3, views.knownMember4, views.knownMember5)
-                        .onEach { it.isVisible = false }
-
                 val someYouKnow = state.peopleYouKnow.invoke()
                 someYouKnow.forEachIndexed { index, item ->
                     images[index].isVisible = true
@@ -175,7 +176,7 @@ class MatrixToRoomSpaceFragment @Inject constructor(
                 )
             }
             else       -> {
-                views.matrixToCardPeopleYouKnowVisibility.isVisible = false
+                views.peopleYouMayKnowText.isVisible = false
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt
new file mode 100644
index 0000000000..05909e5684
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.args
+import im.vector.app.R
+import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.ButtonStateView
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.utils.toast
+import im.vector.app.databinding.BottomSheetInvitedToSpaceBinding
+import im.vector.app.features.home.AvatarRenderer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.parcelize.Parcelize
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetInvitedToSpaceBinding>() {
+
+    interface InteractionListener {
+        fun onAccept(spaceId: String)
+        fun onDecline(spaceId: String)
+    }
+
+    var interactionListener: InteractionListener? = null
+
+    @Parcelize
+    data class Args(
+            val spaceId: String
+    ) : Parcelable
+
+    @Inject
+    lateinit var activeSessionHolder: ActiveSessionHolder
+
+    @Inject
+    lateinit var avatarRenderer: AvatarRenderer
+
+    @Inject
+    lateinit var errorFormatter: ErrorFormatter
+
+    override fun injectWith(injector: ScreenComponent) {
+        injector.inject(this)
+    }
+
+    override val showExpanded = true
+
+    private val inviteArgs: Args by args()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val session = activeSessionHolder.getSafeActiveSession() ?: return
+
+        val summary = session.getRoomSummary(inviteArgs.spaceId) ?: return Unit.also {
+            dismiss()
+        }
+
+        val inviter = summary.inviterId?.let { session.getUser(it) }
+        if (inviter != null) {
+            views.inviterAvatarImage.isVisible = true
+            views.inviterText.isVisible = true
+            views.inviterMxid.isVisible = true
+            avatarRenderer.render(inviter.toMatrixItem(), views.inviterAvatarImage)
+            views.inviterText.text = getString(R.string.user_invites_you, inviter.getBestName())
+            views.inviterMxid.text = inviter.userId
+        } else {
+            views.inviterAvatarImage.isVisible = false
+            views.inviterText.isVisible = false
+            views.inviterMxid.isVisible = false
+        }
+
+        views.spaceCard.matrixToCardContentVisibility.isVisible = true
+        avatarRenderer.renderSpace(summary.toMatrixItem(), views.spaceCard.matrixToCardAvatar)
+        views.spaceCard.matrixToCardNameText.text = summary.displayName
+        views.spaceCard.matrixToBetaTag.isVisible = true
+        views.spaceCard.matrixToCardAliasText.setTextOrHide(summary.canonicalAlias)
+        views.spaceCard.matrixToCardDescText.setTextOrHide(summary.topic)
+
+        views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Button)
+        views.spaceCard.matrixToCardMainButton.button.text = getString(R.string.accept)
+        views.spaceCard.matrixToCardMainButton.callback = object : ButtonStateView.Callback {
+            override fun onButtonClicked() {
+                doJoin()
+            }
+
+            override fun onRetryClicked() {
+                doJoin()
+            }
+
+            private fun doJoin() {
+                views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Loading)
+                views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = false
+                GlobalScope.launch(Dispatchers.IO) {
+                    try {
+                        activeSessionHolder.getSafeActiveSession()?.getRoom(inviteArgs.spaceId)?.join()
+                        withContext(Dispatchers.Main) {
+                            if (!isAdded) return@withContext
+                            views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Loaded)
+                            views.spaceCard.matrixToCardSecondaryButton.isEnabled = true
+                            interactionListener?.onAccept(inviteArgs.spaceId)
+                            dismiss()
+                        }
+                    } catch (failure: Throwable) {
+                        withContext(Dispatchers.Main) {
+                            if (!isAdded) return@withContext
+                            requireActivity().toast(errorFormatter.toHumanReadable(failure))
+                            views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Error)
+                            views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = true
+                        }
+                    }
+                }
+            }
+        }
+
+        views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Button)
+        views.spaceCard.matrixToCardSecondaryButton.button.text = getString(R.string.reject)
+        views.spaceCard.matrixToCardSecondaryButton.callback = object : ButtonStateView.Callback {
+            override fun onButtonClicked() {
+                doJoin()
+            }
+
+            override fun onRetryClicked() {
+                doJoin()
+            }
+
+            private fun doJoin() {
+                views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Loading)
+                views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = false
+                GlobalScope.launch(Dispatchers.IO) {
+                    try {
+                        activeSessionHolder.getSafeActiveSession()?.getRoom(inviteArgs.spaceId)?.leave()
+                        withContext(Dispatchers.Main) {
+                            if (!isAdded) return@withContext
+                            views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Loaded)
+                            views.spaceCard.matrixToCardMainButton.button.isEnabled = true
+                            interactionListener?.onDecline(inviteArgs.spaceId)
+                            dismiss()
+                        }
+                    } catch (failure: Throwable) {
+                        withContext(Dispatchers.Main) {
+                            if (!isAdded) return@withContext
+                            requireActivity().toast(errorFormatter.toHumanReadable(failure))
+                            views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Error)
+                            views.spaceCard.matrixToCardMainButton.button.isEnabled = true
+                        }
+                    }
+                }
+            }
+        }
+
+        val memberCount = summary.otherMemberIds.size
+        if (memberCount != 0) {
+            views.spaceCard.matrixToMemberPills.isVisible = true
+            views.spaceCard.spaceChildMemberCountText.text = resources.getQuantityString(R.plurals.room_title_members, memberCount, memberCount)
+        } else {
+            // hide the pill
+            views.spaceCard.matrixToMemberPills.isVisible = false
+        }
+
+        val knownMembers = summary.otherMemberIds.filter {
+            session.getExistingDirectRoomWithUser(it) != null
+        }.mapNotNull { session.getUser(it) }
+        // put one with avatar first, and take 5
+        val peopleYouKnow = (knownMembers.filter { it.avatarUrl != null } + knownMembers.filter { it.avatarUrl == null })
+                .take(5)
+
+        val images = listOf(
+                views.spaceCard.knownMember1,
+                views.spaceCard.knownMember2,
+                views.spaceCard.knownMember3,
+                views.spaceCard.knownMember4,
+                views.spaceCard.knownMember5
+        ).onEach { it.isGone = true }
+
+        if (peopleYouKnow.isEmpty()) {
+            views.spaceCard.peopleYouMayKnowText.isVisible = false
+        } else {
+            peopleYouKnow.forEachIndexed { index, item ->
+                images[index].isVisible = true
+                avatarRenderer.render(item.toMatrixItem(), images[index])
+            }
+            views.spaceCard.peopleYouMayKnowText.setTextOrHide(
+                    resources.getQuantityString(R.plurals.space_people_you_know,
+                            peopleYouKnow.count(),
+                            peopleYouKnow.count()
+                    )
+            )
+        }
+    }
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetInvitedToSpaceBinding {
+        return BottomSheetInvitedToSpaceBinding.inflate(inflater, container, false)
+    }
+
+    companion object {
+
+        fun newInstance(spaceId: String, interactionListener: InteractionListener)
+                : SpaceInviteBottomSheet {
+            return SpaceInviteBottomSheet().apply {
+                this.interactionListener = interactionListener
+                setArguments(Args(spaceId))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index 672fb28928..f1627cc6b6 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -60,6 +60,7 @@ class SpaceListFragment @Inject constructor(
                 is SpaceListViewEvents.OpenSpace        -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup(it.groupingMethodHasChanged))
                 is SpaceListViewEvents.AddSpace         -> sharedActionViewModel.post(HomeActivitySharedAction.AddSpace)
                 is SpaceListViewEvents.OpenGroup        -> sharedActionViewModel.post(HomeActivitySharedAction.OpenGroup(it.groupingMethodHasChanged))
+                is SpaceListViewEvents.OpenSpaceInvite  -> sharedActionViewModel.post(HomeActivitySharedAction.OpenSpaceInvite(it.id))
             }.exhaustive
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt
index b7e31d28f2..582f6cd144 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewEvents.kt
@@ -24,6 +24,7 @@ import im.vector.app.core.platform.VectorViewEvents
 sealed class SpaceListViewEvents : VectorViewEvents {
     data class OpenSpace(val groupingMethodHasChanged: Boolean) : SpaceListViewEvents()
     data class OpenSpaceSummary(val id: String) : SpaceListViewEvents()
+    data class OpenSpaceInvite(val id: String) : SpaceListViewEvents()
     object AddSpace : SpaceListViewEvents()
     data class OpenGroup(val groupingMethodHasChanged: Boolean) : SpaceListViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 90ab771342..c79f6b12a4 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -181,7 +181,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
     }
 
     private fun handleSelectSpaceInvite(action: SpaceListAction.OpenSpaceInvite) {
-        _viewEvents.post(SpaceListViewEvents.OpenSpaceSummary(action.spaceSummary.roomId))
+        _viewEvents.post(SpaceListViewEvents.OpenSpaceInvite(action.spaceSummary.roomId))
     }
 
     private fun handleToggleExpand(action: SpaceListAction.ToggleExpand) = withState { state ->
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
index eee8d1241f..8f2e7379c4 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewController.kt
@@ -37,16 +37,15 @@ class SpacePreviewController @Inject constructor(
     var interactionListener: InteractionListener? = null
 
     override fun buildModels(data: SpacePreviewState?) {
-        val result = data?.childInfoList?.invoke() ?: return
-
-        val memberCount = data.spaceInfo.invoke()?.memberCount ?: 0
+        val memberCount = data?.spaceInfo?.invoke()?.memberCount ?: 0
 
         spaceTopSummaryItem {
             id("info")
             formattedMemberCount(stringProvider.getQuantityString(R.plurals.room_title_members, memberCount, memberCount))
-            topic(data.spaceInfo.invoke()?.topic ?: data.topic ?: "")
+            topic(data?.spaceInfo?.invoke()?.topic ?: data?.topic ?: "")
         }
 
+        val result = data?.childInfoList?.invoke() ?: return
         if (result.isNotEmpty()) {
             genericItemHeader {
                 id("header_rooms")
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
index 563b4f39e0..b6f1fb6a4e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewFragment.kt
@@ -119,14 +119,17 @@ class SpacePreviewFragment @Inject constructor(
             }
         }
         updateToolbar(it)
+
+        when (it.inviteTermination) {
+            is Loading -> sharedActionViewModel.post(SpacePreviewSharedAction.ShowModalLoading)
+            else       -> sharedActionViewModel.post(SpacePreviewSharedAction.HideModalLoading)
+        }
     }
 
     private fun handleViewEvents(viewEvents: SpacePreviewViewEvents) {
         when (viewEvents) {
             SpacePreviewViewEvents.Dismiss -> {
-            }
-            SpacePreviewViewEvents.StartJoining -> {
-                sharedActionViewModel.post(SpacePreviewSharedAction.ShowModalLoading)
+                sharedActionViewModel.post(SpacePreviewSharedAction.DismissAction)
             }
             SpacePreviewViewEvents.JoinSuccess -> {
                 sharedActionViewModel.post(SpacePreviewSharedAction.HideModalLoading)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
index cf64672046..d31d05cf96 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewState.kt
@@ -26,7 +26,8 @@ data class SpacePreviewState(
         val topic: String?  = null,
         val avatarUrl: String? = null,
         val spaceInfo: Async<ChildInfo> = Uninitialized,
-        val childInfoList: Async<List<ChildInfo>> = Uninitialized
+        val childInfoList: Async<List<ChildInfo>> = Uninitialized,
+        val inviteTermination: Async<Unit> = Uninitialized
 ) : MvRxState {
     constructor(args: SpacePreviewArgs) : this(idOrAlias = args.idOrAlias)
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewEvents.kt
index 04645e59ad..2f0eddb189 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewEvents.kt
@@ -20,7 +20,6 @@ import im.vector.app.core.platform.VectorViewEvents
 
 sealed class SpacePreviewViewEvents : VectorViewEvents {
     object Dismiss: SpacePreviewViewEvents()
-    object StartJoining: SpacePreviewViewEvents()
     object JoinSuccess: SpacePreviewViewEvents()
     data class JoinFailure(val message: String?): SpacePreviewViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index 7da6c8a053..2073a55e90 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -28,6 +28,7 @@ import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -41,6 +42,7 @@ import timber.log.Timber
 
 class SpacePreviewViewModel @AssistedInject constructor(
         @Assisted private val initialState: SpacePreviewState,
+        private val errorFormatter: ErrorFormatter,
         private val session: Session
 ) : VectorViewModel<SpacePreviewState, SpacePreviewViewAction, SpacePreviewViewEvents>(initialState) {
 
@@ -80,12 +82,15 @@ class SpacePreviewViewModel @AssistedInject constructor(
 
     private fun handleDismissInvite() {
         // Here we need to join the space himself as well as the default rooms in that space
-        // TODO modal loading
+        setState { copy(inviteTermination = Loading()) }
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 session.spaceService().rejectInvite(initialState.idOrAlias, null)
+                setState { copy(inviteTermination = Uninitialized) }
             } catch (failure: Throwable) {
+                setState { copy(inviteTermination = Uninitialized) }
                 Timber.e(failure, "## Space: Failed to reject invite")
+                _viewEvents.post(SpacePreviewViewEvents.JoinFailure(errorFormatter.toHumanReadable(failure)))
             }
         }
     }
@@ -98,18 +103,24 @@ class SpacePreviewViewModel @AssistedInject constructor(
         val spaceVia = spaceInfo?.viaServers ?: emptyList()
 
         // trigger modal loading
-        _viewEvents.post(SpacePreviewViewEvents.StartJoining)
+        setState { copy(inviteTermination = Loading()) }
         viewModelScope.launch(Dispatchers.IO) {
-            val joinResult = session.spaceService().joinSpace(initialState.idOrAlias, null, spaceVia)
-            when (joinResult) {
-                JoinSpaceResult.Success,
-                is JoinSpaceResult.PartialSuccess -> {
-                    // For now we don't handle partial success, it's just success
-                    _viewEvents.post(SpacePreviewViewEvents.JoinSuccess)
-                }
-                is JoinSpaceResult.Fail           -> {
-                    _viewEvents.post(SpacePreviewViewEvents.JoinFailure(joinResult.error.toString()))
+            try {
+                val joinResult = session.spaceService().joinSpace(initialState.idOrAlias, null, spaceVia)
+                setState { copy(inviteTermination = Uninitialized) }
+                when (joinResult) {
+                    JoinSpaceResult.Success,
+                    is JoinSpaceResult.PartialSuccess -> {
+                        // For now we don't handle partial success, it's just success
+                        _viewEvents.post(SpacePreviewViewEvents.JoinSuccess)
+                    }
+                    is JoinSpaceResult.Fail -> {
+                        _viewEvents.post(SpacePreviewViewEvents.JoinFailure(joinResult.error.toString()))
+                    }
                 }
+            } catch (failure: Throwable) {
+                // should not throw
+                Timber.w(failure, "## Failed to join space")
             }
         }
     }
@@ -221,7 +232,21 @@ class SpacePreviewViewModel @AssistedInject constructor(
             }
         } catch (failure: Throwable) {
             setState {
-                copy(spaceInfo = Fail(failure), childInfoList = Fail(failure))
+                copy(
+                        spaceInfo = session.getRoomSummary(initialState.idOrAlias)?.let {
+                            Success(
+                                    ChildInfo(
+                                            roomId = it.roomId,
+                                            avatarUrl = it.avatarUrl,
+                                            name = it.displayName,
+                                            topic = it.topic,
+                                            memberCount = it.joinedMembersCount,
+                                            isSubSpace = false,
+                                            viaServers = null,
+                                            children = Uninitialized
+                                    )
+                            )
+                        } ?: Fail(failure), childInfoList = Fail(failure))
             }
         }
     }
diff --git a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
new file mode 100644
index 0000000000..6730a585db
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/bottomSheetScrollView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
+    android:background="?riotx_bottom_sheet_background"
+    android:fadeScrollbars="false"
+    android:scrollbars="vertical">
+
+    <!-- Inviter info-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:padding="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/inviterAvatarImage"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:contentDescription="@string/avatar"
+                android:transitionName="profile"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:src="@tools:sample/avatars" />
+
+
+            <TextView
+                android:id="@+id/inviterText"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:textColor="?riotx_text_primary"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/inviterAvatarImage"
+                app:layout_constraintTop_toTopOf="@id/inviterAvatarImage"
+                tools:text="@string/user_invites_you" />
+
+            <TextView
+                android:id="@+id/inviterMxid"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="?riotx_text_secondary"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/inviterAvatarImage"
+                app:layout_constraintTop_toBottomOf="@id/inviterText"
+                tools:text="@sample/matrix.json/data/mxid" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/vctr_list_divider_color" />
+
+        <include
+            android:id="@+id/spaceCard"
+            layout="@layout/fragment_matrix_to_room_space_card" />
+
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index c87a0d9e4b..85ec04ba50 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -1,224 +1,257 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="200dp"
-    android:padding="16dp">
+    android:layout_height="wrap_content">
 
-    <ImageView
-        android:id="@+id/matrixToCardAvatar"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="@dimen/layout_vertical_margin_big"
-        android:contentDescription="@string/avatar"
-        android:elevation="4dp"
-        android:transitionName="profile"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
-
-    <TextView
-        android:id="@+id/matrixToCardNameText"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/matrixToCardContentVisibility"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_vertical_margin"
-        android:maxLines="1"
-        android:singleLine="true"
-        android:textAlignment="textStart"
-        android:textColor="?riotx_text_primary"
-        android:textSize="15sp"
-        android:textStyle="bold"
-        app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
-        tools:text="@sample/matrix.json/data/roomName" />
-
-    <TextView
-        android:id="@+id/matrixToCardAliasText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:maxLines="1"
-        android:singleLine="true"
-        android:textAlignment="textStart"
-        android:textColor="?riotx_text_secondary"
-        android:textSize="15sp"
+        android:minHeight="200dp"
+        android:padding="16dp"
         android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
-        app:layout_goneMarginTop="0dp"
-        tools:text="@sample/matrix.json/data/roomAlias" />
-
-    <LinearLayout
-        android:id="@+id/matrixToMemberPills"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:background="@drawable/pill_receipt"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:paddingStart="12dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="12dp"
-        android:paddingBottom="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/matrixToCardAliasText">
+        tools:visibility="visible">
 
         <ImageView
-            android:id="@+id/spaceChildMemberCountIcon"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="4dp"
-            android:importantForAccessibility="no"
-            android:src="@drawable/ic_room_profile_member_list"
-            app:tint="?riotx_text_primary"
-            tools:ignore="MissingPrefix" />
+            android:id="@+id/matrixToCardAvatar"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_marginTop="20dp"
+            android:contentDescription="@string/avatar"
+            android:elevation="4dp"
+            android:transitionName="profile"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@tools:sample/avatars" />
 
-        <TextView
-            android:id="@+id/spaceChildMemberCountText"
+        <ImageView
+            android:id="@+id/matrixToBetaTag"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_marginTop="@dimen/layout_vertical_margin_big"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_beta_pill"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/matrixToCardNameText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/layout_vertical_margin"
             android:maxLines="1"
+            android:singleLine="true"
+            android:textAlignment="textStart"
             android:textColor="?riotx_text_primary"
-            tools:text="123 members" />
-    </LinearLayout>
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
+            tools:text="@sample/matrix.json/data/roomName" />
 
-    <TextView
-        android:id="@+id/matrixToCardDescText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:maxLines="4"
-        android:textAlignment="textStart"
-        android:textColor="?riotx_text_secondary"
-        android:textSize="15sp"
-        app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
-        tools:text="@sample/matrix.json/data/roomTopic" />
+        <TextView
+            android:id="@+id/matrixToCardAliasText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:textAlignment="textStart"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="15sp"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
+            app:layout_goneMarginTop="0dp"
+            tools:text="@sample/matrix.json/data/roomAlias" />
 
-    <ImageView
-        android:id="@+id/knownMember5"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:contentDescription="@string/avatar"
-        app:layout_constraintCircle="@id/knownMember4"
-        app:layout_constraintCircleAngle="90"
-        app:layout_constraintCircleRadius="20dp"
-        tools:ignore="MissingConstraints"
-        tools:src="@tools:sample/avatars" />
+        <LinearLayout
+            android:id="@+id/matrixToMemberPills"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/pill_receipt"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingStart="12dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="12dp"
+            android:paddingBottom="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/matrixToCardAliasText">
 
-    <ImageView
-        android:id="@+id/knownMember4"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:contentDescription="@string/avatar"
-        app:layout_constraintCircle="@id/knownMember3"
-        app:layout_constraintCircleAngle="90"
-        app:layout_constraintCircleRadius="20dp"
-        tools:ignore="MissingConstraints"
-        tools:src="@tools:sample/avatars" />
+            <ImageView
+                android:id="@+id/spaceChildMemberCountIcon"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="4dp"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_room_profile_member_list"
+                app:tint="?riotx_text_primary"
+                tools:ignore="MissingPrefix" />
 
-    <ImageView
-        android:id="@+id/knownMember3"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:contentDescription="@string/avatar"
-        app:layout_constraintCircle="@id/knownMember2"
-        app:layout_constraintCircleAngle="90"
-        app:layout_constraintCircleRadius="20dp"
-        tools:ignore="MissingConstraints"
-        tools:src="@tools:sample/avatars" />
+            <TextView
+                android:id="@+id/spaceChildMemberCountText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:maxLines="1"
+                android:textColor="?riotx_text_primary"
+                tools:text="123 members" />
+        </LinearLayout>
 
-    <ImageView
-        android:id="@+id/knownMember2"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:contentDescription="@string/avatar"
-        app:layout_constraintCircle="@id/knownMember1"
-        app:layout_constraintCircleAngle="90"
-        app:layout_constraintCircleRadius="20dp"
-        tools:ignore="MissingConstraints"
-        tools:src="@tools:sample/avatars" />
+        <TextView
+            android:id="@+id/matrixToCardDescText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:maxLines="4"
+            android:textAlignment="textStart"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="15sp"
+            app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
+            tools:text="@sample/matrix.json/data/roomTopic" />
 
-    <ImageView
-        android:id="@+id/knownMember1"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginTop="8dp"
-        android:contentDescription="@string/avatar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/matrixToCardDescText"
-        tools:src="@tools:sample/avatars" />
+        <ImageView
+            android:id="@+id/knownMember5"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:contentDescription="@string/avatar"
+            app:layout_constraintCircle="@id/knownMember4"
+            app:layout_constraintCircleAngle="90"
+            app:layout_constraintCircleRadius="20dp"
+            tools:ignore="MissingConstraints"
+            tools:src="@tools:sample/avatars"
+            tools:visibility="gone" />
 
-    <TextView
-        android:id="@+id/peopleYouMayKnowText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:textColor="?riotx_text_secondary"
-        android:textSize="15sp"
-        app:layout_constraintBottom_toBottomOf="@id/knownMember1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/knownMember5"
-        app:layout_constraintTop_toTopOf="@id/knownMember1"
-        tools:text="7 people you may know" />
+        <ImageView
+            android:id="@+id/knownMember4"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:contentDescription="@string/avatar"
+            app:layout_constraintCircle="@id/knownMember3"
+            app:layout_constraintCircleAngle="90"
+            app:layout_constraintCircleRadius="20dp"
+            tools:ignore="MissingConstraints"
+            tools:src="@tools:sample/avatars"
+            tools:visibility="gone" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/matrixToCardMainButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="@dimen/layout_vertical_margin_big"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/knownMember1"
-        app:layout_constraintWidth_max="400dp"
-        tools:text="@string/join" />
+        <ImageView
+            android:id="@+id/knownMember3"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:contentDescription="@string/avatar"
+            app:layout_constraintCircle="@id/knownMember2"
+            app:layout_constraintCircleAngle="90"
+            app:layout_constraintCircleRadius="20dp"
+            tools:ignore="MissingConstraints"
+            tools:src="@tools:sample/avatars" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/matrixToCardSecondaryButton"
-        style="@style/VectorButtonStyleOutlined"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="@dimen/layout_vertical_margin_big"
-        android:textAllCaps="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/matrixToCardMainButton"
-        app:layout_constraintWidth_max="400dp"
-        tools:text="@string/dismiss" />
+        <ImageView
+            android:id="@+id/knownMember2"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:contentDescription="@string/avatar"
+            app:layout_constraintCircle="@id/knownMember1"
+            app:layout_constraintCircleAngle="90"
+            app:layout_constraintCircleRadius="20dp"
+            tools:ignore="MissingConstraints"
+            tools:src="@tools:sample/avatars" />
+
+        <ImageView
+            android:id="@+id/knownMember1"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginTop="8dp"
+            android:contentDescription="@string/avatar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/matrixToCardDescText"
+            tools:src="@tools:sample/avatars" />
+
+        <TextView
+            android:id="@+id/peopleYouMayKnowText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textColor="?riotx_text_secondary"
+            android:textSize="15sp"
+            app:layout_constraintBottom_toBottomOf="@id/knownMember1"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/knownMember5"
+            app:layout_constraintTop_toTopOf="@id/knownMember1"
+            tools:text="7 people you may know" />
+
+        <im.vector.app.core.platform.ButtonStateView
+            android:id="@+id/matrixToCardMainButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="@dimen/layout_vertical_margin_big"
+            app:bsv_button_text="@string/accept"
+            app:bsv_loaded_image_src="@drawable/ic_tick"
+            app:bsv_use_flat_button="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/knownMember1"
+            app:layout_constraintWidth_max="400dp" />
+
+        <!--        <com.google.android.material.button.MaterialButton-->
+        <!--            android:id="@+id/matrixToCardMainButton"-->
+        <!--            android:layout_width="0dp"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginTop="16dp"-->
+        <!--            android:layout_marginBottom="@dimen/layout_vertical_margin_big"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/knownMember1"-->
+        <!--            app:layout_constraintWidth_max="400dp"-->
+        <!--            tools:text="@string/join" />-->
+
+        <!--        <com.google.android.material.button.MaterialButton-->
+        <!--            android:id="@+id/matrixToCardSecondaryButton"-->
+        <!--            style="@style/VectorButtonStyleOutlined"-->
+        <!--            android:layout_width="0dp"-->
+        <!--            android:layout_height="wrap_content"-->
+        <!--            android:layout_marginTop="8dp"-->
+        <!--            android:layout_marginBottom="@dimen/layout_vertical_margin_big"-->
+        <!--            android:textAllCaps="true"-->
+        <!--            app:layout_constraintBottom_toBottomOf="parent"-->
+        <!--            app:layout_constraintEnd_toEndOf="parent"-->
+        <!--            app:layout_constraintStart_toStartOf="parent"-->
+        <!--            app:layout_constraintTop_toBottomOf="@id/matrixToCardMainButton"-->
+        <!--            app:layout_constraintWidth_max="400dp"-->
+        <!--            tools:text="@string/dismiss" />-->
+
+        <im.vector.app.core.platform.ButtonStateView
+            android:id="@+id/matrixToCardSecondaryButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="@dimen/layout_vertical_margin_big"
+            app:bsv_button_text="@string/dismiss"
+            app:bsv_loaded_image_src="@drawable/ic_tick"
+            app:bsv_use_flat_button="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/matrixToCardMainButton"
+            app:layout_constraintWidth_max="400dp" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ProgressBar
         android:id="@+id/matrixToCardButtonLoading"
         style="?android:attr/progressBarStyleSmall"
         android:layout_width="20dp"
         android:layout_height="20dp"
+        android:layout_centerInParent="true"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/matrixToCardMainButton"
-        app:layout_constraintEnd_toEndOf="@id/matrixToCardMainButton"
-        app:layout_constraintStart_toStartOf="@id/matrixToCardMainButton"
-        app:layout_constraintTop_toTopOf="@id/matrixToCardMainButton"
         tools:visibility="visible" />
 
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/matrixToCardPeopleYouKnowVisibility"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:constraint_referenced_ids="knownMember1,knownMember2,knownMember3,knownMember4,knownMember5,peopleYouMayKnowText"
-        tools:visibility="visible" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/matrixToCardContentVisibility"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:constraint_referenced_ids="matrixToCardNameText,matrixToCardAvatar,matrixToCardNameText,matrixToCardDescText, matrixToCardMainButton, matrixToCardAliasText, matrixToCardSecondaryButton, matrixToMemberPills,matrixToCardPeopleYouKnowVisibility"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
diff --git a/vector/src/main/res/layout/view_button_state.xml b/vector/src/main/res/layout/view_button_state.xml
index 28a3f066e5..1e22d79b5e 100644
--- a/vector/src/main/res/layout/view_button_state.xml
+++ b/vector/src/main/res/layout/view_button_state.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:parentTag="android.widget.FrameLayout">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/buttonStateButtonFlat"
         style="@style/VectorButtonStyleText"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         tools:layout_gravity="center_horizontal"
@@ -16,7 +16,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/buttonStateButtonBig"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:minWidth="120dp"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index c7153df6e4..072209b71c 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3341,4 +3341,5 @@
 
     <string name="labs_use_restricted_join_rule">Experimental Space - Restricted Room.</string>
     <string name="labs_use_restricted_join_rule_desc">Warning requires server support and experimental room version</string>
+    <string name="user_invites_you">%s invites you</string>
 </resources>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 89d5ac12e2..a265727522 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -152,7 +152,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@null</item>
-        <!--item name="android:textColor">?colorAccent</item-->
+        <item name="android:textColor">?colorAccent</item>
         <item name="colorControlHighlight">?colorAccent</item>
     </style>
 
@@ -162,7 +162,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@null</item>
-        <!--item name="android:textColor">?colorAccent</item-->
+        <item name="android:textColor">?colorAccent</item>
         <item name="colorControlHighlight">?colorAccent</item>
         <item name="strokeColor">@color/button_background_tint_selector</item>
         <item name="strokeWidth">1dp</item>

From ecceb0fb03586917a17ec55c899b8387cb548696 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 5 May 2021 11:33:12 +0200
Subject: [PATCH 285/350] code review

---
 .../app/features/spaces/SpaceInviteBottomSheet.kt  | 14 +++++++-------
 .../spaces/preview/SpacePreviewViewModel.kt        |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt
index 05909e5684..3331d0b87d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt
@@ -81,14 +81,14 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
             dismiss()
         }
 
-        val inviter = summary.inviterId?.let { session.getUser(it) }
+        val inviter = summary.inviterId?.let { session.getUser(it) }?.toMatrixItem()
         if (inviter != null) {
             views.inviterAvatarImage.isVisible = true
             views.inviterText.isVisible = true
             views.inviterMxid.isVisible = true
-            avatarRenderer.render(inviter.toMatrixItem(), views.inviterAvatarImage)
-            views.inviterText.text = getString(R.string.user_invites_you, inviter.getBestName())
-            views.inviterMxid.text = inviter.userId
+            avatarRenderer.render(inviter, views.inviterAvatarImage)
+            views.inviterText.text = getString(R.string.user_invites_you, inviter.displayName)
+            views.inviterMxid.text = inviter.id
         } else {
             views.inviterAvatarImage.isVisible = false
             views.inviterText.isVisible = false
@@ -142,14 +142,14 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
         views.spaceCard.matrixToCardSecondaryButton.button.text = getString(R.string.reject)
         views.spaceCard.matrixToCardSecondaryButton.callback = object : ButtonStateView.Callback {
             override fun onButtonClicked() {
-                doJoin()
+                doReject()
             }
 
             override fun onRetryClicked() {
-                doJoin()
+                doReject()
             }
 
-            private fun doJoin() {
+            private fun doReject() {
                 views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Loading)
                 views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = false
                 GlobalScope.launch(Dispatchers.IO) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
index 2073a55e90..61328d2a1c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/preview/SpacePreviewViewModel.kt
@@ -86,12 +86,11 @@ class SpacePreviewViewModel @AssistedInject constructor(
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 session.spaceService().rejectInvite(initialState.idOrAlias, null)
-                setState { copy(inviteTermination = Uninitialized) }
             } catch (failure: Throwable) {
-                setState { copy(inviteTermination = Uninitialized) }
                 Timber.e(failure, "## Space: Failed to reject invite")
                 _viewEvents.post(SpacePreviewViewEvents.JoinFailure(errorFormatter.toHumanReadable(failure)))
             }
+            setState { copy(inviteTermination = Uninitialized) }
         }
     }
 
@@ -115,12 +114,13 @@ class SpacePreviewViewModel @AssistedInject constructor(
                         _viewEvents.post(SpacePreviewViewEvents.JoinSuccess)
                     }
                     is JoinSpaceResult.Fail -> {
-                        _viewEvents.post(SpacePreviewViewEvents.JoinFailure(joinResult.error.toString()))
+                        _viewEvents.post(SpacePreviewViewEvents.JoinFailure(errorFormatter.toHumanReadable(joinResult.error)))
                     }
                 }
             } catch (failure: Throwable) {
                 // should not throw
                 Timber.w(failure, "## Failed to join space")
+                _viewEvents.post(SpacePreviewViewEvents.JoinFailure(errorFormatter.toHumanReadable(failure)))
             }
         }
     }

From 168633b4660425b222344d5362d547b81e37107e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 5 May 2021 14:55:02 +0200
Subject: [PATCH 286/350] Code review

---
 .../im/vector/app/core/di/ScreenComponent.kt  |   2 +-
 .../vector/app/features/home/HomeActivity.kt  |  23 +--
 .../{ => invite}/SpaceInviteBottomSheet.kt    | 181 +++++++++---------
 .../invite/SpaceInviteBottomSheetAction.kt    |  24 +++
 .../invite/SpaceInviteBottomSheetEvents.kt    |  23 +++
 .../invite/SpaceInviteBottomSheetState.kt     |  36 ++++
 .../invite/SpaceInviteBottomSheetViewModel.kt | 107 +++++++++++
 7 files changed, 293 insertions(+), 103 deletions(-)
 rename vector/src/main/java/im/vector/app/features/spaces/{ => invite}/SpaceInviteBottomSheet.kt (55%)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetEvents.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt

diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index 188e96d7dd..c16c602530 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -81,7 +81,7 @@ import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
 import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpaceExploreActivity
-import im.vector.app.features.spaces.SpaceInviteBottomSheet
+import im.vector.app.features.spaces.invite.SpaceInviteBottomSheet
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
 import im.vector.app.features.spaces.manage.SpaceManageActivity
 import im.vector.app.features.terms.ReviewTermsActivity
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 28ee36604d..1de1ff1c3e 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -60,9 +60,9 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.spaces.ShareSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
-import im.vector.app.features.spaces.SpaceInviteBottomSheet
 import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
+import im.vector.app.features.spaces.invite.SpaceInviteBottomSheet
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
 import im.vector.app.features.workers.signout.ServerBackupStatusViewState
@@ -89,7 +89,8 @@ class HomeActivity :
         UnknownDeviceDetectorSharedViewModel.Factory,
         ServerBackupStatusViewModel.Factory,
         UnreadMessagesSharedViewModel.Factory,
-        NavigationInterceptor {
+        NavigationInterceptor,
+        SpaceInviteBottomSheet.InteractionListener {
 
     private lateinit var sharedActionViewModel: HomeSharedActionViewModel
 
@@ -212,15 +213,7 @@ class HomeActivity :
                                     .show(supportFragmentManager, "SPACE_SETTINGS")
                         }
                         is HomeActivitySharedAction.OpenSpaceInvite -> {
-                            SpaceInviteBottomSheet.newInstance(sharedAction.spaceId, object : SpaceInviteBottomSheet.InteractionListener {
-                                override fun onAccept(spaceId: String) {
-                                    navigator.switchToSpace(this@HomeActivity, spaceId, Navigator.PostSwitchSpaceAction.None)
-                                }
-
-                                override fun onDecline(spaceId: String) {
-                                    // nop
-                                }
-                            })
+                            SpaceInviteBottomSheet.newInstance(sharedAction.spaceId)
                                     .show(supportFragmentManager, "SPACE_INVITE")
                         }
                     }.exhaustive
@@ -527,6 +520,14 @@ class HomeActivity :
         return true
     }
 
+    override fun spaceInviteBottomSheetOnAccept(spaceId: String) {
+        navigator.switchToSpace(this, spaceId, Navigator.PostSwitchSpaceAction.None)
+    }
+
+    override fun spaceInviteBottomSheetOnDecline(spaceId: String) {
+        // nop
+    }
+
     companion object {
         fun newIntent(context: Context, clearNotification: Boolean = false, accountCreation: Boolean = false): Intent {
             val args = HomeActivityArgs(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
similarity index 55%
rename from vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt
rename to vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
index 3331d0b87d..4553f2f2df 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceInviteBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.spaces
+package im.vector.app.features.spaces.invite
 
+import android.content.Context
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
@@ -23,30 +24,30 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.args
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
 import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ScreenComponent
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.ButtonStateView
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.BottomSheetInvitedToSpaceBinding
 import im.vector.app.features.home.AvatarRenderer
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
-class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetInvitedToSpaceBinding>() {
+class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetInvitedToSpaceBinding>(), SpaceInviteBottomSheetViewModel.Factory {
 
     interface InteractionListener {
-        fun onAccept(spaceId: String)
-        fun onDecline(spaceId: String)
+        fun spaceInviteBottomSheetOnAccept(spaceId: String)
+        fun spaceInviteBottomSheetOnDecline(spaceId: String)
     }
 
     var interactionListener: InteractionListener? = null
@@ -56,14 +57,14 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
             val spaceId: String
     ) : Parcelable
 
-    @Inject
-    lateinit var activeSessionHolder: ActiveSessionHolder
-
     @Inject
     lateinit var avatarRenderer: AvatarRenderer
 
-    @Inject
-    lateinit var errorFormatter: ErrorFormatter
+    private val viewModel: SpaceInviteBottomSheetViewModel by fragmentViewModel(SpaceInviteBottomSheetViewModel::class)
+
+    @Inject lateinit var viewModelFactory: SpaceInviteBottomSheetViewModel.Factory
+
+    override fun create(initialState: SpaceInviteBottomSheetState) = viewModelFactory.create(initialState)
 
     override fun injectWith(injector: ScreenComponent) {
         injector.inject(this)
@@ -75,13 +76,50 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val session = activeSessionHolder.getSafeActiveSession() ?: return
 
-        val summary = session.getRoomSummary(inviteArgs.spaceId) ?: return Unit.also {
-            dismiss()
+        views.spaceCard.matrixToCardMainButton.callback = object : ButtonStateView.Callback {
+            override fun onButtonClicked() {
+                // quick local echo
+                views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Loading)
+                views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = true
+                viewModel.handle(SpaceInviteBottomSheetAction.DoJoin)
+            }
+
+            override fun onRetryClicked() = onButtonClicked()
+        }
+        views.spaceCard.matrixToCardSecondaryButton.callback = object : ButtonStateView.Callback {
+            override fun onButtonClicked() {
+                views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Loading)
+                views.spaceCard.matrixToCardMainButton.button.isEnabled = true
+                viewModel.handle(SpaceInviteBottomSheetAction.DoReject)
+            }
+
+            override fun onRetryClicked() = onButtonClicked()
         }
 
-        val inviter = summary.inviterId?.let { session.getUser(it) }?.toMatrixItem()
+        viewModel.observeViewEvents {
+            when (it) {
+                is SpaceInviteBottomSheetEvents.ShowError -> requireActivity().toast(it.message)
+            }
+        }
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        if (context is InteractionListener) {
+            interactionListener = context
+        }
+    }
+
+    override fun onDetach() {
+        interactionListener = null
+        super.onDetach()
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        super.invalidate()
+        val summary = state.summary.invoke()
+        val inviter = state.inviterUser.invoke()?.toMatrixItem()
         if (inviter != null) {
             views.inviterAvatarImage.isVisible = true
             views.inviterText.isVisible = true
@@ -96,85 +134,52 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
         }
 
         views.spaceCard.matrixToCardContentVisibility.isVisible = true
-        avatarRenderer.renderSpace(summary.toMatrixItem(), views.spaceCard.matrixToCardAvatar)
-        views.spaceCard.matrixToCardNameText.text = summary.displayName
+        summary?.toMatrixItem()?.let { avatarRenderer.renderSpace(it, views.spaceCard.matrixToCardAvatar) }
+        views.spaceCard.matrixToCardNameText.text = summary?.displayName
         views.spaceCard.matrixToBetaTag.isVisible = true
-        views.spaceCard.matrixToCardAliasText.setTextOrHide(summary.canonicalAlias)
-        views.spaceCard.matrixToCardDescText.setTextOrHide(summary.topic)
+        views.spaceCard.matrixToCardAliasText.setTextOrHide(summary?.canonicalAlias)
+        views.spaceCard.matrixToCardDescText.setTextOrHide(summary?.topic)
 
-        views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Button)
         views.spaceCard.matrixToCardMainButton.button.text = getString(R.string.accept)
-        views.spaceCard.matrixToCardMainButton.callback = object : ButtonStateView.Callback {
-            override fun onButtonClicked() {
-                doJoin()
-            }
+        views.spaceCard.matrixToCardSecondaryButton.button.text = getString(R.string.decline)
 
-            override fun onRetryClicked() {
-                doJoin()
+        when (state.joinActionState) {
+            Uninitialized -> {
+                views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Button)
             }
-
-            private fun doJoin() {
+            is Loading -> {
                 views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Loading)
                 views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = false
-                GlobalScope.launch(Dispatchers.IO) {
-                    try {
-                        activeSessionHolder.getSafeActiveSession()?.getRoom(inviteArgs.spaceId)?.join()
-                        withContext(Dispatchers.Main) {
-                            if (!isAdded) return@withContext
-                            views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Loaded)
-                            views.spaceCard.matrixToCardSecondaryButton.isEnabled = true
-                            interactionListener?.onAccept(inviteArgs.spaceId)
-                            dismiss()
-                        }
-                    } catch (failure: Throwable) {
-                        withContext(Dispatchers.Main) {
-                            if (!isAdded) return@withContext
-                            requireActivity().toast(errorFormatter.toHumanReadable(failure))
-                            views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Error)
-                            views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = true
-                        }
-                    }
-                }
+            }
+            is Success -> {
+                interactionListener?.spaceInviteBottomSheetOnAccept(inviteArgs.spaceId)
+                dismiss()
+            }
+            is Fail -> {
+                views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Error)
+                views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = true
             }
         }
 
-        views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Button)
-        views.spaceCard.matrixToCardSecondaryButton.button.text = getString(R.string.reject)
-        views.spaceCard.matrixToCardSecondaryButton.callback = object : ButtonStateView.Callback {
-            override fun onButtonClicked() {
-                doReject()
+        when (state.rejectActionState) {
+            Uninitialized -> {
+                views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Button)
             }
-
-            override fun onRetryClicked() {
-                doReject()
-            }
-
-            private fun doReject() {
+            is Loading -> {
                 views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Loading)
-                views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = false
-                GlobalScope.launch(Dispatchers.IO) {
-                    try {
-                        activeSessionHolder.getSafeActiveSession()?.getRoom(inviteArgs.spaceId)?.leave()
-                        withContext(Dispatchers.Main) {
-                            if (!isAdded) return@withContext
-                            views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Loaded)
-                            views.spaceCard.matrixToCardMainButton.button.isEnabled = true
-                            interactionListener?.onDecline(inviteArgs.spaceId)
-                            dismiss()
-                        }
-                    } catch (failure: Throwable) {
-                        withContext(Dispatchers.Main) {
-                            if (!isAdded) return@withContext
-                            requireActivity().toast(errorFormatter.toHumanReadable(failure))
-                            views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Error)
-                            views.spaceCard.matrixToCardMainButton.button.isEnabled = true
-                        }
-                    }
-                }
+                views.spaceCard.matrixToCardMainButton.button.isEnabled = false
+            }
+            is Success -> {
+                interactionListener?.spaceInviteBottomSheetOnDecline(inviteArgs.spaceId)
+                dismiss()
+            }
+            is Fail -> {
+                views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Error)
+                views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = true
             }
         }
 
-        val memberCount = summary.otherMemberIds.size
+        val memberCount = summary?.otherMemberIds?.size ?: 0
         if (memberCount != 0) {
             views.spaceCard.matrixToMemberPills.isVisible = true
             views.spaceCard.spaceChildMemberCountText.text = resources.getQuantityString(R.plurals.room_title_members, memberCount, memberCount)
@@ -183,12 +188,7 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
             views.spaceCard.matrixToMemberPills.isVisible = false
         }
 
-        val knownMembers = summary.otherMemberIds.filter {
-            session.getExistingDirectRoomWithUser(it) != null
-        }.mapNotNull { session.getUser(it) }
-        // put one with avatar first, and take 5
-        val peopleYouKnow = (knownMembers.filter { it.avatarUrl != null } + knownMembers.filter { it.avatarUrl == null })
-                .take(5)
+        val peopleYouKnow = state.peopleYouKnow.invoke().orEmpty()
 
         val images = listOf(
                 views.spaceCard.knownMember1,
@@ -220,10 +220,9 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
 
     companion object {
 
-        fun newInstance(spaceId: String, interactionListener: InteractionListener)
+        fun newInstance(spaceId: String)
                 : SpaceInviteBottomSheet {
             return SpaceInviteBottomSheet().apply {
-                this.interactionListener = interactionListener
                 setArguments(Args(spaceId))
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetAction.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetAction.kt
new file mode 100644
index 0000000000..b8e3283aff
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetAction.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.invite
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class SpaceInviteBottomSheetAction : VectorViewModelAction {
+    object DoJoin : SpaceInviteBottomSheetAction()
+    object DoReject : SpaceInviteBottomSheetAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetEvents.kt
new file mode 100644
index 0000000000..b097d19d9e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetEvents.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.invite
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SpaceInviteBottomSheetEvents : VectorViewEvents {
+    data class ShowError(val message: String) : SpaceInviteBottomSheetEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetState.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetState.kt
new file mode 100644
index 0000000000..d712cf9e8a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetState.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.invite
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.user.model.User
+
+data class SpaceInviteBottomSheetState(
+        val spaceId: String,
+        val summary: Async<RoomSummary> = Uninitialized,
+        val inviterUser: Async<User> = Uninitialized,
+        val peopleYouKnow: Async<List<User>> = Uninitialized,
+        val joinActionState: Async<Unit> = Uninitialized,
+        val rejectActionState: Async<Unit> = Uninitialized
+) : MvRxState {
+    constructor(args: SpaceInviteBottomSheet.Args) : this(
+            spaceId = args.spaceId
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
new file mode 100644
index 0000000000..4524b57004
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheetViewModel.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.invite
+
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.session.coroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+
+class SpaceInviteBottomSheetViewModel @AssistedInject constructor(
+        @Assisted private val initialState: SpaceInviteBottomSheetState,
+        private val session: Session,
+        private val errorFormatter: ErrorFormatter
+) : VectorViewModel<SpaceInviteBottomSheetState, SpaceInviteBottomSheetAction, SpaceInviteBottomSheetEvents>(initialState) {
+
+    init {
+        session.getRoomSummary(initialState.spaceId)?.let { roomSummary ->
+
+            val knownMembers = roomSummary.otherMemberIds.filter {
+                session.getExistingDirectRoomWithUser(it) != null
+            }.mapNotNull { session.getUser(it) }
+            // put one with avatar first, and take 5
+            val peopleYouKnow = (knownMembers.filter { it.avatarUrl != null } + knownMembers.filter { it.avatarUrl == null })
+                    .take(5)
+
+            setState {
+                copy(
+                        summary = Success(roomSummary),
+                        inviterUser = roomSummary.inviterId?.let { session.getUser(it) }?.let { Success(it) } ?: Uninitialized,
+                        peopleYouKnow = Success(peopleYouKnow)
+                )
+            }
+        }
+    }
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: SpaceInviteBottomSheetState): SpaceInviteBottomSheetViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SpaceInviteBottomSheetViewModel, SpaceInviteBottomSheetState> {
+
+        override fun create(viewModelContext: ViewModelContext, state: SpaceInviteBottomSheetState): SpaceInviteBottomSheetViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    override fun handle(action: SpaceInviteBottomSheetAction) {
+        when (action) {
+            SpaceInviteBottomSheetAction.DoJoin   -> {
+                setState { copy(joinActionState = Loading()) }
+                session.coroutineScope.launch(Dispatchers.IO) {
+                    try {
+                        session.getRoom(initialState.spaceId)?.join()
+                        setState { copy(joinActionState = Success(Unit)) }
+                    } catch (failure: Throwable) {
+                        setState { copy(joinActionState = Fail(failure)) }
+                        _viewEvents.post(SpaceInviteBottomSheetEvents.ShowError(errorFormatter.toHumanReadable(failure)))
+                    }
+                }
+            }
+            SpaceInviteBottomSheetAction.DoReject -> {
+                setState { copy(rejectActionState = Loading()) }
+                session.coroutineScope.launch(Dispatchers.IO) {
+                    try {
+                        session.getRoom(initialState.spaceId)?.leave()
+                        setState { copy(rejectActionState = Success(Unit)) }
+                    } catch (failure: Throwable) {
+                        setState { copy(rejectActionState = Fail(failure)) }
+                        _viewEvents.post(SpaceInviteBottomSheetEvents.ShowError(errorFormatter.toHumanReadable(failure)))
+                    }
+                }
+            }
+        }
+    }
+}

From 080bdf149525fc08d68d9ea5f7346c1d132c912b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 15:48:11 +0200
Subject: [PATCH 287/350] Fix long line

---
 .../sdk/internal/session/content/UploadContentWorker.kt  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 751eb0c04b..d5c3deeec6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -194,10 +194,11 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
 
                                         tryOrNull {
                                             context.contentResolver.openFileDescriptor(compressedFile.toUri(), "r")?.use { pfd ->
-                                                val mediaMetadataRetriever = MediaMetadataRetriever()
-                                                mediaMetadataRetriever.setDataSource(pfd.fileDescriptor)
-                                                compressedWidth = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt()
-                                                compressedHeight = mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt()
+                                                MediaMetadataRetriever().let {
+                                                    it.setDataSource(pfd.fileDescriptor)
+                                                    compressedWidth = it.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)?.toInt()
+                                                    compressedHeight = it.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)?.toInt()
+                                                }
                                             }
                                         }
 

From 17e57fe86cef0e557430e09e9db3133873ff98df Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 16:24:47 +0200
Subject: [PATCH 288/350] Fix small issue

---
 .../app/features/spaces/invite/SpaceInviteBottomSheet.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
index 4553f2f2df..8e536459a3 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/invite/SpaceInviteBottomSheet.kt
@@ -81,7 +81,7 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
             override fun onButtonClicked() {
                 // quick local echo
                 views.spaceCard.matrixToCardMainButton.render(ButtonStateView.State.Loading)
-                views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = true
+                views.spaceCard.matrixToCardSecondaryButton.button.isEnabled = false
                 viewModel.handle(SpaceInviteBottomSheetAction.DoJoin)
             }
 
@@ -89,8 +89,8 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
         }
         views.spaceCard.matrixToCardSecondaryButton.callback = object : ButtonStateView.Callback {
             override fun onButtonClicked() {
+                views.spaceCard.matrixToCardMainButton.button.isEnabled = false
                 views.spaceCard.matrixToCardSecondaryButton.render(ButtonStateView.State.Loading)
-                views.spaceCard.matrixToCardMainButton.button.isEnabled = true
                 viewModel.handle(SpaceInviteBottomSheetAction.DoReject)
             }
 
@@ -125,7 +125,7 @@ class SpaceInviteBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetIn
             views.inviterText.isVisible = true
             views.inviterMxid.isVisible = true
             avatarRenderer.render(inviter, views.inviterAvatarImage)
-            views.inviterText.text = getString(R.string.user_invites_you, inviter.displayName)
+            views.inviterText.text = getString(R.string.user_invites_you, inviter.getBestName())
             views.inviterMxid.text = inviter.id
         } else {
             views.inviterAvatarImage.isVisible = false

From 4abfc1fd2b4fcee5eb7fad81d2221947f78498d7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 5 May 2021 17:46:58 +0200
Subject: [PATCH 289/350] Fix space test + room history visibility bug

---
 .../sdk/session/space/SpaceCreationTest.kt    | 104 +++++---
 .../sdk/session/space/SpaceHierarchyTest.kt   | 228 +++++++++++-------
 .../room/model/RoomHistoryVisibility.kt       |  12 +-
 3 files changed, 218 insertions(+), 126 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 3fec1145d1..9bdf85f1a8 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -16,7 +16,9 @@
 
 package org.matrix.android.sdk.session.space
 
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -26,7 +28,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
-import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
@@ -56,22 +58,29 @@ class SpaceCreationTest : InstrumentedTest {
         val session = commonTestHelper.createAccount("Hubble", SessionTestParams(true))
         val roomName = "My Space"
         val topic = "A public space for test"
-        val spaceId: String
-        runBlocking {
-            spaceId = session.spaceService().createSpace(roomName, topic, null, true)
-            // wait a bit to let the summary update it self :/
-            delay(400)
+        var spaceId: String = ""
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                spaceId = session.spaceService().createSpace(roomName, topic, null, true)
+                // wait a bit to let the summary update it self :/
+                it.countDown()
+            }
         }
 
         val syncedSpace = session.spaceService().getSpace(spaceId)
-        assertEquals(roomName, syncedSpace?.asRoom()?.roomSummary()?.name, "Room name should be set")
-        assertEquals(topic, syncedSpace?.asRoom()?.roomSummary()?.topic, "Room topic should be set")
+        commonTestHelper.waitWithLatch {
+            commonTestHelper.retryPeriodicallyWithLatch(it) {
+                syncedSpace?.asRoom()?.roomSummary()?.name != null
+            }
+        }
+        assertEquals("Room name should be set", roomName, syncedSpace?.asRoom()?.roomSummary()?.name)
+        assertEquals("Room topic should be set", topic, syncedSpace?.asRoom()?.roomSummary()?.topic)
         // assertEquals(topic, syncedSpace.asRoom().roomSummary()?., "Room topic should be set")
 
         assertNotNull("Space should be found by Id", syncedSpace)
         val creationEvent = syncedSpace!!.asRoom().getStateEvent(EventType.STATE_ROOM_CREATE)
         val createContent = creationEvent?.content.toModel<RoomCreateContent>()
-        assertEquals(RoomType.SPACE, createContent?.type, "Room type should be space")
+        assertEquals("Room type should be space", RoomType.SPACE, createContent?.type)
 
         var powerLevelsContent: PowerLevelsContent? = null
         commonTestHelper.waitWithLatch { latch ->
@@ -120,8 +129,8 @@ class SpaceCreationTest : InstrumentedTest {
         assertEquals(JoinSpaceResult.Success, joinResult)
 
         val spaceBobPov = bobSession.spaceService().getSpace(spaceId)
-        assertEquals(roomName, spaceBobPov?.asRoom()?.roomSummary()?.name, "Room name should be set")
-        assertEquals(topic, spaceBobPov?.asRoom()?.roomSummary()?.topic, "Room topic should be set")
+        assertEquals("Room name should be set", roomName, spaceBobPov?.asRoom()?.roomSummary()?.name)
+        assertEquals("Room topic should be set", topic, spaceBobPov?.asRoom()?.roomSummary()?.topic)
 
         commonTestHelper.signOutAndClose(aliceSession)
         commonTestHelper.signOutAndClose(bobSession)
@@ -139,54 +148,73 @@ class SpaceCreationTest : InstrumentedTest {
         val syncedSpace = aliceSession.spaceService().getSpace(spaceId)
 
         // create a room
-        val firstChild: String = runBlocking {
-            aliceSession.createRoom(CreateRoomParams().apply {
-                this.name = "FirstRoom"
-                this.topic = "Description of first room"
-                this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
-            })
+        var firstChild: String? = null
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                firstChild = aliceSession.createRoom(CreateRoomParams().apply {
+                    this.name = "FirstRoom"
+                    this.topic = "Description of first room"
+                    this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+                })
+                it.countDown()
+            }
         }
 
-        runBlocking {
-            syncedSpace?.addChildren(firstChild, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "a", true)
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                syncedSpace?.addChildren(firstChild!!, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "a", true, suggested = true)
+                it.countDown()
+            }
         }
 
-        val secondChild: String = runBlocking {
-            aliceSession.createRoom(CreateRoomParams().apply {
-                this.name = "SecondRoom"
-                this.topic = "Description of second room"
-                this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
-            })
+        var secondChild: String? = null
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                secondChild = aliceSession.createRoom(CreateRoomParams().apply {
+                    this.name = "SecondRoom"
+                    this.topic = "Description of second room"
+                    this.preset = CreateRoomPreset.PRESET_PUBLIC_CHAT
+                })
+                it.countDown()
+            }
         }
 
-        runBlocking {
-            syncedSpace?.addChildren(secondChild, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "b", false)
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                syncedSpace?.addChildren(secondChild!!, listOf(aliceSession.sessionParams.homeServerHost ?: ""), "b", false, suggested = true)
+                it.countDown()
+            }
         }
 
         // Try to join from bob, it's a public space no need to invite
-
-        val joinResult = runBlocking {
-            bobSession.spaceService().joinSpace(spaceId)
+        var joinResult: JoinSpaceResult? = null
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                joinResult = bobSession.spaceService().joinSpace(spaceId)
+                // wait a bit to let the summary update it self :/
+                it.countDown()
+            }
         }
 
         assertEquals(JoinSpaceResult.Success, joinResult)
 
         val spaceBobPov = bobSession.spaceService().getSpace(spaceId)
-        assertEquals(roomName, spaceBobPov?.asRoom()?.roomSummary()?.name, "Room name should be set")
-        assertEquals(topic, spaceBobPov?.asRoom()?.roomSummary()?.topic, "Room topic should be set")
+        assertEquals("Room name should be set", roomName, spaceBobPov?.asRoom()?.roomSummary()?.name)
+        assertEquals("Room topic should be set", topic, spaceBobPov?.asRoom()?.roomSummary()?.topic)
 
         // check if bob has joined automatically the first room
 
-        val bobMembershipFirstRoom = bobSession.getRoom(firstChild)?.roomSummary()?.membership
+        val bobMembershipFirstRoom = bobSession.getRoomSummary(firstChild!!)?.membership
         assertEquals("Bob should have joined this room", Membership.JOIN, bobMembershipFirstRoom)
         RoomSummaryQueryParams.Builder()
 
-        val spaceSummaryBobPov = bobSession.spaceService().getSpaceSummaries(roomSummaryQueryParams {
-            this.roomId = QueryStringValue.Equals(spaceId)
-            this.memberships = listOf(Membership.JOIN)
-        }).firstOrNull()
+        val childCount = bobSession.getRoomSummaries(
+                roomSummaryQueryParams {
+                    activeSpaceId = ActiveSpaceFilter.ActiveSpace(spaceId)
+                }
+        ).size
 
-        assertEquals("Unexpected number of children", 2, spaceSummaryBobPov?.spaceChildren?.size ?: -1)
+        assertEquals("Unexpected number of joined children", 1, childCount)
 
         commonTestHelper.signOutAndClose(aliceSession)
         commonTestHelper.signOutAndClose(bobSession)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index 383108e633..facb537225 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -20,7 +20,6 @@ import android.util.Log
 import androidx.lifecycle.Observer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
@@ -32,6 +31,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import org.junit.runners.MethodSorters
 import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.query.ActiveSpaceFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomType
@@ -51,27 +51,38 @@ class SpaceHierarchyTest : InstrumentedTest {
         val session = commonTestHelper.createAccount("John", SessionTestParams(true))
         val spaceName = "My Space"
         val topic = "A public space for test"
-        val spaceId: String
-        runBlocking {
-            spaceId = session.spaceService().createSpace(spaceName, topic, null, true)
-            // wait a bit to let the summary update it self :/
-            delay(400)
+        var spaceId: String = ""
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                spaceId = session.spaceService().createSpace(spaceName, topic, null, true)
+                it.countDown()
+            }
         }
 
         val syncedSpace = session.spaceService().getSpace(spaceId)
 
-        val roomId = runBlocking {
-            session.createRoom(CreateRoomParams().apply { name = "General" })
+        var roomId: String = ""
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                roomId = session.createRoom(CreateRoomParams().apply { name = "General" })
+                it.countDown()
+            }
         }
 
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
 
-        runBlocking {
-            syncedSpace!!.addChildren(roomId, viaServers, null, true)
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                syncedSpace!!.addChildren(roomId, viaServers, null, true)
+                it.countDown()
+            }
         }
 
-        runBlocking {
-            session.spaceService().setSpaceParent(roomId, spaceId, true, viaServers)
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                session.spaceService().setSpaceParent(roomId, spaceId, true, viaServers)
+                it.countDown()
+            }
         }
 
         Thread.sleep(9000)
@@ -92,52 +103,72 @@ class SpaceHierarchyTest : InstrumentedTest {
         assertEquals(spaceName, canonicalParents.first().roomSummary?.name)
     }
 
-    @Test
-    fun testCreateChildRelations() {
-        val session = commonTestHelper.createAccount("Jhon", SessionTestParams(true))
-        val spaceName = "My Space"
-        val topic = "A public space for test"
-        Log.d("## TEST", "Before")
-        val spaceId = runBlocking {
-            session.spaceService().createSpace(spaceName, topic, null, true)
-        }
-
-        Log.d("## TEST", "created space $spaceId ${Thread.currentThread()}")
-        val syncedSpace = session.spaceService().getSpace(spaceId)
-
-        val children = listOf("General" to true /*canonical*/, "Random" to false)
-
-        val roomIdList = children.map {
-            runBlocking {
-                session.createRoom(CreateRoomParams().apply { name = it.first })
-            } to it.second
-        }
-
-        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
-
-        runBlocking {
-            roomIdList.forEach { entry ->
-                syncedSpace!!.addChildren(entry.first, viaServers, null, true)
-            }
-        }
-
-        runBlocking {
-            roomIdList.forEach {
-                session.spaceService().setSpaceParent(it.first, spaceId, it.second, viaServers)
-            }
-            delay(400)
-        }
-
-        roomIdList.forEach {
-            val parents = session.getRoom(it.first)?.roomSummary()?.spaceParents
-            val canonicalParents = session.getRoom(it.first)?.roomSummary()?.spaceParents?.filter { it.canonical == true }
-
-            assertNotNull(parents)
-            assertEquals("Unexpected number of parent", 1, parents!!.size)
-            assertEquals("Unexpected parent name", spaceName, parents.first().roomSummary?.name)
-            assertEquals("Parent of ${it.first} should be canonical ${it.second}", if (it.second) 1 else 0, canonicalParents?.size ?: 0)
-        }
-    }
+//    @Test
+//    fun testCreateChildRelations() {
+//        val session = commonTestHelper.createAccount("Jhon", SessionTestParams(true))
+//        val spaceName = "My Space"
+//        val topic = "A public space for test"
+//        Log.d("## TEST", "Before")
+//
+//        var spaceId = ""
+//        commonTestHelper.waitWithLatch {
+//            GlobalScope.launch {
+//                spaceId = session.spaceService().createSpace(spaceName, topic, null, true)
+//                it.countDown()
+//            }
+//        }
+//
+//        Log.d("## TEST", "created space $spaceId ${Thread.currentThread()}")
+//        val syncedSpace = session.spaceService().getSpace(spaceId)
+//
+//        val children = listOf("General" to true /*canonical*/, "Random" to false)
+//
+// //        val roomIdList = children.map {
+// //            runBlocking {
+// //                session.createRoom(CreateRoomParams().apply { name = it.first })
+// //            } to it.second
+// //        }
+//        val roomIdList = mutableListOf<Pair<String, Boolean>>()
+//        commonTestHelper.waitWithLatch {
+//            GlobalScope.launch {
+//                children.forEach {
+//                    val rID = session.createRoom(CreateRoomParams().apply { name = it.first })
+//                    roomIdList.add(rID to it.second)
+//                }
+//                it.countDown()
+//            }
+//        }
+//
+//        val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
+//
+//        commonTestHelper.waitWithLatch {
+//            GlobalScope.launch {
+//                roomIdList.forEach { entry ->
+//                    syncedSpace!!.addChildren(entry.first, viaServers, null, true)
+//                }
+//                it.countDown()
+//            }
+//        }
+//
+//        commonTestHelper.waitWithLatch {
+//            GlobalScope.launch {
+//                roomIdList.forEach {
+//                    session.spaceService().setSpaceParent(it.first, spaceId, it.second, viaServers)
+//                }
+//                it.countDown()
+//            }
+//        }
+//
+//        roomIdList.forEach {
+//            val parents = session.getRoom(it.first)?.roomSummary()?.spaceParents
+//            val canonicalParents = session.getRoom(it.first)?.roomSummary()?.spaceParents?.filter { it.canonical == true }
+//
+//            assertNotNull(parents)
+//            assertEquals("Unexpected number of parent", 1, parents!!.size)
+//            assertEquals("Unexpected parent name", spaceName, parents.first().roomSummary?.name)
+//            assertEquals("Parent of ${it.first} should be canonical ${it.second}", if (it.second) 1 else 0, canonicalParents?.size ?: 0)
+//        }
+//    }
 
     @Test
     fun testFilteringBySpace() {
@@ -162,18 +193,30 @@ class SpaceHierarchyTest : InstrumentedTest {
         // add C as a subspace of A
         val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
-        runBlocking {
-            spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
-            session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
+                session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
+                it.countDown()
+            }
         }
 
         // Create orphan rooms
 
-        val orphan1 = runBlocking {
-            session.createRoom(CreateRoomParams().apply { name = "O1" })
+        var orphan1 = ""
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                orphan1 = session.createRoom(CreateRoomParams().apply { name = "O1" })
+                it.countDown()
+            }
         }
-        val orphan2 = runBlocking {
-            session.createRoom(CreateRoomParams().apply { name = "O2" })
+
+        var orphan2 = ""
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                orphan2 = session.createRoom(CreateRoomParams().apply { name = "O2" })
+                it.countDown()
+            }
         }
 
         val allRooms = session.getRoomSummaries(roomSummaryQueryParams { excludeType = listOf(RoomType.SPACE) })
@@ -195,16 +238,18 @@ class SpaceHierarchyTest : InstrumentedTest {
         assertTrue("A1 should be a grand child of A", aChildren.any { it.name == "C2" })
 
         // Add a non canonical child and check that it does not appear as orphan
-        val a3 = runBlocking {
-            session.createRoom(CreateRoomParams().apply { name = "A3" })
-        }
-        runBlocking {
-            spaceA!!.addChildren(a3, viaServers, null, false)
-            delay(400)
-            // here we do not set the parent!!
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                val a3 = session.createRoom(CreateRoomParams().apply { name = "A3" })
+                spaceA!!.addChildren(a3, viaServers, null, false)
+                it.countDown()
+            }
         }
 
-        val orphansUpdate = session.getFlattenRoomSummaryChildrenOf(null)
+        Thread.sleep(2_000)
+        val orphansUpdate = session.getRoomSummaries(roomSummaryQueryParams {
+            activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+        })
         assertEquals("Unexpected number of orphan rooms ${orphansUpdate.map { it.name }}", 2, orphansUpdate.size)
     }
 
@@ -225,15 +270,21 @@ class SpaceHierarchyTest : InstrumentedTest {
         // add C as a subspace of A
         val spaceA = session.spaceService().getSpace(spaceAInfo.spaceId)
         val viaServers = listOf(session.sessionParams.homeServerHost ?: "")
-        runBlocking {
-            spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
-            session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                spaceA!!.addChildren(spaceCInfo.spaceId, viaServers, null, true)
+                session.spaceService().setSpaceParent(spaceCInfo.spaceId, spaceAInfo.spaceId, true, viaServers)
+                it.countDown()
+            }
         }
 
         // add back A as subspace of C
-        runBlocking {
-            val spaceC = session.spaceService().getSpace(spaceCInfo.spaceId)
-            spaceC!!.addChildren(spaceAInfo.spaceId, viaServers, null, true)
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                val spaceC = session.spaceService().getSpace(spaceCInfo.spaceId)
+                spaceC!!.addChildren(spaceAInfo.spaceId, viaServers, null, true)
+                it.countDown()
+            }
         }
 
         Thread.sleep(1000)
@@ -343,8 +394,12 @@ class SpaceHierarchyTest : InstrumentedTest {
                                   childInfo: List<Triple<String, Boolean, Boolean?>>
             /** Name, auto-join, canonical*/
     ): TestSpaceCreationResult {
-        val spaceId = runBlocking {
-            session.spaceService().createSpace(spaceName, "Test Topic", null, true)
+        var spaceId = ""
+        commonTestHelper.waitWithLatch {
+            GlobalScope.launch {
+                spaceId = session.spaceService().createSpace(spaceName, "Test Topic", null, true)
+                it.countDown()
+            }
         }
 
         val syncedSpace = session.spaceService().getSpace(spaceId)
@@ -352,9 +407,14 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         val roomIds =
                 childInfo.map { entry ->
-                    runBlocking {
-                        session.createRoom(CreateRoomParams().apply { name = entry.first })
+                    var roomId = ""
+                    commonTestHelper.waitWithLatch {
+                        GlobalScope.launch {
+                            roomId = session.createRoom(CreateRoomParams().apply { name = entry.first })
+                            it.countDown()
+                        }
                     }
+                    roomId
                 }
 
         roomIds.forEachIndexed { index, roomId ->
@@ -401,7 +461,7 @@ class SpaceHierarchyTest : InstrumentedTest {
         // + A
         //   a1, a2
         // + B
-         //  b1, b2, b3
+        //  b1, b2, b3
         //   + C
         //     + c1, c2
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
index e980be93ed..06069f2646 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
@@ -16,31 +16,35 @@
 
 package org.matrix.android.sdk.api.session.room.model
 
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#room-history-visibility
  */
+@JsonClass(generateAdapter = false)
 enum class RoomHistoryVisibility {
     /**
      * All events while this is the m.room.history_visibility value may be shared by any
      * participating homeserver with anyone, regardless of whether they have ever joined the room.
      */
-    WORLD_READABLE,
+    @Json(name = "world_readable") WORLD_READABLE,
 
     /**
      * Previous events are always accessible to newly joined members. All events in the
      * room are accessible, even those sent when the member was not a part of the room.
      */
-    SHARED,
+    @Json(name = "shared") SHARED,
 
     /**
      * Events are accessible to newly joined members from the point they were invited onwards.
      * Events stop being accessible when the member's state changes to something other than invite or join.
      */
-    INVITED,
+    @Json(name = "invited") INVITED,
 
     /**
      * Events are accessible to newly joined members from the point they joined the room onwards.
      * Events stop being accessible when the member's state changes to something other than join.
      */
-    JOINED
+    @Json(name = "joined") JOINED
 }

From 99d44717993acf990ae7aaae5d56b110465964d7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 5 May 2021 10:05:47 +0200
Subject: [PATCH 290/350] space beta people screen

---
 vector/src/main/AndroidManifest.xml           |   1 +
 .../im/vector/app/core/di/FragmentModule.kt   |   6 +
 .../im/vector/app/core/di/ViewModelModule.kt  |   6 +
 .../ProfileMatrixItemWithPowerLevel.kt        |  41 +++++
 .../features/navigation/DefaultNavigator.kt   |  18 +-
 .../members/RoomMemberListFragment.kt         |   7 +-
 .../members/RoomMemberListViewModel.kt        |  12 +-
 .../members/RoomMemberSummaryFilter.kt        |  11 +-
 .../spaces/people/SpacePeopleActivity.kt      | 104 +++++++++++
 .../spaces/people/SpacePeopleFragment.kt      | 152 ++++++++++++++++
 .../people/SpacePeopleListController.kt       | 167 ++++++++++++++++++
 .../SpacePeopleSharedActionViewModel.kt       |  31 ++++
 .../spaces/people/SpacePeopleViewModel.kt     | 130 ++++++++++++++
 .../res/layout/activity_simple_loading.xml    |  17 ++
 .../fragment_recyclerview_with_search.xml     |  96 ++++++++++
 .../res/layout/item_profile_matrix_item.xml   |  22 ++-
 vector/src/main/res/values/strings.xml        |   2 +
 17 files changed, 808 insertions(+), 15 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedActionViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
 create mode 100644 vector/src/main/res/layout/activity_simple_loading.xml
 create mode 100644 vector/src/main/res/layout/fragment_recyclerview_with_search.xml

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 1e2bf1ab0f..ea4ea9fd12 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -295,6 +295,7 @@
         <activity android:name=".features.spaces.SpaceExploreActivity" />
         <activity android:name=".features.spaces.SpaceCreationActivity" />
         <activity android:name=".features.spaces.manage.SpaceManageActivity" />
+        <activity android:name=".features.spaces.people.SpacePeopleActivity" />
         <!-- Services -->
 
         <service
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 3d15bdd123..c685231756 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -125,6 +125,7 @@ import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
 import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
 import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
 import im.vector.app.features.spaces.manage.SpaceAddRoomFragment
+import im.vector.app.features.spaces.people.SpacePeopleFragment
 import im.vector.app.features.spaces.preview.SpacePreviewFragment
 import im.vector.app.features.terms.ReviewTermsFragment
 import im.vector.app.features.usercode.ShowUserCodeFragment
@@ -678,4 +679,9 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(SpaceAddRoomFragment::class)
     fun bindSpaceAddRoomFragment(fragment: SpaceAddRoomFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SpacePeopleFragment::class)
+    fun bindSpacePeopleFragment(fragment: SpacePeopleFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
index 2639e87e6e..4e07c1e2ca 100644
--- a/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt
@@ -39,6 +39,7 @@ import im.vector.app.features.roomprofile.alias.detail.RoomAliasBottomSheetShare
 import im.vector.app.features.roomprofile.settings.historyvisibility.RoomHistoryVisibilitySharedActionViewModel
 import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleSharedActionViewModel
 import im.vector.app.features.spaces.SpacePreviewSharedActionViewModel
+import im.vector.app.features.spaces.people.SpacePeopleSharedActionViewModel
 import im.vector.app.features.userdirectory.UserListSharedActionViewModel
 
 @Module
@@ -148,4 +149,9 @@ interface ViewModelModule {
     @IntoMap
     @ViewModelKey(SpacePreviewSharedActionViewModel::class)
     fun bindSpacePreviewSharedActionViewModel(viewModel: SpacePreviewSharedActionViewModel): ViewModel
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(SpacePeopleSharedActionViewModel::class)
+    fun bindSpacePeopleSharedActionViewModel(viewModel: SpacePeopleSharedActionViewModel): ViewModel
 }
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt
new file mode 100644
index 0000000000..b7fd597789
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithPowerLevel.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.app.core.epoxy.profiles
+
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
+
+@EpoxyModelClass(layout = R.layout.item_profile_matrix_item)
+abstract class ProfileMatrixItemWithPowerLevel : BaseProfileMatrixItem<ProfileMatrixItemWithPowerLevel.Holder>() {
+
+    @EpoxyAttribute var powerLevelLabel: CharSequence? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.editableView.isVisible = false
+        holder.powerLabel.setTextOrHide(powerLevelLabel)
+    }
+
+    class Holder : ProfileMatrixItem.Holder() {
+        val powerLabel by bind<TextView>(R.id.matrixItemPowerLevelLabel)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 735a29afa4..c38dccd63b 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -75,6 +75,7 @@ import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
 import im.vector.app.features.spaces.SpaceExploreActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
 import im.vector.app.features.spaces.manage.SpaceManageActivity
+import im.vector.app.features.spaces.people.SpacePeopleActivity
 import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.widgets.WidgetActivity
 import im.vector.app.features.widgets.WidgetArgsBuilder
@@ -283,8 +284,21 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openCreateDirectRoom(context: Context) {
-        val intent = CreateDirectRoomActivity.getIntent(context)
-        context.startActivity(intent)
+        when (val currentGroupingMethod = appStateHandler.getCurrentRoomGroupingMethod()) {
+            is RoomGroupingMethod.ByLegacyGroup -> {
+                val intent = CreateDirectRoomActivity.getIntent(context)
+                context.startActivity(intent)
+            }
+            is RoomGroupingMethod.BySpace       -> {
+                if (currentGroupingMethod.spaceSummary != null) {
+                    val intent = SpacePeopleActivity.newIntent(context, currentGroupingMethod.spaceSummary.roomId)
+                    context.startActivity(intent)
+                } else {
+                    val intent = CreateDirectRoomActivity.getIntent(context)
+                    context.startActivity(intent)
+                }
+            }
+        }
     }
 
     override fun openInviteUsersToRoom(context: Context, roomId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 2ff89d6e54..591e3b84e0 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -47,11 +47,16 @@ class RoomMemberListFragment @Inject constructor(
         private val roomMemberListController: RoomMemberListController,
         private val avatarRenderer: AvatarRenderer
 ) : VectorBaseFragment<FragmentRoomMemberListBinding>(),
-        RoomMemberListController.Callback {
+        RoomMemberListController.Callback,
+        RoomMemberListViewModel.Factory {
 
     private val viewModel: RoomMemberListViewModel by fragmentViewModel()
     private val roomProfileArgs: RoomProfileArgs by args()
 
+    override fun create(initialState: RoomMemberListViewState): RoomMemberListViewModel {
+        return viewModelFactory.create(initialState)
+    }
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRoomMemberListBinding {
         return FragmentRoomMemberListBinding.inflate(inflater, container, false)
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index 270b3cb408..5c6ff48403 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -17,12 +17,13 @@
 package im.vector.app.features.roomprofile.members
 
 import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
 import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
@@ -62,8 +63,11 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
 
         @JvmStatic
         override fun create(viewModelContext: ViewModelContext, state: RoomMemberListViewState): RoomMemberListViewModel? {
-            val fragment: RoomMemberListFragment = (viewModelContext as FragmentViewModelContext).fragment()
-            return fragment.viewModelFactory.create(state)
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
         }
     }
 
@@ -188,7 +192,7 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
     override fun handle(action: RoomMemberListAction) {
         when (action) {
             is RoomMemberListAction.RevokeThreePidInvite -> handleRevokeThreePidInvite(action)
-            is RoomMemberListAction.FilterMemberList     -> handleFilterMemberList(action)
+            is RoomMemberListAction.FilterMemberList -> handleFilterMemberList(action)
         }.exhaustive
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
index e2cc3f7b99..a9e55f91c3 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
@@ -29,9 +29,12 @@ class RoomMemberSummaryFilter @Inject constructor() : Predicate<RoomMemberSummar
             // No filter
             return true
         }
-
-        return roomMemberSummary.displayName?.contains(filter, ignoreCase = true).orFalse()
-                // We should maybe exclude the domain from the userId
-                || roomMemberSummary.userId.contains(filter, ignoreCase = true)
+        // if filter is "Jo Do", it should match "John Doe"
+        return filter.split(" ").fold(true) { acc, s ->
+            acc
+                    && (roomMemberSummary.displayName?.contains(s, ignoreCase = true).orFalse()
+                    // We should maybe exclude the domain from the userId
+                    || roomMemberSummary.userId.contains(s, ignoreCase = true))
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
new file mode 100644
index 0000000000..1cc2203042
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.people
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.MvRx
+import im.vector.app.R
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivitySimpleLoadingBinding
+import im.vector.app.features.roomprofile.RoomProfileArgs
+import im.vector.app.features.spaces.ShareSpaceBottomSheet
+
+class SpacePeopleActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>() {
+
+    override fun getBinding() = ActivitySimpleLoadingBinding.inflate(layoutInflater)
+
+    private lateinit var sharedActionViewModel: SpacePeopleSharedActionViewModel
+
+    override fun initUiAndData() {
+        super.initUiAndData()
+        waitingView = views.waitingView.waitingView
+    }
+
+    override fun showWaitingView(text: String?) {
+        hideKeyboard()
+        views.waitingView.waitingStatusText.isGone = views.waitingView.waitingStatusText.text.isNullOrBlank()
+        super.showWaitingView(text)
+    }
+
+    override fun hideWaitingView() {
+        views.waitingView.waitingStatusText.text = null
+        views.waitingView.waitingStatusText.isGone = true
+        views.waitingView.waitingHorizontalProgress.progress = 0
+        views.waitingView.waitingHorizontalProgress.isVisible = false
+        super.hideWaitingView()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val args = intent?.getParcelableExtra<RoomProfileArgs>(MvRx.KEY_ARG)
+        if (isFirstCreation()) {
+            val simpleName = SpacePeopleFragment::class.java.simpleName
+            if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
+                supportFragmentManager.commitTransaction {
+                    replace(R.id.simpleFragmentContainer,
+                            SpacePeopleFragment::class.java,
+                            Bundle().apply { this.putParcelable(MvRx.KEY_ARG, args) },
+                            simpleName
+                    )
+                }
+            }
+        }
+
+        sharedActionViewModel = viewModelProvider.get(SpacePeopleSharedActionViewModel::class.java)
+        sharedActionViewModel
+                .observe()
+                .subscribe { sharedAction ->
+                    when (sharedAction) {
+                        SpacePeopleSharedAction.Dismiss             -> finish()
+                        is SpacePeopleSharedAction.NavigateToRoom   -> navigateToRooms(sharedAction)
+                        SpacePeopleSharedAction.HideModalLoading    -> hideWaitingView()
+                        SpacePeopleSharedAction.ShowModalLoading    -> {
+                            showWaitingView()
+                        }
+                        is SpacePeopleSharedAction.NavigateToInvite -> {
+                            ShareSpaceBottomSheet.show(supportFragmentManager, sharedAction.spaceId)
+                        }
+                    }
+                }.disposeOnDestroy()
+    }
+
+    private fun navigateToRooms(action: SpacePeopleSharedAction.NavigateToRoom) {
+        navigator.openRoom(this, action.roomId)
+        finish()
+    }
+
+    companion object {
+        fun newIntent(context: Context, spaceId: String): Intent {
+            return Intent(context, SpacePeopleActivity::class.java).apply {
+                putExtra(MvRx.KEY_ARG, RoomProfileArgs(spaceId))
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
new file mode 100644
index 0000000000..7f5369a6ec
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.people
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import com.jakewharton.rxbinding3.appcompat.queryTextChanges
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentRecyclerviewWithSearchBinding
+import im.vector.app.features.roomprofile.members.RoomMemberListAction
+import im.vector.app.features.roomprofile.members.RoomMemberListViewModel
+import im.vector.app.features.roomprofile.members.RoomMemberListViewState
+import io.reactivex.rxkotlin.subscribeBy
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class SpacePeopleFragment @Inject constructor(
+        private val viewModelFactory: SpacePeopleViewModel.Factory,
+        private val roomMemberModelFactory: RoomMemberListViewModel.Factory,
+        private val epoxyController: SpacePeopleListController
+) : VectorBaseFragment<FragmentRecyclerviewWithSearchBinding>(),
+        SpacePeopleViewModel.Factory,
+        RoomMemberListViewModel.Factory,
+        OnBackPressed, SpacePeopleListController.InteractionListener {
+
+    private val viewModel by fragmentViewModel(SpacePeopleViewModel::class)
+    private val membersViewModel by fragmentViewModel(RoomMemberListViewModel::class)
+    private lateinit var sharedActionViewModel: SpacePeopleSharedActionViewModel
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
+            FragmentRecyclerviewWithSearchBinding.inflate(inflater, container, false)
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        sharedActionViewModel.post(SpacePeopleSharedAction.Dismiss)
+        return true
+    }
+
+    override fun create(initialState: SpacePeopleViewState): SpacePeopleViewModel {
+        return viewModelFactory.create(initialState)
+    }
+
+    override fun create(initialState: RoomMemberListViewState): RoomMemberListViewModel {
+        return roomMemberModelFactory.create(initialState)
+    }
+
+    override fun invalidate() = withState(viewModel, membersViewModel) { baseState, memberListState ->
+        views.appBarTitle.text = getString(R.string.bottom_action_people)
+        val memberCount = (memberListState.roomSummary.invoke()?.otherMemberIds?.size ?: 0) + 1
+        views.appBarSpaceInfo.text = resources.getQuantityString(R.plurals.room_title_members, memberCount, memberCount)
+//        views.listBuildingProgress.isVisible = true
+        epoxyController.setData(memberListState)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        sharedActionViewModel = activityViewModelProvider.get(SpacePeopleSharedActionViewModel::class.java)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupRecyclerView()
+        setupSearchView()
+
+        views.addRoomToSpaceToolbar.navigationIcon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_close_24dp)
+        views.addRoomToSpaceToolbar.setNavigationOnClickListener {
+            sharedActionViewModel.post(SpacePeopleSharedAction.Dismiss)
+        }
+
+        viewModel.observeViewEvents {
+            handleViewEvents(it)
+        }
+
+        viewModel.subscribe(this) {
+            when (it.createAndInviteState) {
+                is Loading -> sharedActionViewModel.post(SpacePeopleSharedAction.ShowModalLoading)
+                Uninitialized,
+                is Fail    -> sharedActionViewModel.post(SpacePeopleSharedAction.HideModalLoading)
+                is Success -> {
+                    // don't hide on success, it will navigate out. If not the loading goes out before navigation
+                }
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        epoxyController.listener = null
+        views.roomList.cleanup()
+        super.onDestroyView()
+    }
+
+    private fun setupRecyclerView() {
+        views.roomList.configureWith(epoxyController, hasFixedSize = false, disableItemAnimation = false)
+        epoxyController.listener = this
+    }
+
+    private fun setupSearchView() {
+        views.memberNameFilter.queryHint = getString(R.string.search_members_hint)
+        views.memberNameFilter.queryTextChanges()
+                .debounce(100, TimeUnit.MILLISECONDS)
+                .subscribeBy {
+                    membersViewModel.handle(RoomMemberListAction.FilterMemberList(it.toString()))
+                }
+                .disposeOnDestroyView()
+    }
+
+    private fun handleViewEvents(events: SpacePeopleViewEvents) {
+        when (events) {
+            is SpacePeopleViewEvents.OpenRoom -> {
+                sharedActionViewModel.post(SpacePeopleSharedAction.NavigateToRoom(events.roomId))
+            }
+            is SpacePeopleViewEvents.InviteToSpace -> {
+                sharedActionViewModel.post(SpacePeopleSharedAction.NavigateToInvite(events.spaceId))
+            }
+        }
+    }
+
+    override fun onSpaceMemberClicked(roomMemberSummary: RoomMemberSummary) {
+        viewModel.handle(SpacePeopleViewAction.ChatWith(roomMemberSummary))
+    }
+
+    override fun onInviteToSpaceSelected() {
+        viewModel.handle(SpacePeopleViewAction.InviteToSpace)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
new file mode 100644
index 0000000000..fc982862a7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.people
+
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.epoxy.dividerItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.epoxy.profiles.profileMatrixItemWithPowerLevel
+import im.vector.app.core.extensions.join
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.ui.list.GenericItem
+import im.vector.app.core.ui.list.genericItem
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomprofile.members.RoomMemberListCategories
+import im.vector.app.features.roomprofile.members.RoomMemberListViewState
+import im.vector.app.features.roomprofile.members.RoomMemberSummaryFilter
+import me.gujun.android.span.span
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class SpacePeopleListController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val colorProvider: ColorProvider,
+        private val stringProvider: StringProvider,
+        private val dimensionConverter: DimensionConverter,
+        private val roomMemberSummaryFilter: RoomMemberSummaryFilter
+) : TypedEpoxyController<RoomMemberListViewState>() {
+
+    private val dividerColor = colorProvider.getColorFromAttribute(R.attr.vctr_list_divider_color)
+
+    interface InteractionListener {
+        fun onSpaceMemberClicked(roomMemberSummary: RoomMemberSummary)
+        fun onInviteToSpaceSelected()
+    }
+
+    var listener: InteractionListener? = null
+
+    init {
+        setData(null)
+    }
+
+    override fun buildModels(data: RoomMemberListViewState?) {
+        val memberSummaries = data?.roomMemberSummaries?.invoke()
+        if (memberSummaries == null) {
+            loadingItem { id("loading") }
+            return
+        }
+        roomMemberSummaryFilter.filter = data.filter
+        var foundCount = 0
+        memberSummaries.forEach { memberEntry ->
+
+            val filtered = memberEntry.second
+                    .filter { roomMemberSummaryFilter.test(it) }
+            if (filtered.isNotEmpty()) {
+                dividerItem {
+                    id("divider_type_${memberEntry.first.titleRes}")
+                    color(dividerColor)
+                }
+            }
+            foundCount += filtered.size
+            filtered
+                    .join(
+                            each = { _, roomMember ->
+                                profileMatrixItemWithPowerLevel {
+                                    id(roomMember.userId)
+                                    matrixItem(roomMember.toMatrixItem())
+                                    avatarRenderer(avatarRenderer)
+                                    userEncryptionTrustLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
+                                            .apply {
+                                                val pl = memberEntry.first.toPowerLevelLabel()
+                                                if (memberEntry.first == RoomMemberListCategories.INVITE) {
+                                                    powerLevelLabel(
+                                                            span {
+                                                                span(stringProvider.getString(R.string.invited)) {
+                                                                    textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+                                                                    textStyle = "bold"
+                                                                    // fontFamily = "monospace"
+                                                                }
+                                                            }
+                                                    )
+                                                } else if (pl != null) {
+                                                    powerLevelLabel(
+                                                            span {
+                                                                span(" $pl ") {
+                                                                    backgroundColor = colorProvider.getColor(R.color.notification_accent_color)
+                                                                    paddingTop = dimensionConverter.dpToPx(2)
+                                                                    paddingBottom = dimensionConverter.dpToPx(2)
+                                                                    textColor = colorProvider.getColor(R.color.white)
+                                                                    textStyle = "bold"
+                                                                    // fontFamily = "monospace"
+                                                                }
+                                                            }
+                                                    )
+                                                } else {
+                                                    powerLevelLabel(null)
+                                                }
+                                            }
+
+                                    clickListener { _ ->
+                                        listener?.onSpaceMemberClicked(roomMember)
+                                    }
+                                }
+                            },
+                            between = { _, roomMemberBefore ->
+                                dividerItem {
+                                    id("divider_${roomMemberBefore.userId}")
+                                    color(dividerColor)
+                                }
+                            }
+                    )
+        }
+
+        if (foundCount == 0 && data.filter.isNotEmpty()) {
+            // add the footer thing
+            genericItem {
+                id("not_found")
+                title(
+                        span {
+                            +"\n"
+                            +stringProvider.getString(R.string.no_result_placeholder)
+                        }
+                )
+                description(
+                        span {
+                            +stringProvider.getString(R.string.looking_for_someone_not_in_space, data.roomSummary.invoke()?.displayName ?: "")
+                            +"\n"
+                            span("Invite them") {
+                                textColor = colorProvider.getColorFromAttribute(R.attr.colorAccent)
+                                textStyle = "bold"
+                            }
+                        }
+                )
+                itemClickAction(GenericItem.Action("invite").apply {
+                    perform = Runnable {
+                        listener?.onInviteToSpaceSelected()
+                    }
+                })
+            }
+        }
+    }
+
+    private fun RoomMemberListCategories.toPowerLevelLabel(): String? {
+        return when (this) {
+            RoomMemberListCategories.ADMIN -> stringProvider.getString(R.string.power_level_admin)
+            RoomMemberListCategories.MODERATOR -> stringProvider.getString(R.string.power_level_moderator)
+            else                               -> null
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedActionViewModel.kt
new file mode 100644
index 0000000000..649f241bf9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedActionViewModel.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.people
+
+import im.vector.app.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedActionViewModel
+import javax.inject.Inject
+
+sealed class SpacePeopleSharedAction : VectorSharedAction {
+    object Dismiss : SpacePeopleSharedAction()
+    object ShowModalLoading : SpacePeopleSharedAction()
+    object HideModalLoading : SpacePeopleSharedAction()
+    data class NavigateToRoom(val roomId: String) : SpacePeopleSharedAction()
+    data class NavigateToInvite(val spaceId: String) : SpacePeopleSharedAction()
+}
+
+class SpacePeopleSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<SpacePeopleSharedAction>()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
new file mode 100644
index 0000000000..71c3bcdda7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.people
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.features.raw.wellknown.getElementWellknown
+import im.vector.app.features.raw.wellknown.isE2EByDefault
+import im.vector.app.features.roomprofile.RoomProfileArgs
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.raw.RawService
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
+
+data class SpacePeopleViewState(
+        val spaceId: String,
+        val createAndInviteState: Async<String> = Uninitialized
+) : MvRxState {
+    constructor(args: RoomProfileArgs) : this(
+            spaceId = args.roomId
+    )
+}
+
+sealed class SpacePeopleViewAction : VectorViewModelAction {
+    data class ChatWith(val member: RoomMemberSummary) : SpacePeopleViewAction()
+    object InviteToSpace : SpacePeopleViewAction()
+}
+
+sealed class SpacePeopleViewEvents : VectorViewEvents {
+    data class OpenRoom(val roomId: String) : SpacePeopleViewEvents()
+    data class InviteToSpace(val spaceId: String) : SpacePeopleViewEvents()
+}
+
+class SpacePeopleViewModel @AssistedInject constructor(
+        @Assisted val initialState: SpacePeopleViewState,
+        private val rawService: RawService,
+        private val session: Session
+) : VectorViewModel<SpacePeopleViewState, SpacePeopleViewAction, SpacePeopleViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: SpacePeopleViewState): SpacePeopleViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SpacePeopleViewModel, SpacePeopleViewState> {
+        override fun create(viewModelContext: ViewModelContext, state: SpacePeopleViewState): SpacePeopleViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    override fun handle(action: SpacePeopleViewAction) {
+        when (action) {
+            is SpacePeopleViewAction.ChatWith -> handleChatWith(action)
+            SpacePeopleViewAction.InviteToSpace -> handleInviteToSpace()
+        }.exhaustive
+    }
+
+    private fun handleInviteToSpace() {
+        _viewEvents.post(SpacePeopleViewEvents.InviteToSpace(initialState.spaceId))
+    }
+
+    private fun handleChatWith(action: SpacePeopleViewAction.ChatWith) {
+        val otherUserId = action.member.userId
+        if (otherUserId == session.myUserId) return
+        val existingRoomId = session.getExistingDirectRoomWithUser(otherUserId)
+        if (existingRoomId != null) {
+            // just open it
+            _viewEvents.post(SpacePeopleViewEvents.OpenRoom(existingRoomId))
+            return
+        }
+        setState { copy(createAndInviteState = Loading()) }
+
+        viewModelScope.launch(Dispatchers.IO) {
+            val adminE2EByDefault = rawService.getElementWellknown(session.myUserId)
+                    ?.isE2EByDefault()
+                    ?: true
+
+            val roomParams = CreateRoomParams()
+                    .apply {
+                        invitedUserIds.add(otherUserId)
+                        setDirectMessage()
+                        enableEncryptionIfInvitedUsersSupportIt = adminE2EByDefault
+                    }
+
+            try {
+                val roomId = session.createRoom(roomParams)
+                _viewEvents.post(SpacePeopleViewEvents.OpenRoom(roomId))
+                setState { copy(createAndInviteState = Success(roomId)) }
+            } catch (failure: Throwable) {
+                setState { copy(createAndInviteState = Fail(failure)) }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/res/layout/activity_simple_loading.xml b/vector/src/main/res/layout/activity_simple_loading.xml
new file mode 100644
index 0000000000..b523d97c92
--- /dev/null
+++ b/vector/src/main/res/layout/activity_simple_loading.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/simpleFragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <include
+        android:id="@+id/waiting_view"
+        layout="@layout/merge_overlay_waiting_view" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
new file mode 100644
index 0000000000..a9c26cff6f
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:background="?riotx_background"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/roomList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?riotx_background"
+        android:overScrollMode="always"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/item_profile_matrix_item" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        style="@style/VectorAppBarLayoutStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="4dp">
+
+        <!-- minHeight="0dp" is important to collapse on scroll -->
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/addRoomToSpaceToolbar"
+            style="@style/VectorToolbarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:elevation="4dp"
+            android:minHeight="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|start"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/appBarTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:ellipsize="end"
+                    android:gravity="start|center"
+                    android:maxLines="1"
+                    tools:text="@tools:sample/lorem/random"
+                    android:textColor="?riotx_text_primary"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/appBarSpaceInfo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:ellipsize="end"
+                    android:gravity="start|center"
+                    android:maxLines="1"
+                    android:textColor="?riotx_text_secondary"
+                    android:textSize="16sp"
+                    tools:text="@tools:sample/lorem/random"/>
+
+            </LinearLayout>
+
+        </androidx.appcompat.widget.Toolbar>
+
+
+        <androidx.appcompat.widget.SearchView
+            android:id="@+id/memberNameFilter"
+            style="@style/VectorSearchView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
+            app:queryHint="@string/search_hint_room_name" />
+
+<!--        <ProgressBar-->
+<!--            android:id="@+id/listBuildingProgress"-->
+<!--            android:indeterminate="true"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="8dp"-->
+<!--            style="@style/Widget.AppCompat.ProgressBar.Horizontal"-->
+<!--            />-->
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index d2ea7c01f5..29f537c315 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -40,7 +40,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="8dp"
         android:drawablePadding="16dp"
         android:ellipsize="end"
         android:maxLines="1"
@@ -48,7 +48,7 @@
         android:textSize="16sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
-        app:layout_constraintEnd_toStartOf="@+id/matrixItemEditable"
+        app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
@@ -60,7 +60,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="8dp"
         android:drawablePadding="16dp"
         android:ellipsize="end"
         android:maxLines="1"
@@ -68,13 +68,27 @@
         android:textSize="12sp"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/matrixItemEditable"
+        app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
         app:layout_goneMarginStart="0dp"
         tools:text="@sample/matrix.json/data/mxid" />
 
+
+    <TextView
+        android:id="@+id/matrixItemPowerLevelLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/matrixItemEditable"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Admin"
+        tools:visibility="visible" />
+
     <ImageView
         android:id="@+id/matrixItemEditable"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index f8b04ef3a6..f5fd97be31 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3353,4 +3353,6 @@
     <string name="labs_use_restricted_join_rule">Experimental Space - Restricted Room.</string>
     <string name="labs_use_restricted_join_rule_desc">Warning requires server support and experimental room version</string>
     <string name="user_invites_you">%s invites you</string>
+
+    <string name="looking_for_someone_not_in_space">Looking for someone not in %s?</string>
 </resources>

From 2acfb294161bdfea6823734be773f445f9bde388 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 5 May 2021 17:46:58 +0200
Subject: [PATCH 291/350] Some cleanup

---
 .../epoxy/profiles/BaseProfileMatrixItem.kt   |  2 ++
 .../features/navigation/DefaultNavigator.kt   | 15 +++++++-------
 .../members/RoomMemberSummaryFilter.kt        |  7 +++----
 .../res/layout/item_profile_matrix_item.xml   | 14 ++++---------
 .../item_profile_matrix_item_progress.xml     | 20 +++++++------------
 5 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
index ccb3bea25a..9f865df372 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
@@ -17,6 +17,7 @@
 package im.vector.app.core.epoxy.profiles
 
 import android.view.View
+import androidx.annotation.CallSuper
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import im.vector.app.core.epoxy.VectorEpoxyModel
@@ -34,6 +35,7 @@ abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder> : VectorEpoxy
     var userEncryptionTrustLevel: RoomEncryptionTrustLevel? = null
     @EpoxyAttribute var clickListener: View.OnClickListener? = null
 
+    @CallSuper
     override fun bind(holder: T) {
         super.bind(holder)
         val bestName = matrixItem.getBestName()
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index c38dccd63b..27de04210a 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -284,21 +284,20 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openCreateDirectRoom(context: Context) {
-        when (val currentGroupingMethod = appStateHandler.getCurrentRoomGroupingMethod()) {
+        val intent = when (val currentGroupingMethod = appStateHandler.getCurrentRoomGroupingMethod()) {
             is RoomGroupingMethod.ByLegacyGroup -> {
-                val intent = CreateDirectRoomActivity.getIntent(context)
-                context.startActivity(intent)
+                CreateDirectRoomActivity.getIntent(context)
             }
             is RoomGroupingMethod.BySpace       -> {
                 if (currentGroupingMethod.spaceSummary != null) {
-                    val intent = SpacePeopleActivity.newIntent(context, currentGroupingMethod.spaceSummary.roomId)
-                    context.startActivity(intent)
+                    SpacePeopleActivity.newIntent(context, currentGroupingMethod.spaceSummary.roomId)
                 } else {
-                    val intent = CreateDirectRoomActivity.getIntent(context)
-                    context.startActivity(intent)
+                    CreateDirectRoomActivity.getIntent(context)
                 }
             }
-        }
+            else                                -> null
+        } ?: return
+        context.startActivity(intent)
     }
 
     override fun openInviteUsersToRoom(context: Context, roomId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
index a9e55f91c3..bd9fb7b941 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
@@ -30,11 +30,10 @@ class RoomMemberSummaryFilter @Inject constructor() : Predicate<RoomMemberSummar
             return true
         }
         // if filter is "Jo Do", it should match "John Doe"
-        return filter.split(" ").fold(true) { acc, s ->
-            acc
-                    && (roomMemberSummary.displayName?.contains(s, ignoreCase = true).orFalse()
+        return filter.split(" ").all {
+            roomMemberSummary.displayName?.contains(it, ignoreCase = true).orFalse()
                     // We should maybe exclude the domain from the userId
-                    || roomMemberSummary.userId.contains(s, ignoreCase = true))
+                    || roomMemberSummary.userId.contains(it, ignoreCase = true)
         }
     }
 }
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 29f537c315..3d9aa0e876 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -37,11 +37,10 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
-        android:drawablePadding="16dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?riotx_text_primary"
@@ -49,19 +48,17 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginStart="0dp"
+        app:layout_goneMarginEnd="80dp"
         tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="8dp"
-        android:drawablePadding="16dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
@@ -69,13 +66,11 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
-        app:layout_goneMarginStart="0dp"
+        app:layout_goneMarginEnd="8dp"
         tools:text="@sample/matrix.json/data/mxid" />
 
-
     <TextView
         android:id="@+id/matrixItemPowerLevelLabel"
         android:layout_width="wrap_content"
@@ -101,5 +96,4 @@
         app:tint="?riotx_text_secondary"
         tools:ignore="MissingPrefix" />
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 3376d58598..55e8cecade 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -37,11 +37,10 @@
 
     <TextView
         android:id="@+id/matrixItemTitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:drawablePadding="16dp"
+        android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?riotx_text_primary"
@@ -49,19 +48,17 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginStart="0dp"
+        app:layout_goneMarginEnd="80dp"
         tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:drawablePadding="16dp"
+        android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
@@ -69,10 +66,9 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
-        app:layout_goneMarginStart="0dp"
+        app:layout_goneMarginEnd="8dp"
         tools:text="@sample/matrix.json/data/mxid" />
 
     <ProgressBar
@@ -93,12 +89,10 @@
         android:layout_height="wrap_content"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_arrow_right"
-        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?riotx_text_secondary"
-        tools:ignore="MissingPrefix"
-        tools:visibility="visible" />
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From 961f3bcd19caaeea811c94370c5ba16f9750cb69 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 18:09:29 +0200
Subject: [PATCH 292/350] More cleanup and split into several files

---
 .../spaces/people/SpacePeopleFragment.kt      |  4 +--
 .../people/SpacePeopleListController.kt       |  2 +-
 .../spaces/people/SpacePeopleSharedAction.kt  | 27 ++++++++++++++++
 .../SpacePeopleSharedActionViewModel.kt       |  9 ------
 .../spaces/people/SpacePeopleViewAction.kt    | 25 +++++++++++++++
 .../spaces/people/SpacePeopleViewEvents.kt    | 24 ++++++++++++++
 .../spaces/people/SpacePeopleViewModel.kt     | 28 +----------------
 .../spaces/people/SpacePeopleViewState.kt     | 31 +++++++++++++++++++
 8 files changed, 111 insertions(+), 39 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewEvents.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewState.kt

diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
index 7f5369a6ec..e6a84a37cf 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
@@ -71,7 +71,7 @@ class SpacePeopleFragment @Inject constructor(
         return roomMemberModelFactory.create(initialState)
     }
 
-    override fun invalidate() = withState(viewModel, membersViewModel) { baseState, memberListState ->
+    override fun invalidate() = withState(membersViewModel) { memberListState ->
         views.appBarTitle.text = getString(R.string.bottom_action_people)
         val memberCount = (memberListState.roomSummary.invoke()?.otherMemberIds?.size ?: 0) + 1
         views.appBarSpaceInfo.text = resources.getQuantityString(R.plurals.room_title_members, memberCount, memberCount)
@@ -133,7 +133,7 @@ class SpacePeopleFragment @Inject constructor(
 
     private fun handleViewEvents(events: SpacePeopleViewEvents) {
         when (events) {
-            is SpacePeopleViewEvents.OpenRoom -> {
+            is SpacePeopleViewEvents.OpenRoom      -> {
                 sharedActionViewModel.post(SpacePeopleSharedAction.NavigateToRoom(events.roomId))
             }
             is SpacePeopleViewEvents.InviteToSpace -> {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
index fc982862a7..71be3690a1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
@@ -159,7 +159,7 @@ class SpacePeopleListController @Inject constructor(
 
     private fun RoomMemberListCategories.toPowerLevelLabel(): String? {
         return when (this) {
-            RoomMemberListCategories.ADMIN -> stringProvider.getString(R.string.power_level_admin)
+            RoomMemberListCategories.ADMIN     -> stringProvider.getString(R.string.power_level_admin)
             RoomMemberListCategories.MODERATOR -> stringProvider.getString(R.string.power_level_moderator)
             else                               -> null
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedAction.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedAction.kt
new file mode 100644
index 0000000000..201196c865
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedAction.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.people
+
+import im.vector.app.core.platform.VectorSharedAction
+
+sealed class SpacePeopleSharedAction : VectorSharedAction {
+    object Dismiss : SpacePeopleSharedAction()
+    object ShowModalLoading : SpacePeopleSharedAction()
+    object HideModalLoading : SpacePeopleSharedAction()
+    data class NavigateToRoom(val roomId: String) : SpacePeopleSharedAction()
+    data class NavigateToInvite(val spaceId: String) : SpacePeopleSharedAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedActionViewModel.kt
index 649f241bf9..ace942cd63 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleSharedActionViewModel.kt
@@ -16,16 +16,7 @@
 
 package im.vector.app.features.spaces.people
 
-import im.vector.app.core.platform.VectorSharedAction
 import im.vector.app.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject
 
-sealed class SpacePeopleSharedAction : VectorSharedAction {
-    object Dismiss : SpacePeopleSharedAction()
-    object ShowModalLoading : SpacePeopleSharedAction()
-    object HideModalLoading : SpacePeopleSharedAction()
-    data class NavigateToRoom(val roomId: String) : SpacePeopleSharedAction()
-    data class NavigateToInvite(val spaceId: String) : SpacePeopleSharedAction()
-}
-
 class SpacePeopleSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<SpacePeopleSharedAction>()
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewAction.kt
new file mode 100644
index 0000000000..39d9dddc3a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewAction.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.people
+
+import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+
+sealed class SpacePeopleViewAction : VectorViewModelAction {
+    data class ChatWith(val member: RoomMemberSummary) : SpacePeopleViewAction()
+    object InviteToSpace : SpacePeopleViewAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewEvents.kt
new file mode 100644
index 0000000000..e2d93668f2
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewEvents.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.people
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SpacePeopleViewEvents : VectorViewEvents {
+    data class OpenRoom(val roomId: String) : SpacePeopleViewEvents()
+    data class InviteToSpace(val spaceId: String) : SpacePeopleViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
index 71c3bcdda7..13944adfc8 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewModel.kt
@@ -18,51 +18,25 @@ package im.vector.app.features.spaces.people
 
 import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.ActivityViewModelContext
-import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.features.raw.wellknown.getElementWellknown
 import im.vector.app.features.raw.wellknown.isE2EByDefault
-import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.raw.RawService
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 
-data class SpacePeopleViewState(
-        val spaceId: String,
-        val createAndInviteState: Async<String> = Uninitialized
-) : MvRxState {
-    constructor(args: RoomProfileArgs) : this(
-            spaceId = args.roomId
-    )
-}
-
-sealed class SpacePeopleViewAction : VectorViewModelAction {
-    data class ChatWith(val member: RoomMemberSummary) : SpacePeopleViewAction()
-    object InviteToSpace : SpacePeopleViewAction()
-}
-
-sealed class SpacePeopleViewEvents : VectorViewEvents {
-    data class OpenRoom(val roomId: String) : SpacePeopleViewEvents()
-    data class InviteToSpace(val spaceId: String) : SpacePeopleViewEvents()
-}
-
 class SpacePeopleViewModel @AssistedInject constructor(
         @Assisted val initialState: SpacePeopleViewState,
         private val rawService: RawService,
@@ -86,7 +60,7 @@ class SpacePeopleViewModel @AssistedInject constructor(
 
     override fun handle(action: SpacePeopleViewAction) {
         when (action) {
-            is SpacePeopleViewAction.ChatWith -> handleChatWith(action)
+            is SpacePeopleViewAction.ChatWith   -> handleChatWith(action)
             SpacePeopleViewAction.InviteToSpace -> handleInviteToSpace()
         }.exhaustive
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewState.kt
new file mode 100644
index 0000000000..094145f901
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewState.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.people
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import im.vector.app.features.roomprofile.RoomProfileArgs
+
+data class SpacePeopleViewState(
+        val spaceId: String,
+        val createAndInviteState: Async<String> = Uninitialized
+) : MvRxState {
+    constructor(args: RoomProfileArgs) : this(
+            spaceId = args.roomId
+    )
+}

From ea3abee63a1c2d789353ed605fd9417668b31735 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 18:12:45 +0200
Subject: [PATCH 293/350] Format

---
 .../fragment_recyclerview_with_search.xml     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
index a9c26cff6f..a76c786026 100644
--- a/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
+++ b/vector/src/main/res/layout/fragment_recyclerview_with_search.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
-    android:background="?riotx_background"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?riotx_background">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/roomList"
@@ -49,10 +49,10 @@
                     android:ellipsize="end"
                     android:gravity="start|center"
                     android:maxLines="1"
-                    tools:text="@tools:sample/lorem/random"
                     android:textColor="?riotx_text_primary"
                     android:textSize="18sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    tools:text="@tools:sample/lorem/random" />
 
                 <TextView
                     android:id="@+id/appBarSpaceInfo"
@@ -64,7 +64,7 @@
                     android:maxLines="1"
                     android:textColor="?riotx_text_secondary"
                     android:textSize="16sp"
-                    tools:text="@tools:sample/lorem/random"/>
+                    tools:text="@tools:sample/lorem/random" />
 
             </LinearLayout>
 
@@ -83,13 +83,13 @@
             app:layout_constraintTop_toBottomOf="@+id/addRoomToSpaceToolbar"
             app:queryHint="@string/search_hint_room_name" />
 
-<!--        <ProgressBar-->
-<!--            android:id="@+id/listBuildingProgress"-->
-<!--            android:indeterminate="true"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="8dp"-->
-<!--            style="@style/Widget.AppCompat.ProgressBar.Horizontal"-->
-<!--            />-->
+        <!--        <ProgressBar-->
+        <!--            android:id="@+id/listBuildingProgress"-->
+        <!--            android:indeterminate="true"-->
+        <!--            android:layout_width="match_parent"-->
+        <!--            android:layout_height="8dp"-->
+        <!--            style="@style/Widget.AppCompat.ProgressBar.Horizontal"-->
+        <!--            />-->
 
     </com.google.android.material.appbar.AppBarLayout>
 

From cdb3d7c3080caa1ffec13c542909cf1627517cec Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 18:22:16 +0200
Subject: [PATCH 294/350] Create a GenericIdArgs instead of using unrelated
 GenericIdArgs

---
 .../vector/app/core/platform/GenericIdArgs.kt | 28 +++++++++++++++++++
 .../spaces/people/SpacePeopleActivity.kt      |  6 ++--
 .../spaces/people/SpacePeopleViewState.kt     |  6 ++--
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/platform/GenericIdArgs.kt

diff --git a/vector/src/main/java/im/vector/app/core/platform/GenericIdArgs.kt b/vector/src/main/java/im/vector/app/core/platform/GenericIdArgs.kt
new file mode 100644
index 0000000000..0f22ae9136
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/platform/GenericIdArgs.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.platform
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+/**
+ * Generic argument with one String. Can be an id (ex: roomId, spaceId, callId, etc.), or anything else
+ */
+@Parcelize
+data class GenericIdArgs(
+        val id: String
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
index 1cc2203042..87f5356f6d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleActivity.kt
@@ -25,9 +25,9 @@ import com.airbnb.mvrx.MvRx
 import im.vector.app.R
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.platform.GenericIdArgs
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleLoadingBinding
-import im.vector.app.features.roomprofile.RoomProfileArgs
 import im.vector.app.features.spaces.ShareSpaceBottomSheet
 
 class SpacePeopleActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>() {
@@ -57,7 +57,7 @@ class SpacePeopleActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        val args = intent?.getParcelableExtra<RoomProfileArgs>(MvRx.KEY_ARG)
+        val args = intent?.getParcelableExtra<GenericIdArgs>(MvRx.KEY_ARG)
         if (isFirstCreation()) {
             val simpleName = SpacePeopleFragment::class.java.simpleName
             if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
@@ -97,7 +97,7 @@ class SpacePeopleActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>() {
     companion object {
         fun newIntent(context: Context, spaceId: String): Intent {
             return Intent(context, SpacePeopleActivity::class.java).apply {
-                putExtra(MvRx.KEY_ARG, RoomProfileArgs(spaceId))
+                putExtra(MvRx.KEY_ARG, GenericIdArgs(spaceId))
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewState.kt
index 094145f901..ea322e3fbd 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleViewState.kt
@@ -19,13 +19,13 @@ package im.vector.app.features.spaces.people
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import im.vector.app.features.roomprofile.RoomProfileArgs
+import im.vector.app.core.platform.GenericIdArgs
 
 data class SpacePeopleViewState(
         val spaceId: String,
         val createAndInviteState: Async<String> = Uninitialized
 ) : MvRxState {
-    constructor(args: RoomProfileArgs) : this(
-            spaceId = args.roomId
+    constructor(args: GenericIdArgs) : this(
+            spaceId = args.id
     )
 }

From 908e7be2bac2ca3b8da2f81ec45e4297e61333c9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 18:36:33 +0200
Subject: [PATCH 295/350] Create a GenericIdArgs instead of using unrelated
 GenericIdArgs - fix crash

---
 .../features/roomprofile/members/RoomMemberListViewState.kt    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
index 6fe8df3d36..63d07cc4dd 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
@@ -21,6 +21,7 @@ import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 import im.vector.app.R
+import im.vector.app.core.platform.GenericIdArgs
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -38,6 +39,8 @@ data class RoomMemberListViewState(
 ) : MvRxState {
 
     constructor(args: RoomProfileArgs) : this(roomId = args.roomId)
+
+    constructor(args: GenericIdArgs) : this(roomId = args.id)
 }
 
 data class ActionPermissions(

From ea93261b8315016cce2c47bfe5e8d10631db39ac Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 18:51:43 +0200
Subject: [PATCH 296/350] Fix close icon color in dark theme

---
 .../app/features/spaces/people/SpacePeopleFragment.kt  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
index e6a84a37cf..bd7a941249 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleFragment.kt
@@ -20,7 +20,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
@@ -33,6 +32,8 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.databinding.FragmentRecyclerviewWithSearchBinding
 import im.vector.app.features.roomprofile.members.RoomMemberListAction
 import im.vector.app.features.roomprofile.members.RoomMemberListViewModel
@@ -45,6 +46,8 @@ import javax.inject.Inject
 class SpacePeopleFragment @Inject constructor(
         private val viewModelFactory: SpacePeopleViewModel.Factory,
         private val roomMemberModelFactory: RoomMemberListViewModel.Factory,
+        private val drawableProvider: DrawableProvider,
+        private val colorProvider: ColorProvider,
         private val epoxyController: SpacePeopleListController
 ) : VectorBaseFragment<FragmentRecyclerviewWithSearchBinding>(),
         SpacePeopleViewModel.Factory,
@@ -89,7 +92,10 @@ class SpacePeopleFragment @Inject constructor(
         setupRecyclerView()
         setupSearchView()
 
-        views.addRoomToSpaceToolbar.navigationIcon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_close_24dp)
+        views.addRoomToSpaceToolbar.navigationIcon = drawableProvider.getDrawable(
+                R.drawable.ic_close_24dp,
+                colorProvider.getColorFromAttribute(R.attr.riot_primary_text_color)
+        )
         views.addRoomToSpaceToolbar.setNavigationOnClickListener {
             sharedActionViewModel.post(SpacePeopleSharedAction.Dismiss)
         }

From 506870302ee7b58c1c9ef3de62ed1f2098732f4c Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 5 May 2021 22:12:29 +0200
Subject: [PATCH 297/350] Fix unread badges and invite filtering

---
 .../app/features/home/HomeDetailViewModel.kt  |  4 ++
 .../room/list/SpaceRoomListSectionBuilder.kt  | 43 +------------------
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 91f3877fab..c375d7b38b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -166,10 +166,12 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                             // TODO!!
                         }
                         is RoomGroupingMethod.BySpace -> {
+                            val activeSpaceRoomId = groupingMethod.spaceSummary?.roomId
                             val dmInvites = session.getRoomSummaries(
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.INVITE)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                                        activeSpaceId = activeSpaceRoomId?.let { ActiveSpaceFilter.ActiveSpace(it) } ?: ActiveSpaceFilter.None
                                     }
                             ).size
 
@@ -177,6 +179,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.INVITE)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
+                                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(groupingMethod.spaceSummary?.roomId)
                                     }
                             ).size
 
@@ -184,6 +187,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.JOIN)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_DM
+                                        activeSpaceId = activeSpaceRoomId?.let { ActiveSpaceFilter.ActiveSpace(it) } ?: ActiveSpaceFilter.None
                                     }
                             )
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 37c1228b50..4124aa4b32 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -129,7 +129,7 @@ class SpaceRoomListSectionBuilder(
                 sections, activeSpaceAwareQueries,
                 R.string.invitations_header,
                 true,
-                RoomListViewModel.SpaceFilterStrategy.NONE
+                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
         ) {
             it.memberships = listOf(Membership.INVITE)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -259,47 +259,6 @@ class SpaceRoomListSectionBuilder(
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
             it.roomTagQueryFilter = RoomTagQueryFilter(false, null, null)
         }
-
-//        // For DMs we still need some post query filter :/
-//        // It's probably less important as home is not filtering at all
-//        val dmList = MutableLiveData<List<RoomSummary>>()
-//        Observables.combineLatest(
-//                session.getRoomSummariesLive(
-//                        roomSummaryQueryParams {
-//                            memberships = listOf(Membership.JOIN)
-//                            roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-//                        }
-//                ).asObservable(),
-//                appStateHandler.selectedSpaceDataSource.observe()
-//
-//        ) { rooms, currentSpaceOption ->
-//            val currentSpace = currentSpaceOption.orNull()
-//                    .takeIf {
-//                        // the +ALL trick is annoying, should find a way to fix that at the source!
-//                        MatrixPatterns.isRoomId(it?.roomId)
-//                    }
-//            if (currentSpace == null) {
-//                rooms
-//            } else {
-//                rooms.filter {
-//                    it.otherMemberIds
-//                            .intersect(currentSpace.otherMemberIds)
-//                            .isNotEmpty()
-//                }
-//            }
-//        }.subscribe {
-//            dmList.postValue(it)
-//        }.also {
-//            onDisposable.invoke(it)
-//        }
-//
-//        sections.add(
-//                RoomsSection(
-//                        sectionName = stringProvider.getString(R.string.bottom_action_people_x),
-//                        liveList = dmList,
-//                        notifyOfLocalEcho = false
-//                )
-//        )
     }
 
     private fun addSection(sections: MutableList<RoomsSection>,

From 3cbdf4ad5c445cae8d0dfbc62f6dfa8b583ad7a0 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 5 May 2021 22:30:38 +0200
Subject: [PATCH 298/350] stable prefix for msc1772

---
 .../android/sdk/api/session/events/model/EventType.kt       | 6 ++----
 .../matrix/android/sdk/api/session/room/model/RoomType.kt   | 3 +--
 .../sdk/api/session/room/model/create/CreateRoomParams.kt   | 2 +-
 .../sdk/api/session/room/model/create/RoomCreateContent.kt  | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index b4a58e5ee6..d2befca1ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -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
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
index b4932494f2..b0f3a56d67 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomType.kt
@@ -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"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index cd729832eb..ca8c66bb3b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -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"
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
index f9d40d5652..52e5c0e9c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
@@ -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
 )

From efe5176286952a7613d93756a9a2bcd7811cb6c6 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 5 May 2021 22:36:27 +0200
Subject: [PATCH 299/350] rename activeSpaceId to activeSpaceFilter

---
 .../android/sdk/session/space/SpaceCreationTest.kt     |  2 +-
 .../android/sdk/session/space/SpaceHierarchyTest.kt    |  2 +-
 .../sdk/api/session/room/RoomSummaryQueryParams.kt     |  6 +++---
 .../session/room/summary/RoomSummaryDataSource.kt      |  8 ++++----
 .../im/vector/app/features/home/HomeDetailViewModel.kt |  8 ++++----
 .../app/features/home/UnreadMessagesSharedViewModel.kt |  8 ++++----
 .../home/room/list/SpaceRoomListSectionBuilder.kt      | 10 +++++-----
 .../vector/app/features/spaces/SpacesListViewModel.kt  |  4 ++--
 .../features/spaces/manage/SpaceAddRoomsViewModel.kt   |  4 ++--
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
index 9bdf85f1a8..a1744a0dae 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceCreationTest.kt
@@ -210,7 +210,7 @@ class SpaceCreationTest : InstrumentedTest {
 
         val childCount = bobSession.getRoomSummaries(
                 roomSummaryQueryParams {
-                    activeSpaceId = ActiveSpaceFilter.ActiveSpace(spaceId)
+                    activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(spaceId)
                 }
         ).size
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
index facb537225..521b5805bd 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/space/SpaceHierarchyTest.kt
@@ -248,7 +248,7 @@ class SpaceHierarchyTest : InstrumentedTest {
 
         Thread.sleep(2_000)
         val orphansUpdate = session.getRoomSummaries(roomSummaryQueryParams {
-            activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+            activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
         })
         assertEquals("Unexpected number of orphan rooms ${orphansUpdate.map { it.name }}", 2, orphansUpdate.size)
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index 42dbecdaad..88ec2de768 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -58,7 +58,7 @@ data class RoomSummaryQueryParams(
         val roomTagQueryFilter: RoomTagQueryFilter?,
         val excludeType: List<String?>?,
         val includeType: List<String?>?,
-        val activeSpaceId: ActiveSpaceFilter?,
+        val activeSpaceFilter: ActiveSpaceFilter?,
         var activeGroupId: String? = null
 ) {
 
@@ -72,7 +72,7 @@ data class RoomSummaryQueryParams(
         var roomTagQueryFilter: RoomTagQueryFilter? = null
         var excludeType: List<String?>? = listOf(RoomType.SPACE)
         var includeType: List<String?>? = null
-        var activeSpaceId: ActiveSpaceFilter = ActiveSpaceFilter.None
+        var activeSpaceFilter: ActiveSpaceFilter = ActiveSpaceFilter.None
         var activeGroupId: String? = null
 
         fun build() = RoomSummaryQueryParams(
@@ -84,7 +84,7 @@ data class RoomSummaryQueryParams(
                 roomTagQueryFilter = roomTagQueryFilter,
                 excludeType = excludeType,
                 includeType = includeType,
-                activeSpaceId = activeSpaceId,
+                activeSpaceFilter = activeSpaceFilter,
                 activeGroupId = activeGroupId
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index 887219fdd8..126458b082 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -282,19 +282,19 @@ internal class RoomSummaryDataSource @Inject constructor(@SessionDatabase privat
         }
 
         // Timber.w("VAL: activeSpaceId : ${queryParams.activeSpaceId}")
-        when (queryParams.activeSpaceId) {
+        when (queryParams.activeSpaceFilter) {
             is ActiveSpaceFilter.ActiveSpace -> {
                 // It's annoying but for now realm java does not support querying in primitive list :/
                 // https://github.com/realm/realm-java/issues/5361
-                if (queryParams.activeSpaceId.currentSpaceId == null) {
+                if (queryParams.activeSpaceFilter.currentSpaceId == null) {
                     // orphan rooms
                     query.isNull(RoomSummaryEntityFields.FLATTEN_PARENT_IDS)
                 } else {
-                    query.contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.activeSpaceId.currentSpaceId)
+                    query.contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.activeSpaceFilter.currentSpaceId)
                 }
             }
             is ActiveSpaceFilter.ExcludeSpace -> {
-                query.not().contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.activeSpaceId.spaceId)
+                query.not().contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, queryParams.activeSpaceFilter.spaceId)
             }
             else                              -> {
                 // nop
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index c375d7b38b..be5c72330e 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -171,7 +171,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.INVITE)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                                        activeSpaceId = activeSpaceRoomId?.let { ActiveSpaceFilter.ActiveSpace(it) } ?: ActiveSpaceFilter.None
+                                        activeSpaceFilter = activeSpaceRoomId?.let { ActiveSpaceFilter.ActiveSpace(it) } ?: ActiveSpaceFilter.None
                                     }
                             ).size
 
@@ -179,7 +179,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.INVITE)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(groupingMethod.spaceSummary?.roomId)
+                                        activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(groupingMethod.spaceSummary?.roomId)
                                     }
                             ).size
 
@@ -187,7 +187,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.JOIN)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-                                        activeSpaceId = activeSpaceRoomId?.let { ActiveSpaceFilter.ActiveSpace(it) } ?: ActiveSpaceFilter.None
+                                        activeSpaceFilter = activeSpaceRoomId?.let { ActiveSpaceFilter.ActiveSpace(it) } ?: ActiveSpaceFilter.None
                                     }
                             )
 
@@ -195,7 +195,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                                     roomSummaryQueryParams {
                                         memberships = listOf(Membership.JOIN)
                                         roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(groupingMethod.spaceSummary?.roomId)
+                                        activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(groupingMethod.spaceSummary?.roomId)
                                     }
                             )
 
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index 77ffe903fc..43c878624b 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -79,7 +79,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
         session.getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
-                    this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                    this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
                 }, sortOrder = RoomSortOrder.NONE
         ).asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
@@ -87,13 +87,13 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                     val counts = session.getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
-                                this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
                             }
                     )
                     val invites = session.getRoomSummaries(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.INVITE)
-                                this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
                             }
                     ).size
                     copy(
@@ -129,7 +129,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                             val counts = session.getNotificationCountForRooms(
                                     roomSummaryQueryParams {
                                         this.memberships = listOf(Membership.JOIN)
-                                        this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                                        this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
                                     }
                             )
                             val rootCounts = session.spaceService().getRootSpaceSummaries()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 4124aa4b32..f7e527a710 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -282,7 +282,7 @@ class SpaceRoomListSectionBuilder(
                                     override fun updateForSpaceId(roomId: String?) {
                                         it.updateQuery {
                                             it.copy(
-                                                    activeSpaceId = ActiveSpaceFilter.ActiveSpace(roomId)
+                                                    activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(roomId)
                                             )
                                         }
                                     }
@@ -294,13 +294,13 @@ class SpaceRoomListSectionBuilder(
                                         if (roomId != null) {
                                             it.updateQuery {
                                                 it.copy(
-                                                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(roomId)
+                                                        activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(roomId)
                                                 )
                                             }
                                         } else {
                                             it.updateQuery {
                                                 it.copy(
-                                                        activeSpaceId = ActiveSpaceFilter.None
+                                                        activeSpaceFilter = ActiveSpaceFilter.None
                                                 )
                                             }
                                         }
@@ -351,7 +351,7 @@ class SpaceRoomListSectionBuilder(
         return when (spaceFilter) {
             RoomListViewModel.SpaceFilterStrategy.NORMAL -> {
                 copy(
-                        activeSpaceId = ActiveSpaceFilter.ActiveSpace(currentSpace)
+                        activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(currentSpace)
                 )
             }
             RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL -> {
@@ -359,7 +359,7 @@ class SpaceRoomListSectionBuilder(
                     this
                 } else {
                     copy(
-                            activeSpaceId = ActiveSpaceFilter.ActiveSpace(currentSpace)
+                            activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(currentSpace)
                     )
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index c79f6b12a4..9b2cffc59c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -111,7 +111,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
         session.getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
-                    this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                    this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
                 }, sortOrder = RoomSortOrder.NONE
         ).asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
@@ -120,7 +120,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                     val counts = session.getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
-                                this.activeSpaceId = ActiveSpaceFilter.ActiveSpace(null)
+                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
                             }
                     )
                     setState {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index 5b1674d44a..f64a4c897b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -60,7 +60,7 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
                     this.memberships = listOf(Membership.JOIN)
                     this.excludeType = null
                     this.includeType = listOf(RoomType.SPACE)
-                    this.activeSpaceId = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
+                    this.activeSpaceFilter = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
                     this.displayName = QueryStringValue.Contains(initialState.currentFilter, QueryStringValue.Case.INSENSITIVE)
                 },
                 pagedListConfig = PagedList.Config.Builder()
@@ -80,7 +80,7 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
                     this.excludeType = listOf(RoomType.SPACE)
                     this.includeType = null
                     this.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-                    this.activeSpaceId = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
+                    this.activeSpaceFilter = ActiveSpaceFilter.ExcludeSpace(initialState.spaceId)
                     this.displayName = QueryStringValue.Contains(initialState.currentFilter, QueryStringValue.Case.INSENSITIVE)
                 },
                 pagedListConfig = PagedList.Config.Builder()

From 4864137fa10482e9144c7c296530f24323606312 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 5 May 2021 23:13:56 +0200
Subject: [PATCH 300/350] Properly clean the back stack if the user cancel
 registration when waiting for email/msisdn validation

---
 CHANGES.md                                             |  1 +
 .../java/im/vector/app/features/login/LoginActivity.kt | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 15c811c19b..b3f9615c70 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,7 @@ Bugfix 🐛:
  - Fix missing sender information after edits (#3184)
  - Fix read marker not updating automatically (#3267)
  - Sent video does not contains duration (#3272)
+ - Properly clean the back stack if the user cancel registration when waiting for email validation
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
index 803fd38983..9fa560eb23 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
@@ -183,18 +183,24 @@ open class LoginActivity : VectorBaseActivity<ActivityLoginBinding>(), ToolbarCo
                 // Go back to the login fragment
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
             }
-            is LoginViewEvents.OnSendEmailSuccess                         ->
+            is LoginViewEvents.OnSendEmailSuccess                         -> {
+                // Pop the enter email Fragment
+                supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 addFragmentToBackstack(R.id.loginFragmentContainer,
                         LoginWaitForEmailFragment::class.java,
                         LoginWaitForEmailFragmentArgument(loginViewEvents.email),
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
                         option = commonOption)
-            is LoginViewEvents.OnSendMsisdnSuccess                        ->
+            }
+            is LoginViewEvents.OnSendMsisdnSuccess                        -> {
+                // Pop the enter Msisdn Fragment
+                supportFragmentManager.popBackStack(FRAGMENT_REGISTRATION_STAGE_TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 addFragmentToBackstack(R.id.loginFragmentContainer,
                         LoginGenericTextInputFormFragment::class.java,
                         LoginGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.ConfirmMsisdn, true, loginViewEvents.msisdn),
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
                         option = commonOption)
+            }
             is LoginViewEvents.Failure,
             is LoginViewEvents.Loading                                    ->
                 // This is handled by the Fragments

From 19223826fe6a2a0eb19042a78325993895693bc2 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 6 May 2021 11:54:26 +0200
Subject: [PATCH 301/350] Various fixes on spaces explore

+ MxTo bottom sheet Fix regression when using state button
---
 .../session/space/DefaultSpaceService.kt      | 41 +++++++++++--------
 .../room/list/SpaceRoomListSectionBuilder.kt  |  2 +-
 .../features/matrixto/MatrixToBottomSheet.kt  |  2 +-
 .../matrixto/MatrixToBottomSheetViewModel.kt  |  3 +-
 .../matrixto/MatrixToRoomSpaceFragment.kt     | 29 +++++++------
 .../explore/SpaceDirectoryController.kt       |  3 ++
 .../spaces/explore/SpaceDirectoryFragment.kt  | 38 ++++++++++++++---
 .../explore/SpaceDirectoryViewAction.kt       |  1 +
 .../spaces/explore/SpaceDirectoryViewModel.kt |  6 ++-
 9 files changed, 84 insertions(+), 41 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 8fdc563edb..540eed9b6a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -127,24 +127,29 @@ internal class DefaultSpaceService @Inject constructor(
                     ),
                     second = response.rooms
                             ?.filter { it.roomId != spaceId }
-                            ?.map { childSummary ->
-                                val childStateEv = response.events
-                                        ?.firstOrNull { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
-                                val childStateEvContent = childStateEv?.content.toModel<SpaceChildContent>()
-                                SpaceChildInfo(
-                                        childRoomId = childSummary.roomId,
-                                        isKnown = true,
-                                        roomType = childSummary.roomType,
-                                        name = childSummary.name,
-                                        topic = childSummary.topic,
-                                        avatarUrl = childSummary.avatarUrl,
-                                        order = childStateEvContent?.order,
-                                        autoJoin = childStateEvContent?.autoJoin ?: false,
-                                        viaServers = childStateEvContent?.via ?: emptyList(),
-                                        activeMemberCount = childSummary.numJoinedMembers,
-                                        parentRoomId = childStateEv?.roomId
-                                )
-                            }.orEmpty()
+                            ?.flatMap { childSummary ->
+                                response.events
+                                        ?.filter { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
+                                        ?.map { childStateEv ->
+                                            // create a child entry for everytime this room is the child of a space
+                                            // beware that a room could appear then twice in this list
+                                            val childStateEvContent = childStateEv.content.toModel<SpaceChildContent>()
+                                            SpaceChildInfo(
+                                                    childRoomId = childSummary.roomId,
+                                                    isKnown = true,
+                                                    roomType = childSummary.roomType,
+                                                    name = childSummary.name,
+                                                    topic = childSummary.topic,
+                                                    avatarUrl = childSummary.avatarUrl,
+                                                    order = childStateEvContent?.order,
+                                                    autoJoin = childStateEvContent?.autoJoin ?: false,
+                                                    viaServers = childStateEvContent?.via ?: emptyList(),
+                                                    activeMemberCount = childSummary.numJoinedMembers,
+                                                    parentRoomId = childStateEv.roomId
+                                            )
+                                        }.orEmpty()
+                            }
+                            .orEmpty()
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index f7e527a710..351c72ab48 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -194,7 +194,7 @@ class SpaceRoomListSectionBuilder(
                             } else {
                                 liveData(context = viewModelScope.coroutineContext + Dispatchers.IO) {
                                     val spaceSum = tryOrNull { session.spaceService().querySpaceChildren(selectedSpace.roomId, suggestedOnly = true) }
-                                    val value = spaceSum?.second ?: emptyList()
+                                    val value = spaceSum?.second.orEmpty().distinctBy { it.childRoomId }
                                     // i need to check if it's already joined.
                                     val filtered = value.filter {
                                         session.getRoomSummary(it.childRoomId)?.membership?.isActive() != true
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
index b9ef833850..13c0645d8d 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
@@ -56,7 +56,7 @@ class MatrixToBottomSheet :
         injector.inject(this)
     }
 
-    private var interactionListener: InteractionListener? = null
+    var interactionListener: InteractionListener? = null
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetMatrixToCardBinding {
         return BottomSheetMatrixToCardBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
index 0d633ac422..694f324025 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheetViewModel.kt
@@ -120,6 +120,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                         ?.roomSummary()
                         // don't take if not active, as it could be outdated
                         ?.takeIf { it.membership.isActive() }
+                // XXX fix that
                 val forceRefresh = true
                 if (!forceRefresh && knownRoom != null) {
                     setState {
@@ -147,7 +148,7 @@ class MatrixToBottomSheetViewModel @AssistedInject constructor(
                                     topic = peekResult.topic ?: "",
                                     memberCount = peekResult.numJoinedMembers,
                                     alias = peekResult.alias,
-                                    membership = Membership.NONE,
+                                    membership = knownRoom?.membership ?: Membership.NONE,
                                     roomType = peekResult.roomType,
                                     viaServers = peekResult.viaServers.takeIf { it.isNotEmpty() } ?: permalinkData.viaParameters
                             ).also {
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 7a5a740b93..43fd819c4d 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -21,7 +21,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isGone
-import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
@@ -31,6 +30,7 @@ import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.ButtonStateView
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentMatrixToRoomSpaceCardBinding
 import im.vector.app.features.home.AvatarRenderer
@@ -50,11 +50,18 @@ class MatrixToRoomSpaceFragment @Inject constructor(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        views.matrixToCardMainButton.debouncedClicks {
-            mainButtonClicked()
+        views.matrixToCardMainButton.callback = object : ButtonStateView.Callback {
+            override fun onButtonClicked() {
+                mainButtonClicked()
+            }
+
+            override fun onRetryClicked() = onButtonClicked()
         }
-        views.matrixToCardSecondaryButton.debouncedClicks {
-            secondaryButtonClicked()
+        views.matrixToCardSecondaryButton.callback = object : ButtonStateView.Callback {
+            override fun onButtonClicked() {
+                secondaryButtonClicked()
+            }
+            override fun onRetryClicked() = onButtonClicked()
         }
     }
 
@@ -182,21 +189,17 @@ class MatrixToRoomSpaceFragment @Inject constructor(
 
         when (state.startChattingState) {
             Uninitialized -> {
-                views.matrixToCardButtonLoading.isVisible = false
-//                views.matrixToCardMainButton.isVisible = false
+                views.matrixToCardMainButton.render(ButtonStateView.State.Button)
             }
             is Success -> {
-                views.matrixToCardButtonLoading.isVisible = false
-                views.matrixToCardMainButton.isVisible = true
+                views.matrixToCardMainButton.render(ButtonStateView.State.Button)
             }
             is Fail -> {
-                views.matrixToCardButtonLoading.isVisible = false
-                views.matrixToCardMainButton.isVisible = true
+                views.matrixToCardMainButton.render(ButtonStateView.State.Error)
                 // TODO display some error copy?
             }
             is Loading -> {
-                views.matrixToCardButtonLoading.isVisible = true
-                views.matrixToCardMainButton.isInvisible = true
+                views.matrixToCardMainButton.render(ButtonStateView.State.Loading)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 44d98766d5..f8e45dcd5e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -38,6 +38,7 @@ class SpaceDirectoryController @Inject constructor(
     interface InteractionListener {
         fun onButtonClick(spaceChildInfo: SpaceChildInfo)
         fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo)
+        fun onRoomClick(spaceChildInfo: SpaceChildInfo)
     }
 
     var listener: InteractionListener? = null
@@ -81,6 +82,8 @@ class SpaceDirectoryController @Inject constructor(
                         apply {
                             if (isSpace) {
                                 itemClickListener(View.OnClickListener { listener?.onSpaceChildClick(info) })
+                            } else {
+                                itemClickListener(View.OnClickListener { listener?.onRoomClick(info) })
                             }
                         }
                         buttonClickListener(View.OnClickListener { listener?.onButtonClick(info) })
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index 567012675e..0454112417 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -21,15 +21,17 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.FragmentOnAttachListener
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
+import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
+import im.vector.app.features.matrixto.MatrixToBottomSheet
 import kotlinx.parcelize.Parcelize
-import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import javax.inject.Inject
 
@@ -42,13 +44,19 @@ class SpaceDirectoryFragment @Inject constructor(
         private val epoxyController: SpaceDirectoryController
 ) : VectorBaseFragment<FragmentRoomDirectoryPickerBinding>(),
         SpaceDirectoryController.InteractionListener,
-        OnBackPressed {
+        OnBackPressed, MatrixToBottomSheet.InteractionListener {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentRoomDirectoryPickerBinding.inflate(layoutInflater, container, false)
 
     private val viewModel by activityViewModel(SpaceDirectoryViewModel::class)
 
+    private var fragmentOnAttachListener = FragmentOnAttachListener { _, fragment ->
+        if (fragment is MatrixToBottomSheet) {
+            fragment.interactionListener = this
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -60,16 +68,24 @@ class SpaceDirectoryFragment @Inject constructor(
         }
         epoxyController.listener = this
         views.roomDirectoryPickerList.configureWith(epoxyController)
+
+        childFragmentManager.addFragmentOnAttachListener(fragmentOnAttachListener)
     }
 
     override fun onDestroyView() {
+        childFragmentManager.removeFragmentOnAttachListener(fragmentOnAttachListener)
         epoxyController.listener = null
         views.roomDirectoryPickerList.cleanup()
         super.onDestroyView()
     }
 
-    override fun invalidate() = withState(viewModel) {
-        epoxyController.setData(it)
+    override fun invalidate() = withState(viewModel) { state ->
+        epoxyController.setData(state)
+
+        val title = state.hierarchyStack.lastOrNull()?.let { currentParent ->
+            state.spaceSummaryApiResult.invoke()?.firstOrNull { it.childRoomId == currentParent }
+        }?.name ?: getString(R.string.space_explore_activity_title)
+        views.toolbar.title = title
     }
 
     override fun onButtonClick(spaceChildInfo: SpaceChildInfo) {
@@ -77,8 +93,14 @@ class SpaceDirectoryFragment @Inject constructor(
     }
 
     override fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo) {
-        if (spaceChildInfo.roomType == RoomType.SPACE) {
-            viewModel.handle(SpaceDirectoryViewAction.ExploreSubSpace(spaceChildInfo))
+        viewModel.handle(SpaceDirectoryViewAction.ExploreSubSpace(spaceChildInfo))
+    }
+
+    override fun onRoomClick(spaceChildInfo: SpaceChildInfo) {
+        // This is temporary for now to at least display something for the space beta
+        // It's not ideal as it's doing some peeking that is not needed.
+        viewModel.session.permalinkService().createRoomPermalink(spaceChildInfo.childRoomId)?.let {
+            MatrixToBottomSheet.withLink(it, this).show(childFragmentManager, "ShowChild")
         }
     }
 
@@ -86,4 +108,8 @@ class SpaceDirectoryFragment @Inject constructor(
         viewModel.handle(SpaceDirectoryViewAction.HandleBack)
         return true
     }
+
+    override fun navigateToRoom(roomId: String) {
+        viewModel.handle(SpaceDirectoryViewAction.NavigateToRoom(roomId))
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
index a74662759e..562d1c1124 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
@@ -22,5 +22,6 @@ import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 sealed class SpaceDirectoryViewAction : VectorViewModelAction {
     data class ExploreSubSpace(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
     data class JoinOrOpen(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
+    data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewAction()
     object HandleBack : SpaceDirectoryViewAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index fbe405e641..9173e15dac 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -40,7 +40,7 @@ import timber.log.Timber
 
 class SpaceDirectoryViewModel @AssistedInject constructor(
         @Assisted initialState: SpaceDirectoryState,
-        private val session: Session
+        val session: Session
 ) : VectorViewModel<SpaceDirectoryState, SpaceDirectoryViewAction, SpaceDirectoryViewEvents>(initialState) {
 
     @AssistedFactory
@@ -91,6 +91,7 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
     private fun observeJoinedRooms() {
         val queryParams = roomSummaryQueryParams {
             memberships = listOf(Membership.JOIN)
+            excludeType = null
         }
         session
                 .rx()
@@ -135,6 +136,9 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
             is SpaceDirectoryViewAction.JoinOrOpen -> {
                 handleJoinOrOpen(action.spaceChildInfo)
             }
+            is SpaceDirectoryViewAction.NavigateToRoom -> {
+                _viewEvents.post(SpaceDirectoryViewEvents.NavigateToRoom(action.roomId))
+            }
         }
     }
 

From 728356fdeb849063d26162d27f13613d5883c871 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Thu, 6 May 2021 10:44:00 +0000
Subject: [PATCH 302/350] Translated using Weblate (Swedish)

Currently translated at 99.1% (2418 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 45dbe5d4f4..3889dca92d 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2726,4 +2726,6 @@
     <string name="create_spaces_room_public_header">Vad är några diskussioner du vill ha i %s\?</string>
     <string name="create_space_error_empty_field_space_name">Ge det ett namn för att fortsätta.</string>
     <string name="create_spaces_details_private_header">Lägg till några detaljer för att hjälpa folk att identifiera det. Du kan ändra dessa när som helst.</string>
+    <string name="invite_just_to_this_room">Bara till det här rummet</string>
+    <string name="invite_to_space_with_name_desc">De kommer att kunna utforska %s</string>
 </resources>
\ No newline at end of file

From 610c25b67c3583348705bfee4be619db36fdf43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ange=20des=20t=C3=A9n=C3=A8bres?=
 <angedestenebres@tugaleres.com>
Date: Wed, 5 May 2021 10:50:15 +0000
Subject: [PATCH 303/350] Translated using Weblate (French)

Currently translated at 88.8% (16 of 18 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
---
 fastlane/metadata/android/fr/changelogs/40101040.txt | 2 ++
 fastlane/metadata/android/fr/changelogs/40101050.txt | 2 ++
 fastlane/metadata/android/fr/changelogs/40101060.txt | 2 ++
 fastlane/metadata/android/fr/short_description.txt   | 2 +-
 fastlane/metadata/android/fr/title.txt               | 2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/fr/changelogs/40101040.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/40101050.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/40101060.txt

diff --git a/fastlane/metadata/android/fr/changelogs/40101040.txt b/fastlane/metadata/android/fr/changelogs/40101040.txt
new file mode 100644
index 0000000000..0af0cf55d8
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101040.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : amélioration des performances et corrections de bugs !
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.4
diff --git a/fastlane/metadata/android/fr/changelogs/40101050.txt b/fastlane/metadata/android/fr/changelogs/40101050.txt
new file mode 100644
index 0000000000..dd6e8468af
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101050.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Corrections de bugs sur la 1.1.4
+Liste de tous les changements : https://github.com/vector-im/element-android/releases/tag/v1.1.5
diff --git a/fastlane/metadata/android/fr/changelogs/40101060.txt b/fastlane/metadata/android/fr/changelogs/40101060.txt
new file mode 100644
index 0000000000..e10a8aa4f3
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/40101060.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Corrections de bugs sur la 1.1.5
+Liste de tous les changements : https://github.com/vector-im/element-android/releases/tag/v1.1.6
diff --git a/fastlane/metadata/android/fr/short_description.txt b/fastlane/metadata/android/fr/short_description.txt
index 2fb9762e97..6d86b77a6b 100644
--- a/fastlane/metadata/android/fr/short_description.txt
+++ b/fastlane/metadata/android/fr/short_description.txt
@@ -1 +1 @@
-Chat & VoIP sûr et décentralisé. Gardez vos données en sécurité.
+Messagerie de groupes - messages chiffrés, groupés et appels vidéos
diff --git a/fastlane/metadata/android/fr/title.txt b/fastlane/metadata/android/fr/title.txt
index 87cbc3b858..9152e92cfa 100644
--- a/fastlane/metadata/android/fr/title.txt
+++ b/fastlane/metadata/android/fr/title.txt
@@ -1 +1 @@
-Element (anciennement Riot.im)
+Element - Messagerie sécurisée

From e2682b608277b435b48f5cb2d6ee1b1750384c95 Mon Sep 17 00:00:00 2001
From: Quang Trung <quangtrung02hn16@gmail.com>
Date: Wed, 5 May 2021 14:02:01 +0000
Subject: [PATCH 304/350] Translated using Weblate (Vietnamese)

Currently translated at 18.7% (456 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
---
 vector/src/main/res/values-vi/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index a1566a81d2..c6fd66bf68 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -457,4 +457,12 @@
     <string name="summary_message">%1$s: %2$s</string>
     <string name="notice_profile_change_redacted_by_you">Bạn đã cập nhật hồ sơ của bạn %1$s</string>
     <string name="notice_profile_change_redacted">%1$s đã cập nhật hồ sơ của họ %2$s</string>
+    <string name="invite_just_to_this_room_desc">Họ sẽ không ở trong %s</string>
+    <string name="invite_just_to_this_room">Chỉ vào phòng này</string>
+    <string name="invite_to_space_with_name_desc">Họ sẽ có thể khám phá %s</string>
+    <string name="invite_to_space_with_name">Mời vào %s</string>
+    <string name="invite_by_link">Chia sẻ liên kết</string>
+    <string name="room_alias_preview_not_found">Bí danh này không truy cập được vào lúc này.
+\nHãy thử lại sau, hoặc yêu cầu một quản trị viên của phòng kiểm tra xem bạn có quyền truy cập không.</string>
+    <string name="join_anyway">Vẫn tham gia</string>
 </resources>
\ No newline at end of file

From fb0205e90349cd9b90cd25397e0385f069a5dcae Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 6 May 2021 14:28:27 +0200
Subject: [PATCH 305/350] Exchange fun name :)

---
 .../features/roomprofile/settings/RoomSettingsViewModel.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index c9271f5357..7f75ded738 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -143,7 +143,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                 .disposeOnClear()
     }
 
-    private fun observeGuestAccess() {
+    private fun observeJoinRule() {
         room.rx()
                 .liveStateEvent(EventType.STATE_ROOM_JOIN_RULES, QueryStringValue.NoCondition)
                 .mapOptional { it.content.toModel<RoomJoinRulesContent>() }
@@ -156,7 +156,7 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                 .disposeOnClear()
     }
 
-    private fun observeJoinRule() {
+    private fun observeGuestAccess() {
         room.rx()
                 .liveStateEvent(EventType.STATE_ROOM_GUEST_ACCESS, QueryStringValue.NoCondition)
                 .mapOptional { it.content.toModel<RoomGuestAccessContent>() }

From 64f18349135934ba76f15963bae9c89c071e1ef9 Mon Sep 17 00:00:00 2001
From: yostyle <yoanp@element.io>
Date: Thu, 6 May 2021 18:41:26 +0200
Subject: [PATCH 306/350] Add joinRules to RoomSummary

---
 .../sdk/api/session/room/model/RoomSummary.kt  |  3 ++-
 .../database/mapper/RoomSummaryMapper.kt       |  3 ++-
 .../database/model/RoomSummaryEntity.kt        | 18 ++++++++++++++++++
 .../session/room/summary/RoomSummaryUpdater.kt |  4 ++++
 .../session/space/DefaultSpaceService.kt       |  3 ++-
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index d324cff246..78a79dedb2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -59,7 +59,8 @@ data class RoomSummary constructor(
         val roomType: String? = null,
         val spaceParents: List<SpaceParentInfo>? = null,
         val spaceChildren: List<SpaceChildInfo>? = null,
-        val flattenParentIds: List<String> = emptyList()
+        val flattenParentIds: List<String> = emptyList(),
+        val joinRules: RoomJoinRules? = null
 ) {
 
     val isVersioned: Boolean
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 92aff0a140..e7f1e67c0a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -91,7 +91,8 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                             parentRoomId = roomSummaryEntity.roomId
                     )
                 },
-                flattenParentIds = roomSummaryEntity.flattenParentIds?.split("|") ?: emptyList()
+                flattenParentIds = roomSummaryEntity.flattenParentIds?.split("|") ?: emptyList(),
+                joinRules = roomSummaryEntity.joinnRules
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index 4f47032c4d..d5e847f362 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -22,6 +22,7 @@ import io.realm.annotations.Index
 import io.realm.annotations.PrimaryKey
 import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
@@ -242,6 +243,23 @@ internal open class RoomSummaryEntity(
             }
         }
 
+    private var joinnRulesStr: String? = null
+    var joinnRules: RoomJoinRules?
+        get() {
+            return joinnRulesStr?.let {
+                try {
+                    RoomJoinRules.valueOf(it)
+                } catch (failure: Throwable) {
+                    null
+                }
+            }
+        }
+        set(value) {
+            if (value?.name != joinnRulesStr) {
+                joinnRulesStr = value?.name
+            }
+        }
+
     var roomEncryptionTrustLevel: RoomEncryptionTrustLevel?
         get() {
             return roomEncryptionTrustLevelStr?.let {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index f580a7f354..45cf3248cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -24,6 +24,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomAliasesContent
 import org.matrix.android.sdk.api.session.room.model.RoomCanonicalAliasContent
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
 import org.matrix.android.sdk.api.session.room.model.RoomNameContent
 import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
 import org.matrix.android.sdk.api.session.room.model.RoomType
@@ -104,6 +105,7 @@ internal class RoomSummaryUpdater @Inject constructor(
         val lastCanonicalAliasEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_CANONICAL_ALIAS, stateKey = "")?.root
         val lastAliasesEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_ALIASES, stateKey = "")?.root
         val roomCreateEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_CREATE, stateKey = "")?.root
+        val joinRulesEvent = CurrentStateEventEntity.getOrNull(realm, roomId, type = EventType.STATE_ROOM_JOIN_RULES, stateKey = "")?.root
 
         val roomType = ContentMapper.map(roomCreateEvent?.content).toModel<RoomCreateContent>()?.type
         roomSummaryEntity.roomType = roomType
@@ -171,6 +173,8 @@ internal class RoomSummaryUpdater @Inject constructor(
                 crossSigningService.onUsersDeviceUpdate(otherRoomMembers)
             }
         }
+
+        roomSummaryEntity.joinnRules = ContentMapper.map(joinRulesEvent?.content).toModel<RoomJoinRulesContent>()?.joinRules
     }
 
     private fun RoomSummaryEntity.updateHasFailedSending() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 8fdc563edb..3e58c51a6f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -123,7 +123,8 @@ internal class DefaultSpaceService @Inject constructor(
                             encryptionEventTs = null,
                             typingUsers = emptyList(),
                             isEncrypted = false,
-                            flattenParentIds = emptyList()
+                            flattenParentIds = emptyList(),
+                            joinRules = null
                     ),
                     second = response.rooms
                             ?.filter { it.roomId != spaceId }

From e969d663a57fe328103a2ae68b47cdc87374206b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 May 2021 12:33:01 +0200
Subject: [PATCH 307/350] Code review

---
 .../sdk/api/session/room/model/RoomSummary.kt   |  6 +++---
 .../database/mapper/RoomSummaryMapper.kt        |  4 ++--
 .../database/model/RoomSummaryEntity.kt         | 17 +++++++----------
 .../session/room/summary/RoomSummaryUpdater.kt  |  3 +--
 .../session/space/DefaultSpaceService.kt        |  3 +--
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index 78a79dedb2..e06d70d4f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -26,7 +26,7 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
  * This class holds some data of a room.
  * It can be retrieved by [org.matrix.android.sdk.api.session.room.Room] and [org.matrix.android.sdk.api.session.room.RoomService]
  */
-data class RoomSummary constructor(
+data class RoomSummary(
         val roomId: String,
         // Computed display name
         val displayName: String = "",
@@ -35,6 +35,7 @@ data class RoomSummary constructor(
         val avatarUrl: String = "",
         val canonicalAlias: String? = null,
         val aliases: List<String> = emptyList(),
+        val joinRules: RoomJoinRules? = null,
         val isDirect: Boolean = false,
         val directUserId: String? = null,
         val joinedMembersCount: Int? = 0,
@@ -59,8 +60,7 @@ data class RoomSummary constructor(
         val roomType: String? = null,
         val spaceParents: List<SpaceParentInfo>? = null,
         val spaceChildren: List<SpaceChildInfo>? = null,
-        val flattenParentIds: List<String> = emptyList(),
-        val joinRules: RoomJoinRules? = null
+        val flattenParentIds: List<String> = emptyList()
 ) {
 
     val isVersioned: Boolean
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index e7f1e67c0a..0b057ec6fc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -44,6 +44,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                 name = roomSummaryEntity.name ?: "",
                 topic = roomSummaryEntity.topic ?: "",
                 avatarUrl = roomSummaryEntity.avatarUrl ?: "",
+                joinRules = roomSummaryEntity.joinRules,
                 isDirect = roomSummaryEntity.isDirect,
                 directUserId = roomSummaryEntity.directUserId,
                 latestPreviewableEvent = latestEvent,
@@ -91,8 +92,7 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                             parentRoomId = roomSummaryEntity.roomId
                     )
                 },
-                flattenParentIds = roomSummaryEntity.flattenParentIds?.split("|") ?: emptyList(),
-                joinRules = roomSummaryEntity.joinnRules
+                flattenParentIds = roomSummaryEntity.flattenParentIds?.split("|") ?: emptyList()
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index d5e847f362..1001f9cd66 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -21,6 +21,7 @@ import io.realm.RealmObject
 import io.realm.annotations.Index
 import io.realm.annotations.PrimaryKey
 import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -243,20 +244,16 @@ internal open class RoomSummaryEntity(
             }
         }
 
-    private var joinnRulesStr: String? = null
-    var joinnRules: RoomJoinRules?
+    private var joinRulesStr: String? = null
+    var joinRules: RoomJoinRules?
         get() {
-            return joinnRulesStr?.let {
-                try {
-                    RoomJoinRules.valueOf(it)
-                } catch (failure: Throwable) {
-                    null
-                }
+            return joinRulesStr?.let {
+                tryOrNull { RoomJoinRules.valueOf(it) }
             }
         }
         set(value) {
-            if (value?.name != joinnRulesStr) {
-                joinnRulesStr = value?.name
+            if (value?.name != joinRulesStr) {
+                joinRulesStr = value?.name
             }
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 45cf3248cd..63fcb557a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -132,6 +132,7 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.avatarUrl = roomAvatarResolver.resolve(realm, roomId)
         roomSummaryEntity.name = ContentMapper.map(lastNameEvent?.content).toModel<RoomNameContent>()?.name
         roomSummaryEntity.topic = ContentMapper.map(lastTopicEvent?.content).toModel<RoomTopicContent>()?.topic
+        roomSummaryEntity.joinRules = ContentMapper.map(joinRulesEvent?.content).toModel<RoomJoinRulesContent>()?.joinRules
         roomSummaryEntity.latestPreviewableEvent = latestPreviewableEvent
         roomSummaryEntity.canonicalAlias = ContentMapper.map(lastCanonicalAliasEvent?.content).toModel<RoomCanonicalAliasContent>()
                 ?.canonicalAlias
@@ -173,8 +174,6 @@ internal class RoomSummaryUpdater @Inject constructor(
                 crossSigningService.onUsersDeviceUpdate(otherRoomMembers)
             }
         }
-
-        roomSummaryEntity.joinnRules = ContentMapper.map(joinRulesEvent?.content).toModel<RoomJoinRulesContent>()?.joinRules
     }
 
     private fun RoomSummaryEntity.updateHasFailedSending() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 3e58c51a6f..8fdc563edb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -123,8 +123,7 @@ internal class DefaultSpaceService @Inject constructor(
                             encryptionEventTs = null,
                             typingUsers = emptyList(),
                             isEncrypted = false,
-                            flattenParentIds = emptyList(),
-                            joinRules = null
+                            flattenParentIds = emptyList()
                     ),
                     second = response.rooms
                             ?.filter { it.roomId != spaceId }

From bbabfdabd0fec321df240aa62224794a173e1721 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 May 2021 13:22:55 +0200
Subject: [PATCH 308/350] Handle database migration

---
 .../database/RealmSessionStoreMigration.kt    | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 05213b40e5..3e18f55831 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -20,6 +20,7 @@ import io.realm.DynamicRealm
 import io.realm.FieldAttribute
 import io.realm.RealmMigration
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
@@ -33,9 +34,9 @@ import org.matrix.android.sdk.internal.database.model.RoomEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomMembersLoadStatusType
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.RoomTagEntityFields
-import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.SpaceParentSummaryEntityFields
+import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import timber.log.Timber
 import javax.inject.Inject
@@ -43,7 +44,7 @@ import javax.inject.Inject
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 11L
+        const val SESSION_STORE_SCHEMA_VERSION = 12L
     }
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@@ -60,6 +61,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         if (oldVersion <= 8) migrateTo9(realm)
         if (oldVersion <= 9) migrateTo10(realm)
         if (oldVersion <= 10) migrateTo11(realm)
+        if (oldVersion <= 11) migrateTo12(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -247,4 +249,25 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         realm.schema.get("EventEntity")
                 ?.addField(EventEntityFields.SEND_STATE_DETAILS, String::class.java)
     }
+
+    private fun migrateTo12(realm: DynamicRealm) {
+        Timber.d("Step 11 -> 12")
+
+        val joinRulesContentAdapter = MoshiProvider.providesMoshi().adapter(RoomJoinRulesContent::class.java)
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.JOIN_RULES_STR, String::class.java)
+                ?.transform { obj ->
+                    val joinRulesEvent = realm.where("CurrentStateEventEntity")
+                            .equalTo(CurrentStateEventEntityFields.ROOM_ID, obj.getString(RoomSummaryEntityFields.ROOM_ID))
+                            .equalTo(CurrentStateEventEntityFields.TYPE, EventType.STATE_ROOM_JOIN_RULES)
+                            .findFirst()
+
+                    val roomJoinRules = joinRulesEvent?.getObject(CurrentStateEventEntityFields.ROOT.`$`)
+                            ?.getString(EventEntityFields.CONTENT)?.let {
+                                joinRulesContentAdapter.fromJson(it)?.joinRules
+                            }
+
+                    obj.setString(RoomSummaryEntityFields.JOIN_RULES_STR, roomJoinRules?.value)
+                }
+    }
 }

From 3d613c003d7822dae67242d6395c833843727c25 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Thu, 6 May 2021 11:48:37 +0000
Subject: [PATCH 309/350] Translated using Weblate (Swedish)

Currently translated at 99.3% (2421 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 3889dca92d..66efc6bd1b 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2728,4 +2728,7 @@
     <string name="create_spaces_details_private_header">Lägg till några detaljer för att hjälpa folk att identifiera det. Du kan ändra dessa när som helst.</string>
     <string name="invite_just_to_this_room">Bara till det här rummet</string>
     <string name="invite_to_space_with_name_desc">De kommer att kunna utforska %s</string>
+    <string name="skip_for_now">Hoppa över för tillfället</string>
+    <string name="share_space_link_message">Gå med i mitt utrymme %1$s %2$s</string>
+    <string name="invite_just_to_this_room_desc">De kommer inte att bli en del av %s</string>
 </resources>
\ No newline at end of file

From 87b12b7e1188800baa1bde26dab56b0418b5898e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 May 2021 16:41:30 +0200
Subject: [PATCH 310/350] Add the public icon on the rooms in the room list
 (#3292)

---
 CHANGES.md                                    |  1 +
 .../sdk/api/session/room/model/RoomSummary.kt |  3 +++
 .../home/room/list/RoomSummaryItem.kt         |  3 +++
 .../home/room/list/RoomSummaryItemFactory.kt  |  1 +
 .../main/res/drawable/background_circle.xml   |  7 +++++++
 .../src/main/res/drawable/ic_public_room.xml  | 20 +++++++++----------
 vector/src/main/res/layout/item_room.xml      | 19 +++++++++++++++++-
 vector/src/main/res/values/strings.xml        |  1 +
 8 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 vector/src/main/res/drawable/background_circle.xml

diff --git a/CHANGES.md b/CHANGES.md
index b3f9615c70..fedc77833a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
  - Improve file too big error detection (#3245)
  - User can now select video when selecting Gallery to send attachments to a room
  - Add option to record a video from the camera
+ - Add the public icon on the rooms in the room list (#3292)
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index e06d70d4f9..cae4775e71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -75,6 +75,9 @@ data class RoomSummary(
     val isFavorite: Boolean
         get() = hasTag(RoomTag.ROOM_TAG_FAVOURITE)
 
+    val isPublic: Boolean
+        get() = joinRules == RoomJoinRules.PUBLIC
+
     fun hasTag(tag: String) = tags.any { it.name == tag }
 
     val canStartCall: Boolean
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
index 06f55d3952..d099ac16b7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
@@ -50,6 +50,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var lastFormattedEvent: CharSequence
     @EpoxyAttribute lateinit var lastEventTime: CharSequence
     @EpoxyAttribute var encryptionTrustLevel: RoomEncryptionTrustLevel? = null
+    @EpoxyAttribute var izPublic: Boolean = false
     @EpoxyAttribute var unreadNotificationCount: Int = 0
     @EpoxyAttribute var hasUnreadMessage: Boolean = false
     @EpoxyAttribute var hasDraft: Boolean = false
@@ -74,6 +75,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
         holder.draftView.isVisible = hasDraft
         avatarRenderer.render(matrixItem, holder.avatarImageView)
         holder.roomAvatarDecorationImageView.render(encryptionTrustLevel)
+        holder.roomAvatarPublicDecorationImageView.isVisible = izPublic
         holder.roomAvatarFailSendingImageView.isVisible = hasFailedSending
         renderSelection(holder, showSelected)
         holder.typingView.setTextOrHide(typingMessage)
@@ -110,6 +112,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
         val avatarCheckedImageView by bind<ImageView>(R.id.roomAvatarCheckedImageView)
         val avatarImageView by bind<ImageView>(R.id.roomAvatarImageView)
         val roomAvatarDecorationImageView by bind<ShieldImageView>(R.id.roomAvatarDecorationImageView)
+        val roomAvatarPublicDecorationImageView by bind<ImageView>(R.id.roomAvatarPublicDecorationImageView)
         val roomAvatarFailSendingImageView by bind<ImageView>(R.id.roomAvatarFailSendingImageView)
         val rootView by bind<ViewGroup>(R.id.itemRoomLayout)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 283ed0ac85..e4826af04c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -112,6 +112,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
                 .avatarRenderer(avatarRenderer)
                 // We do not display shield in the room list anymore
                 // .encryptionTrustLevel(roomSummary.roomEncryptionTrustLevel)
+                .izPublic(roomSummary.isPublic)
                 .matrixItem(roomSummary.toMatrixItem())
                 .lastEventTime(latestEventTime)
                 .typingMessage(typingMessage)
diff --git a/vector/src/main/res/drawable/background_circle.xml b/vector/src/main/res/drawable/background_circle.xml
new file mode 100644
index 0000000000..5e20ad45ce
--- /dev/null
+++ b/vector/src/main/res/drawable/background_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="96dp" />
+    <solid android:color="?riotx_background" />
+
+</shape>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_public_room.xml b/vector/src/main/res/drawable/ic_public_room.xml
index 1520898831..d6602cc59c 100644
--- a/vector/src/main/res/drawable/ic_public_room.xml
+++ b/vector/src/main/res/drawable/ic_public_room.xml
@@ -1,13 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M24,12C24,18.6274 18.6274,24 12,24C5.3726,24 0,18.6274 0,12C0,5.3726 5.3726,0 12,0C18.6274,0 24,5.3726 24,12Z"
-      android:fillColor="#C1C6CD"/>
-  <path
-      android:pathData="M18.6999,18.8177L19.6243,15.9652C19.6324,15.9404 19.6365,15.9143 19.6365,15.8882V15.0473C19.6365,14.9823 19.6111,14.9197 19.5657,14.8731L18.7105,13.9934C18.6916,13.9739 18.6697,13.9577 18.6456,13.9453L16.8092,13.0009C16.7852,12.9885 16.7632,12.9723 16.7443,12.9529L15.8919,12.0761C15.8449,12.0277 15.7802,12.0004 15.7127,12.0004H12.2501C12.1121,12.0004 12.0001,11.8885 12.0001,11.7504V10.2868C12.0001,10.1487 11.8882,10.0368 11.7501,10.0368H9.3865C9.2484,10.0368 9.1365,9.9248 9.1365,9.7868V8.3798C9.1365,8.2215 9.2818,8.103 9.4369,8.1349L13.6089,8.9931C13.7639,9.0251 13.9092,8.9066 13.9092,8.7483V7.1928C13.9092,7.1277 13.9346,7.0652 13.98,7.0185L16.6034,4.3201C16.6978,4.2231 16.6978,4.0686 16.6034,3.9716L14.9023,2.2219C14.8769,2.1957 14.8461,2.1755 14.8121,2.1625L13.3697,1.613C12.4823,1.275 11.5072,1.2439 10.6001,1.5247L9.1365,1.9777C7.1638,2.6207 5.6129,4.1612 4.9568,6.1296L4.621,7.1369C4.5407,7.3779 4.4931,7.6285 4.4795,7.8822L4.3696,9.9275C4.3659,9.9972 4.3914,10.0652 4.44,10.1152L6.1992,11.9247C6.2463,11.9731 6.311,12.0004 6.3785,12.0004H8.1214C8.1612,12.0004 8.2004,12.0099 8.2358,12.0281L9.9554,12.9124C10.0387,12.9553 10.091,13.0411 10.091,13.1348V15.8701C10.091,15.908 10.0996,15.9454 10.1162,15.9794L10.9772,17.7506C11.019,17.8367 11.1063,17.8913 11.202,17.8913H12.8491C12.9166,17.8913 12.9812,17.9186 13.0283,17.967L13.9092,18.8731L14.8357,19.8261C14.8543,19.8452 14.8697,19.8671 14.8813,19.8911L15.6626,21.4982C15.7383,21.654 15.9458,21.6874 16.0667,21.5631L16.7729,20.8368L17.7274,19.8549L18.6413,18.9149C18.6681,18.8874 18.6881,18.8542 18.6999,18.8177Z"
-      android:fillColor="#F4F6FA"
-      android:fillAlpha="0.91"/>
+    android:width="21dp"
+    android:height="20dp"
+    android:viewportWidth="21"
+    android:viewportHeight="20">
+    <path
+        android:fillColor="#8D99A5"
+        android:fillType="evenOdd"
+        android:pathData="M10.5,20C16.0228,20 20.5,15.5228 20.5,10C20.5,4.4771 16.0228,0 10.5,0C4.9771,0 0.5,4.4771 0.5,10C0.5,15.5228 4.9771,20 10.5,20ZM16.8518,13.3106L16.0865,15.6722C16.0747,15.7086 16.0546,15.7419 16.0279,15.7694L15.2731,16.5458L14.4776,17.364L13.9305,17.9267C13.8097,18.051 13.6022,18.0176 13.5264,17.8617L12.9043,16.5819C12.8927,16.558 12.8773,16.5361 12.8587,16.517L12.0913,15.7276L11.3694,14.9852C11.3224,14.9367 11.2577,14.9094 11.1902,14.9094H9.8614C9.7656,14.9094 9.6783,14.8548 9.6365,14.7687L8.9346,13.3248C8.918,13.2908 8.9094,13.2534 8.9094,13.2155V10.9711C8.9094,10.8774 8.8571,10.7916 8.7738,10.7487L7.3724,10.028C7.337,10.0098 7.2978,10.0003 7.258,10.0003H5.8333C5.7657,10.0003 5.7011,9.973 5.654,9.9246L4.213,8.4424C4.1644,8.3924 4.1389,8.3244 4.1426,8.2547L4.2331,6.5685C4.2445,6.3571 4.2842,6.1482 4.3511,5.9474L4.6309,5.108C5.1777,3.4677 6.47,2.1839 8.114,1.6481L9.1003,1.3428C10.0075,1.062 10.9825,1.0931 11.8699,1.4312L12.835,1.7988C12.8691,1.8118 12.8999,1.832 12.9253,1.8582L14.3082,3.2806C14.4025,3.3776 14.4025,3.5321 14.3082,3.6291L12.162,5.8366C12.1166,5.8833 12.0913,5.9458 12.0913,6.0109V7.2391C12.0913,7.3974 11.946,7.5159 11.7909,7.484L8.4144,6.7894C8.2593,6.7575 8.114,6.8759 8.114,7.0343V8.114C8.114,8.252 8.2259,8.364 8.364,8.364H10.2504C10.3884,8.364 10.5004,8.4759 10.5004,8.614V9.7503C10.5004,9.8884 10.6123,10.0003 10.7504,10.0003H13.5766C13.6441,10.0003 13.7087,10.0276 13.7558,10.0761L14.4491,10.7892C14.468,10.8086 14.4899,10.8248 14.514,10.8372L16.0321,11.618C16.0562,11.6304 16.0782,11.6466 16.0971,11.666L16.7932,12.3821C16.8386,12.4288 16.864,12.4913 16.864,12.5564V13.2336C16.864,13.2597 16.8599,13.2857 16.8518,13.3106Z" />
+
 </vector>
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 4e20d270cd..bd5aff6a5b 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -60,6 +60,7 @@
         app:layout_constraintCircleRadius="30dp"
         tools:ignore="MissingConstraints" />
 
+    <!-- Note: this is always gone now -->
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/roomAvatarDecorationImageView"
         android:layout_width="24dp"
@@ -67,7 +68,23 @@
         app:layout_constraintCircle="@id/roomAvatarContainer"
         app:layout_constraintCircleAngle="135"
         app:layout_constraintCircleRadius="28dp"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints"
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/roomAvatarPublicDecorationImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/background_circle"
+        android:contentDescription="@string/a11y_public_room"
+        android:padding="0.5dp"
+        android:src="@drawable/ic_public_room"
+        android:visibility="gone"
+        app:layout_constraintCircle="@id/roomAvatarContainer"
+        app:layout_constraintCircleAngle="135"
+        app:layout_constraintCircleRadius="28dp"
+        tools:ignore="MissingConstraints"
+        tools:visibility="visible" />
 
     <!-- Margin bottom does not work, so I use space -->
     <Space
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index f5fd97be31..29a298c821 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3251,6 +3251,7 @@
     <string name="a11y_rule_notify_silent">Notify without sound</string>
     <string name="a11y_rule_notify_off">Do not notify</string>
     <string name="a11y_view_read_receipts">View read receipts</string>
+    <string name="a11y_public_room">This room is public</string>
 
     <string name="dev_tools_menu_name">Dev Tools</string>
     <string name="dev_tools_explore_room_state">Explore Room State</string>

From 53b20a89ca752372804312569312f7a590408b20 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 May 2021 16:41:51 +0200
Subject: [PATCH 311/350] Change with Android Studio 4.2

---
 .idea/codeStyles/Project.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 89a7c466fd..523496e317 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,15 +7,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />

From e951b2097d5687b7a7923191782d72c3371b7774 Mon Sep 17 00:00:00 2001
From: Marek <talong@web.de>
Date: Sat, 8 May 2021 18:41:34 +0000
Subject: [PATCH 312/350] Translated using Weblate (German)

Currently translated at 97.4% (2376 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 12c36ba7b7..f5e14be1d2 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2749,4 +2749,5 @@
     <string name="spaces_invited_header">Einladungen</string>
     <string name="suggested_header">Vorgeschlagene Räume</string>
     <string name="spaces_header">Spaces</string>
+    <string name="room_settings_room_access_entry_knock">Jeder kann im Raum anklopfen, Mitglieder können dann zustimmen oder ablehnen</string>
 </resources>
\ No newline at end of file

From d42a4bb5eefe197829921c8ad824aabafabf3800 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Fri, 7 May 2021 20:07:52 +0000
Subject: [PATCH 313/350] Translated using Weblate (Swedish)

Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 66efc6bd1b..64b67bcc3d 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2731,4 +2731,25 @@
     <string name="skip_for_now">Hoppa över för tillfället</string>
     <string name="share_space_link_message">Gå med i mitt utrymme %1$s %2$s</string>
     <string name="invite_just_to_this_room_desc">De kommer inte att bli en del av %s</string>
+    <string name="labs_use_restricted_join_rule_desc">Varning kräver serverstöd och experimentell rumsversion</string>
+    <string name="labs_use_restricted_join_rule">Experimentellt utrymme - Begränsat rum.</string>
+    <string name="you_are_invited">Du är inbjuden</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Utrymmen är nya sätt att gruppera rum och personer för arbete, skoj eller bara för dig själv.</string>
+    <string name="spaces_beta_welcome_to_spaces">Välkommen till utrymmen!</string>
+    <string name="space_add_existing_rooms">Lägg till existerande rum och utrymme</string>
+    <string name="space_leave_prompt_msg">Är du säker på att du vill lämna utrymmet\?</string>
+    <string name="leave_space">Lämna utrymme</string>
+    <string name="space_add_child_title">Lägg till rum</string>
+    <string name="space_explore_activity_title">Utforska rum</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d person du känner har redan gått med</item>
+        <item quantity="other">%d personer du känner har redan gått med</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">Välkommen till %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_text">Du är inte i några rum än. Nedan finns några föreslagna rum, men du kan se fler med den gröna knappen nere till höger.</string>
+    <string name="room_alias_preview_not_found">Det här aliaset är inte tillgängligt för tillfället.
+\nFörsök igen senare eller be en rumsadminstratör kolla om du har åtkomst.</string>
+    <string name="join_anyway">Gå med iallafall</string>
+    <string name="join_space">Gå med i utrymme</string>
+    <string name="create_space">Skapa utrymme</string>
 </resources>
\ No newline at end of file

From 5e2c3239eabb99bf761829abf3f56026ef228e8d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 10:21:43 +0200
Subject: [PATCH 314/350] Code review

---
 .../session/space/DefaultSpaceService.kt      | 31 ++++++++++---------
 .../features/matrixto/MatrixToBottomSheet.kt  |  9 +++++-
 .../matrixto/MatrixToRoomSpaceFragment.kt     | 22 +++++++------
 .../features/spaces/SpaceExploreActivity.kt   | 18 ++++++++++-
 .../spaces/explore/SpaceDirectoryFragment.kt  | 25 +++------------
 .../explore/SpaceDirectoryViewAction.kt       |  1 +
 .../explore/SpaceDirectoryViewEvents.kt       |  1 +
 .../spaces/explore/SpaceDirectoryViewModel.kt |  9 +++++-
 8 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index 540eed9b6a..fb6a54e3a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -130,23 +130,24 @@ internal class DefaultSpaceService @Inject constructor(
                             ?.flatMap { childSummary ->
                                 response.events
                                         ?.filter { it.stateKey == childSummary.roomId && it.type == EventType.STATE_SPACE_CHILD }
-                                        ?.map { childStateEv ->
+                                        ?.mapNotNull { childStateEv ->
                                             // create a child entry for everytime this room is the child of a space
                                             // beware that a room could appear then twice in this list
-                                            val childStateEvContent = childStateEv.content.toModel<SpaceChildContent>()
-                                            SpaceChildInfo(
-                                                    childRoomId = childSummary.roomId,
-                                                    isKnown = true,
-                                                    roomType = childSummary.roomType,
-                                                    name = childSummary.name,
-                                                    topic = childSummary.topic,
-                                                    avatarUrl = childSummary.avatarUrl,
-                                                    order = childStateEvContent?.order,
-                                                    autoJoin = childStateEvContent?.autoJoin ?: false,
-                                                    viaServers = childStateEvContent?.via ?: emptyList(),
-                                                    activeMemberCount = childSummary.numJoinedMembers,
-                                                    parentRoomId = childStateEv.roomId
-                                            )
+                                            childStateEv.content.toModel<SpaceChildContent>()?.let { childStateEvContent ->
+                                                SpaceChildInfo(
+                                                        childRoomId = childSummary.roomId,
+                                                        isKnown = true,
+                                                        roomType = childSummary.roomType,
+                                                        name = childSummary.name,
+                                                        topic = childSummary.topic,
+                                                        avatarUrl = childSummary.avatarUrl,
+                                                        order = childStateEvContent?.order,
+                                                        autoJoin = childStateEvContent?.autoJoin ?: false,
+                                                        viaServers = childStateEvContent?.via ?: emptyList(),
+                                                        activeMemberCount = childSummary.numJoinedMembers,
+                                                        parentRoomId = childStateEv.roomId
+                                                )
+                                            }
                                         }.orEmpty()
                             }
                             .orEmpty()
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
index 13c0645d8d..aec52a571c 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
@@ -36,6 +36,7 @@ import im.vector.app.databinding.BottomSheetMatrixToCardBinding
 import im.vector.app.features.home.AvatarRenderer
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.permalinks.PermalinkData
+import java.lang.ref.WeakReference
 import javax.inject.Inject
 import kotlin.reflect.KClass
 
@@ -56,7 +57,13 @@ class MatrixToBottomSheet :
         injector.inject(this)
     }
 
-    var interactionListener: InteractionListener? = null
+    var weakReference = WeakReference<InteractionListener>(null)
+
+    var interactionListener: InteractionListener?
+        set(value) {
+            weakReference = WeakReference(value)
+        }
+        get() = weakReference.get()
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetMatrixToCardBinding {
         return BottomSheetMatrixToCardBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
index 43fd819c4d..04f72000fa 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToRoomSpaceFragment.kt
@@ -171,16 +171,20 @@ class MatrixToRoomSpaceFragment @Inject constructor(
         when (state.peopleYouKnow) {
             is Success -> {
                 val someYouKnow = state.peopleYouKnow.invoke()
-                someYouKnow.forEachIndexed { index, item ->
-                    images[index].isVisible = true
-                    avatarRenderer.render(item, images[index])
+                if (someYouKnow.isEmpty()) {
+                    views.peopleYouMayKnowText.isVisible = false
+                } else {
+                    someYouKnow.forEachIndexed { index, item ->
+                        images[index].isVisible = true
+                        avatarRenderer.render(item, images[index])
+                    }
+                    views.peopleYouMayKnowText.setTextOrHide(
+                            resources.getQuantityString(R.plurals.space_people_you_know,
+                                    someYouKnow.count(),
+                                    someYouKnow.count()
+                            )
+                    )
                 }
-                views.peopleYouMayKnowText.setTextOrHide(
-                        resources.getQuantityString(R.plurals.space_people_you_know,
-                                someYouKnow.count(),
-                                someYouKnow.count()
-                        )
-                )
             }
             else       -> {
                 views.peopleYouMayKnowText.isVisible = false
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index e07896de50..3a5fd883f3 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.spaces
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.fragment.app.Fragment
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
 import im.vector.app.R
@@ -26,6 +27,7 @@ import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.spaces.explore.SpaceDirectoryArgs
 import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
 import im.vector.app.features.spaces.explore.SpaceDirectoryState
@@ -33,7 +35,7 @@ import im.vector.app.features.spaces.explore.SpaceDirectoryViewEvents
 import im.vector.app.features.spaces.explore.SpaceDirectoryViewModel
 import javax.inject.Inject
 
-class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceDirectoryViewModel.Factory {
+class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceDirectoryViewModel.Factory, MatrixToBottomSheet.InteractionListener {
 
     @Inject lateinit var spaceDirectoryViewModelFactory: SpaceDirectoryViewModel.Factory
 
@@ -72,10 +74,20 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
                 is SpaceDirectoryViewEvents.NavigateToRoom -> {
                     navigator.openRoom(this, it.roomId)
                 }
+                is SpaceDirectoryViewEvents.NavigateToMxToBottomSheet -> {
+                    MatrixToBottomSheet.withLink(it.link, this).show(supportFragmentManager, "ShowChild")
+                }
             }
         }
     }
 
+    override fun onAttachFragment(fragment: Fragment) {
+        if (fragment is MatrixToBottomSheet) {
+            fragment.interactionListener = this
+        }
+        super.onAttachFragment(fragment)
+    }
+
     companion object {
         fun newIntent(context: Context, spaceId: String): Intent {
             return Intent(context, SpaceExploreActivity::class.java).apply {
@@ -86,4 +98,8 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
 
     override fun create(initialState: SpaceDirectoryState): SpaceDirectoryViewModel =
             spaceDirectoryViewModelFactory.create(initialState)
+
+    override fun navigateToRoom(roomId: String) {
+        navigator.openRoom(this, roomId)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index 0454112417..41ab8d9006 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -21,7 +21,6 @@ import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.FragmentOnAttachListener
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
@@ -30,7 +29,6 @@ import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentRoomDirectoryPickerBinding
-import im.vector.app.features.matrixto.MatrixToBottomSheet
 import kotlinx.parcelize.Parcelize
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import javax.inject.Inject
@@ -44,19 +42,13 @@ class SpaceDirectoryFragment @Inject constructor(
         private val epoxyController: SpaceDirectoryController
 ) : VectorBaseFragment<FragmentRoomDirectoryPickerBinding>(),
         SpaceDirectoryController.InteractionListener,
-        OnBackPressed, MatrixToBottomSheet.InteractionListener {
+        OnBackPressed {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             FragmentRoomDirectoryPickerBinding.inflate(layoutInflater, container, false)
 
     private val viewModel by activityViewModel(SpaceDirectoryViewModel::class)
 
-    private var fragmentOnAttachListener = FragmentOnAttachListener { _, fragment ->
-        if (fragment is MatrixToBottomSheet) {
-            fragment.interactionListener = this
-        }
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -68,12 +60,9 @@ class SpaceDirectoryFragment @Inject constructor(
         }
         epoxyController.listener = this
         views.roomDirectoryPickerList.configureWith(epoxyController)
-
-        childFragmentManager.addFragmentOnAttachListener(fragmentOnAttachListener)
     }
 
     override fun onDestroyView() {
-        childFragmentManager.removeFragmentOnAttachListener(fragmentOnAttachListener)
         epoxyController.listener = null
         views.roomDirectoryPickerList.cleanup()
         super.onDestroyView()
@@ -97,11 +86,7 @@ class SpaceDirectoryFragment @Inject constructor(
     }
 
     override fun onRoomClick(spaceChildInfo: SpaceChildInfo) {
-        // This is temporary for now to at least display something for the space beta
-        // It's not ideal as it's doing some peeking that is not needed.
-        viewModel.session.permalinkService().createRoomPermalink(spaceChildInfo.childRoomId)?.let {
-            MatrixToBottomSheet.withLink(it, this).show(childFragmentManager, "ShowChild")
-        }
+        viewModel.handle(SpaceDirectoryViewAction.ShowDetails(spaceChildInfo))
     }
 
     override fun onBackPressed(toolbarButton: Boolean): Boolean {
@@ -109,7 +94,7 @@ class SpaceDirectoryFragment @Inject constructor(
         return true
     }
 
-    override fun navigateToRoom(roomId: String) {
-        viewModel.handle(SpaceDirectoryViewAction.NavigateToRoom(roomId))
-    }
+//    override fun navigateToRoom(roomId: String) {
+//        viewModel.handle(SpaceDirectoryViewAction.NavigateToRoom(roomId))
+//    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
index 562d1c1124..a7e1482e24 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
@@ -22,6 +22,7 @@ import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 sealed class SpaceDirectoryViewAction : VectorViewModelAction {
     data class ExploreSubSpace(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
     data class JoinOrOpen(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
+    data class ShowDetails(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
     data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewAction()
     object HandleBack : SpaceDirectoryViewAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt
index ef6f5385d3..3ac0426de9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewEvents.kt
@@ -21,4 +21,5 @@ import im.vector.app.core.platform.VectorViewEvents
 sealed class SpaceDirectoryViewEvents : VectorViewEvents {
     object Dismiss : SpaceDirectoryViewEvents()
     data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewEvents()
+    data class NavigateToMxToBottomSheet(val link: String) : SpaceDirectoryViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index 9173e15dac..9d74849386 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -40,7 +40,7 @@ import timber.log.Timber
 
 class SpaceDirectoryViewModel @AssistedInject constructor(
         @Assisted initialState: SpaceDirectoryState,
-        val session: Session
+        private val session: Session
 ) : VectorViewModel<SpaceDirectoryState, SpaceDirectoryViewAction, SpaceDirectoryViewEvents>(initialState) {
 
     @AssistedFactory
@@ -139,6 +139,13 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
             is SpaceDirectoryViewAction.NavigateToRoom -> {
                 _viewEvents.post(SpaceDirectoryViewEvents.NavigateToRoom(action.roomId))
             }
+            is SpaceDirectoryViewAction.ShowDetails ->  {
+                // This is temporary for now to at least display something for the space beta
+                // It's not ideal as it's doing some peeking that is not needed.
+                session.permalinkService().createRoomPermalink(action.spaceChildInfo.childRoomId)?.let {
+                   _viewEvents.post(SpaceDirectoryViewEvents.NavigateToMxToBottomSheet(it))
+                }
+            }
         }
     }
 

From 20f86a30e8874db7f726c0ab33109b25a5ba5426 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 May 2021 13:31:38 +0200
Subject: [PATCH 315/350] Upgrade Realm to version 10.4.0 Migration with
 isEmbedded tested OK

---
 CHANGES.md                                                | 1 +
 matrix-sdk-android/build.gradle                           | 7 ++-----
 .../sdk/internal/database/RealmSessionStoreMigration.kt   | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b3f9615c70..43ab2ee975 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -34,6 +34,7 @@ SDK API changes ⚠️:
 Build 🧱:
  - Upgrade to gradle 7
  - https://github.com/Piasy/BigImageViewer is now hosted on mavenCentral()
+ - Upgrade Realm to version 10.4.0
 
 Test:
  -
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 4059004394..108240f94d 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -6,13 +6,10 @@ apply plugin: 'realm-android'
 
 buildscript {
     repositories {
-        // mavenCentral()
-        //noinspection GrDeprecatedAPIUsage
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        // Stick to this version until https://github.com/realm/realm-java/issues/7402 is fixed
-        classpath "io.realm:realm-gradle-plugin:10.3.1"
+        classpath "io.realm:realm-gradle-plugin:10.4.0"
     }
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 05213b40e5..8770dc8b33 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -144,10 +144,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         Timber.d("Step 7 -> 8")
 
         val editionOfEventSchema = realm.schema.create("EditionOfEvent")
-                .apply {
-                    // setEmbedded does not return `this`...
-                    isEmbedded = true
-                }
                 .addField(EditionOfEventFields.CONTENT, String::class.java)
                 .addField(EditionOfEventFields.EVENT_ID, String::class.java)
                 .setRequired(EditionOfEventFields.EVENT_ID, true)
@@ -162,6 +158,10 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                 ?.removeField("lastEditTs")
                 ?.removeField("sourceLocalEchoEvents")
                 ?.addRealmListField(EditAggregatedSummaryEntityFields.EDITIONS.`$`, editionOfEventSchema)
+
+        // This has to be done once a parent use the model as a child
+        // See https://github.com/realm/realm-java/issues/7402
+        editionOfEventSchema.isEmbedded = true
     }
 
     private fun migrateTo9(realm: DynamicRealm) {

From 981626a0f7bb8e059e9422d357e060663e9b8b3c Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 13:53:43 +0200
Subject: [PATCH 316/350] cleaning

---
 .../sdk/internal/session/space/DefaultSpaceService.kt       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index fb6a54e3a8..c68f4db146 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -141,9 +141,9 @@ internal class DefaultSpaceService @Inject constructor(
                                                         name = childSummary.name,
                                                         topic = childSummary.topic,
                                                         avatarUrl = childSummary.avatarUrl,
-                                                        order = childStateEvContent?.order,
-                                                        autoJoin = childStateEvContent?.autoJoin ?: false,
-                                                        viaServers = childStateEvContent?.via ?: emptyList(),
+                                                        order = childStateEvContent.order,
+                                                        autoJoin = childStateEvContent.autoJoin ?: false,
+                                                        viaServers = childStateEvContent.via.orEmpty(),
                                                         activeMemberCount = childSummary.numJoinedMembers,
                                                         parentRoomId = childStateEv.roomId
                                                 )

From d760d6c25b47de9e143578f7ad537b2d2cb22c74 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 10 May 2021 14:23:36 +0200
Subject: [PATCH 317/350] Iterate with design team

---
 vector/src/main/res/layout/item_room.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index bd5aff6a5b..872cf3e400 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -73,11 +73,11 @@
 
     <ImageView
         android:id="@+id/roomAvatarPublicDecorationImageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
         android:background="@drawable/background_circle"
         android:contentDescription="@string/a11y_public_room"
-        android:padding="0.5dp"
+        android:padding="2dp"
         android:src="@drawable/ic_public_room"
         android:visibility="gone"
         app:layout_constraintCircle="@id/roomAvatarContainer"

From 01ec263ff3c29cdf036526f85e0282dc9460035f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 14:59:38 +0200
Subject: [PATCH 318/350] Fix deprecation warning

---
 .../app/features/spaces/SpaceExploreActivity.kt  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index 3a5fd883f3..52c5780953 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -20,6 +20,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
 import im.vector.app.R
@@ -49,8 +50,18 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
 
     val sharedViewModel: SpaceDirectoryViewModel by viewModel()
 
+    private val fragmentLifecycleCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
+        override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
+            if (f is MatrixToBottomSheet) {
+                f.interactionListener = this@SpaceExploreActivity
+            }
+            super.onFragmentAttached(fm, f, context)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
 
         if (isFirstCreation()) {
             val simpleName = SpaceDirectoryFragment::class.java.simpleName
@@ -81,6 +92,11 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
         }
     }
 
+    override fun onDestroy() {
+        supportFragmentManager.unregisterFragmentLifecycleCallbacks(fragmentLifecycleCallbacks)
+        super.onDestroy()
+    }
+
     override fun onAttachFragment(fragment: Fragment) {
         if (fragment is MatrixToBottomSheet) {
             fragment.interactionListener = this

From 87d35958c630c04b1afd986014b25c753e97f3cb Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 10 May 2021 16:34:30 +0300
Subject: [PATCH 319/350] Allow inviting users even if profile information
 cannot be retrieved.

---
 CHANGES.md                                             |  1 +
 .../android/sdk/api/session/profile/ProfileService.kt  |  1 +
 .../android/sdk/internal/session/profile/ProfileAPI.kt |  1 +
 .../app/features/userdirectory/UserListViewModel.kt    | 10 +++++++++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index b3f9615c70..642d5ef8b5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ Bugfix 🐛:
  - Fix read marker not updating automatically (#3267)
  - Sent video does not contains duration (#3272)
  - Properly clean the back stack if the user cancel registration when waiting for email validation
+ - Fix user invitation in case of restricted profile api (#3306)
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index e493adeaf2..8401ba49eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -66,6 +66,7 @@ interface ProfileService {
     /**
      * Get the combined profile information for this user.
      * This may return keys which are not limited to displayname or avatar_url.
+     * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response will be HTTP 403.
      * @param userId the userId param to look for
      *
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index 5113b821e8..7f4595caf5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -33,6 +33,7 @@ internal interface ProfileAPI {
      * Get the combined profile information for this user.
      * This API may be used to fetch the user's own profile information or other users; either locally or on remote homeservers.
      * This API may return keys which are not limited to displayname or avatar_url.
+     * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response will be HTTP 403.
      * @param userId the user id to fetch profile info
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}")
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index a68717ea57..32771d784d 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -137,7 +137,15 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
                                                 avatarUrl = json[ProfileService.AVATAR_URL_KEY] as? String
                                         ).toOptional()
                                     }
-                                    .onErrorReturn { Optional.empty() }
+                                    .onErrorReturn {
+                                        // Profile API can be restricted and doesn't have to return result.
+                                        // In this case allow inviting valid user ids.
+                                        User(
+                                                userId = search,
+                                                displayName = search,
+                                                avatarUrl = null
+                                        ).toOptional()
+                                    }
 
                             Single.zip(
                                     searchObservable,

From a272f4d4c6bf94669759af00bda2b390b15f9c02 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 15:48:06 +0200
Subject: [PATCH 320/350] Remove dead code

---
 .../im/vector/app/features/spaces/SpaceExploreActivity.kt  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index 52c5780953..9b0173f58f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -97,13 +97,6 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
         super.onDestroy()
     }
 
-    override fun onAttachFragment(fragment: Fragment) {
-        if (fragment is MatrixToBottomSheet) {
-            fragment.interactionListener = this
-        }
-        super.onAttachFragment(fragment)
-    }
-
     companion object {
         fun newIntent(context: Context, spaceId: String): Intent {
             return Intent(context, SpaceExploreActivity::class.java).apply {

From e74f4d570df5563c8de434b4509ef3efc8b7dcb4 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 10 May 2021 17:22:32 +0300
Subject: [PATCH 321/350] Lint fix.

---
 .../im/vector/app/features/userdirectory/UserListViewModel.kt    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index 32771d784d..e60d63f822 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -33,7 +33,6 @@ import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.session.user.model.User
-import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.rx.rx

From 0f8a6415109e99cced2f4010c8280d249a075890 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 10 May 2021 17:38:40 +0300
Subject: [PATCH 322/350] Code review fixes.

---
 .../matrix/android/sdk/api/session/profile/ProfileService.kt    | 2 +-
 .../matrix/android/sdk/internal/session/profile/ProfileAPI.kt   | 2 +-
 .../im/vector/app/features/userdirectory/UserListViewModel.kt   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index 8401ba49eb..05fa24946a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -66,7 +66,7 @@ interface ProfileService {
     /**
      * Get the combined profile information for this user.
      * This may return keys which are not limited to displayname or avatar_url.
-     * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response will be HTTP 403.
+     * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response can be HTTP 403.
      * @param userId the userId param to look for
      *
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index 7f4595caf5..485a4973ca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -33,7 +33,7 @@ internal interface ProfileAPI {
      * Get the combined profile information for this user.
      * This API may be used to fetch the user's own profile information or other users; either locally or on remote homeservers.
      * This API may return keys which are not limited to displayname or avatar_url.
-     * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response will be HTTP 403.
+     * If server is configured as limit_profile_requests_to_users_who_share_rooms: true then response can be HTTP 403.
      * @param userId the user id to fetch profile info
      */
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}")
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
index e60d63f822..5d5247ec06 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
@@ -141,7 +141,7 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
                                         // In this case allow inviting valid user ids.
                                         User(
                                                 userId = search,
-                                                displayName = search,
+                                                displayName = null,
                                                 avatarUrl = null
                                         ).toOptional()
                                     }

From 581847e5c14ebc1e8521df372e154631d066d1f4 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 10 May 2021 16:53:52 +0200
Subject: [PATCH 323/350] Fix read marker visibility/position when filtering
 some events

---
 CHANGES.md                                        |  1 +
 .../helper/TimelineControllerInterceptorHelper.kt | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b3f9615c70..3ce4f3ef35 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ Bugfix 🐛:
  - Fix read marker not updating automatically (#3267)
  - Sent video does not contains duration (#3272)
  - Properly clean the back stack if the user cancel registration when waiting for email validation
+ - Fix read marker visibility/position when filtering some events 
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
index 72fdef9f7d..389dd15413 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
@@ -62,6 +62,7 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
         val firstUnreadEventId = (unreadState as? UnreadState.HasUnread)?.firstUnreadEventId
         var atLeastOneVisibleItemSinceLastDaySeparator = false
         var atLeastOneVisibleItemsBeforeReadMarker = false
+        var appendReadMarker = false
 
         // Then iterate on models so we have the exact positions in the adapter
         modelsIterator.forEach { epoxyModel ->
@@ -72,11 +73,7 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                 }
                 epoxyModel.getEventIds().forEach { eventId ->
                     adapterPositionMapping[eventId] = index
-                    if (epoxyModel.canAppendReadMarker() && eventId == firstUnreadEventId && atLeastOneVisibleItemsBeforeReadMarker) {
-                        modelsIterator.addReadMarkerItem(callback)
-                        index++
-                        positionOfReadMarker.set(index)
-                    }
+                    appendReadMarker = epoxyModel.canAppendReadMarker() && eventId == firstUnreadEventId && atLeastOneVisibleItemsBeforeReadMarker
                 }
             }
             if (epoxyModel is DaySeparatorItem) {
@@ -91,6 +88,12 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                     atLeastOneVisibleItemSinceLastDaySeparator = true
                 }
             }
+            if (appendReadMarker) {
+                modelsIterator.addReadMarkerItem(callback)
+                index++
+                positionOfReadMarker.set(index)
+                appendReadMarker = false
+            }
             index++
         }
         previousModelsSize = models.size
@@ -103,8 +106,6 @@ class TimelineControllerInterceptorHelper(private val positionOfReadMarker: KMut
                     it.setOnVisibilityStateChanged(ReadMarkerVisibilityStateChangedListener(callback))
                 }
         add(readMarker)
-        // Use next as we still have some process to do before the next iterator loop
-        next()
     }
 
     private fun MutableListIterator<EpoxyModel<*>>.removeCallItemIfNeeded(

From f1919be19753fe288d6414ba622f7e611c7ad6d7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 17:15:02 +0200
Subject: [PATCH 324/350] code review

---
 .../im/vector/app/features/matrixto/MatrixToBottomSheet.kt | 2 +-
 .../im/vector/app/features/spaces/SpaceExploreActivity.kt  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
index aec52a571c..61e4accba2 100644
--- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt
@@ -57,7 +57,7 @@ class MatrixToBottomSheet :
         injector.inject(this)
     }
 
-    var weakReference = WeakReference<InteractionListener>(null)
+    private var weakReference = WeakReference<InteractionListener>(null)
 
     var interactionListener: InteractionListener?
         set(value) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
index 9b0173f58f..dbe92d4d93 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt
@@ -57,6 +57,13 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceD
             }
             super.onFragmentAttached(fm, f, context)
         }
+
+        override fun onFragmentDetached(fm: FragmentManager, f: Fragment) {
+            if (f is MatrixToBottomSheet) {
+                f.interactionListener = null
+            }
+            super.onFragmentDetached(fm, f)
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {

From bea67bd7fda215e9948e6273acdd4e0ea639768c Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Mon, 10 May 2021 19:03:34 +0200
Subject: [PATCH 325/350] Join rules: fix migration

---
 .../android/sdk/internal/database/RealmSessionStoreMigration.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 3e18f55831..84f2b0498f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -267,7 +267,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
                                 joinRulesContentAdapter.fromJson(it)?.joinRules
                             }
 
-                    obj.setString(RoomSummaryEntityFields.JOIN_RULES_STR, roomJoinRules?.value)
+                    obj.setString(RoomSummaryEntityFields.JOIN_RULES_STR, roomJoinRules?.name)
                 }
     }
 }

From 5be3faf914f0c77533fc7cbeac0604fd8d3df751 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 09:07:38 +0200
Subject: [PATCH 326/350] Epoxy Form fixes

---
 .../im/vector/app/core/extensions/EditText.kt     | 12 ------------
 .../vector/app/features/form/FormEditTextItem.kt  | 12 ++++++++----
 .../features/form/FormEditTextWithButtonItem.kt   |  9 ++++++---
 .../features/form/FormEditableSquareAvatarItem.kt |  1 -
 .../features/form/FormMultiLineEditTextItem.kt    | 10 +++++++---
 .../im/vector/app/features/form/FormSwitchItem.kt | 15 ++++++++++-----
 .../roomdirectory/createroom/RoomAliasEditItem.kt |  9 ++++++---
 vector/src/main/res/layout/item_form_switch.xml   |  2 +-
 8 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
index 33e7199334..05b70def3d 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
@@ -57,15 +57,3 @@ fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_searc
         return@OnTouchListener false
     })
 }
-
-/**
- * Update the edit text value, only if necessary and move the cursor to the end of the text
- */
-fun EditText.setTextSafe(value: String?) {
-    if (value != null && text.toString() != value) {
-        setText(value)
-        // To fix jumping cursor to the start https://github.com/airbnb/epoxy/issues/426
-        // Note: there is still a known bug if deleting char in the middle of the text, by long pressing on the backspace button.
-        setSelection(value.length)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index fdac8afaed..74f088d739 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -27,7 +27,6 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setTextSafe
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input)
@@ -60,7 +59,7 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     @EpoxyAttribute
     var endIconMode: Int? = null
 
-    @EpoxyAttribute
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var onTextChange: ((String) -> Unit)? = null
 
     private val onTextChangeListener = object : SimpleTextWatcher() {
@@ -76,8 +75,13 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         holder.textInputLayout.error = errorMessage
         holder.textInputLayout.endIconMode = endIconMode ?: TextInputLayout.END_ICON_NONE
 
-        // Update only if text is different and value is not null
-        holder.textInputEditText.setTextSafe(value)
+        if (holder.view.isAttachedToWindow) {
+            // the view is attached to the window
+            // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
+            // Downside is if you ever wanted to programmatically change the content of the edit text while it is on screen you would not be able to
+        } else {
+            holder.textInputEditText.setText(value)
+        }
         holder.textInputEditText.isEnabled = enabled
         inputType?.let { holder.textInputEditText.inputType = it }
         holder.textInputEditText.isSingleLine = singleLine ?: false
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
index 08fc435e11..227e93d2d4 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
@@ -26,7 +26,6 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setTextSafe
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input_with_button)
@@ -61,8 +60,12 @@ abstract class FormEditTextWithButtonItem : VectorEpoxyModel<FormEditTextWithBut
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.hint = hint
 
-        // Update only if text is different
-        holder.textInputEditText.setTextSafe(value)
+        if (holder.view.isAttachedToWindow) {
+            // the view is attached to the window
+            // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
+        } else {
+            holder.textInputEditText.setText(value)
+        }
         holder.textInputEditText.isEnabled = enabled
 
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
index cbb545825d..0a07d27f64 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditableSquareAvatarItem.kt
@@ -83,7 +83,6 @@ abstract class FormEditableSquareAvatarItem : EpoxyModelWithHolder<FormEditableS
 
     override fun unbind(holder: Holder) {
         avatarRenderer?.clear(holder.image)
-        GlideApp.with(holder.image).clear(holder.image)
         super.unbind(holder)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
index 6c6f6d284d..bfdf1a3201 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
@@ -27,7 +27,6 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setTextSafe
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_multiline_text_input)
@@ -57,7 +56,7 @@ abstract class FormMultiLineEditTextItem : VectorEpoxyModel<FormMultiLineEditTex
     @EpoxyAttribute
     var typeFace: Typeface = Typeface.DEFAULT
 
-    @EpoxyAttribute
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var onTextChange: ((String) -> Unit)? = null
 
     private val onTextChangeListener = object : SimpleTextWatcher() {
@@ -77,7 +76,12 @@ abstract class FormMultiLineEditTextItem : VectorEpoxyModel<FormMultiLineEditTex
         holder.textInputEditText.minLines = minLines
 
         // Update only if text is different and value is not null
-        holder.textInputEditText.setTextSafe(value)
+        if (holder.view.isAttachedToWindow) {
+            // the view is attached to the window
+            // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
+        } else {
+            holder.textInputEditText.setText(value)
+        }
         holder.textInputEditText.isEnabled = enabled
 
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
diff --git a/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
index ff4f8711e0..2b2b185c05 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
@@ -40,7 +40,7 @@ abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
     var switchChecked: Boolean = false
 
     @EpoxyAttribute
-    var title: String? = null
+    var title: CharSequence? = null
 
     @EpoxyAttribute
     var summary: String? = null
@@ -61,10 +61,15 @@ abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
 
         holder.switchView.isEnabled = enabled
 
-        holder.switchView.setOnCheckedChangeListener(null)
-        holder.switchView.isChecked = switchChecked
-        holder.switchView.setOnCheckedChangeListener { _, isChecked ->
-            listener?.invoke(isChecked)
+        if (holder.view.isAttachedToWindow) {
+            // the view is attached to the window
+            // So it is a rebind of new data and you could ignore it assuming this is value that was already inputted into the view.
+        } else {
+            holder.switchView.setOnCheckedChangeListener(null)
+            holder.switchView.isChecked = switchChecked
+            holder.switchView.setOnCheckedChangeListener { _, isChecked ->
+                listener?.invoke(isChecked)
+            }
         }
         holder.divider.isVisible = showDivider
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
index 2a30545a47..11f75ddfa7 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
@@ -27,7 +27,6 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setTextSafe
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_room_alias_text_input)
@@ -62,8 +61,12 @@ abstract class RoomAliasEditItem : VectorEpoxyModel<RoomAliasEditItem.Holder>()
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.error = errorMessage
 
-        // Update only if text is different and value is not null
-        holder.textInputEditText.setTextSafe(value)
+        if (holder.view.isAttachedToWindow) {
+            // the view is attached to the window
+            // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
+        } else {
+            holder.textInputEditText.setText(value)
+        }
         holder.textInputEditText.isEnabled = enabled
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
         holder.homeServerText.text = homeServer
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
index cc662680bb..54eabd703d 100644
--- a/vector/src/main/res/layout/item_form_switch.xml
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -50,7 +50,7 @@
         android:id="@+id/formSwitchDivider"
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="?riotx_header_panel_border_mobile"
+        android:background="?vctr_list_divider_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

From f9e608a790ed377218b15b776fc7d1f97922ff03 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 09:37:54 +0200
Subject: [PATCH 327/350] Manage Spaces as Admin

---
 .../api/session/room/model/SpaceChildInfo.kt  |   3 +-
 .../android/sdk/api/session/space/Space.kt    |   3 +
 .../database/RealmSessionStoreMigration.kt    |   4 +
 .../database/mapper/RoomSummaryMapper.kt      |   4 +-
 .../database/model/SpaceChildSummaryEntity.kt |   2 +
 .../internal/session/space/DefaultSpace.kt    |  49 +++-
 .../session/space/DefaultSpaceService.kt      |   3 +-
 .../im/vector/app/core/di/FragmentModule.kt   |  12 +
 .../features/navigation/DefaultNavigator.kt   |   3 +-
 .../settings/RoomSettingsController.kt        |  23 +-
 .../settings/RoomSettingsFragment.kt          |   7 +-
 .../settings/RoomSettingsViewModel.kt         |  12 +-
 .../settings/RoomSettingsViewState.kt         |  27 +-
 .../spaces/SpaceSettingsMenuBottomSheet.kt    |  14 +-
 .../spaces/manage/RoomManageSelectionItem.kt  |  72 +++++
 .../spaces/manage/SpaceAddRoomsViewModel.kt   |  10 +-
 .../spaces/manage/SpaceManageActivity.kt      |  85 ++++--
 .../manage/SpaceManageRoomViewAction.kt       |  28 ++
 .../manage/SpaceManageRoomViewEvents.kt       |  24 ++
 .../spaces/manage/SpaceManageRoomViewState.kt |  36 +++
 .../manage/SpaceManageRoomsController.kt      | 101 +++++++
 .../spaces/manage/SpaceManageRoomsFragment.kt | 200 +++++++++++++
 .../manage/SpaceManageRoomsViewModel.kt       | 186 ++++++++++++
 .../manage/SpaceManageSharedViewModel.kt      |   1 +
 .../spaces/manage/SpaceManageViewState.kt     |  11 +-
 .../spaces/manage/SpaceManagedSharedAction.kt |   1 +
 .../manage/SpaceManagedSharedViewEvents.kt    |   1 +
 .../spaces/manage/SpaceSettingsController.kt  | 173 ++++++++++++
 .../spaces/manage/SpaceSettingsFragment.kt    | 265 ++++++++++++++++++
 .../layout/bottom_sheet_space_settings.xml    |   4 +-
 .../layout/fragment_room_setting_generic.xml  |   2 +-
 .../layout/item_room_to_manage_in_space.xml   |  73 +++++
 .../src/main/res/menu/menu_manage_space.xml   |  21 ++
 vector/src/main/res/values/strings.xml        |   6 +
 vector/src/main/res/values/styles_riot.xml    |   9 +-
 vector/src/main/res/values/theme_dark.xml     |   2 +
 vector/src/main/res/values/theme_light.xml    |   3 +
 .../xml/vector_settings_advanced_settings.xml |   1 +
 38 files changed, 1411 insertions(+), 70 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/RoomManageSelectionItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
 create mode 100644 vector/src/main/res/layout/item_room_to_manage_in_space.xml
 create mode 100644 vector/src/main/res/menu/menu_manage_space.xml

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
index fd5fbf7bb0..2d31930b33 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/SpaceChildInfo.kt
@@ -29,5 +29,6 @@ data class SpaceChildInfo(
         val activeMemberCount: Int?,
         val autoJoin: Boolean,
         val viaServers: List<String>,
-        val parentRoomId: String?
+        val parentRoomId: String?,
+        val suggested: Boolean?
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 9dba4f90af..21daf0b37d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -46,5 +46,8 @@ interface Space {
     @Throws
     suspend fun setChildrenAutoJoin(roomId: String, autoJoin: Boolean)
 
+    @Throws
+    suspend fun setChildrenSuggested(roomId: String, suggested: Boolean)
+
 //    fun getChildren() : List<IRoomSummary>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 906a6d14d6..211059a345 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -269,5 +269,9 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
                     obj.setString(RoomSummaryEntityFields.JOIN_RULES_STR, roomJoinRules?.name)
                 }
+
+        realm.schema.get("SpaceChildSummaryEntity")
+                ?.addField(SpaceChildSummaryEntityFields.SUGGESTED, Boolean::class.java)
+                ?.setNullable(SpaceChildSummaryEntityFields.SUGGESTED, true)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 0b057ec6fc..d52e1f995b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -89,7 +89,9 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                             order = it.order,
                             autoJoin = it.autoJoin ?: false,
                             viaServers = it.viaServers.toList(),
-                            parentRoomId = roomSummaryEntity.roomId
+                            parentRoomId = roomSummaryEntity.roomId,
+                            // What to do here?
+                            suggested = it.suggested
                     )
                 },
                 flattenParentIds = roomSummaryEntity.flattenParentIds?.split("|") ?: emptyList()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt
index 982c9ece6a..ce1afbb507 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SpaceChildSummaryEntity.kt
@@ -29,6 +29,8 @@ internal open class SpaceChildSummaryEntity(
 
         var autoJoin: Boolean? = null,
 
+        var suggested: Boolean? = null,
+
         var childRoomId: String? = null,
         // Link to the actual space summary if it is known locally
         var childSummaryEntity: RoomSummaryEntity? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index 93cb9d9d34..d6df991245 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -63,20 +63,21 @@ internal class DefaultSpace(
     }
 
     override suspend fun removeChildren(roomId: String) {
-        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
-                .firstOrNull()
-                ?.content.toModel<SpaceChildContent>()
-                ?: // should we throw here?
-                return
+//        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+//                .firstOrNull()
+//                ?.content.toModel<SpaceChildContent>()
+//                ?: // should we throw here?
+//                return
 
         // edit state event and set via to null
         room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
-                        order = existing.order,
+                        order = null,
                         via = null,
-                        autoJoin = existing.autoJoin
+                        autoJoin = null,
+                        suggested = null
                 ).toContent()
         )
     }
@@ -94,7 +95,8 @@ internal class DefaultSpace(
                 body = SpaceChildContent(
                         order = order,
                         via = existing.via,
-                        autoJoin = existing.autoJoin
+                        autoJoin = existing.autoJoin,
+                        suggested = existing.suggested
                 ).toContent()
         )
     }
@@ -105,6 +107,11 @@ internal class DefaultSpace(
                 ?.content.toModel<SpaceChildContent>()
                 ?: throw IllegalArgumentException("$roomId is not a child of this space")
 
+        if (existing.autoJoin == autoJoin) {
+            // nothing to do?
+            return
+        }
+
         // edit state event and set via to null
         room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
@@ -112,7 +119,31 @@ internal class DefaultSpace(
                 body = SpaceChildContent(
                         order = existing.order,
                         via = existing.via,
-                        autoJoin = autoJoin
+                        autoJoin = autoJoin,
+                        suggested = existing.suggested
+                ).toContent()
+        )
+    }
+
+    override suspend fun setChildrenSuggested(roomId: String, suggested: Boolean) {
+        val existing = room.getStateEvents(setOf(EventType.STATE_SPACE_CHILD), QueryStringValue.Equals(roomId))
+                .firstOrNull()
+                ?.content.toModel<SpaceChildContent>()
+                ?: throw IllegalArgumentException("$roomId is not a child of this space")
+
+        if (existing.suggested == suggested) {
+            // nothing to do?
+            return
+        }
+        // edit state event and set via to null
+        room.sendStateEvent(
+                eventType = EventType.STATE_SPACE_CHILD,
+                stateKey = roomId,
+                body = SpaceChildContent(
+                        order = existing.order,
+                        via = existing.via,
+                        autoJoin = existing.autoJoin,
+                        suggested = suggested
                 ).toContent()
         )
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index c68f4db146..f7fd77c528 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -145,7 +145,8 @@ internal class DefaultSpaceService @Inject constructor(
                                                         autoJoin = childStateEvContent.autoJoin ?: false,
                                                         viaServers = childStateEvContent.via.orEmpty(),
                                                         activeMemberCount = childSummary.numJoinedMembers,
-                                                        parentRoomId = childStateEv.roomId
+                                                        parentRoomId = childStateEv.roomId,
+                                                        suggested = childStateEvContent.suggested
                                                 )
                                             }
                                         }.orEmpty()
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index c685231756..25c8a07597 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -125,6 +125,8 @@ import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
 import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
 import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
 import im.vector.app.features.spaces.manage.SpaceAddRoomFragment
+import im.vector.app.features.spaces.manage.SpaceManageRoomsFragment
+import im.vector.app.features.spaces.manage.SpaceSettingsFragment
 import im.vector.app.features.spaces.people.SpacePeopleFragment
 import im.vector.app.features.spaces.preview.SpacePreviewFragment
 import im.vector.app.features.terms.ReviewTermsFragment
@@ -684,4 +686,14 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(SpacePeopleFragment::class)
     fun bindSpacePeopleFragment(fragment: SpacePeopleFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SpaceSettingsFragment::class)
+    fun bindSpaceSettingsFragment(fragment: SpaceSettingsFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SpaceManageRoomsFragment::class)
+    fun bindSpaceManageRoomsFragment(fragment: SpaceManageRoomsFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 27de04210a..bf8fa497ff 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -74,6 +74,7 @@ import im.vector.app.features.share.SharedData
 import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
 import im.vector.app.features.spaces.SpaceExploreActivity
 import im.vector.app.features.spaces.SpacePreviewActivity
+import im.vector.app.features.spaces.manage.ManageType
 import im.vector.app.features.spaces.manage.SpaceManageActivity
 import im.vector.app.features.spaces.people.SpacePeopleActivity
 import im.vector.app.features.terms.ReviewTermsActivity
@@ -123,7 +124,7 @@ class DefaultNavigator @Inject constructor(
                 }
             }
             Navigator.PostSwitchSpaceAction.OpenAddExistingRooms -> {
-                startActivity(context, SpaceManageActivity.newIntent(context, spaceId), false)
+                startActivity(context, SpaceManageActivity.newIntent(context, spaceId, ManageType.AddRooms), false)
             }
             is Navigator.PostSwitchSpaceAction.OpenDefaultRoom -> {
                 val args = RoomDetailArgs(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index 299c8ed6ec..a2a8fcb0c2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -27,6 +27,7 @@ import im.vector.app.features.form.formEditableAvatarItem
 import im.vector.app.features.form.formSwitchItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewState.Companion.getJoinRuleWording
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
@@ -121,7 +122,7 @@ class RoomSettingsController @Inject constructor(
         buildProfileAction(
                 id = "joinRule",
                 title = stringProvider.getString(R.string.room_settings_room_access_title),
-                subtitle = data.getJoinRuleWording(),
+                subtitle = data.getJoinRuleWording(stringProvider),
                 dividerColor = dividerColor,
                 divider = false,
                 editable = data.actionPermissions.canChangeJoinRule,
@@ -142,24 +143,4 @@ class RoomSettingsController @Inject constructor(
             }
         }
     }
-
-    private fun RoomSettingsViewState.getJoinRuleWording(): String {
-        return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
-            RoomJoinRules.INVITE     -> {
-                stringProvider.getString(R.string.room_settings_room_access_private_title)
-            }
-            RoomJoinRules.PUBLIC     -> {
-                stringProvider.getString(R.string.room_settings_room_access_public_title)
-            }
-            RoomJoinRules.KNOCK      -> {
-                stringProvider.getString(R.string.room_settings_room_access_entry_knock)
-            }
-            RoomJoinRules.RESTRICTED -> {
-                stringProvider.getString(R.string.room_settings_room_access_restricted_title)
-            }
-            else                     -> {
-                stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
-            }
-        }
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index 99df27b8f1..9aa164271e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -60,7 +60,8 @@ class RoomSettingsFragment @Inject constructor(
         VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
         RoomSettingsController.Callback,
         OnBackPressed,
-        GalleryOrCameraDialogHelper.Listener {
+        GalleryOrCameraDialogHelper.Listener,
+        RoomSettingsViewModel.Factory {
 
     private val viewModel: RoomSettingsViewModel by fragmentViewModel()
     private lateinit var roomProfileSharedActionViewModel: RoomProfileSharedActionViewModel
@@ -76,6 +77,10 @@ class RoomSettingsFragment @Inject constructor(
 
     override fun getMenuRes() = R.menu.vector_room_settings
 
+    override fun create(initialState: RoomSettingsViewState): RoomSettingsViewModel {
+        return viewModelFactory.create(initialState)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         roomProfileSharedActionViewModel = activityViewModelProvider.get(RoomProfileSharedActionViewModel::class.java)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index 7f75ded738..0a9c32e4c2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.roomprofile.settings
 
 import androidx.core.net.toFile
+import com.airbnb.mvrx.ActivityViewModelContext
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
@@ -55,8 +56,11 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
 
         @JvmStatic
         override fun create(viewModelContext: ViewModelContext, state: RoomSettingsViewState): RoomSettingsViewModel? {
-            val fragment: RoomSettingsFragment = (viewModelContext as FragmentViewModelContext).fragment()
-            return fragment.viewModelFactory.create(state)
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
         }
     }
 
@@ -123,7 +127,9 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                             canChangeJoinRule = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
                                     EventType.STATE_ROOM_JOIN_RULES)
                                     && powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
-                                    EventType.STATE_ROOM_GUEST_ACCESS)
+                                    EventType.STATE_ROOM_GUEST_ACCESS),
+                            canAddChildren = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
+                                    EventType.STATE_SPACE_CHILD)
                     )
                     setState { copy(actionPermissions = permissions) }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index 7403917d48..f1931e4add 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -20,6 +20,8 @@ import android.net.Uri
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
@@ -51,7 +53,8 @@ data class RoomSettingsViewState(
             val canChangeName: Boolean = false,
             val canChangeTopic: Boolean = false,
             val canChangeHistoryVisibility: Boolean = false,
-            val canChangeJoinRule: Boolean = false
+            val canChangeJoinRule: Boolean = false,
+            val canAddChildren: Boolean = false
     )
 
     sealed class AvatarAction {
@@ -67,4 +70,26 @@ data class RoomSettingsViewState(
     ) {
         fun hasChanged() = newJoinRules != null || newGuestAccess != null
     }
+
+    companion object {
+        fun RoomSettingsViewState.getJoinRuleWording(stringProvider: StringProvider): String {
+            return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
+                RoomJoinRules.INVITE -> {
+                    stringProvider.getString(R.string.room_settings_room_access_private_title)
+                }
+                RoomJoinRules.PUBLIC -> {
+                    stringProvider.getString(R.string.room_settings_room_access_public_title)
+                }
+                RoomJoinRules.KNOCK -> {
+                    stringProvider.getString(R.string.room_settings_room_access_entry_knock)
+                }
+                RoomJoinRules.RESTRICTED -> {
+                    stringProvider.getString(R.string.room_settings_room_access_restricted_title)
+                }
+                else                     -> {
+                    stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
+                }
+            }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index 5a1d80c240..c39a9a93fa 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -35,6 +35,7 @@ import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
 import im.vector.app.features.roomprofile.RoomProfileActivity
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.spaces.manage.ManageType
 import im.vector.app.features.spaces.manage.SpaceManageActivity
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.coroutines.GlobalScope
@@ -94,6 +95,13 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
                     val powerLevelsHelper = PowerLevelsHelper(powerLevelContent)
                     val canInvite = powerLevelsHelper.isUserAbleToInvite(session.myUserId)
                     val canAddChild = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_SPACE_CHILD)
+
+                    val canChangeAvatar = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_AVATAR)
+                    val canChangeName = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_NAME)
+                    val canChangeTopic = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_TOPIC)
+
+                    views.spaceSettings.isVisible = canChangeAvatar || canChangeName || canChangeTopic
+
                     views.invitePeople.isVisible = canInvite
                     views.addRooms.isVisible = canAddChild
                 }.disposeOnDestroyView()
@@ -107,9 +115,9 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
             navigator.openRoomProfile(requireContext(), spaceArgs.spaceId, RoomProfileActivity.EXTRA_DIRECT_ACCESS_ROOM_MEMBERS)
         }
 
-        views.spaceSettings.isVisible = vectorPreferences.developerMode()
         views.spaceSettings.views.bottomSheetActionClickableZone.debouncedClicks {
-            navigator.openRoomProfile(requireContext(), spaceArgs.spaceId)
+//            navigator.openRoomProfile(requireContext(), spaceArgs.spaceId)
+            startActivity(SpaceManageActivity.newIntent(requireActivity(), spaceArgs.spaceId, ManageType.Settings))
         }
 
         views.exploreRooms.views.bottomSheetActionClickableZone.debouncedClicks {
@@ -118,7 +126,7 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
 
         views.addRooms.views.bottomSheetActionClickableZone.debouncedClicks {
             dismiss()
-            startActivity(SpaceManageActivity.newIntent(requireActivity(), spaceArgs.spaceId))
+            startActivity(SpaceManageActivity.newIntent(requireActivity(), spaceArgs.spaceId, ManageType.AddRooms))
         }
 
         views.leaveSpace.views.bottomSheetActionClickableZone.debouncedClicks {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/RoomManageSelectionItem.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/RoomManageSelectionItem.kt
new file mode 100644
index 0000000000..9d188ac457
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/RoomManageSelectionItem.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_room_to_manage_in_space)
+abstract class RoomManageSelectionItem : VectorEpoxyModel<RoomManageSelectionItem.Holder>() {
+
+    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute var space: Boolean = false
+    @EpoxyAttribute var selected: Boolean = false
+    @EpoxyAttribute var suggested: Boolean = false
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var itemClickListener: View.OnClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        if (space) {
+            avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
+        } else {
+            avatarRenderer.render(matrixItem, holder.avatarImageView)
+        }
+        holder.titleText.text = matrixItem.getBestName()
+
+        if (selected) {
+            holder.checkboxImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_checkbox_on))
+            holder.checkboxImage.contentDescription = holder.view.context.getString(R.string.a11y_checked)
+        } else {
+            holder.checkboxImage.setImageDrawable(ContextCompat.getDrawable(holder.view.context, R.drawable.ic_checkbox_off))
+            holder.checkboxImage.contentDescription = holder.view.context.getString(R.string.a11y_unchecked)
+        }
+
+        holder.suggestedText.isVisible = suggested
+
+        holder.view.setOnClickListener {
+            itemClickListener?.onClick(it)
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.itemAddRoomRoomAvatar)
+        val titleText by bind<TextView>(R.id.itemAddRoomRoomNameText)
+        val suggestedText by bind<TextView>(R.id.itemManageRoomSuggested)
+        val checkboxImage by bind<ImageView>(R.id.itemAddRoomRoomCheckBox)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index f64a4c897b..ce677e39c7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -54,6 +54,11 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
         private val session: Session
 ) : VectorViewModel<SpaceAddRoomsState, SpaceAddRoomActions, SpaceAddRoomsViewEvents>(initialState) {
 
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: SpaceAddRoomsState): SpaceAddRoomsViewModel
+    }
+
     val updatableLiveSpacePageResult: UpdatableLivePageResult by lazy {
         session.getFilteredPagedRoomSummariesLive(
                 roomSummaryQueryParams {
@@ -106,11 +111,6 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
         }
     }
 
-    @AssistedFactory
-    interface Factory {
-        fun create(initialState: SpaceAddRoomsState): SpaceAddRoomsViewModel
-    }
-
     companion object : MvRxViewModelFactory<SpaceAddRoomsViewModel, SpaceAddRoomsState> {
         override fun create(viewModelContext: ViewModelContext, state: SpaceAddRoomsState): SpaceAddRoomsViewModel? {
             val factory = when (viewModelContext) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
index 47c8982643..f3bf3eda09 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
@@ -20,28 +20,37 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
+import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.platform.ToolbarConfigurable
 import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.databinding.ActivitySimpleBinding
+import im.vector.app.databinding.ActivitySimpleLoadingBinding
 import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
 import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
 import im.vector.app.features.roomdirectory.createroom.CreateRoomArgs
 import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.parcelize.Parcelize
 import javax.inject.Inject
 
 @Parcelize
 data class SpaceManageArgs(
-        val spaceId: String
+        val spaceId: String,
+        val manageType: ManageType
 ) : Parcelable
 
-class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceManageSharedViewModel.Factory {
+class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
+        ToolbarConfigurable,
+        SpaceManageSharedViewModel.Factory {
 
     @Inject lateinit var sharedViewModelFactory: SpaceManageSharedViewModel.Factory
     private lateinit var sharedDirectoryActionViewModel: RoomDirectorySharedActionViewModel
@@ -50,12 +59,26 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
         injector.inject(this)
     }
 
-    override fun getBinding(): ActivitySimpleBinding = ActivitySimpleBinding.inflate(layoutInflater)
+    override fun getBinding(): ActivitySimpleLoadingBinding = ActivitySimpleLoadingBinding.inflate(layoutInflater)
 
     override fun getTitleRes(): Int = R.string.space_add_existing_rooms
 
     val sharedViewModel: SpaceManageSharedViewModel by viewModel()
 
+    override fun showWaitingView(text: String?) {
+        hideKeyboard()
+        views.waitingView.waitingStatusText.isGone = views.waitingView.waitingStatusText.text.isNullOrBlank()
+        super.showWaitingView(text)
+    }
+
+    override fun hideWaitingView() {
+        views.waitingView.waitingStatusText.text = null
+        views.waitingView.waitingStatusText.isGone = true
+        views.waitingView.waitingHorizontalProgress.progress = 0
+        views.waitingView.waitingHorizontalProgress.isVisible = false
+        super.hideWaitingView()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -72,14 +95,33 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
 
         val args = intent?.getParcelableExtra<SpaceManageArgs>(MvRx.KEY_ARG)
         if (isFirstCreation()) {
-            val simpleName = SpaceAddRoomFragment::class.java.simpleName
-            if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
-                supportFragmentManager.commitTransaction {
-                    replace(R.id.simpleFragmentContainer,
-                            SpaceAddRoomFragment::class.java,
-                            Bundle().apply { this.putParcelable(MvRx.KEY_ARG, args) },
-                            simpleName
-                    )
+            withState(sharedViewModel) {
+                when (it.manageType) {
+                    ManageType.AddRooms -> {
+                        val simpleName = SpaceAddRoomFragment::class.java.simpleName
+                        if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
+                            supportFragmentManager.commitTransaction {
+                                replace(R.id.simpleFragmentContainer,
+                                        SpaceAddRoomFragment::class.java,
+                                        Bundle().apply { this.putParcelable(MvRx.KEY_ARG, args) },
+                                        simpleName
+                                )
+                            }
+                        }
+                    }
+                    ManageType.Settings -> {
+                        val simpleName = SpaceSettingsFragment::class.java.simpleName
+                        if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
+                            supportFragmentManager.commitTransaction {
+                                replace(R.id.simpleFragmentContainer,
+                                        SpaceSettingsFragment::class.java,
+                                        Bundle().apply { this.putParcelable(MvRx.KEY_ARG, RoomProfileArgs(args?.spaceId ?: "")) },
+                                        simpleName
+                                )
+                            }
+                        }
+                    }
+                    ManageType.ManageRooms -> TODO()
                 }
             }
         }
@@ -90,10 +132,10 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
                     finish()
                 }
                 SpaceManagedSharedViewEvents.HideLoading -> {
-                    views.simpleActivityWaitingView.isVisible = false
+                    hideWaitingView()
                 }
                 SpaceManagedSharedViewEvents.ShowLoading -> {
-                    views.simpleActivityWaitingView.isVisible = true
+                    showWaitingView()
                 }
                 SpaceManagedSharedViewEvents.NavigateToCreateRoom -> {
                     addFragmentToBackstack(
@@ -102,17 +144,28 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleBinding>(), SpaceMa
                             CreateRoomArgs("", parentSpaceId = args?.spaceId)
                     )
                 }
+                SpaceManagedSharedViewEvents.NavigateToManageRooms -> {
+                    addFragmentToBackstack(
+                            R.id.simpleFragmentContainer,
+                            SpaceManageRoomsFragment::class.java,
+                            SpaceManageArgs(args?.spaceId ?: "", ManageType.ManageRooms)
+                    )
+                }
             }
         }
     }
 
     companion object {
-        fun newIntent(context: Context, spaceId: String): Intent {
+        fun newIntent(context: Context, spaceId: String, manageType: ManageType): Intent {
             return Intent(context, SpaceManageActivity::class.java).apply {
-                putExtra(MvRx.KEY_ARG, SpaceManageArgs(spaceId))
+                putExtra(MvRx.KEY_ARG, SpaceManageArgs(spaceId, manageType))
             }
         }
     }
 
     override fun create(initialState: SpaceManageViewState) = sharedViewModelFactory.create(initialState)
+
+    override fun configure(toolbar: Toolbar) {
+        configureToolbar(toolbar)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt
new file mode 100644
index 0000000000..c232377aba
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewAction.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class SpaceManageRoomViewAction : VectorViewModelAction {
+    data class ToggleSelection(val roomId: String) : SpaceManageRoomViewAction()
+    data class UpdateFilter(val filter: String) : SpaceManageRoomViewAction()
+    object ClearSelection : SpaceManageRoomViewAction()
+    data class MarkAllAsSuggested(val suggested: Boolean) : SpaceManageRoomViewAction()
+    object BulkRemove : SpaceManageRoomViewAction()
+    object RefreshFromServer : SpaceManageRoomViewAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
new file mode 100644
index 0000000000..b135fd89f5
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SpaceManageRoomViewEvents : VectorViewEvents {
+    object BulkActionSuccess: SpaceManageRoomViewEvents()
+    data class BulkActionFailure(val errorList: List<String>) : SpaceManageRoomViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt
new file mode 100644
index 0000000000..7bae216b10
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewState.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+
+data class SpaceManageRoomViewState(
+        val spaceId: String,
+        val spaceSummary: Async<RoomSummary> = Uninitialized,
+        val childrenInfo: Async<List<SpaceChildInfo>> = Uninitialized,
+        val selectedRooms: List<String> = emptyList(),
+        val currentFilter: String = "",
+        val actionState: Async<Unit> = Uninitialized
+) : MvRxState {
+    constructor(args: SpaceManageArgs) : this(
+            spaceId = args.spaceId
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
new file mode 100644
index 0000000000..853333faa6
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Incomplete
+import im.vector.app.core.epoxy.errorWithRetryItem
+import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import io.reactivex.functions.Predicate
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.room.model.RoomType
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class SpaceManageRoomsController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val errorFormatter: ErrorFormatter
+) : TypedEpoxyController<SpaceManageRoomViewState>() {
+
+    interface Listener {
+        fun toggleSelection(childInfo: SpaceChildInfo)
+        fun retry()
+    }
+
+    var listener: Listener? = null
+    private val matchFilter = SpaceChildInfoMatchFilter()
+
+    override fun buildModels(data: SpaceManageRoomViewState?) {
+        val roomListAsync = data?.childrenInfo
+        if (roomListAsync is Incomplete) {
+            loadingItem { id("loading") }
+            return
+        }
+        if (roomListAsync is Fail) {
+            errorWithRetryItem {
+                id("Api Error")
+                text(errorFormatter.toHumanReadable(roomListAsync.error))
+                listener { listener?.retry() }
+            }
+            return
+        }
+
+        val roomList = roomListAsync?.invoke() ?: return
+
+        val directChildren = roomList.filter {
+            it.parentRoomId == data.spaceId
+            /** Only direct children **/
+        }
+        matchFilter.filter = data.currentFilter
+        val filteredResult = directChildren.filter { matchFilter.test(it) }
+
+        filteredResult.forEach { childInfo ->
+            roomManageSelectionItem {
+                id(childInfo.childRoomId)
+                matrixItem(childInfo.toMatrixItem())
+                avatarRenderer(avatarRenderer)
+                suggested(childInfo.suggested ?: false)
+                space(childInfo.roomType == RoomType.SPACE)
+                selected(data.selectedRooms.contains(childInfo.childRoomId))
+                itemClickListener(DebouncedClickListener({
+                    listener?.toggleSelection(childInfo)
+                }))
+            }
+        }
+    }
+}
+
+class SpaceChildInfoMatchFilter : Predicate<SpaceChildInfo> {
+    var filter: String = ""
+
+    override fun test(spaceChildInfo: SpaceChildInfo): Boolean {
+        if (filter.isEmpty()) {
+            // No filter
+            return true
+        }
+        // if filter is "Jo Do", it should match "John Doe"
+        return filter.split(" ").all {
+            spaceChildInfo.name?.contains(it, ignoreCase = true).orFalse()
+                    || spaceChildInfo.topic?.contains(it, ignoreCase = true).orFalse()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
new file mode 100644
index 0000000000..9e1463cb68
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.view.ActionMode
+import androidx.appcompat.view.ActionMode.Callback
+import androidx.core.view.isVisible
+import androidx.transition.TransitionManager
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import com.jakewharton.rxbinding3.appcompat.queryTextChanges
+import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.utils.toast
+import im.vector.app.databinding.FragmentSpaceAddRoomsBinding
+import io.reactivex.rxkotlin.subscribeBy
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+class SpaceManageRoomsFragment @Inject constructor(
+        private val viewModelFactory: SpaceManageRoomsViewModel.Factory,
+        private val epoxyController: SpaceManageRoomsController
+) : VectorBaseFragment<FragmentSpaceAddRoomsBinding>(),
+        SpaceManageRoomsViewModel.Factory,
+        OnBackPressed,
+        SpaceManageRoomsController.Listener,
+        Callback {
+
+    private val viewModel by fragmentViewModel(SpaceManageRoomsViewModel::class)
+    private val sharedViewModel: SpaceManageSharedViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) = FragmentSpaceAddRoomsBinding.inflate(inflater)
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        parentFragmentManager.popBackStack()
+        return true
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar(views.addRoomToSpaceToolbar)
+        views.appBarTitle.text = getString(R.string.space_manage_rooms_and_spaces)
+        views.createNewRoom.isVisible = false
+        epoxyController.listener = this
+        views.roomList.configureWith(epoxyController, hasFixedSize = true, showDivider = true)
+
+        views.publicRoomsFilter.queryTextChanges()
+                .debounce(200, TimeUnit.MILLISECONDS)
+                .subscribeBy {
+                    viewModel.handle(SpaceManageRoomViewAction.UpdateFilter(it.toString()))
+                }
+                .disposeOnDestroyView()
+
+        viewModel.selectSubscribe(SpaceManageRoomViewState::actionState) { actionState ->
+            when (actionState) {
+                is Loading -> {
+                    sharedViewModel.handle(SpaceManagedSharedAction.ShowLoading)
+                }
+                else       -> {
+                    sharedViewModel.handle(SpaceManagedSharedAction.HideLoading)
+                }
+            }
+        }
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is SpaceManageRoomViewEvents.BulkActionFailure -> {
+                    it.errorList.forEach {
+                        vectorBaseActivity.toast(it)
+                    }
+                }
+                SpaceManageRoomViewEvents.BulkActionSuccess -> {
+                    //
+                }
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        epoxyController.listener = null
+        views.roomList.cleanup()
+        super.onDestroyView()
+    }
+
+    override fun create(initialState: SpaceManageRoomViewState) = viewModelFactory.create(initialState)
+
+    override fun invalidate() = withState(viewModel) { state ->
+        epoxyController.setData(state)
+
+        state.spaceSummary.invoke()?.let {
+            views.appBarSpaceInfo.text = it.displayName
+        }
+        if (state.selectedRooms.isNotEmpty()) {
+            if (currentActionMode == null) {
+                views.addRoomToSpaceToolbar.isVisible = true
+                vectorBaseActivity.startSupportActionMode(this)
+            } else {
+                currentActionMode?.title = "${state.selectedRooms.size} selected"
+            }
+//            views.addRoomToSpaceToolbar.isVisible = false
+//            views.addRoomToSpaceToolbar.startActionMode(this)
+        } else {
+            currentActionMode?.finish()
+        }
+        Unit
+    }
+
+    var currentActionMode: ActionMode? = null
+
+    override fun toggleSelection(childInfo: SpaceChildInfo) {
+        viewModel.handle(SpaceManageRoomViewAction.ToggleSelection(childInfo.childRoomId))
+    }
+
+    override fun retry() {
+        viewModel.handle(SpaceManageRoomViewAction.RefreshFromServer)
+    }
+
+    override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+        val inflater = mode?.menuInflater
+        inflater?.inflate(R.menu.menu_manage_space, menu)
+        withState(viewModel) {
+            mode?.title = resources.getQuantityString(R.plurals.room_details_selected, it.selectedRooms.size, it.selectedRooms.size)
+        }
+        currentActionMode = mode
+        views.addRoomToSpaceToolbar.isVisible = false
+        return true
+    }
+
+    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
+        withState(viewModel) { state ->
+            // check if we show mark as suggested or not
+            val areAllSuggested = state.childrenInfo.invoke().orEmpty().filter { state.selectedRooms.contains(it.childRoomId) }
+                    .all { it.suggested == true }
+            menu?.findItem(R.id.action_mark_as_suggested)?.isVisible = !areAllSuggested
+            menu?.findItem(R.id.action_mark_as_not_suggested)?.isVisible = areAllSuggested
+        }
+
+        return true
+    }
+
+    override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
+        when (item?.itemId) {
+            R.id.action_delete -> {
+                handleDeleteSelection()
+            }
+            R.id.action_mark_as_suggested -> {
+                viewModel.handle(SpaceManageRoomViewAction.MarkAllAsSuggested(true))
+            }
+            R.id.action_mark_as_not_suggested -> {
+                viewModel.handle(SpaceManageRoomViewAction.MarkAllAsSuggested(false))
+            }
+            else                              -> {
+            }
+        }
+        mode?.finish()
+        return true
+    }
+
+    private fun handleDeleteSelection() {
+        viewModel.handle(SpaceManageRoomViewAction.BulkRemove)
+    }
+
+    override fun onDestroyActionMode(mode: ActionMode?) {
+        // should force a refresh
+        currentActionMode = null
+        viewModel.handle(SpaceManageRoomViewAction.ClearSelection)
+        views.coordinatorLayout.post {
+            if (isAdded) {
+                TransitionManager.beginDelayedTransition(views.coordinatorLayout)
+                views.addRoomToSpaceToolbar.isVisible = true
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
new file mode 100644
index 0000000000..d229c5072b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.ViewModelContext
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.mvrx.runCatchingToAsync
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.session.coroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+
+class SpaceManageRoomsViewModel @AssistedInject constructor(
+        @Assisted val initialState: SpaceManageRoomViewState,
+        private val session: Session,
+        private val errorFormatter: ErrorFormatter
+) : VectorViewModel<SpaceManageRoomViewState, SpaceManageRoomViewAction, SpaceManageRoomViewEvents>(initialState) {
+
+    init {
+        val spaceSummary = session.getRoomSummary(initialState.spaceId)
+        setState {
+            copy(
+                    spaceSummary = spaceSummary?.let { Success(it) } ?: Uninitialized,
+                    childrenInfo = Loading()
+            )
+        }
+
+        viewModelScope.launch(Dispatchers.IO) {
+            val apiResult = runCatchingToAsync {
+                session.spaceService().querySpaceChildren(spaceId = initialState.spaceId).second
+            }
+            setState {
+                copy(
+                        childrenInfo = apiResult
+                )
+            }
+        }
+    }
+
+    @AssistedFactory
+    interface Factory {
+        fun create(initialState: SpaceManageRoomViewState): SpaceManageRoomsViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SpaceManageRoomsViewModel, SpaceManageRoomViewState> {
+        override fun create(viewModelContext: ViewModelContext, state: SpaceManageRoomViewState): SpaceManageRoomsViewModel? {
+            val factory = when (viewModelContext) {
+                is FragmentViewModelContext -> viewModelContext.fragment as? Factory
+                is ActivityViewModelContext -> viewModelContext.activity as? Factory
+            }
+            return factory?.create(state) ?: error("You should let your activity/fragment implements Factory interface")
+        }
+    }
+
+    override fun handle(action: SpaceManageRoomViewAction) {
+        when (action) {
+            is SpaceManageRoomViewAction.ToggleSelection    -> handleToggleSelection(action)
+            is SpaceManageRoomViewAction.UpdateFilter       -> {
+                setState { copy(currentFilter = action.filter) }
+            }
+            SpaceManageRoomViewAction.ClearSelection        -> {
+                setState { copy(selectedRooms = emptyList()) }
+            }
+            SpaceManageRoomViewAction.BulkRemove            -> {
+                handleBulkRemove()
+            }
+            is SpaceManageRoomViewAction.MarkAllAsSuggested -> {
+                handleBulkMarkAsSuggested(action.suggested)
+            }
+            SpaceManageRoomViewAction.RefreshFromServer     -> {
+                refreshSummaryAPI()
+            }
+        }
+    }
+
+    private fun handleBulkRemove() = withState { state ->
+        setState { copy(actionState = Loading()) }
+        val selection = state.selectedRooms
+        session.coroutineScope.launch(Dispatchers.IO) {
+            val errorList = mutableListOf<Throwable>()
+            selection.forEach {
+                try {
+                    session.spaceService().getSpace(state.spaceId)?.removeChildren(it)
+                } catch (failure: Throwable) {
+                    errorList.add(failure)
+                }
+            }
+            if (errorList.isEmpty()) {
+                // success
+                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionSuccess)
+            } else {
+                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionFailure(errorList.map { errorFormatter.toHumanReadable(it) }))
+            }
+            setState { copy(actionState = Uninitialized) }
+        }
+    }
+
+    private fun handleBulkMarkAsSuggested(suggested: Boolean) = withState { state ->
+        setState { copy(actionState = Loading()) }
+        val selection = state.childrenInfo.invoke()?.filter {
+            state.selectedRooms.contains(it.childRoomId)
+        }.orEmpty()
+        session.coroutineScope.launch(Dispatchers.IO) {
+            val errorList = mutableListOf<Throwable>()
+            selection.forEach { info ->
+                try {
+//                    session.spaceService().getSpace(state.spaceId)?.setChildrenSuggested(roomId, suggested)
+                    session.spaceService().getSpace(state.spaceId)?.addChildren(
+                            roomId = info.childRoomId,
+                            viaServers = info?.viaServers ?: emptyList(),
+                            order = info?.order,
+                            suggested = suggested,
+                            autoJoin = info?.autoJoin ?: false
+                    )
+                } catch (failure: Throwable) {
+                    errorList.add(failure)
+                }
+            }
+            if (errorList.isEmpty()) {
+                // success
+                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionSuccess)
+                refreshSummaryAPI()
+            } else {
+                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionFailure(errorList.map { errorFormatter.toHumanReadable(it) }))
+            }
+            setState { copy(actionState = Uninitialized) }
+        }
+    }
+
+    private fun refreshSummaryAPI() {
+        setState {
+            copy(
+                    childrenInfo = Loading()
+            )
+        }
+        viewModelScope.launch(Dispatchers.IO) {
+            val apiResult = runCatchingToAsync {
+                session.spaceService().querySpaceChildren(spaceId = initialState.spaceId).second
+            }
+            setState {
+                copy(
+                        childrenInfo = apiResult
+                )
+            }
+        }
+    }
+
+    private fun handleToggleSelection(action: SpaceManageRoomViewAction.ToggleSelection) = withState { state ->
+        val existing = state.selectedRooms.toMutableList()
+        if (existing.contains(action.roomId)) {
+            existing.remove(action.roomId)
+        } else {
+            existing.add(action.roomId)
+        }
+        setState {
+            copy(
+                    selectedRooms = existing.toList()
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
index 24110c081a..57c47250f9 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageSharedViewModel.kt
@@ -55,6 +55,7 @@ class SpaceManageSharedViewModel @AssistedInject constructor(
             SpaceManagedSharedAction.HideLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.HideLoading)
             SpaceManagedSharedAction.ShowLoading -> _viewEvents.post(SpaceManagedSharedViewEvents.ShowLoading)
             SpaceManagedSharedAction.CreateRoom ->  _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToCreateRoom)
+            SpaceManagedSharedAction.ManageRooms -> _viewEvents.post(SpaceManagedSharedViewEvents.NavigateToManageRooms)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
index 18c289f3b3..91d49d90d1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageViewState.kt
@@ -18,10 +18,17 @@ package im.vector.app.features.spaces.manage
 
 import com.airbnb.mvrx.MvRxState
 
+enum class ManageType {
+    AddRooms,
+    Settings,
+    ManageRooms
+}
 data class SpaceManageViewState(
-        val spaceId: String = ""
+        val spaceId: String = "",
+        val manageType: ManageType
 ) : MvRxState {
     constructor(args: SpaceManageArgs) : this(
-            spaceId = args.spaceId
+            spaceId = args.spaceId,
+            manageType = args.manageType
     )
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
index 1c0de1041b..0b413a3b8a 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedAction.kt
@@ -23,4 +23,5 @@ sealed class SpaceManagedSharedAction : VectorViewModelAction {
     object ShowLoading : SpaceManagedSharedAction()
     object HideLoading : SpaceManagedSharedAction()
     object CreateRoom : SpaceManagedSharedAction()
+    object ManageRooms : SpaceManagedSharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
index 0cf6bcaee1..da6f01d205 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManagedSharedViewEvents.kt
@@ -23,4 +23,5 @@ sealed class SpaceManagedSharedViewEvents : VectorViewEvents {
     object ShowLoading : SpaceManagedSharedViewEvents()
     object HideLoading : SpaceManagedSharedViewEvents()
     object NavigateToCreateRoom : SpaceManagedSharedViewEvents()
+    object NavigateToManageRooms : SpaceManagedSharedViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
new file mode 100644
index 0000000000..c92692a800
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.R
+import im.vector.app.core.epoxy.profiles.buildProfileAction
+import im.vector.app.core.epoxy.profiles.buildProfileSection
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.form.formEditTextItem
+import im.vector.app.features.form.formEditableSquareAvatarItem
+import im.vector.app.features.form.formMultiLineEditTextItem
+import im.vector.app.features.form.formSwitchItem
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewState
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewState.Companion.getJoinRuleWording
+import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class SpaceSettingsController @Inject constructor(
+        private val stringProvider: StringProvider,
+        private val avatarRenderer: AvatarRenderer,
+        colorProvider: ColorProvider,
+        private val vectorPreferences: VectorPreferences
+) : TypedEpoxyController<RoomSettingsViewState>() {
+
+    interface Callback {
+        // Delete the avatar, or cancel an avatar change
+        fun onAvatarDelete()
+        fun onAvatarChange()
+        fun onNameChanged(name: String)
+        fun onTopicChanged(topic: String)
+        fun onHistoryVisibilityClicked()
+        fun onJoinRuleClicked()
+        fun onToggleGuestAccess()
+        fun onDevTools()
+        fun onDevRoomSettings()
+        fun onManageRooms()
+        fun setIsPublic(public: Boolean)
+    }
+
+    private val dividerColor = colorProvider.getColorFromAttribute(R.attr.vctr_list_divider_color)
+
+    var callback: Callback? = null
+
+    override fun buildModels(data: RoomSettingsViewState?) {
+        val roomSummary = data?.roomSummary?.invoke() ?: return
+
+        formEditableSquareAvatarItem {
+            id("avatar")
+            enabled(data.actionPermissions.canChangeAvatar)
+            when (val avatarAction = data.avatarAction) {
+                RoomSettingsViewState.AvatarAction.None -> {
+                    // Use the current value
+                    avatarRenderer(avatarRenderer)
+                    // We do not want to use the fallback avatar url, which can be the other user avatar, or the current user avatar.
+                    matrixItem(roomSummary.toMatrixItem().copy(avatarUrl = data.currentRoomAvatarUrl))
+                }
+                RoomSettingsViewState.AvatarAction.DeleteAvatar ->
+                    imageUri(null)
+                is RoomSettingsViewState.AvatarAction.UpdateAvatar ->
+                    imageUri(avatarAction.newAvatarUri)
+            }
+            clickListener { callback?.onAvatarChange() }
+            deleteListener { callback?.onAvatarDelete() }
+        }
+
+        buildProfileSection(
+                stringProvider.getString(R.string.settings)
+        )
+
+        formEditTextItem {
+            id("name")
+            enabled(data.actionPermissions.canChangeName)
+            value(data.newName ?: roomSummary.displayName)
+            hint(stringProvider.getString(R.string.create_room_name_hint))
+            showBottomSeparator(false)
+            onTextChange { text ->
+                callback?.onNameChanged(text)
+            }
+        }
+
+        formMultiLineEditTextItem {
+            id("topic")
+            enabled(data.actionPermissions.canChangeTopic)
+            value(data.newTopic ?: roomSummary.topic)
+            hint(stringProvider.getString(R.string.create_space_topic_hint))
+            showBottomSeparator(false)
+            onTextChange { text ->
+                callback?.onTopicChanged(text)
+            }
+        }
+
+        if (vectorPreferences.labsUseExperimentalRestricted()) {
+            buildProfileAction(
+                    id = "joinRule",
+                    title = stringProvider.getString(R.string.room_settings_room_access_title),
+                    subtitle = data.getJoinRuleWording(stringProvider),
+                    dividerColor = dividerColor,
+                    divider = true,
+                    editable = data.actionPermissions.canChangeJoinRule,
+                    action = { if (data.actionPermissions.canChangeJoinRule) callback?.onJoinRuleClicked() }
+            )
+        } else {
+            val isPublic = (data.newRoomJoinRules.newJoinRules ?: data.currentRoomJoinRules) == RoomJoinRules.PUBLIC
+            formSwitchItem {
+                id("isPublic")
+                enabled(data.actionPermissions.canChangeJoinRule)
+                title(stringProvider.getString(R.string.make_this_space_public))
+                switchChecked(isPublic)
+
+                listener { value ->
+                    callback?.setIsPublic(value)
+                }
+            }
+        }
+
+        buildProfileAction(
+                id = "manage_rooms",
+                title = stringProvider.getString(R.string.space_settings_manage_rooms),
+                // subtitle = data.getJoinRuleWording(stringProvider),
+                dividerColor = dividerColor,
+                divider = vectorPreferences.developerMode(),
+                editable = data.actionPermissions.canAddChildren,
+                action = {
+                    if (data.actionPermissions.canAddChildren) callback?.onManageRooms()
+                }
+        )
+
+        if (vectorPreferences.developerMode()) {
+            buildProfileAction(
+                    id = "dev_tools",
+                    title = stringProvider.getString(R.string.settings_dev_tools),
+                    icon = R.drawable.ic_verification_glasses,
+                    tintIcon = false,
+                    dividerColor = dividerColor,
+                    divider = true,
+                    action = {
+                        callback?.onDevTools()
+                    }
+            )
+
+            buildProfileAction(
+                    id = "room_tools",
+                    title = stringProvider.getString(R.string.room_list_quick_actions_room_settings),
+                    icon = R.drawable.ic_verification_glasses,
+                    tintIcon = false,
+                    dividerColor = dividerColor,
+                    divider = false,
+                    action = {
+                        callback?.onDevRoomSettings()
+                    }
+            )
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
new file mode 100644
index 0000000000..e33f461f47
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.args
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.intent.getFilenameFromUri
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.core.utils.toast
+import im.vector.app.databinding.FragmentRoomSettingGenericBinding
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomprofile.RoomProfileArgs
+import im.vector.app.features.roomprofile.settings.RoomSettingsAction
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewEvents
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewModel
+import im.vector.app.features.roomprofile.settings.RoomSettingsViewState
+import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleBottomSheet
+import im.vector.app.features.roomprofile.settings.joinrule.RoomJoinRuleSharedActionViewModel
+import org.matrix.android.sdk.api.session.room.model.GuestAccess
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
+import org.matrix.android.sdk.api.util.toMatrixItem
+import java.util.UUID
+import javax.inject.Inject
+
+class SpaceSettingsFragment @Inject constructor(
+        private val epoxyController: SpaceSettingsController,
+        private val colorProvider: ColorProvider,
+        val viewModelFactory: RoomSettingsViewModel.Factory,
+        private val avatarRenderer: AvatarRenderer,
+        private val drawableProvider: DrawableProvider
+) : VectorBaseFragment<FragmentRoomSettingGenericBinding>(),
+        RoomSettingsViewModel.Factory,
+        SpaceSettingsController.Callback,
+        GalleryOrCameraDialogHelper.Listener,
+        OnBackPressed {
+
+    private val viewModel: RoomSettingsViewModel by fragmentViewModel()
+    private val sharedViewModel: SpaceManageSharedViewModel by activityViewModel()
+
+    private lateinit var roomJoinRuleSharedActionViewModel: RoomJoinRuleSharedActionViewModel
+
+    private val galleryOrCameraDialogHelper = GalleryOrCameraDialogHelper(this, colorProvider)
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) = FragmentRoomSettingGenericBinding.inflate(inflater)
+
+    private val roomProfileArgs: RoomProfileArgs by args()
+
+    override fun getMenuRes() = R.menu.vector_room_settings
+
+    override fun create(initialState: RoomSettingsViewState): RoomSettingsViewModel {
+        return viewModelFactory.create(initialState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar(views.roomSettingsToolbar)
+        // roomProfileSharedActionViewModel = activityViewModelProvider.get(RoomProfileSharedActionViewModel::class.java)
+//        setupRoomHistoryVisibilitySharedActionViewModel()
+        setupRoomJoinRuleSharedActionViewModel()
+        epoxyController.callback = this
+        views.roomSettingsRecyclerView.configureWith(epoxyController, hasFixedSize = true)
+        views.waitingView.waitingStatusText.setText(R.string.please_wait)
+        views.waitingView.waitingStatusText.isVisible = true
+
+        viewModel.observeViewEvents {
+            when (it) {
+                is RoomSettingsViewEvents.Failure -> showFailure(it.throwable)
+                RoomSettingsViewEvents.Success -> showSuccess()
+                RoomSettingsViewEvents.GoBack -> {
+                    ignoreChanges = true
+                    vectorBaseActivity.onBackPressed()
+                }
+            }.exhaustive
+        }
+    }
+
+    override fun onDestroyView() {
+        epoxyController.callback = null
+        views.roomSettingsRecyclerView.cleanup()
+        super.onDestroyView()
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        withState(viewModel) { state ->
+            menu.findItem(R.id.roomSettingsSaveAction).isVisible = state.showSaveAction
+        }
+        super.onPrepareOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.roomSettingsSaveAction) {
+            viewModel.handle(RoomSettingsAction.Save)
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun renderRoomSummary(state: RoomSettingsViewState) {
+        views.waitingView.root.isVisible = state.isLoading
+
+        state.roomSummary()?.let {
+            views.roomSettingsToolbarTitleView.text = it.displayName
+            views.roomSettingsToolbarTitleView.setCompoundDrawablesWithIntrinsicBounds(
+                    null,
+                    null,
+                    drawableProvider.getDrawable(R.drawable.ic_beta_pill),
+                    null
+            )
+            avatarRenderer.renderSpace(it.toMatrixItem(), views.roomSettingsToolbarAvatarImageView)
+            views.roomSettingsDecorationToolbarAvatarImageView.render(it.roomEncryptionTrustLevel)
+        }
+
+        invalidateOptionsMenu()
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        epoxyController.setData(state)
+        renderRoomSummary(state)
+    }
+
+    private fun setupRoomJoinRuleSharedActionViewModel() {
+        roomJoinRuleSharedActionViewModel = activityViewModelProvider.get(RoomJoinRuleSharedActionViewModel::class.java)
+        roomJoinRuleSharedActionViewModel
+                .observe()
+                .subscribe { action ->
+                    viewModel.handle(RoomSettingsAction.SetRoomJoinRule(action.roomJoinRule))
+                }
+                .disposeOnDestroyView()
+    }
+
+    private var ignoreChanges = false
+
+    override fun onBackPressed(toolbarButton: Boolean): Boolean {
+        if (ignoreChanges) return false
+
+        return withState(viewModel) {
+            return@withState if (it.showSaveAction) {
+                AlertDialog.Builder(requireContext())
+                        .setTitle(R.string.dialog_title_warning)
+                        .setMessage(R.string.warning_unsaved_change)
+                        .setPositiveButton(R.string.warning_unsaved_change_discard) { _, _ ->
+                            viewModel.handle(RoomSettingsAction.Cancel)
+                        }
+                        .setNegativeButton(R.string.cancel, null)
+                        .show()
+                true
+            } else {
+                false
+            }
+        }
+    }
+
+    private fun showSuccess() {
+        activity?.toast(R.string.room_settings_save_success)
+    }
+
+    override fun onNameChanged(name: String) {
+        viewModel.handle(RoomSettingsAction.SetRoomName(name))
+    }
+
+    override fun onTopicChanged(topic: String) {
+        viewModel.handle(RoomSettingsAction.SetRoomTopic(topic))
+    }
+
+    override fun onHistoryVisibilityClicked() {}
+
+    override fun onJoinRuleClicked() = withState(viewModel) { state ->
+        val currentJoinRule = state.newRoomJoinRules.newJoinRules ?: state.currentRoomJoinRules
+        RoomJoinRuleBottomSheet.newInstance(currentJoinRule)
+                .show(childFragmentManager, "RoomJoinRuleBottomSheet")
+    }
+
+    override fun onToggleGuestAccess() = withState(viewModel) { state ->
+        val currentGuestAccess = state.newRoomJoinRules.newGuestAccess ?: state.currentGuestAccess
+        val toggled = if (currentGuestAccess == GuestAccess.Forbidden) GuestAccess.CanJoin else GuestAccess.Forbidden
+        viewModel.handle(RoomSettingsAction.SetRoomGuestAccess(toggled))
+    }
+
+    override fun onDevTools() = withState(viewModel) { state ->
+        navigator.openDevTools(requireContext(), state.roomId)
+    }
+
+    override fun onDevRoomSettings() = withState(viewModel) { state ->
+        navigator.openRoomProfile(requireContext(), state.roomId)
+    }
+
+    override fun onManageRooms() {
+        sharedViewModel.handle(SpaceManagedSharedAction.ManageRooms)
+    }
+
+    override fun setIsPublic(public: Boolean) {
+        if (public) {
+            viewModel.handle(RoomSettingsAction.SetRoomJoinRule(RoomJoinRules.PUBLIC))
+            viewModel.handle(RoomSettingsAction.SetRoomHistoryVisibility(RoomHistoryVisibility.WORLD_READABLE))
+        } else {
+            viewModel.handle(RoomSettingsAction.SetRoomJoinRule(RoomJoinRules.INVITE))
+            viewModel.handle(RoomSettingsAction.SetRoomHistoryVisibility(RoomHistoryVisibility.INVITED))
+        }
+    }
+
+    override fun onImageReady(uri: Uri?) {
+        uri ?: return
+        viewModel.handle(
+                RoomSettingsAction.SetAvatarAction(
+                        RoomSettingsViewState.AvatarAction.UpdateAvatar(
+                                newAvatarUri = uri,
+                                newAvatarFileName = getFilenameFromUri(requireContext(), uri) ?: UUID.randomUUID().toString())
+                )
+        )
+    }
+
+    override fun onAvatarDelete() {
+        withState(viewModel) {
+            when (it.avatarAction) {
+                RoomSettingsViewState.AvatarAction.None -> {
+                    viewModel.handle(RoomSettingsAction.SetAvatarAction(RoomSettingsViewState.AvatarAction.DeleteAvatar))
+                }
+                RoomSettingsViewState.AvatarAction.DeleteAvatar -> {
+                    /* Should not happen */
+                }
+                is RoomSettingsViewState.AvatarAction.UpdateAvatar -> {
+                    // Cancel the update of the avatar
+                    viewModel.handle(RoomSettingsAction.SetAvatarAction(RoomSettingsViewState.AvatarAction.None))
+                }
+            }
+        }
+    }
+
+    override fun onAvatarChange() {
+        galleryOrCameraDialogHelper.show()
+    }
+}
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index 053a326b03..b473c7b03d 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -94,12 +94,10 @@
         android:id="@+id/spaceSettings"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:visibility="gone"
         app:actionTitle="@string/settings"
         app:leftIcon="@drawable/ic_settings_root_general"
         app:tint="?attr/riotx_text_primary"
-        app:titleTextColor="?attr/riotx_text_primary"
-        tools:visibility="visible" />
+        app:titleTextColor="?attr/riotx_text_primary"/>
 
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/exploreRooms"
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 9c3827f919..fffcb59234 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -5,7 +5,7 @@
     android:id="@+id/rootConstraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?riotx_header_panel_background">
+    android:background="?riotx_background">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/roomSettingsToolbar"
diff --git a/vector/src/main/res/layout/item_room_to_manage_in_space.xml b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
new file mode 100644
index 0000000000..d6b5eb2acd
--- /dev/null
+++ b/vector/src/main/res/layout/item_room_to_manage_in_space.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemPublicRoomLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    android:minHeight="50dp">
+
+    <ImageView
+        android:id="@+id/itemAddRoomRoomAvatar"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="16dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/itemAddRoomRoomNameText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="17dp"
+        android:layout_marginEnd="4dp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/itemManageRoomSuggested"
+        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@sample/matrix.json/data/roomName" />
+
+    <TextView
+        android:id="@+id/itemManageRoomSuggested"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
+        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        android:text="@string/space_suggested" />
+
+    <ImageView
+        android:id="@+id/itemAddRoomRoomCheckBox"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginEnd="16dp"
+        android:contentDescription="@string/a11y_checked"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/itemManageRoomSuggested"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_checkbox_on" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_manage_space.xml b/vector/src/main/res/menu/menu_manage_space.xml
new file mode 100644
index 0000000000..858c3bc9c3
--- /dev/null
+++ b/vector/src/main/res/menu/menu_manage_space.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_delete"
+        android:title="@string/delete"
+        android:icon="@drawable/ic_delete_unsent_messages"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/action_mark_as_suggested"
+        android:title="@string/space_mark_as_suggested"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/action_mark_as_not_suggested"
+        android:title="@string/space_mark_as_not_suggested"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 29a298c821..cea541410b 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3356,4 +3356,10 @@
     <string name="user_invites_you">%s invites you</string>
 
     <string name="looking_for_someone_not_in_space">Looking for someone not in %s?</string>
+    <string name="space_settings_manage_rooms">Manage rooms</string>
+    <string name="make_this_space_public">Make this space public</string>
+    <string name="space_suggested">Suggested</string>
+    <string name="space_mark_as_suggested">Mark as suggested</string>
+    <string name="space_mark_as_not_suggested">Mark as not suggested</string>
+    <string name="space_manage_rooms_and_spaces">Manage rooms and spaces</string>
 </resources>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index a265727522..c3b8247582 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -11,6 +11,13 @@
         <item name="android:background">?riotx_background</item>
     </style>
 
+    <style name="ActionModeTheme" parent="Base.Widget.AppCompat.ActionMode">
+        <item name="background">?riotx_background</item>
+        <item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
+        <item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>
+        <item name="actionMenuTextColor">?colorOnPrimary</item>
+    </style>
+
     <style name="VectorToolbarStyle" parent="VectorToolbarStyleWithPadding">
         <item name="contentInsetStartWithNavigation">0dp</item>
     </style>
@@ -65,7 +72,7 @@
 
     <!-- actionbar icons color -->
     <style name="Vector.ActionBarTheme" parent="ThemeOverlay.MaterialComponents.ActionBar">
-        <item name="colorControlNormal">@android:color/white</item>
+        <item name="colorControlNormal">?android:attr/textColorPrimary</item>
     </style>
 
     <!-- custom action bar -->
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index d5b8a40cbb..94252622f4 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -181,6 +181,8 @@
 
         <!-- chat effect -->
         <item name="vctr_chat_effect_snow_background">@android:color/transparent</item>
+
+        <item name="actionModeStyle">@style/ActionModeTheme</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 049f8dd1db..e2b65a410e 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -183,6 +183,9 @@
 
         <!-- chat effect -->
         <item name="vctr_chat_effect_snow_background">@color/black_alpha</item>
+
+        <item name="actionModeStyle">@style/ActionModeTheme</item>
+
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.Base.Light" />
diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
index e136ed0f80..6ded739c0e 100644
--- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml
+++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
@@ -7,6 +7,7 @@
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:key="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
+            android:icon="@drawable/ic_verification_glasses"
             android:summary="@string/settings_developer_mode_summary"
             android:title="@string/settings_developer_mode" />
 

From 31b6d9844b8b220376481d8c08d9fdb03c868afc Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 11:44:31 +0200
Subject: [PATCH 328/350] Cleaning

---
 .../features/spaces/manage/SpaceManageRoomsViewModel.kt    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
index d229c5072b..c018b9afd0 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
@@ -129,13 +129,12 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
             val errorList = mutableListOf<Throwable>()
             selection.forEach { info ->
                 try {
-//                    session.spaceService().getSpace(state.spaceId)?.setChildrenSuggested(roomId, suggested)
                     session.spaceService().getSpace(state.spaceId)?.addChildren(
                             roomId = info.childRoomId,
-                            viaServers = info?.viaServers ?: emptyList(),
-                            order = info?.order,
+                            viaServers = info.viaServers,
+                            order = info.order,
                             suggested = suggested,
-                            autoJoin = info?.autoJoin ?: false
+                            autoJoin = info.autoJoin
                     )
                 } catch (failure: Throwable) {
                     errorList.add(failure)

From 80366ee93801a420d791251018baa132f977184f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 14:38:36 +0200
Subject: [PATCH 329/350] Code review

---
 .../database/mapper/RoomSummaryMapper.kt      |  1 -
 .../im/vector/app/core/extensions/EditText.kt | 16 ++++++++
 .../app/features/form/FormEditTextItem.kt     | 10 ++---
 .../form/FormEditTextWithButtonItem.kt        |  9 ++---
 .../form/FormMultiLineEditTextItem.kt         | 10 ++---
 .../createroom/RoomAliasEditItem.kt           |  8 +---
 .../settings/RoomSettingsController.kt        |  1 -
 .../settings/RoomSettingsViewState.kt         | 36 +++++++++---------
 .../manage/SpaceChildInfoMatchFilter.kt       | 37 +++++++++++++++++++
 .../spaces/manage/SpaceManageActivity.kt      | 20 ++++++----
 .../manage/SpaceManageRoomViewEvents.kt       |  4 +-
 .../manage/SpaceManageRoomsController.kt      | 18 ---------
 .../spaces/manage/SpaceManageRoomsFragment.kt |  7 +---
 .../manage/SpaceManageRoomsViewModel.kt       | 23 +++++-------
 .../spaces/manage/SpaceSettingsController.kt  |  2 +-
 .../spaces/manage/SpaceSettingsFragment.kt    |  4 +-
 vector/src/main/res/values/styles_riot.xml    |  2 +-
 17 files changed, 111 insertions(+), 97 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/manage/SpaceChildInfoMatchFilter.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index d52e1f995b..fbecbf37be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -90,7 +90,6 @@ internal class RoomSummaryMapper @Inject constructor(private val timelineEventMa
                             autoJoin = it.autoJoin ?: false,
                             viaServers = it.viaServers.toList(),
                             parentRoomId = roomSummaryEntity.roomId,
-                            // What to do here?
                             suggested = it.suggested
                     )
                 },
diff --git a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
index 05b70def3d..e65dc4d2c6 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
@@ -23,7 +23,9 @@ import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import androidx.annotation.DrawableRes
+import com.google.android.material.textfield.TextInputEditText
 import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.platform.SimpleTextWatcher
 
 fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_search,
@@ -57,3 +59,17 @@ fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_searc
         return@OnTouchListener false
     })
 }
+
+/**
+ * Set the initial value of the textEdit.
+ * Avoids issue with two way bindings, the value is only set the first time
+ */
+fun TextInputEditText.setValueOnce(value: String?, holder: VectorEpoxyHolder) {
+    if (holder.view.isAttachedToWindow) {
+        // the view is attached to the window
+        // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
+        // Downside is if you ever wanted to programmatically change the content of the edit text while it is on screen you would not be able to
+    } else {
+        setText(value)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index 74f088d739..9ab939945c 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -27,6 +27,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input)
@@ -75,13 +76,8 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         holder.textInputLayout.error = errorMessage
         holder.textInputLayout.endIconMode = endIconMode ?: TextInputLayout.END_ICON_NONE
 
-        if (holder.view.isAttachedToWindow) {
-            // the view is attached to the window
-            // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
-            // Downside is if you ever wanted to programmatically change the content of the edit text while it is on screen you would not be able to
-        } else {
-            holder.textInputEditText.setText(value)
-        }
+        holder.textInputEditText.setValueOnce(value, holder)
+
         holder.textInputEditText.isEnabled = enabled
         inputType?.let { holder.textInputEditText.inputType = it }
         holder.textInputEditText.isSingleLine = singleLine ?: false
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
index 227e93d2d4..ef3ee2a371 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
@@ -26,6 +26,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input_with_button)
@@ -60,12 +61,8 @@ abstract class FormEditTextWithButtonItem : VectorEpoxyModel<FormEditTextWithBut
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.hint = hint
 
-        if (holder.view.isAttachedToWindow) {
-            // the view is attached to the window
-            // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
-        } else {
-            holder.textInputEditText.setText(value)
-        }
+        holder.textInputEditText.setValueOnce(value, holder)
+
         holder.textInputEditText.isEnabled = enabled
 
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
diff --git a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
index bfdf1a3201..0cc1fdd7b8 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
@@ -27,6 +27,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_multiline_text_input)
@@ -75,13 +76,8 @@ abstract class FormMultiLineEditTextItem : VectorEpoxyModel<FormMultiLineEditTex
         holder.textInputEditText.textSize = textSizeSp?.toFloat() ?: 14f
         holder.textInputEditText.minLines = minLines
 
-        // Update only if text is different and value is not null
-        if (holder.view.isAttachedToWindow) {
-            // the view is attached to the window
-            // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
-        } else {
-            holder.textInputEditText.setText(value)
-        }
+        holder.textInputEditText.setValueOnce(value, holder)
+
         holder.textInputEditText.isEnabled = enabled
 
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
index 11f75ddfa7..aec2da22d7 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
@@ -27,6 +27,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_room_alias_text_input)
@@ -61,12 +62,7 @@ abstract class RoomAliasEditItem : VectorEpoxyModel<RoomAliasEditItem.Holder>()
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.error = errorMessage
 
-        if (holder.view.isAttachedToWindow) {
-            // the view is attached to the window
-            // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
-        } else {
-            holder.textInputEditText.setText(value)
-        }
+        holder.textInputEditText.setValueOnce(value, holder)
         holder.textInputEditText.isEnabled = enabled
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
         holder.homeServerText.text = homeServer
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index a2a8fcb0c2..b12a6d52eb 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -27,7 +27,6 @@ import im.vector.app.features.form.formEditableAvatarItem
 import im.vector.app.features.form.formSwitchItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter
-import im.vector.app.features.roomprofile.settings.RoomSettingsViewState.Companion.getJoinRuleWording
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.room.model.GuestAccess
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index f1931e4add..bb97acde61 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -70,26 +70,24 @@ data class RoomSettingsViewState(
     ) {
         fun hasChanged() = newJoinRules != null || newGuestAccess != null
     }
+}
 
-    companion object {
-        fun RoomSettingsViewState.getJoinRuleWording(stringProvider: StringProvider): String {
-            return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
-                RoomJoinRules.INVITE -> {
-                    stringProvider.getString(R.string.room_settings_room_access_private_title)
-                }
-                RoomJoinRules.PUBLIC -> {
-                    stringProvider.getString(R.string.room_settings_room_access_public_title)
-                }
-                RoomJoinRules.KNOCK -> {
-                    stringProvider.getString(R.string.room_settings_room_access_entry_knock)
-                }
-                RoomJoinRules.RESTRICTED -> {
-                    stringProvider.getString(R.string.room_settings_room_access_restricted_title)
-                }
-                else                     -> {
-                    stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
-                }
-            }
+fun RoomSettingsViewState.getJoinRuleWording(stringProvider: StringProvider): String {
+    return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
+        RoomJoinRules.INVITE -> {
+            stringProvider.getString(R.string.room_settings_room_access_private_title)
+        }
+        RoomJoinRules.PUBLIC -> {
+            stringProvider.getString(R.string.room_settings_room_access_public_title)
+        }
+        RoomJoinRules.KNOCK -> {
+            stringProvider.getString(R.string.room_settings_room_access_entry_knock)
+        }
+        RoomJoinRules.RESTRICTED -> {
+            stringProvider.getString(R.string.room_settings_room_access_restricted_title)
+        }
+        else                     -> {
+            stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceChildInfoMatchFilter.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceChildInfoMatchFilter.kt
new file mode 100644
index 0000000000..17f5d13e19
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceChildInfoMatchFilter.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces.manage
+
+import io.reactivex.functions.Predicate
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+
+class SpaceChildInfoMatchFilter : Predicate<SpaceChildInfo> {
+    var filter: String = ""
+
+    override fun test(spaceChildInfo: SpaceChildInfo): Boolean {
+        if (filter.isEmpty()) {
+            // No filter
+            return true
+        }
+        // if filter is "Jo Do", it should match "John Doe"
+        return filter.split(" ").all {
+            spaceChildInfo.name?.contains(it, ignoreCase = true).orFalse()
+                    || spaceChildInfo.topic?.contains(it, ignoreCase = true).orFalse()
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
index f3bf3eda09..a4585df474 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
@@ -111,17 +111,19 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
                     }
                     ManageType.Settings -> {
                         val simpleName = SpaceSettingsFragment::class.java.simpleName
-                        if (supportFragmentManager.findFragmentByTag(simpleName) == null) {
+                        if (supportFragmentManager.findFragmentByTag(simpleName) == null && args?.spaceId != null) {
                             supportFragmentManager.commitTransaction {
                                 replace(R.id.simpleFragmentContainer,
                                         SpaceSettingsFragment::class.java,
-                                        Bundle().apply { this.putParcelable(MvRx.KEY_ARG, RoomProfileArgs(args?.spaceId ?: "")) },
+                                        Bundle().apply { this.putParcelable(MvRx.KEY_ARG, RoomProfileArgs(args.spaceId)) },
                                         simpleName
                                 )
                             }
                         }
                     }
-                    ManageType.ManageRooms -> TODO()
+                    ManageType.ManageRooms -> {
+                        // no direct access for now
+                    }
                 }
             }
         }
@@ -145,11 +147,13 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
                     )
                 }
                 SpaceManagedSharedViewEvents.NavigateToManageRooms -> {
-                    addFragmentToBackstack(
-                            R.id.simpleFragmentContainer,
-                            SpaceManageRoomsFragment::class.java,
-                            SpaceManageArgs(args?.spaceId ?: "", ManageType.ManageRooms)
-                    )
+                    args?.spaceId?.let { spaceId ->
+                        addFragmentToBackstack(
+                                R.id.simpleFragmentContainer,
+                                SpaceManageRoomsFragment::class.java,
+                                SpaceManageArgs(spaceId, ManageType.ManageRooms)
+                        )
+                    }
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
index b135fd89f5..8ba7398a2f 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomViewEvents.kt
@@ -19,6 +19,6 @@ package im.vector.app.features.spaces.manage
 import im.vector.app.core.platform.VectorViewEvents
 
 sealed class SpaceManageRoomViewEvents : VectorViewEvents {
-    object BulkActionSuccess: SpaceManageRoomViewEvents()
-    data class BulkActionFailure(val errorList: List<String>) : SpaceManageRoomViewEvents()
+//    object BulkActionSuccess: SpaceManageRoomViewEvents()
+    data class BulkActionFailure(val errorList: List<Throwable>) : SpaceManageRoomViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
index 853333faa6..a94a2d9242 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsController.kt
@@ -24,8 +24,6 @@ import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.features.home.AvatarRenderer
-import io.reactivex.functions.Predicate
-import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.util.toMatrixItem
@@ -83,19 +81,3 @@ class SpaceManageRoomsController @Inject constructor(
         }
     }
 }
-
-class SpaceChildInfoMatchFilter : Predicate<SpaceChildInfo> {
-    var filter: String = ""
-
-    override fun test(spaceChildInfo: SpaceChildInfo): Boolean {
-        if (filter.isEmpty()) {
-            // No filter
-            return true
-        }
-        // if filter is "Jo Do", it should match "John Doe"
-        return filter.split(" ").all {
-            spaceChildInfo.name?.contains(it, ignoreCase = true).orFalse()
-                    || spaceChildInfo.topic?.contains(it, ignoreCase = true).orFalse()
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
index 9e1463cb68..b918af0b68 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsFragment.kt
@@ -91,12 +91,7 @@ class SpaceManageRoomsFragment @Inject constructor(
         viewModel.observeViewEvents {
             when (it) {
                 is SpaceManageRoomViewEvents.BulkActionFailure -> {
-                    it.errorList.forEach {
-                        vectorBaseActivity.toast(it)
-                    }
-                }
-                SpaceManageRoomViewEvents.BulkActionSuccess -> {
-                    //
+                    vectorBaseActivity.toast(errorFormatter.toHumanReadable(it.errorList.firstOrNull()))
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
index c018b9afd0..d1e1d8f0fb 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageRoomsViewModel.kt
@@ -27,7 +27,6 @@ import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.mvrx.runCatchingToAsync
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.session.coroutineScope
@@ -37,8 +36,7 @@ import org.matrix.android.sdk.api.session.Session
 
 class SpaceManageRoomsViewModel @AssistedInject constructor(
         @Assisted val initialState: SpaceManageRoomViewState,
-        private val session: Session,
-        private val errorFormatter: ErrorFormatter
+        private val session: Session
 ) : VectorViewModel<SpaceManageRoomViewState, SpaceManageRoomViewAction, SpaceManageRoomViewEvents>(initialState) {
 
     init {
@@ -79,20 +77,20 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
 
     override fun handle(action: SpaceManageRoomViewAction) {
         when (action) {
-            is SpaceManageRoomViewAction.ToggleSelection    -> handleToggleSelection(action)
-            is SpaceManageRoomViewAction.UpdateFilter       -> {
+            is SpaceManageRoomViewAction.ToggleSelection -> handleToggleSelection(action)
+            is SpaceManageRoomViewAction.UpdateFilter -> {
                 setState { copy(currentFilter = action.filter) }
             }
-            SpaceManageRoomViewAction.ClearSelection        -> {
+            SpaceManageRoomViewAction.ClearSelection -> {
                 setState { copy(selectedRooms = emptyList()) }
             }
-            SpaceManageRoomViewAction.BulkRemove            -> {
+            SpaceManageRoomViewAction.BulkRemove -> {
                 handleBulkRemove()
             }
             is SpaceManageRoomViewAction.MarkAllAsSuggested -> {
                 handleBulkMarkAsSuggested(action.suggested)
             }
-            SpaceManageRoomViewAction.RefreshFromServer     -> {
+            SpaceManageRoomViewAction.RefreshFromServer -> {
                 refreshSummaryAPI()
             }
         }
@@ -112,10 +110,10 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
             }
             if (errorList.isEmpty()) {
                 // success
-                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionSuccess)
             } else {
-                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionFailure(errorList.map { errorFormatter.toHumanReadable(it) }))
+                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionFailure(errorList))
             }
+            refreshSummaryAPI()
             setState { copy(actionState = Uninitialized) }
         }
     }
@@ -142,11 +140,10 @@ class SpaceManageRoomsViewModel @AssistedInject constructor(
             }
             if (errorList.isEmpty()) {
                 // success
-                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionSuccess)
-                refreshSummaryAPI()
             } else {
-                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionFailure(errorList.map { errorFormatter.toHumanReadable(it) }))
+                _viewEvents.post(SpaceManageRoomViewEvents.BulkActionFailure(errorList))
             }
+            refreshSummaryAPI()
             setState { copy(actionState = Uninitialized) }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
index c92692a800..34263bcb32 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
@@ -28,7 +28,7 @@ import im.vector.app.features.form.formMultiLineEditTextItem
 import im.vector.app.features.form.formSwitchItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.roomprofile.settings.RoomSettingsViewState
-import im.vector.app.features.roomprofile.settings.RoomSettingsViewState.Companion.getJoinRuleWording
+import im.vector.app.features.roomprofile.settings.getJoinRuleWording
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.util.toMatrixItem
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
index e33f461f47..85c73ac8ef 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsFragment.kt
@@ -195,7 +195,9 @@ class SpaceSettingsFragment @Inject constructor(
         viewModel.handle(RoomSettingsAction.SetRoomTopic(topic))
     }
 
-    override fun onHistoryVisibilityClicked() {}
+    override fun onHistoryVisibilityClicked() {
+        // N/A for space settings screen
+    }
 
     override fun onJoinRuleClicked() = withState(viewModel) { state ->
         val currentJoinRule = state.newRoomJoinRules.newJoinRules ?: state.currentRoomJoinRules
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index c3b8247582..a48cecf5f2 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -11,7 +11,7 @@
         <item name="android:background">?riotx_background</item>
     </style>
 
-    <style name="ActionModeTheme" parent="Base.Widget.AppCompat.ActionMode">
+    <style name="ActionModeTheme" parent="Widget.AppCompat.ActionMode">
         <item name="background">?riotx_background</item>
         <item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
         <item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>

From 723f7cc326c948ee4ef85dc3600060d5f9e1e65a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 10 May 2021 17:43:40 +0200
Subject: [PATCH 330/350] VectorEpoxyHolder Form Ext

---
 .../app/core/epoxy/VectorEpoxyFormExt.kt      | 41 +++++++++++++++++++
 .../im/vector/app/core/extensions/EditText.kt | 16 --------
 .../app/features/form/FormEditTextItem.kt     |  4 +-
 .../form/FormEditTextWithButtonItem.kt        |  4 +-
 .../form/FormMultiLineEditTextItem.kt         |  4 +-
 .../app/features/form/FormSwitchItem.kt       | 13 ++----
 .../createroom/RoomAliasEditItem.kt           |  4 +-
 .../settings/RoomSettingsViewState.kt         | 34 +++++++--------
 .../spaces/manage/SpaceSettingsController.kt  |  1 -
 9 files changed, 70 insertions(+), 51 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyFormExt.kt

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyFormExt.kt b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyFormExt.kt
new file mode 100644
index 0000000000..f93b07a98d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyFormExt.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.epoxy
+
+import android.widget.CompoundButton
+import com.google.android.material.switchmaterial.SwitchMaterial
+import com.google.android.material.textfield.TextInputEditText
+
+fun VectorEpoxyHolder.setValueOnce(textInputEditText: TextInputEditText, value: String?) {
+    if (view.isAttachedToWindow) {
+        // the view is attached to the window
+        // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
+        // Downside is if you ever wanted to programmatically change the content of the edit text while it is on screen you would not be able to
+    } else {
+        textInputEditText.setText(value)
+    }
+}
+
+fun VectorEpoxyHolder.setValueOnce(switchView: SwitchMaterial, switchChecked: Boolean, listener: CompoundButton.OnCheckedChangeListener) {
+    if (view.isAttachedToWindow) {
+        // the view is attached to the window
+        // So it is a rebind of new data and you could ignore it assuming this is value that was already inputted into the view.
+    } else {
+        switchView.isChecked = switchChecked
+        switchView.setOnCheckedChangeListener(listener)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
index e65dc4d2c6..05b70def3d 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
@@ -23,9 +23,7 @@ import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import androidx.annotation.DrawableRes
-import com.google.android.material.textfield.TextInputEditText
 import im.vector.app.R
-import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.platform.SimpleTextWatcher
 
 fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_search,
@@ -59,17 +57,3 @@ fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_searc
         return@OnTouchListener false
     })
 }
-
-/**
- * Set the initial value of the textEdit.
- * Avoids issue with two way bindings, the value is only set the first time
- */
-fun TextInputEditText.setValueOnce(value: String?, holder: VectorEpoxyHolder) {
-    if (holder.view.isAttachedToWindow) {
-        // the view is attached to the window
-        // So it is a rebind of new data and you could ignore it assuming this is text that was already inputted into the view.
-        // Downside is if you ever wanted to programmatically change the content of the edit text while it is on screen you would not be able to
-    } else {
-        setText(value)
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index 9ab939945c..f8bcbddd34 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -27,7 +27,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setValueOnce
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input)
@@ -76,7 +76,7 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         holder.textInputLayout.error = errorMessage
         holder.textInputLayout.endIconMode = endIconMode ?: TextInputLayout.END_ICON_NONE
 
-        holder.textInputEditText.setValueOnce(value, holder)
+        holder.setValueOnce(holder.textInputEditText, value)
 
         holder.textInputEditText.isEnabled = enabled
         inputType?.let { holder.textInputEditText.inputType = it }
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
index ef3ee2a371..6cf862b10b 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt
@@ -26,7 +26,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setValueOnce
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_text_input_with_button)
@@ -61,7 +61,7 @@ abstract class FormEditTextWithButtonItem : VectorEpoxyModel<FormEditTextWithBut
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.hint = hint
 
-        holder.textInputEditText.setValueOnce(value, holder)
+        holder.setValueOnce(holder.textInputEditText, value)
 
         holder.textInputEditText.isEnabled = enabled
 
diff --git a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
index 0cc1fdd7b8..7ebe09eeee 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormMultiLineEditTextItem.kt
@@ -27,7 +27,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setValueOnce
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_form_multiline_text_input)
@@ -76,7 +76,7 @@ abstract class FormMultiLineEditTextItem : VectorEpoxyModel<FormMultiLineEditTex
         holder.textInputEditText.textSize = textSizeSp?.toFloat() ?: 14f
         holder.textInputEditText.minLines = minLines
 
-        holder.textInputEditText.setValueOnce(value, holder)
+        holder.setValueOnce(holder.textInputEditText, value)
 
         holder.textInputEditText.isEnabled = enabled
 
diff --git a/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
index 2b2b185c05..5a7ddd5835 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt
@@ -25,6 +25,7 @@ import com.google.android.material.switchmaterial.SwitchMaterial
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_form_switch)
@@ -61,16 +62,10 @@ abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
 
         holder.switchView.isEnabled = enabled
 
-        if (holder.view.isAttachedToWindow) {
-            // the view is attached to the window
-            // So it is a rebind of new data and you could ignore it assuming this is value that was already inputted into the view.
-        } else {
-            holder.switchView.setOnCheckedChangeListener(null)
-            holder.switchView.isChecked = switchChecked
-            holder.switchView.setOnCheckedChangeListener { _, isChecked ->
-                listener?.invoke(isChecked)
-            }
+        holder.setValueOnce(holder.switchView, switchChecked) { _, isChecked ->
+            listener?.invoke(isChecked)
         }
+
         holder.divider.isVisible = showDivider
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
index aec2da22d7..800d7292d2 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/RoomAliasEditItem.kt
@@ -27,7 +27,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.extensions.setValueOnce
+import im.vector.app.core.epoxy.setValueOnce
 import im.vector.app.core.platform.SimpleTextWatcher
 
 @EpoxyModelClass(layout = R.layout.item_room_alias_text_input)
@@ -62,7 +62,7 @@ abstract class RoomAliasEditItem : VectorEpoxyModel<RoomAliasEditItem.Holder>()
         holder.textInputLayout.isEnabled = enabled
         holder.textInputLayout.error = errorMessage
 
-        holder.textInputEditText.setValueOnce(value, holder)
+        holder.setValueOnce(holder.textInputEditText, value)
         holder.textInputEditText.isEnabled = enabled
         holder.textInputEditText.addTextChangedListener(onTextChangeListener)
         holder.homeServerText.text = homeServer
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index bb97acde61..e220687878 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -70,24 +70,24 @@ data class RoomSettingsViewState(
     ) {
         fun hasChanged() = newJoinRules != null || newGuestAccess != null
     }
-}
 
-fun RoomSettingsViewState.getJoinRuleWording(stringProvider: StringProvider): String {
-    return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
-        RoomJoinRules.INVITE -> {
-            stringProvider.getString(R.string.room_settings_room_access_private_title)
-        }
-        RoomJoinRules.PUBLIC -> {
-            stringProvider.getString(R.string.room_settings_room_access_public_title)
-        }
-        RoomJoinRules.KNOCK -> {
-            stringProvider.getString(R.string.room_settings_room_access_entry_knock)
-        }
-        RoomJoinRules.RESTRICTED -> {
-            stringProvider.getString(R.string.room_settings_room_access_restricted_title)
-        }
-        else                     -> {
-            stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
+    fun getJoinRuleWording(stringProvider: StringProvider): String {
+        return when (val joinRule = newRoomJoinRules.newJoinRules ?: currentRoomJoinRules) {
+            RoomJoinRules.INVITE -> {
+                stringProvider.getString(R.string.room_settings_room_access_private_title)
+            }
+            RoomJoinRules.PUBLIC -> {
+                stringProvider.getString(R.string.room_settings_room_access_public_title)
+            }
+            RoomJoinRules.KNOCK -> {
+                stringProvider.getString(R.string.room_settings_room_access_entry_knock)
+            }
+            RoomJoinRules.RESTRICTED -> {
+                stringProvider.getString(R.string.room_settings_room_access_restricted_title)
+            }
+            else                     -> {
+                stringProvider.getString(R.string.room_settings_room_access_entry_unknown, joinRule.value)
+            }
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
index 34263bcb32..de51805472 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceSettingsController.kt
@@ -28,7 +28,6 @@ import im.vector.app.features.form.formMultiLineEditTextItem
 import im.vector.app.features.form.formSwitchItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.roomprofile.settings.RoomSettingsViewState
-import im.vector.app.features.roomprofile.settings.getJoinRuleWording
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.util.toMatrixItem

From 1ec08bec0792e18deb864bcf82500293982d7f68 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 11 May 2021 08:18:37 +0200
Subject: [PATCH 331/350] Fix spaces add room via server

---
 .../android/sdk/api/session/space/Space.kt    |  2 +-
 .../session/permalinks/PermalinkFactory.kt    | 42 +----------
 .../session/permalinks/ViaParameterFinder.kt  | 69 +++++++++++++++++++
 .../sdk/internal/session/room/DefaultRoom.kt  |  4 +-
 .../sdk/internal/session/room/RoomFactory.kt  |  5 +-
 .../internal/session/space/DefaultSpace.kt    | 10 ++-
 .../home/room/detail/RoomDetailViewModel.kt   |  4 +-
 .../createroom/CreateRoomViewModel.kt         |  3 +-
 .../spaces/manage/SpaceAddRoomsViewModel.kt   |  2 +-
 9 files changed, 91 insertions(+), 50 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
index 21daf0b37d..db25762c2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/space/Space.kt
@@ -33,7 +33,7 @@ interface Space {
     fun spaceSummary(): RoomSummary?
 
     suspend fun addChildren(roomId: String,
-                            viaServers: List<String>,
+                            viaServers: List<String>?,
                             order: String?,
                             autoJoin: Boolean = false,
                             suggested: Boolean? = false)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
index 71a6e224bf..970752449a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
@@ -18,19 +18,13 @@ package org.matrix.android.sdk.internal.session.permalinks
 
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService.Companion.MATRIX_TO_URL_BASE
-import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
-import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.internal.di.UserId
-import org.matrix.android.sdk.internal.session.room.RoomGetter
-import java.net.URLEncoder
 import javax.inject.Inject
-import javax.inject.Provider
 
 internal class PermalinkFactory @Inject constructor(
         @UserId
         private val userId: String,
-        // Use a provider to fix circular Dagger dependency
-        private val roomGetterProvider: Provider<RoomGetter>
+        private val viaParameterFinder: ViaParameterFinder
 ) {
 
     fun createPermalink(event: Event): String? {
@@ -50,12 +44,12 @@ internal class PermalinkFactory @Inject constructor(
         return if (roomId.isEmpty()) {
             null
         } else {
-            MATRIX_TO_URL_BASE + escape(roomId) + computeViaParams(userId, roomId)
+            MATRIX_TO_URL_BASE + escape(roomId) + viaParameterFinder.computeViaParams(userId, roomId)
         }
     }
 
     fun createPermalink(roomId: String, eventId: String): String {
-        return MATRIX_TO_URL_BASE + escape(roomId) + "/" + escape(eventId) + computeViaParams(userId, roomId)
+        return MATRIX_TO_URL_BASE + escape(roomId) + "/" + escape(eventId) + viaParameterFinder.computeViaParams(userId, roomId)
     }
 
     fun getLinkedId(url: String): String? {
@@ -66,25 +60,6 @@ internal class PermalinkFactory @Inject constructor(
         } else null
     }
 
-    /**
-     * Compute the via parameters.
-     * Take up to 3 homeserver domains, taking the most representative one regarding room members and including the
-     * current user one.
-     */
-    private fun computeViaParams(userId: String, roomId: String): String {
-        val userHomeserver = userId.substringAfter(":")
-        return getUserIdsOfJoinedMembers(roomId)
-                .map { it.substringAfter(":") }
-                .groupBy { it }
-                .mapValues { it.value.size }
-                .toMutableMap()
-                // Ensure the user homeserver will be included
-                .apply { this[userHomeserver] = Int.MAX_VALUE }
-                .let { map -> map.keys.sortedByDescending { map[it] } }
-                .take(3)
-                .joinToString(prefix = "?via=", separator = "&via=") { URLEncoder.encode(it, "utf-8") }
-    }
-
     /**
      * Escape '/' in id, because it is used as a separator
      *
@@ -104,15 +79,4 @@ internal class PermalinkFactory @Inject constructor(
     private fun unescape(id: String): String {
         return id.replace("%2F", "/")
     }
-
-    /**
-     * Get a set of userIds of joined members of a room
-     */
-    private fun getUserIdsOfJoinedMembers(roomId: String): Set<String> {
-        return roomGetterProvider.get().getRoom(roomId)
-                ?.getRoomMembers(roomMemberQueryParams { memberships = listOf(Membership.JOIN) })
-                ?.map { it.userId }
-                .orEmpty()
-                .toSet()
-    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
new file mode 100644
index 0000000000..0da60e9ba2
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/ViaParameterFinder.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2021 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.permalinks
+
+import org.matrix.android.sdk.api.session.room.members.roomMemberQueryParams
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.internal.di.UserId
+import org.matrix.android.sdk.internal.session.room.RoomGetter
+import java.net.URLEncoder
+import javax.inject.Inject
+import javax.inject.Provider
+
+internal class ViaParameterFinder @Inject constructor(
+        @UserId private val userId: String,
+        private val roomGetterProvider: Provider<RoomGetter>
+) {
+
+    fun computeViaParams(roomId: String, max: Int): List<String> {
+        return computeViaParams(userId, roomId, max)
+    }
+
+    /**
+     * Compute the via parameters.
+     * Take up to 3 homeserver domains, taking the most representative one regarding room members and including the
+     * current user one.
+     */
+    fun computeViaParams(userId: String, roomId: String): String {
+        return computeViaParams(userId, roomId, 3)
+                .joinToString(prefix = "?via=", separator = "&via=") { URLEncoder.encode(it, "utf-8") }
+    }
+
+    fun computeViaParams(userId: String, roomId: String, max: Int): List<String> {
+        val userHomeserver = userId.substringAfter(":")
+        return getUserIdsOfJoinedMembers(roomId)
+                .map { it.substringAfter(":") }
+                .groupBy { it }
+                .mapValues { it.value.size }
+                .toMutableMap()
+                // Ensure the user homeserver will be included
+                .apply { this[userHomeserver] = Int.MAX_VALUE }
+                .let { map -> map.keys.sortedByDescending { map[it] } }
+                .take(max)
+    }
+
+    /**
+     * Get a set of userIds of joined members of a room
+     */
+    private fun getUserIdsOfJoinedMembers(roomId: String): Set<String> {
+        return roomGetterProvider.get().getRoom(roomId)
+                ?.getRoomMembers(roomMemberQueryParams { memberships = listOf(Membership.JOIN) })
+                ?.map { it.userId }
+                .orEmpty()
+                .toSet()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index c6059f84ea..a5e066dae8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -40,6 +40,7 @@ import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.session.permalinks.ViaParameterFinder
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.search.SearchTask
@@ -66,6 +67,7 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
                                                private val roomMembersService: MembershipService,
                                                private val roomPushRuleService: RoomPushRuleService,
                                                private val sendStateTask: SendStateTask,
+                                               private val viaParameterFinder: ViaParameterFinder,
                                                private val searchTask: SearchTask) :
         Room,
         TimelineService by timelineService,
@@ -154,6 +156,6 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
 
     override fun asSpace(): Space? {
         if (roomSummary()?.roomType != RoomType.SPACE) return null
-        return DefaultSpace(this, roomSummaryDataSource)
+        return DefaultSpace(this, roomSummaryDataSource, viaParameterFinder)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
index 90640b4700..3f743c2922 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.session.room
 import org.matrix.android.sdk.api.session.crypto.CryptoService
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.internal.session.SessionScope
+import org.matrix.android.sdk.internal.session.permalinks.ViaParameterFinder
 import org.matrix.android.sdk.internal.session.room.alias.DefaultAliasService
 import org.matrix.android.sdk.internal.session.room.call.DefaultRoomCallService
 import org.matrix.android.sdk.internal.session.room.draft.DefaultDraftService
@@ -60,6 +61,7 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                                                       private val membershipServiceFactory: DefaultMembershipService.Factory,
                                                       private val roomPushRuleServiceFactory: DefaultRoomPushRuleService.Factory,
                                                       private val sendStateTask: SendStateTask,
+                                                      private val viaParameterFinder: ViaParameterFinder,
                                                       private val searchTask: SearchTask) :
         RoomFactory {
 
@@ -83,7 +85,8 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                 roomMembersService = membershipServiceFactory.create(roomId),
                 roomPushRuleService = roomPushRuleServiceFactory.create(roomId),
                 sendStateTask = sendStateTask,
-                searchTask = searchTask
+                searchTask = searchTask,
+                viaParameterFinder = viaParameterFinder
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
index d6df991245..70c52bf4ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpace.kt
@@ -24,11 +24,13 @@ import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.space.Space
 import org.matrix.android.sdk.api.session.space.model.SpaceChildContent
+import org.matrix.android.sdk.internal.session.permalinks.ViaParameterFinder
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 
 internal class DefaultSpace(
         private val room: Room,
-        private val spaceSummaryDataSource: RoomSummaryDataSource
+        private val spaceSummaryDataSource: RoomSummaryDataSource,
+        private val viaParameterFinder: ViaParameterFinder
 ) : Space {
 
     override fun asRoom(): Room {
@@ -46,15 +48,17 @@ internal class DefaultSpace(
     }
 
     override suspend fun addChildren(roomId: String,
-                                     viaServers: List<String>,
+                                     viaServers: List<String>?,
                                      order: String?,
                                      autoJoin: Boolean,
                                      suggested: Boolean?) {
+        // Find best via
+
         room.sendStateEvent(
                 eventType = EventType.STATE_SPACE_CHILD,
                 stateKey = roomId,
                 body = SpaceChildContent(
-                        via = viaServers,
+                        via = viaServers ?: viaParameterFinder.computeViaParams(roomId, 3),
                         autoJoin = autoJoin,
                         order = order,
                         suggested = suggested
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 52779c863d..cd7f6a5730 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -832,7 +832,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                                     session.spaceService().getSpace(spaceId)
                                             ?.addChildren(
                                                     state.roomId,
-                                                    listOf(session.sessionParams.homeServerHost ?: ""),
+                                                    null,
                                                     null,
                                                     true
                                             )
@@ -849,7 +849,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                                     session.spaceService().getSpace(slashCommandResult.spaceId)
                                             ?.addChildren(
                                                     room.roomId,
-                                                    listOf(session.sessionParams.homeServerHost ?: ""),
+                                                    null,
                                                     null,
                                                     false
                                             )
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 4eb05fb697..8c8d17dd46 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -236,10 +236,9 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted private val init
                         if (initialState.parentSpaceId != null) {
                             // add it as a child
                             try {
-                                val via = session.sessionParams.homeServerHost?.let { listOf(it) }.orEmpty()
                                 session.spaceService()
                                         .getSpace(initialState.parentSpaceId)
-                                        ?.addChildren(roomId, viaServers = via, order = null)
+                                        ?.addChildren(roomId, viaServers = null, order = null)
                             } catch (failure: Throwable) {
                                 Timber.w(failure, "Failed to add as a child")
                             }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
index ce677e39c7..55e65eb171 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomsViewModel.kt
@@ -174,7 +174,7 @@ class SpaceAddRoomsViewModel @AssistedInject constructor(
                 try {
                     session.spaceService().getSpace(initialState.spaceId)!!.addChildren(
                             roomId = roomId,
-                            viaServers = listOf(session.sessionParams.homeServerHost ?: ""),
+                            viaServers = null,
                             order = null
                     )
                     completed.add(roomId)

From 4e28de21075c0dcd08bb97ab0d09fc447850482b Mon Sep 17 00:00:00 2001
From: Michael Sasser <Michael@MichaelSasser.org>
Date: Mon, 10 May 2021 13:09:15 +0000
Subject: [PATCH 332/350] Translated using Weblate (German)

Currently translated at 99.5% (2428 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 56 +++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index f5e14be1d2..9eb7301176 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2750,4 +2750,60 @@
     <string name="suggested_header">Vorgeschlagene Räume</string>
     <string name="spaces_header">Spaces</string>
     <string name="room_settings_room_access_entry_knock">Jeder kann im Raum anklopfen, Mitglieder können dann zustimmen oder ablehnen</string>
+    <string name="invite_people_to_your_space_desc"></string>
+    <string name="invite_to_space_with_name_desc">Diese werden in der Lage sein %s zu durchsuchen</string>
+    <string name="invite_just_to_this_room_desc">Diese werden kein Teil von %s sein</string>
+    <string name="share_space_link_message">Tritt meinem Space %1$s %2$s bei</string>
+    <string name="suggested_rooms_pills_on_empty_header">Willkommen zu %1$s, %2$s.</string>
+    <string name="labs_use_restricted_join_rule_desc">Warnung benötigt Server Unterstützung und eine experimentelle Raumversion</string>
+    <string name="labs_use_restricted_join_rule">Experimenteller Space - Zugangsbeschränkter Raum.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Mit Spaces hast du die Möglichkeit Personen und Räume für die Arbeit, zum Spaß oder nur für dich selbst zu gruppieren.</string>
+    <string name="spaces_beta_welcome_to_spaces">Sag hallo zu Spaces!</string>
+    <string name="space_add_existing_rooms">Füge bereits existierende Räume und Spaces hinzu</string>
+    <string name="skip_for_now">Vorübergehend überspringen</string>
+    <string name="create_spaces_room_public_header">Über welche Themen möchtest du dich in %s unterhalten\?</string>
+    <string name="create_spaces_details_private_header">Füge ein paar Details hinzu, um die Wiedererkennbarkeit zu steigern. Du kannst die Angaben auch später wieder ändern.</string>
+    <string name="create_spaces_details_public_header">Füge ein paar Details hinzu, um die Wiedererkennbarkeit zu steigern. Du kannst die Angaben auch später wieder ändern.</string>
+    <string name="space_type_private_desc">Zugang nur mit Einladung. Am besten für Teams oder dich selbst</string>
+    <string name="create_spaces_make_sure_access">Stelle sicher, dass die richtigen Personen Zugang zu %s besitzen. Du kannst das später noch ändern.</string>
+    <string name="create_spaces_who_are_you_working_with">Mit wem arbeitest du zusammen\?</string>
+    <string name="command_description_leave_room">Verlasse den Raum mit der angegebenen ID (oder den aktuellen Raum, indem du keine ID angibst)</string>
+    <string name="search_hint_room_name">Name des Spaces</string>
+    <string name="you_are_invited">Du wurdest eingeladen</string>
+    <string name="space_leave_prompt_msg">Bist du dir sicher, dass du den Space verlassen willst\?</string>
+    <string name="leave_space">Space verlassen</string>
+    <string name="space_add_child_title">Räume hinzufügen</string>
+    <string name="space_explore_activity_title">Räume erkunden</string>
+    <string name="suggested_rooms_pills_on_empty_text">Bislang bist du keinem Raum beigetreten. Unterhalb findest du ein paar Raum-Empfehlungen, welche du mit der grünen Taste unten rechts erweitern kannst.</string>
+    <string name="join_anyway">Trotzdem beitreten</string>
+    <string name="join_space">Space beitreten</string>
+    <string name="create_space">Space erzeugen</string>
+    <string name="invite_just_to_this_room">Nur zu diesem Raum</string>
+    <string name="invite_to_space_with_name">Zu %s einladen</string>
+    <string name="invite_by_link">Link teilen</string>
+    <string name="invite_by_mxid">Mithilfe eines Benutzernamens einladen</string>
+    <string name="invite_by_email">Mithilfe einer E-Mail-Adresse einladen</string>
+    <string name="invite_people_menu">Personen einladen</string>
+    <string name="invite_people_to_your_space">Lade Personen in deinen Space ein</string>
+    <string name="create_space_error_empty_field_space_name">Trage einen Namen ein um fortzufahren.</string>
+    <string name="space_type_public_desc">Offen für Jeden. Am Besten für Communities</string>
+    <string name="create_spaces_private_teammates">Ein privater Space für meine Teamkameraden und mich</string>
+    <string name="create_spaces_me_and_teammates">Meine Teamkameraden und ich</string>
+    <string name="create_spaces_organise_rooms">Ein privater Space um deine Räume zu organisieren</string>
+    <string name="create_spaces_join_info_help">Um einem bereits existierenden Space beizutreten, benötigst du eine Einladung.</string>
+    <string name="create_spaces_type_header">Spaces sind eine neue Art Personen und Räume zu gruppieren</string>
+    <string name="your_private_space">Dein Privater space</string>
+    <string name="your_public_space">Dein Öffentliches Space</string>
+    <string name="command_description_join_space">Betrete einen Space mit der angegebenen ID</string>
+    <string name="create_space_topic_hint">Beschreibung</string>
+    <string name="create_spaces_loading_message">Erzeuge Space…</string>
+    <string name="create_spaces_default_public_random_room_name">Irgendetwas</string>
+    <string name="create_spaces_default_public_room_name">Allgemein</string>
+    <string name="activity_create_space_title">Einen Space erstellen</string>
+    <string name="create_spaces_just_me">Nur für mich</string>
+    <string name="create_spaces_choose_type_label">Welche Art von Space möchtest du erstellen\?</string>
+    <string name="add_space">Space hinzufügen</string>
+    <string name="command_description_create_space">Space erstellen</string>
+    <string name="room_settings_room_access_restricted_description">Jeder, der sich in einem Space mit diesem Raum befindet, kann diesen Raum finden und ihm beitreten. Nur die Administratoren des Raums können diesen zu einem Space hinzufügen.</string>
+    <string name="room_settings_room_access_restricted_title">Spaces</string>
 </resources>
\ No newline at end of file

From 631d8510ed8e104e4b2477df5f390d2c2f527b06 Mon Sep 17 00:00:00 2001
From: Hivaa <hivaa@hivaa.im>
Date: Mon, 10 May 2021 10:01:29 +0000
Subject: [PATCH 333/350] Translated using Weblate (Persian)

Currently translated at 100.0% (2438 of 2438 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
---
 vector/src/main/res/values-fa/strings.xml | 79 +++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index ee58a8e508..4d1ff806e5 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -2673,4 +2673,83 @@
     <string name="settings_room_directory_show_all_rooms">نمایش‌ها همه‌ی اتاق‌ها</string>
     <string name="settings_category_room_directory">فهرست اتاق‌ها</string>
     <string name="event_status_sent_message">پَیام فِرِستاده شُد</string>
+    <string name="labs_use_restricted_join_rule_desc">هشدار به پشتیبانی سرور و نسخه اتاق آزمایشی نیاز دارد</string>
+    <string name="labs_use_restricted_join_rule">فضای کاری آزمایشی - اتاق محدود.</string>
+    <string name="you_are_invited">شما دعوت شده‌اید</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">فضای‌های کاری روش هایی برای دسته‌بندی اتاق‌ها و افراد برای کار، تفریح یا فقط خودتان است.</string>
+    <string name="spaces_beta_welcome_to_spaces">به فضای‌های کاری خوش‌آمدید!</string>
+    <string name="space_add_existing_rooms">اتاق‌ها و فضای کاری موجود را اضافه کنید</string>
+    <string name="space_leave_prompt_msg">آیا مطمئن هستید که می خواهید فضای کاری را ترک کنید؟</string>
+    <string name="leave_space">خروج از فضای کاری</string>
+    <string name="space_add_child_title">افزودن اتاق</string>
+    <string name="space_explore_activity_title">کاوش در اتاق‌ها</string>
+    <plurals name="space_people_you_know">
+        <item quantity="one">%d نفر از افرادی که می‌شناسید عضو شده‌اند</item>
+        <item quantity="other">%d نفر از کسانی که می‌شناسید عضو شده‌اند</item>
+    </plurals>
+    <string name="suggested_rooms_pills_on_empty_header">%2$s، به %1$s خوش آمدی.</string>
+    <string name="suggested_rooms_pills_on_empty_text">شما هنوز در هیچ اتاقی نیستید. در زیر چند اتاق پیشنهادی وجود دارد، با دکمه سبز پایین سمت راست می توانید موارد بیشتری را مشاهده کنید.</string>
+    <string name="room_alias_preview_not_found">این نام مستعار در حال حاضر قابل دسترسی نیست.
+\nبعداً دوباره امتحان کنید، یا از مدیر اتاق بخواهید که دسترسی شما به آن را بررسی کند.</string>
+    <string name="join_anyway">در هر صورت بپیوند</string>
+    <string name="join_space">پیوستن به فضای کاری</string>
+    <string name="create_space">ساخت فضای کاری</string>
+    <string name="skip_for_now">فعلا رد شوید</string>
+    <string name="share_space_link_message">به فضای کاری %1$s من بپیوند.%2$s</string>
+    <string name="invite_just_to_this_room_desc">آن‌ها بخشی از %s نخواهند شد</string>
+    <string name="invite_just_to_this_room">فقط به این اتاق</string>
+    <string name="invite_to_space_with_name_desc">آنها قادر به کاوش در %s خواهند بود</string>
+    <string name="invite_to_space_with_name">دعوت به %s</string>
+    <string name="invite_by_link">به اشتراک‌گذاری لینک</string>
+    <string name="invite_by_mxid">دعوت با شناسه‌کاربری</string>
+    <string name="invite_by_email">دعوت با ایمیل</string>
+    <string name="invite_people_to_your_space_desc">در حال حاضر فقط شما هستید. %s با دیگران حتی بهتر خواهد بود.</string>
+    <string name="invite_people_menu">دعوت افراد</string>
+    <string name="invite_people_to_your_space">افراد را به فضای کاری خود دعوت کنید</string>
+    <string name="create_space_topic_hint">توضیحات</string>
+    <string name="create_spaces_loading_message">در حال ساخت فضای کاری …</string>
+    <string name="create_spaces_default_public_random_room_name">تصادفی</string>
+    <string name="create_spaces_default_public_room_name">عمومی</string>
+    <string name="create_spaces_room_private_header_desc">بیایید برای هر یک از آنها یک اتاق درست کنیم. بعداً می توانید موارد دیگر را اضافه کنید، از جمله موارد موجود.</string>
+    <string name="create_spaces_room_private_header">روی چه چیزی کار می کنید؟</string>
+    <string name="create_spaces_room_public_header_desc">ما اتاق‌هایی برای آنها ایجاد خواهیم کرد. بعداً می توانید بیشتر اضافه کنید.</string>
+    <string name="create_spaces_room_public_header">موضوع گفتگوها %s یی چیست؟</string>
+    <string name="create_space_error_empty_field_space_name">برای ادامه یک اسم برای آن بگذارید.</string>
+    <string name="create_spaces_details_private_header">توضیحاتی را برای کمک به افراد در شناسایی آن اضافه کنید. همواره می توانید این توضیحات را تغییر دهید.</string>
+    <string name="create_spaces_details_public_header">توضیحاتی را برای مشخص کردن آن اضافه کنید. همواره می توانید این توضیحات را تغییر دهید.</string>
+    <string name="activity_create_space_title">ساخت فضای کاری</string>
+    <string name="space_type_private_desc">فقط با دعوت، مناسب برای خودتان و یا تیم‌ها</string>
+    <string name="space_type_private">خصوصی</string>
+    <string name="space_type_public_desc">برای همه آزاد است، بهترین حالت برای انجمن‌ها می‌باشد</string>
+    <string name="space_type_public">عمومی</string>
+    <string name="create_spaces_private_teammates">یک فضای کاری خصوصی برای شما و همکارانتان</string>
+    <string name="create_spaces_me_and_teammates">من و همکارانم</string>
+    <string name="create_spaces_organise_rooms">یک فضای کاری خصوصی برای نظم بخشیدن به اتاق‌های شما</string>
+    <string name="create_spaces_just_me">فقط خودم</string>
+    <string name="create_spaces_make_sure_access">اطمینان حاصل کنید که افراد مناسب به %s دسترسی دارند. شما می‌توانید این را بعدا تغییر دهید.</string>
+    <string name="command_description_create_space">ساخت فضای کاری</string>
+    <string name="room_settings_room_access_restricted_description">هر کسی در فضای کاری این اتاق وجود داشته باشد، می‌تواند اتاق را پیدا کرده و به آن بپیوندد. فقط مدیران این اتاق می توانند آن را به یک فضای کاری اضافه کنند.</string>
+    <string name="room_settings_room_access_restricted_title">فضا‌های کاری</string>
+    <string name="spaces_header">فضا‌های کاری</string>
+    <string name="create_spaces_who_are_you_working_with">با چه کسانی کار می‌کنی؟</string>
+    <string name="create_spaces_join_info_help">برای پیوستن به یک فضای کاری موجود، نیاز به دعوت دارید.</string>
+    <string name="create_spaces_you_can_change_later">می‌توانید این را بعدا تغییر دهید</string>
+    <string name="create_spaces_choose_type_label">می خواهید چه نوع فضای‌ کاری‌ای ایجاد کنید؟</string>
+    <string name="create_spaces_type_header">فضاهای کاری راهی جدید برای ایجاد دسته‌هایی از اتاق‌ها و افراد است</string>
+    <string name="your_private_space">فضای کاری خصوصی شما</string>
+    <string name="your_public_space">فضای کاری عمومی شما</string>
+    <string name="add_space">افزودن فضای کاری</string>
+    <string name="command_description_leave_room">ترک اتاق با شناسه داده شده (یا اگر اتاق خالی باشد اتاق فعلی)</string>
+    <string name="command_description_join_space">پیوستن به فضای کاری با شناسه</string>
+    <string name="a11y_unchecked">علامت زده نشده</string>
+    <string name="search_hint_room_name">جستجو با نام اتاق</string>
+    <string name="room_settings_room_access_public_description">هرکسی می تواند اتاق را پیدا کرده و به آن بپیوندد</string>
+    <string name="room_settings_room_access_public_title">عمومی</string>
+    <string name="room_settings_room_access_private_description">فقط افراد دعوت شده می‌توانند اتاق را پیدا کرده و به آن بپیوندند</string>
+    <string name="room_settings_room_access_private_title">خصوصی</string>
+    <string name="room_settings_room_access_entry_unknown">تنظیم دسترسی ناشناخته (%s)</string>
+    <string name="room_settings_room_access_entry_knock">هرکسی می تواند درخواست ورود به اتاق را بدهد، سپس اعضا می توانند قبول یا رد کنند</string>
+    <string name="room_settings_guest_access_title">مجوز پیوستن مهمان به اتاق</string>
+    <string name="spaces_invited_header">دعوت‌ها</string>
+    <string name="suggested_header">اتاق‌های پیشنهادی</string>
 </resources>
\ No newline at end of file

From 24a32f2b7e33d6f22c50f9735de9f8a9a4839454 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 11 May 2021 10:07:34 +0200
Subject: [PATCH 334/350] Subspace more hierarchy depth + fix bad notification
 count

---
 .../grouplist/HomeSpaceSummaryItem.kt         |   6 +-
 .../features/spaces/SpaceSummaryController.kt |  60 +++++---
 .../app/features/spaces/SpaceSummaryItem.kt   |  12 +-
 .../features/spaces/SubSpaceSummaryItem.kt    | 106 ++++++++++++++
 vector/src/main/res/layout/item_sub_space.xml | 132 ++++++++++++++++++
 5 files changed, 292 insertions(+), 24 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
 create mode 100644 vector/src/main/res/layout/item_sub_space.xml

diff --git a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
index 553f82e98f..ddda38aa9c 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
@@ -18,6 +18,7 @@
 package im.vector.app.features.grouplist
 
 import android.content.res.ColorStateList
+import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
@@ -35,8 +36,9 @@ import im.vector.app.features.themes.ThemeUtils
 abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Holder>() {
 
     @EpoxyAttribute var selected: Boolean = false
-    @EpoxyAttribute var listener: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: (() -> Unit)? = null
     @EpoxyAttribute var countState : UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+    @EpoxyAttribute var showSeparator: Boolean = false
 
     override fun getViewType(): Int {
         // mm.. it's reusing the same layout for basic space item
@@ -56,6 +58,7 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         holder.leaveView.isVisible = false
 
         holder.counterBadgeView.render(countState)
+        holder.bottomSeparator.isVisible = showSeparator
     }
 
     class Holder : VectorEpoxyHolder() {
@@ -64,5 +67,6 @@ abstract class HomeSpaceSummaryItem : VectorEpoxyModel<HomeSpaceSummaryItem.Hold
         val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
         val leaveView by bind<ImageView>(R.id.groupTmpLeave)
         val counterBadgeView by bind<UnreadCounterBadgeView>(R.id.groupCounterBadge)
+        val bottomSeparator by bind<View>(R.id.groupBottomSeparator)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 4b78a999bb..6bd56c9d81 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -31,8 +31,8 @@ import im.vector.app.space
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
-import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -163,24 +163,7 @@ class SpaceSummaryController @Inject constructor(
                     if (hasChildren && expanded) {
                         // it's expanded
                         subSpaces?.forEach { child ->
-                            summaries?.firstOrNull { it.roomId == child.childRoomId }?.let { childSum ->
-                                val isChildSelected = selected is RoomGroupingMethod.BySpace && childSum.roomId == selected.space()?.roomId
-                                spaceSummaryItem {
-                                    avatarRenderer(avatarRenderer)
-                                    id(child.childRoomId)
-                                    hasChildren(false)
-                                    selected(isChildSelected)
-                                    matrixItem(MatrixItem.RoomItem(child.childRoomId, child.name, child.avatarUrl))
-                                    listener { callback?.onSpaceSelected(childSum) }
-                                    indent(1)
-                                    countState(
-                                            UnreadCounterBadgeView.State(
-                                                    groupSummary.notificationCount,
-                                                    groupSummary.highlightCount > 0
-                                            )
-                                    )
-                                }
-                            }
+                            buildSubSpace(summaries, expandedStates, selected, child, 1, 3)
                         }
                     }
                 }
@@ -191,6 +174,45 @@ class SpaceSummaryController @Inject constructor(
         }
     }
 
+    private fun buildSubSpace(summaries: List<RoomSummary>?,
+                              expandedStates: Map<String, Boolean>,
+                              selected: RoomGroupingMethod,
+                              childSum: SpaceChildInfo, currentDepth: Int, maxDepth: Int) {
+        if (currentDepth >= maxDepth) return
+        val childSum = summaries?.firstOrNull { it.roomId == childSum.childRoomId } ?: return
+        // does it have children?
+        val subSpaces = childSum.spaceChildren?.filter { childInfo ->
+            summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
+        }
+        val expanded = expandedStates[childSum.roomId] == true
+        val isSelected = selected is RoomGroupingMethod.BySpace && childSum.roomId == selected.space()?.roomId
+
+        subSpaceSummaryItem {
+            avatarRenderer(avatarRenderer)
+            id(childSum.roomId)
+            hasChildren(!subSpaces.isNullOrEmpty())
+            selected(isSelected)
+            expanded(expanded)
+            onMore { callback?.onSpaceSettings(childSum) }
+            matrixItem(childSum.toMatrixItem())
+            listener { callback?.onSpaceSelected(childSum) }
+            toggleExpand { callback?.onToggleExpand(childSum) }
+            indent(currentDepth)
+            countState(
+                    UnreadCounterBadgeView.State(
+                            childSum.notificationCount,
+                            childSum.highlightCount > 0
+                    )
+            )
+        }
+
+        if (expanded) {
+            subSpaces?.forEach {
+                buildSubSpace(summaries, expandedStates, selected, it, currentDepth + 1, maxDepth)
+            }
+        }
+    }
+
     interface Callback {
         fun onSpaceSelected(spaceSummary: RoomSummary?)
         fun onSpaceInviteSelected(spaceSummary: RoomSummary)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
index 013f7d6db5..c029f4b25e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.spaces
 
+import android.view.View
 import android.widget.ImageView
 import android.widget.Space
 import android.widget.TextView
@@ -37,17 +38,18 @@ import org.matrix.android.sdk.api.util.MatrixItem
 @EpoxyModelClass(layout = R.layout.item_space)
 abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
 
-    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute lateinit var matrixItem: MatrixItem
     @EpoxyAttribute var selected: Boolean = false
-    @EpoxyAttribute var listener: (() -> Unit)? = null
-    @EpoxyAttribute var onMore: (() -> Unit)? = null
-    @EpoxyAttribute var toggleExpand: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onMore: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var toggleExpand: (() -> Unit)? = null
     @EpoxyAttribute var expanded: Boolean = false
     @EpoxyAttribute var hasChildren: Boolean = false
     @EpoxyAttribute var indent: Int = 0
     @EpoxyAttribute var countState : UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
     @EpoxyAttribute var description: String? = null
+    @EpoxyAttribute var showSeparator: Boolean = false
 
     override fun bind(holder: Holder) {
         super.bind(holder)
@@ -83,6 +85,7 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         }
 
         holder.indentSpace.isVisible = indent > 0
+        holder.separator.isVisible = showSeparator
 
         avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
         holder.counterBadgeView.render(countState)
@@ -102,5 +105,6 @@ abstract class SpaceSummaryItem : VectorEpoxyModel<SpaceSummaryItem.Holder>() {
         val collapseIndicator by bind<ImageView>(R.id.groupChildrenCollapse)
         val indentSpace by bind<Space>(R.id.indent)
         val counterBadgeView by bind<UnreadCounterBadgeView>(R.id.groupCounterBadge)
+        val separator by bind<View>(R.id.groupBottomSeparator)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
new file mode 100644
index 0000000000..b98f1ca7af
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.spaces
+
+import android.widget.ImageView
+import android.widget.Space
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.platform.CheckableConstraintLayout
+import im.vector.app.core.utils.DebouncedClickListener
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_sub_space)
+abstract class SubSpaceSummaryItem : VectorEpoxyModel<SubSpaceSummaryItem.Holder>() {
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)  lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute var selected: Boolean = false
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)  var onMore: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)  var toggleExpand: (() -> Unit)? = null
+    @EpoxyAttribute var expanded: Boolean = false
+    @EpoxyAttribute var hasChildren: Boolean = false
+    @EpoxyAttribute var indent: Int = 0
+    @EpoxyAttribute var countState : UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.rootView.setOnClickListener { listener?.invoke() }
+        holder.groupNameView.text = matrixItem.displayName
+        holder.rootView.isChecked = selected
+        if (onMore != null) {
+            holder.moreView.isVisible = true
+            holder.moreView.setOnClickListener(
+                    DebouncedClickListener({ _ ->
+                        onMore?.invoke()
+                    })
+            )
+        } else {
+            holder.moreView.isVisible = false
+        }
+
+        if (hasChildren) {
+            holder.collapseIndicator.isVisible = true
+            holder.collapseIndicator.setImageDrawable(
+                    ContextCompat.getDrawable(holder.view.context,
+                            if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more
+                    )
+            )
+            holder.collapseIndicator.setOnClickListener(
+                    DebouncedClickListener({ _ ->
+                        toggleExpand?.invoke()
+                    })
+            )
+        } else {
+            holder.collapseIndicator.isGone = true
+        }
+
+        holder.indentSpace.isVisible = indent > 0
+        holder.indentSpace.updateLayoutParams {
+            width = indent * 30
+        }
+
+        avatarRenderer.renderSpace(matrixItem, holder.avatarImageView)
+        holder.counterBadgeView.render(countState)
+    }
+
+    override fun unbind(holder: Holder) {
+        avatarRenderer.clear(holder.avatarImageView)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.groupAvatarImageView)
+        val groupNameView by bind<TextView>(R.id.groupNameView)
+        val rootView by bind<CheckableConstraintLayout>(R.id.itemGroupLayout)
+        val moreView by bind<ImageView>(R.id.groupTmpLeave)
+        val collapseIndicator by bind<ImageView>(R.id.groupChildrenCollapse)
+        val indentSpace by bind<Space>(R.id.indent)
+        val counterBadgeView by bind<UnreadCounterBadgeView>(R.id.groupCounterBadge)
+    }
+}
diff --git a/vector/src/main/res/layout/item_sub_space.xml b/vector/src/main/res/layout/item_sub_space.xml
new file mode 100644
index 0000000000..e01b9a4cc7
--- /dev/null
+++ b/vector/src/main/res/layout/item_sub_space.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<im.vector.app.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/itemGroupLayout"
+    android:layout_width="match_parent"
+    android:layout_height="40dp"
+    android:background="@drawable/bg_space_item"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground">
+
+    <Space
+        android:id="@+id/indent"
+        android:layout_width="20dp"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/groupAvatarImageView"
+        android:layout_width="26dp"
+        android:layout_height="26dp"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:contentDescription="@string/avatar"
+        android:duplicateParentState="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@id/indent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+        android:id="@+id/groupCounterBadge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:gravity="center"
+        android:minWidth="16dp"
+        android:minHeight="16dp"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        android:textColor="@android:color/white"
+        android:textSize="10sp"
+        android:visibility="gone"
+        app:layout_constraintCircle="@+id/groupAvatarImageView"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="14dp"
+        tools:background="@drawable/bg_unread_highlight"
+        tools:text="147"
+        tools:visibility="visible" />
+
+
+    <TextView
+        android:id="@+id/groupNameView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/groupChildrenCollapse"
+        app:layout_constraintStart_toEndOf="@+id/groupAvatarImageView"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@tools:sample/lorem/random" />
+
+    <ImageView
+        android:id="@+id/groupChildrenCollapse"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:background="?selectableItemBackground"
+        android:clickable="true"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_expand_less_white"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/groupTmpLeave"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix"
+        tools:src="@drawable/ic_expand_more_white"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/groupTmpLeave"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="4dp"
+        android:background="?selectableItemBackground"
+        android:clickable="true"
+        android:importantForAccessibility="no"
+        android:padding="4dp"
+        android:src="@drawable/ic_more_vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/groupAvatarChevron"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_secondary" />
+
+    <ImageView
+        android:id="@+id/groupAvatarChevron"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="21dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_arrow_right"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
+
+<!--    <View-->
+<!--        android:id="@+id/groupBottomSeparator"-->
+<!--        android:layout_width="0dp"-->
+<!--        android:layout_height="1dp"-->
+<!--        android:background="?riotx_header_panel_border_mobile"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent" />-->
+
+</im.vector.app.core.platform.CheckableConstraintLayout>
\ No newline at end of file

From 14144dc99d222a3e190fd1d7caf2b0ad0e8c6bd9 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 11 May 2021 10:45:07 +0200
Subject: [PATCH 335/350] Default all in home + lab flag

---
 .../home/room/list/RoomListViewModel.kt       |  7 ++--
 .../room/list/SpaceRoomListSectionBuilder.kt  | 42 +++++++++++--------
 .../features/settings/VectorPreferences.kt    |  5 +++
 .../settings/VectorSettingsLabsFragment.kt    | 10 ++++-
 vector/src/main/res/values/strings.xml        |  3 ++
 .../src/main/res/xml/vector_settings_labs.xml |  5 +++
 6 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index bc24705e13..246d5052cf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -69,12 +69,12 @@ class RoomListViewModel @Inject constructor(
          * Filter the rooms if they are part of the current space (children and grand children).
          * If current space is null, will return orphan rooms only
          */
-        NORMAL,
+        ORPHANS_IF_SPACE_NULL,
         /**
          * Special case when we don't want to discriminate rooms when current space is null.
          * In this case return all.
          */
-        NOT_IF_ALL,
+        ALL_IF_SPACE_NULL,
         /** Do not filter based on space*/
         NONE
     }
@@ -131,7 +131,8 @@ class RoomListViewModel @Inject constructor(
                     },
                     {
                         updatableQuery = it
-                    }
+                    },
+                    vectorPreferences.labsSpacesOnlyOrphansInHome()
             ).buildSections(initialState.displayMode)
         } else {
             GroupRoomListSectionBuilder(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 351c72ab48..852efb9193 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -50,7 +50,8 @@ class SpaceRoomListSectionBuilder(
         val viewModelScope: CoroutineScope,
         private val suggestedRoomJoiningState: LiveData<Map<String, Async<Unit>>>,
         val onDisposable: (Disposable) -> Unit,
-        val onUdpatable: (UpdatableLivePageResult) -> Unit
+        val onUdpatable: (UpdatableLivePageResult) -> Unit,
+        val onlyOrphansInHome: Boolean = false
 ) : RoomListSectionBuilder {
 
     val pagedListConfig = PagedList.Config.Builder()
@@ -91,7 +92,8 @@ class SpaceRoomListSectionBuilder(
                         activeSpaceAwareQueries,
                         R.string.invitations_header,
                         true,
-                        RoomListViewModel.SpaceFilterStrategy.NORMAL
+                        RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
+                                ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
                 ) {
                     it.memberships = listOf(Membership.INVITE)
                     it.roomCategoryFilter = RoomCategoryFilter.ALL
@@ -102,7 +104,8 @@ class SpaceRoomListSectionBuilder(
                         activeSpaceAwareQueries,
                         R.string.bottom_action_rooms,
                         false,
-                        RoomListViewModel.SpaceFilterStrategy.NORMAL
+                        RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
+                                ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
                 ) {
                     it.memberships = listOf(Membership.JOIN)
                     it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
@@ -129,7 +132,7 @@ class SpaceRoomListSectionBuilder(
                 sections, activeSpaceAwareQueries,
                 R.string.invitations_header,
                 true,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+                 RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.INVITE)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -140,7 +143,7 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.bottom_action_favourites,
                 false,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+                RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -152,7 +155,8 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.bottom_action_rooms,
                 false,
-                RoomListViewModel.SpaceFilterStrategy.NORMAL
+                RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
+                        ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -164,7 +168,8 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.low_priority_header,
                 false,
-                RoomListViewModel.SpaceFilterStrategy.NORMAL
+                RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
+                        ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -176,7 +181,8 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.system_alerts_header,
                 false,
-                RoomListViewModel.SpaceFilterStrategy.NORMAL
+                RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
+                        ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -232,7 +238,7 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.invitations_header,
                 true,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+                RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.INVITE)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -242,7 +248,7 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.bottom_action_favourites,
                 false,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+                RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -253,7 +259,7 @@ class SpaceRoomListSectionBuilder(
                 activeSpaceAwareQueries,
                 R.string.bottom_action_people_x,
                 false,
-                RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL
+                RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -277,7 +283,7 @@ class SpaceRoomListSectionBuilder(
                             pagedListConfig
                     ).also {
                         when (spaceFilterStrategy) {
-                            RoomListViewModel.SpaceFilterStrategy.NORMAL     -> {
+                            RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL -> {
                                 activeSpaceUpdaters.add(object : RoomListViewModel.ActiveSpaceQueryUpdater {
                                     override fun updateForSpaceId(roomId: String?) {
                                         it.updateQuery {
@@ -288,7 +294,7 @@ class SpaceRoomListSectionBuilder(
                                     }
                                 })
                             }
-                            RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL -> {
+                            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL     -> {
                                 activeSpaceUpdaters.add(object : RoomListViewModel.ActiveSpaceQueryUpdater {
                                     override fun updateForSpaceId(roomId: String?) {
                                         if (roomId != null) {
@@ -349,21 +355,23 @@ class SpaceRoomListSectionBuilder(
 
     internal fun RoomSummaryQueryParams.process(spaceFilter: RoomListViewModel.SpaceFilterStrategy, currentSpace: String?): RoomSummaryQueryParams {
         return when (spaceFilter) {
-            RoomListViewModel.SpaceFilterStrategy.NORMAL -> {
+            RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL -> {
                 copy(
                         activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(currentSpace)
                 )
             }
-            RoomListViewModel.SpaceFilterStrategy.NOT_IF_ALL -> {
+            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL     -> {
                 if (currentSpace == null) {
-                    this
+                    copy(
+                            activeSpaceFilter = ActiveSpaceFilter.None
+                    )
                 } else {
                     copy(
                             activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(currentSpace)
                     )
                 }
             }
-            RoomListViewModel.SpaceFilterStrategy.NONE -> this
+            RoomListViewModel.SpaceFilterStrategy.NONE                  -> this
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index b44d44aba0..9fc496a914 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -151,6 +151,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
 
         const val SETTINGS_LABS_ALLOW_EXTENDED_LOGS = "SETTINGS_LABS_ALLOW_EXTENDED_LOGS"
         const val SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE = "SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE"
+        const val SETTINGS_LABS_SPACES_HOME_AS_ORPHAN = "SETTINGS_LABS_SPACES_HOME_AS_ORPHAN"
 
         private const val SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
         private const val SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY = "SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
@@ -956,6 +957,10 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_LABS_USE_RESTRICTED_JOIN_RULE, false)
     }
 
+    fun labsSpacesOnlyOrphansInHome(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_SPACES_HOME_AS_ORPHAN, false)
+    }
+
     /*
      * Photo / video picker
      */
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
index 6a4ea83d68..ae6b24e4e4 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
@@ -17,6 +17,9 @@
 package im.vector.app.features.settings
 
 import im.vector.app.R
+import im.vector.app.core.preference.VectorSwitchPreference
+import im.vector.app.features.MainActivity
+import im.vector.app.features.MainActivityArgs
 import javax.inject.Inject
 
 class VectorSettingsLabsFragment @Inject constructor(
@@ -27,6 +30,11 @@ class VectorSettingsLabsFragment @Inject constructor(
     override val preferenceXmlRes = R.xml.vector_settings_labs
 
     override fun bindPref() {
-        // Nothing to do
+        findPreference<VectorSwitchPreference>(VectorPreferences.SETTINGS_LABS_SPACES_HOME_AS_ORPHAN)!!.let { pref ->
+            pref.setOnPreferenceChangeListener { _, _ ->
+                MainActivity.restartApp(requireActivity(), MainActivityArgs(clearCache = false))
+                true
+            }
+        }
     }
 }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index cea541410b..9d2763e243 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3362,4 +3362,7 @@
     <string name="space_mark_as_suggested">Mark as suggested</string>
     <string name="space_mark_as_not_suggested">Mark as not suggested</string>
     <string name="space_manage_rooms_and_spaces">Manage rooms and spaces</string>
+
+
+    <string name="labs_space_show_orphan_in_home">Experimental Space - Only show orphans in Home</string>
 </resources>
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 607f01db35..1e0f736db2 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -52,4 +52,9 @@
         android:summary="@string/labs_use_restricted_join_rule_desc"/>
     <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
 
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:key="SETTINGS_LABS_SPACES_HOME_AS_ORPHAN"
+        android:title="@string/labs_space_show_orphan_in_home"/>
+
 </androidx.preference.PreferenceScreen>
\ No newline at end of file

From f9820cde58715013cb0a2fdcb25f8caccd667a0c Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 11 May 2021 11:36:17 +0200
Subject: [PATCH 336/350] Fixes on unread badges

---
 .../room/summary/RoomSummaryUpdater.kt        |  2 +
 .../app/features/home/HomeDetailViewModel.kt  |  2 +-
 .../home/UnreadMessagesSharedViewModel.kt     | 18 ++++++-
 .../room/list/SpaceRoomListSectionBuilder.kt  | 50 ++++++++++++-------
 .../features/spaces/SpacesListViewModel.kt    | 28 ++++++++---
 5 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 63fcb557a8..cac0d715f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -364,6 +364,8 @@ internal class RoomSummaryUpdater @Inject constructor(
                         realm.where(RoomSummaryEntity::class.java)
                                 .process(RoomSummaryEntityFields.MEMBERSHIP_STR, listOf(Membership.JOIN))
                                 .notEqualTo(RoomSummaryEntityFields.ROOM_TYPE, RoomType.SPACE)
+                                // also we do not count DM in here, because home space will already show them
+                                .equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
                                 .contains(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, space.roomId)
                                 .findAll().forEach {
                                     highlightCount += it.highlightCount
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index be5c72330e..836c63e85b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -202,7 +202,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                             setState {
                                 copy(
                                         notificationCountCatchup = dmRooms.totalCount + otherRooms.totalCount + roomsInvite + dmInvites,
-                                        notificationHighlightCatchup = dmRooms.isHighlight || otherRooms.isHighlight,
+                                        notificationHighlightCatchup = dmRooms.isHighlight || otherRooms.isHighlight || (dmInvites + roomsInvite) > 0,
                                         notificationCountPeople = dmRooms.totalCount + dmInvites,
                                         notificationHighlightPeople = dmRooms.isHighlight || dmInvites > 0,
                                         notificationCountRooms = otherRooms.totalCount + roomsInvite,
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index 43c878624b..79450321ba 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -29,6 +29,7 @@ import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.settings.VectorPreferences
 import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
@@ -52,6 +53,7 @@ data class CountInfo(
 
 class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initialState: UnreadMessagesState,
                                                                 session: Session,
+                                                                private val vectorPreferences: VectorPreferences,
                                                                 appStateHandler: AppStateHandler)
     : VectorViewModel<UnreadMessagesState, EmptyAction, EmptyViewEvents>(initialState) {
 
@@ -126,12 +128,24 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                         }
                         is RoomGroupingMethod.BySpace       -> {
                             val selectedSpace = appStateHandler.safeActiveSpaceId()
-                            val counts = session.getNotificationCountForRooms(
+
+                            val inviteCount = session.getRoomSummaries(roomSummaryQueryParams {
+                                this.memberships = listOf(Membership.INVITE)
+                            }).size
+
+                            val totalCount = session.getNotificationCountForRooms(
                                     roomSummaryQueryParams {
                                         this.memberships = listOf(Membership.JOIN)
-                                        this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+                                        this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
+                                            vectorPreferences.labsSpacesOnlyOrphansInHome()
+                                        } ?: ActiveSpaceFilter.None
                                     }
                             )
+
+                            val counts = RoomAggregateNotificationCount(
+                                    totalCount.notificationCount + inviteCount,
+                                    totalCount.highlightCount + inviteCount
+                            )
                             val rootCounts = session.spaceService().getRootSpaceSummaries()
                                     .filter {
                                         // filter out current selection
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 852efb9193..2cd0199062 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -41,6 +41,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.UpdatableLivePageResult
 import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.rx.asObservable
 
 class SpaceRoomListSectionBuilder(
@@ -88,12 +89,13 @@ class SpaceRoomListSectionBuilder(
             }
             RoomListDisplayMode.NOTIFICATIONS -> {
                 addSection(
-                        sections,
-                        activeSpaceAwareQueries,
-                        R.string.invitations_header,
-                        true,
-                        RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
-                                ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                        sections = sections,
+                        activeSpaceUpdaters = activeSpaceAwareQueries,
+                        nameRes = R.string.invitations_header,
+                        notifyOfLocalEcho = true,
+                        spaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
+                                ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL,
+                        countRoomAsNotif = true
                 ) {
                     it.memberships = listOf(Membership.INVITE)
                     it.roomCategoryFilter = RoomCategoryFilter.ALL
@@ -129,10 +131,12 @@ class SpaceRoomListSectionBuilder(
 
     private fun buildRoomsSections(sections: MutableList<RoomsSection>, activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>) {
         addSection(
-                sections, activeSpaceAwareQueries,
-                R.string.invitations_header,
-                true,
-                 RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.invitations_header,
+                notifyOfLocalEcho = true,
+                spaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL,
+                countRoomAsNotif = true
         ) {
             it.memberships = listOf(Membership.INVITE)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -234,11 +238,12 @@ class SpaceRoomListSectionBuilder(
     }
 
     private fun buildDmSections(sections: MutableList<RoomsSection>, activeSpaceAwareQueries: MutableList<RoomListViewModel.ActiveSpaceQueryUpdater>) {
-        addSection(sections,
-                activeSpaceAwareQueries,
-                R.string.invitations_header,
-                true,
-                RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+        addSection(sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.invitations_header,
+                notifyOfLocalEcho = true,
+                spaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL,
+                countRoomAsNotif = true
         ) {
             it.memberships = listOf(Membership.INVITE)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
@@ -272,6 +277,7 @@ class SpaceRoomListSectionBuilder(
                            @StringRes nameRes: Int,
                            notifyOfLocalEcho: Boolean = false,
                            spaceFilterStrategy: RoomListViewModel.SpaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.NONE,
+                           countRoomAsNotif: Boolean = false,
                            query: (RoomSummaryQueryParams.Builder) -> Unit) {
         withQueryParams(
                 { query.invoke(it) },
@@ -313,7 +319,7 @@ class SpaceRoomListSectionBuilder(
                                     }
                                 })
                             }
-                            RoomListViewModel.SpaceFilterStrategy.NONE       -> {
+                            RoomListViewModel.SpaceFilterStrategy.NONE                  -> {
                                 // we ignore current space for this one
                             }
                         }
@@ -326,9 +332,15 @@ class SpaceRoomListSectionBuilder(
                                         .subscribe {
                                             sections.find { it.sectionName == name }
                                                     ?.notificationCount
-                                                    ?.postValue(session.getNotificationCountForRooms(
-                                                            roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())
-                                                    ))
+                                                    ?.postValue(
+                                                            if (countRoomAsNotif) {
+                                                                RoomAggregateNotificationCount(it.size, it.size)
+                                                            } else {
+                                                                session.getNotificationCountForRooms(
+                                                                        roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())
+                                                                )
+                                                            }
+                                                    )
                                         }.also {
                                             onDisposable.invoke(it)
                                         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index 9b2cffc59c..eec604d318 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -28,8 +28,7 @@ import dagger.assisted.AssistedInject
 import im.vector.app.AppStateHandler
 import im.vector.app.RoomGroupingMethod
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.ui.UiStateRepository
+import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.group
 import im.vector.app.space
 import io.reactivex.Observable
@@ -45,6 +44,7 @@ import org.matrix.android.sdk.api.session.room.RoomSortOrder
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
+import org.matrix.android.sdk.api.session.room.summary.RoomAggregateNotificationCount
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.rx.asObservable
@@ -54,8 +54,7 @@ import java.util.concurrent.TimeUnit
 class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: SpaceListViewState,
                                                       private val appStateHandler: AppStateHandler,
                                                       private val session: Session,
-                                                      private val stringProvider: StringProvider,
-                                                      private val uiStateRepository: UiStateRepository
+                                                      private val vectorPreferences: VectorPreferences
 ) : VectorViewModel<SpaceListViewState, SpaceListAction, SpaceListViewEvents>(initialState) {
 
     @AssistedFactory
@@ -108,21 +107,34 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                     }
                 }.disposeOnClear()
 
+        // XXX there should be a way to refactor this and share it
         session.getPagedRoomSummariesLive(
                 roomSummaryQueryParams {
                     this.memberships = listOf(Membership.JOIN)
-                    this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+                    this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
+                        vectorPreferences.labsSpacesOnlyOrphansInHome()
+                    } ?: ActiveSpaceFilter.None
                 }, sortOrder = RoomSortOrder.NONE
         ).asObservable()
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
                 .observeOn(Schedulers.computation())
                 .subscribe {
-                    val counts = session.getNotificationCountForRooms(
+                    val inviteCount = session.getRoomSummaries(roomSummaryQueryParams {
+                        this.memberships = listOf(Membership.INVITE)
+                    }).size
+
+                    val totalCount = session.getNotificationCountForRooms(
                             roomSummaryQueryParams {
                                 this.memberships = listOf(Membership.JOIN)
-                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null)
+                                this.activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(null).takeIf {
+                                    vectorPreferences.labsSpacesOnlyOrphansInHome()
+                                } ?: ActiveSpaceFilter.None
                             }
                     )
+                    val counts = RoomAggregateNotificationCount(
+                            totalCount.notificationCount + inviteCount,
+                            totalCount.highlightCount + inviteCount
+                    )
                     setState {
                         copy(
                                 homeAggregateCount = counts
@@ -217,7 +229,7 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                         .rx()
                         .liveUser(session.myUserId)
                         .map {
-                             it.getOrNull()
+                            it.getOrNull()
                         },
                 session
                         .rx()

From 91d8ee2a81348e5a25b9e9bd0a8cdaaea57a1f5f Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 11 May 2021 14:45:30 +0200
Subject: [PATCH 337/350] Space panel room ordering

---
 .../vector/app/features/spaces/SpaceSummaryController.kt  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 6bd56c9d81..bd190519aa 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -43,6 +43,8 @@ class SpaceSummaryController @Inject constructor(
     var callback: Callback? = null
     private var viewState: SpaceListViewState? = null
 
+    private val subSpaceComparator: Comparator<SpaceChildInfo> = compareBy<SpaceChildInfo> { it.order }.thenBy { it.childRoomId }
+
     init {
         requestModelBuild()
     }
@@ -132,13 +134,13 @@ class SpaceSummaryController @Inject constructor(
         }
 
         rootSpaces
-                ?.sortedBy { it.displayName }
+                ?.sortedBy { it.roomId }
                 ?.forEach { groupSummary ->
                     val isSelected = selected is RoomGroupingMethod.BySpace && groupSummary.roomId == selected.space()?.roomId
                     // does it have children?
                     val subSpaces = groupSummary.spaceChildren?.filter { childInfo ->
                         summaries?.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
-                    }
+                    }?.sortedWith(subSpaceComparator)
                     val hasChildren = (subSpaces?.size ?: 0) > 0
                     val expanded = expandedStates[groupSummary.roomId] == true
 
@@ -183,7 +185,7 @@ class SpaceSummaryController @Inject constructor(
         // does it have children?
         val subSpaces = childSum.spaceChildren?.filter { childInfo ->
             summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
-        }
+        }?.sortedWith(subSpaceComparator)
         val expanded = expandedStates[childSum.roomId] == true
         val isSelected = selected is RoomGroupingMethod.BySpace && childSum.roomId == selected.space()?.roomId
 

From eb9fadaebfd137db84068f8b9fa5ca3350427eef Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 11 May 2021 17:34:26 +0200
Subject: [PATCH 338/350] user error when no space support on HS

remove buggy separators on add room; design update
---
 .../app/core/ui/list/GenericPillItem.kt       | 85 +++++++++++++++++++
 .../explore/SpaceDirectoryController.kt       | 40 ++++++++-
 .../spaces/explore/SpaceDirectoryFragment.kt  |  3 +
 .../explore/SpaceDirectoryViewAction.kt       |  1 +
 .../spaces/explore/SpaceDirectoryViewModel.kt | 25 ++++--
 .../spaces/manage/AddRoomListController.kt    | 13 +++
 .../spaces/manage/SpaceAddRoomFragment.kt     | 39 +--------
 vector/src/main/res/drawable/ic_info.xml      | 10 +++
 .../res/layout/fragment_space_add_rooms.xml   |  2 +-
 .../res/layout/item_generic_pill_footer.xml   | 27 ++++++
 vector/src/main/res/values/strings.xml        |  3 +
 11 files changed, 201 insertions(+), 47 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt
 create mode 100644 vector/src/main/res/drawable/ic_info.xml
 create mode 100644 vector/src/main/res/layout/item_generic_pill_footer.xml

diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt
new file mode 100644
index 0000000000..5750fd93b4
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.app.core.ui.list
+
+import android.content.res.ColorStateList
+import android.view.Gravity
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.core.widget.ImageViewCompat
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.themes.ThemeUtils
+
+/**
+ * A generic list item.
+ * Displays an item with a title, and optional description.
+ * Can display an accessory on the right, that can be an image or an indeterminate progress.
+ * If provided with an action, will display a button at the bottom of the list item.
+ */
+@EpoxyModelClass(layout = R.layout.item_generic_pill_footer)
+abstract class GenericPillItem : VectorEpoxyModel<GenericPillItem.Holder>() {
+
+    @EpoxyAttribute
+    var text: CharSequence? = null
+
+    @EpoxyAttribute
+    var style: ItemStyle = ItemStyle.NORMAL_TEXT
+
+    @EpoxyAttribute
+    var itemClickAction: GenericItem.Action? = null
+
+    @EpoxyAttribute
+    var centered: Boolean = false
+
+    @EpoxyAttribute
+    @DrawableRes
+    var imageRes: Int? = null
+
+    @EpoxyAttribute
+    var tintIcon: Boolean = true
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+
+        holder.textView.setTextOrHide(text)
+        holder.textView.typeface = style.toTypeFace()
+        holder.textView.textSize = style.toTextSize()
+        holder.textView.gravity = if (centered) Gravity.CENTER_HORIZONTAL else Gravity.START
+
+        imageRes?.let { holder.imageView.setImageResource(it) }
+        if (tintIcon) {
+            val iconTintColor = ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
+            ImageViewCompat.setImageTintList(holder.imageView, ColorStateList.valueOf(iconTintColor))
+        } else {
+            ImageViewCompat.setImageTintList(holder.imageView, null)
+        }
+
+        holder.view.setOnClickListener {
+            itemClickAction?.perform?.run()
+        }
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val imageView by bind<ImageView>(R.id.itemGenericPillImage)
+        val textView by bind<TextView>(R.id.itemGenericPillText)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index f8e45dcd5e..28d410529e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -18,13 +18,21 @@ package im.vector.app.features.spaces.explore
 
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Incomplete
 import im.vector.app.R
+import im.vector.app.core.epoxy.errorWithRetryItem
 import im.vector.app.core.epoxy.loadingItem
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.core.ui.list.genericPillItem
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.list.spaceChildInfoItem
+import me.gujun.android.span.span
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.failure.MatrixError.Companion.M_UNRECOGNIZED
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
 import org.matrix.android.sdk.api.util.MatrixItem
@@ -32,13 +40,16 @@ import javax.inject.Inject
 
 class SpaceDirectoryController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
-        private val stringProvider: StringProvider
+        private val stringProvider: StringProvider,
+        private val colorProvider: ColorProvider,
+        private val errorFormatter: ErrorFormatter
 ) : TypedEpoxyController<SpaceDirectoryState>() {
 
     interface InteractionListener {
         fun onButtonClick(spaceChildInfo: SpaceChildInfo)
         fun onSpaceChildClick(spaceChildInfo: SpaceChildInfo)
         fun onRoomClick(spaceChildInfo: SpaceChildInfo)
+        fun retry()
     }
 
     var listener: InteractionListener? = null
@@ -50,6 +61,33 @@ class SpaceDirectoryController @Inject constructor(
             loadingItem {
                 id("loading")
             }
+        } else if (results is Fail) {
+            val failure = results.error
+            if (failure is Failure.ServerError && failure.error.code == M_UNRECOGNIZED) {
+                genericPillItem {
+                    id("HS no Support")
+                    imageRes(R.drawable.error)
+                    tintIcon(false)
+                    text(
+                            span {
+                                span(stringProvider.getString(R.string.spaces_no_server_support_title)) {
+                                    textStyle = "bold"
+                                    textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_primary)
+                                }
+                                +"\n\n"
+                                span(stringProvider.getString(R.string.spaces_no_server_support_description)) {
+                                    textColor = colorProvider.getColorFromAttribute(R.attr.riotx_text_secondary)
+                                }
+                            }
+                    )
+                }
+            } else {
+                errorWithRetryItem {
+                    id("api_err")
+                    text(errorFormatter.toHumanReadable(failure))
+                    listener { listener?.retry() }
+                }
+            }
         } else {
             val flattenChildInfo = results?.invoke()
                     ?.filter {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
index 41ab8d9006..fa44f4595e 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryFragment.kt
@@ -94,6 +94,9 @@ class SpaceDirectoryFragment @Inject constructor(
         return true
     }
 
+    override fun retry() {
+        viewModel.handle(SpaceDirectoryViewAction.Retry)
+    }
 //    override fun navigateToRoom(roomId: String) {
 //        viewModel.handle(SpaceDirectoryViewAction.NavigateToRoom(roomId))
 //    }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
index a7e1482e24..83cdf2916d 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewAction.kt
@@ -25,4 +25,5 @@ sealed class SpaceDirectoryViewAction : VectorViewModelAction {
     data class ShowDetails(val spaceChildInfo: SpaceChildInfo) : SpaceDirectoryViewAction()
     data class NavigateToRoom(val roomId: String) : SpaceDirectoryViewAction()
     object HandleBack : SpaceDirectoryViewAction()
+    object Retry : SpaceDirectoryViewAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
index 9d74849386..0c23752936 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt
@@ -39,7 +39,7 @@ import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
 class SpaceDirectoryViewModel @AssistedInject constructor(
-        @Assisted initialState: SpaceDirectoryState,
+        @Assisted val initialState: SpaceDirectoryState,
         private val session: Session
 ) : VectorViewModel<SpaceDirectoryState, SpaceDirectoryViewAction, SpaceDirectoryViewEvents>(initialState) {
 
@@ -63,11 +63,21 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
         val spaceSum = session.getRoomSummary(initialState.spaceId)
         setState {
             copy(
-                    childList = spaceSum?.spaceChildren ?: emptyList(),
-                    spaceSummaryApiResult = Loading()
+                    childList = spaceSum?.spaceChildren ?: emptyList()
             )
         }
 
+        refreshFromApi()
+        observeJoinedRooms()
+        observeMembershipChanges()
+    }
+
+    private fun refreshFromApi() {
+        setState {
+            copy(
+                    spaceSummaryApiResult = Loading()
+            )
+        }
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 val query = session.spaceService().querySpaceChildren(initialState.spaceId)
@@ -84,8 +94,6 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
                 }
             }
         }
-        observeJoinedRooms()
-        observeMembershipChanges()
     }
 
     private fun observeJoinedRooms() {
@@ -139,13 +147,16 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
             is SpaceDirectoryViewAction.NavigateToRoom -> {
                 _viewEvents.post(SpaceDirectoryViewEvents.NavigateToRoom(action.roomId))
             }
-            is SpaceDirectoryViewAction.ShowDetails ->  {
+            is SpaceDirectoryViewAction.ShowDetails -> {
                 // This is temporary for now to at least display something for the space beta
                 // It's not ideal as it's doing some peeking that is not needed.
                 session.permalinkService().createRoomPermalink(action.spaceChildInfo.childRoomId)?.let {
-                   _viewEvents.post(SpaceDirectoryViewEvents.NavigateToMxToBottomSheet(it))
+                    _viewEvents.post(SpaceDirectoryViewEvents.NavigateToMxToBottomSheet(it))
                 }
             }
+            SpaceDirectoryViewAction.Retry -> {
+                refreshFromApi()
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
index 46ca2a6606..dffb09529b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/AddRoomListController.kt
@@ -19,6 +19,8 @@ package im.vector.app.features.spaces.manage
 import androidx.recyclerview.widget.DiffUtil
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.paging.PagedListEpoxyController
+import im.vector.app.R
+import im.vector.app.core.ui.list.GenericPillItem_
 import im.vector.app.core.utils.DebouncedClickListener
 import im.vector.app.core.utils.createUIHandler
 import im.vector.app.features.home.AvatarRenderer
@@ -56,6 +58,8 @@ class AddRoomListController @Inject constructor(
     var listener: Listener? = null
     var ignoreRooms: List<String>? = null
 
+    var subHeaderText: CharSequence? = null
+
     var initialLoadOccurred = false
 
     fun boundaryChange(boundary: ResultBoundaries) {
@@ -100,6 +104,15 @@ class AddRoomListController @Inject constructor(
                         expanded(true)
                     }
             )
+            if (subHeaderText != null) {
+                add(
+                        GenericPillItem_().apply {
+                            id("sub_header")
+                            text(subHeaderText)
+                            imageRes(R.drawable.ic_info)
+                        }
+                )
+            }
         }
         super.addModels(filteredModel)
         if (!initialLoadOccurred) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
index 9a25e79f85..203098d32b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomFragment.kt
@@ -16,9 +16,6 @@
 
 package im.vector.app.features.spaces.manage
 
-import android.graphics.Canvas
-import android.graphics.Rect
-import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
@@ -26,12 +23,8 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.ConcatAdapter
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.airbnb.epoxy.EpoxyViewHolder
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
@@ -41,7 +34,6 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSpaceAddRoomsBinding
-import im.vector.app.features.home.room.list.RoomCategoryItem_
 import io.reactivex.rxkotlin.subscribeBy
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import java.util.concurrent.TimeUnit
@@ -88,6 +80,7 @@ class SpaceAddRoomFragment @Inject constructor(
                 }
                 .disposeOnDestroyView()
 
+        spaceEpoxyController.subHeaderText = getString(R.string.spaces_feeling_experimental_subspace)
         viewModel.selectionListLiveData.observe(viewLifecycleOwner) {
             spaceEpoxyController.selectedItems = it
             roomEpoxyController.selectedItems = it
@@ -183,36 +176,6 @@ class SpaceAddRoomFragment @Inject constructor(
         }
 
         views.roomList.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-        views.roomList.addItemDecoration(
-
-                object : DividerItemDecoration(context, VERTICAL) {
-                    val decorationDrawable = ContextCompat.getDrawable(requireContext(), R.drawable.divider_horizontal)
-
-                    override fun getDrawable(): Drawable? {
-                        return decorationDrawable
-                    }
-
-                    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
-                        val position = parent.getChildAdapterPosition(view)
-                        val vh = parent.findViewHolderForAdapterPosition(position)
-                        val nextIsSectionOrFinal = parent.findViewHolderForAdapterPosition(position + 1)?.let {
-                            (it as? EpoxyViewHolder)?.model is RoomCategoryItem_
-                        } ?: true
-                        if (vh == null
-                                || (vh as? EpoxyViewHolder)?.model is RoomCategoryItem_
-                                || nextIsSectionOrFinal
-                        ) {
-                            outRect.setEmpty()
-                        } else {
-                            super.getItemOffsets(outRect, view, parent, state)
-                        }
-                    }
-
-                    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
-                        super.onDraw(c, parent, state)
-                    }
-                }
-        )
         views.roomList.setHasFixedSize(true)
 
         concatAdapter.addAdapter(roomEpoxyController.adapter)
diff --git a/vector/src/main/res/drawable/ic_info.xml b/vector/src/main/res/drawable/ic_info.xml
new file mode 100644
index 0000000000..afca98641a
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M14.6666,7.9999C14.6666,11.6818 11.6818,14.6666 7.9999,14.6666C4.318,14.6666 1.3333,11.6818 1.3333,7.9999C1.3333,4.318 4.318,1.3333 7.9999,1.3333C11.6818,1.3333 14.6666,4.318 14.6666,7.9999ZM6.3333,7.9999C6.3333,8.4353 6.6115,8.8057 6.9999,8.943V10.9999C6.9999,11.5522 7.4476,11.9999 7.9999,11.9999H8.9999C9.5522,11.9999 9.9999,11.5522 9.9999,10.9999C9.9999,10.4476 9.5522,9.9999 8.9999,9.9999V7.9999C8.9999,7.4476 8.5522,6.9999 7.9999,6.9999H7.3333C6.781,6.9999 6.3333,7.4476 6.3333,7.9999ZM7.9999,6.6666C8.5522,6.6666 8.9999,6.2189 8.9999,5.6666C8.9999,5.1143 8.5522,4.6666 7.9999,4.6666C7.4476,4.6666 6.9999,5.1143 6.9999,5.6666C6.9999,6.2189 7.4476,6.6666 7.9999,6.6666Z"
+      android:fillColor="#737D8C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml
index 6619d06cca..84774d9cf9 100644
--- a/vector/src/main/res/layout/fragment_space_add_rooms.xml
+++ b/vector/src/main/res/layout/fragment_space_add_rooms.xml
@@ -10,7 +10,7 @@
         android:id="@+id/roomList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?riotx_header_panel_background"
+        android:background="?riotx_background"
         android:overScrollMode="always"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:listitem="@layout/item_room_to_add_in_space" />
diff --git a/vector/src/main/res/layout/item_generic_pill_footer.xml b/vector/src/main/res/layout/item_generic_pill_footer.xml
new file mode 100644
index 0000000000..160fbc5210
--- /dev/null
+++ b/vector/src/main/res/layout/item_generic_pill_footer.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="16dp"
+    android:background="@drawable/rounded_rect_shape_8"
+    android:backgroundTint="?riotx_reaction_background_off"
+    android:orientation="horizontal"
+    android:padding="16dp">
+
+    <ImageView
+        android:id="@+id/itemGenericPillImage"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:src="@drawable/ic_info"
+        android:tint="?riotx_text_secondary" />
+
+    <TextView
+        android:id="@+id/itemGenericPillText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:gravity="start"
+        tools:text="@tools:sample/lorem" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 9d2763e243..cdd33b9a92 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3365,4 +3365,7 @@
 
 
     <string name="labs_space_show_orphan_in_home">Experimental Space - Only show orphans in Home</string>
+    <string name="spaces_feeling_experimental_subspace">Feeling experimental?\nYou can add existing spaces to a space.</string>
+    <string name="spaces_no_server_support_title">It looks like your homeserver does not support Spaces yet</string>
+    <string name="spaces_no_server_support_description">Please contact your homserver admin for further information</string>
 </resources>

From 0de56e29933f94740e3cd9e6034fb5a7d10be360 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 11 May 2021 19:11:15 +0200
Subject: [PATCH 339/350] Code Review

---
 .../app/core/ui/list/GenericPillItem.kt       | 13 ++--
 .../room/list/SpaceRoomListSectionBuilder.kt  | 71 +++++++++++--------
 .../features/spaces/SpaceSummaryController.kt | 24 +++----
 .../features/spaces/SubSpaceSummaryItem.kt    | 36 +++++-----
 4 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt
index 5750fd93b4..ce9e35c007 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericPillItem.kt
@@ -20,6 +20,7 @@ import android.view.Gravity
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.DrawableRes
+import androidx.core.view.isVisible
 import androidx.core.widget.ImageViewCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
@@ -30,10 +31,7 @@ import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.features.themes.ThemeUtils
 
 /**
- * A generic list item.
- * Displays an item with a title, and optional description.
- * Can display an accessory on the right, that can be an image or an indeterminate progress.
- * If provided with an action, will display a button at the bottom of the list item.
+ * A generic list item with a rounded corner background and an optional icon
  */
 @EpoxyModelClass(layout = R.layout.item_generic_pill_footer)
 abstract class GenericPillItem : VectorEpoxyModel<GenericPillItem.Holder>() {
@@ -65,7 +63,12 @@ abstract class GenericPillItem : VectorEpoxyModel<GenericPillItem.Holder>() {
         holder.textView.textSize = style.toTextSize()
         holder.textView.gravity = if (centered) Gravity.CENTER_HORIZONTAL else Gravity.START
 
-        imageRes?.let { holder.imageView.setImageResource(it) }
+        if (imageRes != null) {
+            holder.imageView.setImageResource(imageRes!!)
+            holder.imageView.isVisible = true
+        } else {
+            holder.imageView.isVisible = false
+        }
         if (tintIcon) {
             val iconTintColor = ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
             ImageViewCompat.setImageTintList(holder.imageView, ColorStateList.valueOf(iconTintColor))
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
index 2cd0199062..266adf6b0c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
@@ -93,8 +93,11 @@ class SpaceRoomListSectionBuilder(
                         activeSpaceUpdaters = activeSpaceAwareQueries,
                         nameRes = R.string.invitations_header,
                         notifyOfLocalEcho = true,
-                        spaceFilterStrategy = RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
-                                ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL,
+                        spaceFilterStrategy = if (onlyOrphansInHome) {
+                            RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                        } else {
+                            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                        },
                         countRoomAsNotif = true
                 ) {
                     it.memberships = listOf(Membership.INVITE)
@@ -102,12 +105,15 @@ class SpaceRoomListSectionBuilder(
                 }
 
                 addSection(
-                        sections,
-                        activeSpaceAwareQueries,
-                        R.string.bottom_action_rooms,
-                        false,
-                        RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
-                                ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                        sections = sections,
+                        activeSpaceUpdaters = activeSpaceAwareQueries,
+                        nameRes = R.string.bottom_action_rooms,
+                        notifyOfLocalEcho = false,
+                        spaceFilterStrategy = if (onlyOrphansInHome) {
+                            RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                        } else {
+                            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                        }
                 ) {
                     it.memberships = listOf(Membership.JOIN)
                     it.roomCategoryFilter = RoomCategoryFilter.ONLY_WITH_NOTIFICATIONS
@@ -155,12 +161,15 @@ class SpaceRoomListSectionBuilder(
         }
 
         addSection(
-                sections,
-                activeSpaceAwareQueries,
-                R.string.bottom_action_rooms,
-                false,
-                RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
-                        ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.bottom_action_rooms,
+                notifyOfLocalEcho = false,
+                spaceFilterStrategy = if (onlyOrphansInHome) {
+                    RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                } else {
+                    RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                }
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -168,12 +177,15 @@ class SpaceRoomListSectionBuilder(
         }
 
         addSection(
-                sections,
-                activeSpaceAwareQueries,
-                R.string.low_priority_header,
-                false,
-                RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
-                        ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.low_priority_header,
+                notifyOfLocalEcho = false,
+                spaceFilterStrategy = if (onlyOrphansInHome) {
+                    RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                } else {
+                    RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                }
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -181,12 +193,15 @@ class SpaceRoomListSectionBuilder(
         }
 
         addSection(
-                sections,
-                activeSpaceAwareQueries,
-                R.string.system_alerts_header,
-                false,
-                RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL.takeIf { onlyOrphansInHome }
-                        ?: RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                sections = sections,
+                activeSpaceUpdaters = activeSpaceAwareQueries,
+                nameRes = R.string.system_alerts_header,
+                notifyOfLocalEcho = false,
+                spaceFilterStrategy = if (onlyOrphansInHome) {
+                    RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL
+                } else {
+                    RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL
+                }
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
@@ -372,7 +387,7 @@ class SpaceRoomListSectionBuilder(
                         activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(currentSpace)
                 )
             }
-            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL     -> {
+            RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL -> {
                 if (currentSpace == null) {
                     copy(
                             activeSpaceFilter = ActiveSpaceFilter.None
@@ -383,7 +398,7 @@ class SpaceRoomListSectionBuilder(
                     )
                 }
             }
-            RoomListViewModel.SpaceFilterStrategy.NONE                  -> this
+            RoomListViewModel.SpaceFilterStrategy.NONE -> this
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index bd190519aa..33e4b23047 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -179,31 +179,31 @@ class SpaceSummaryController @Inject constructor(
     private fun buildSubSpace(summaries: List<RoomSummary>?,
                               expandedStates: Map<String, Boolean>,
                               selected: RoomGroupingMethod,
-                              childSum: SpaceChildInfo, currentDepth: Int, maxDepth: Int) {
+                              info: SpaceChildInfo, currentDepth: Int, maxDepth: Int) {
         if (currentDepth >= maxDepth) return
-        val childSum = summaries?.firstOrNull { it.roomId == childSum.childRoomId } ?: return
+        val childSummary = summaries?.firstOrNull { it.roomId == info.childRoomId } ?: return
         // does it have children?
-        val subSpaces = childSum.spaceChildren?.filter { childInfo ->
+        val subSpaces = childSummary.spaceChildren?.filter { childInfo ->
             summaries.indexOfFirst { it.roomId == childInfo.childRoomId } != -1
         }?.sortedWith(subSpaceComparator)
-        val expanded = expandedStates[childSum.roomId] == true
-        val isSelected = selected is RoomGroupingMethod.BySpace && childSum.roomId == selected.space()?.roomId
+        val expanded = expandedStates[childSummary.roomId] == true
+        val isSelected = selected is RoomGroupingMethod.BySpace && childSummary.roomId == selected.space()?.roomId
 
         subSpaceSummaryItem {
             avatarRenderer(avatarRenderer)
-            id(childSum.roomId)
+            id(childSummary.roomId)
             hasChildren(!subSpaces.isNullOrEmpty())
             selected(isSelected)
             expanded(expanded)
-            onMore { callback?.onSpaceSettings(childSum) }
-            matrixItem(childSum.toMatrixItem())
-            listener { callback?.onSpaceSelected(childSum) }
-            toggleExpand { callback?.onToggleExpand(childSum) }
+            onMore { callback?.onSpaceSettings(childSummary) }
+            matrixItem(childSummary.toMatrixItem())
+            listener { callback?.onSpaceSelected(childSummary) }
+            toggleExpand { callback?.onToggleExpand(childSummary) }
             indent(currentDepth)
             countState(
                     UnreadCounterBadgeView.State(
-                            childSum.notificationCount,
-                            childSum.highlightCount > 0
+                            childSummary.notificationCount,
+                            childSummary.highlightCount > 0
                     )
             )
         }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
index b98f1ca7af..db58353e5c 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
@@ -20,7 +20,6 @@ import android.widget.ImageView
 import android.widget.Space
 import android.widget.TextView
 import androidx.core.content.ContextCompat
-import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.airbnb.epoxy.EpoxyAttribute
@@ -37,16 +36,16 @@ import org.matrix.android.sdk.api.util.MatrixItem
 @EpoxyModelClass(layout = R.layout.item_sub_space)
 abstract class SubSpaceSummaryItem : VectorEpoxyModel<SubSpaceSummaryItem.Holder>() {
 
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)  lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute lateinit var matrixItem: MatrixItem
     @EpoxyAttribute var selected: Boolean = false
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var listener: (() -> Unit)? = null
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)  var onMore: (() -> Unit)? = null
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)  var toggleExpand: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var onMore: (() -> Unit)? = null
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) var toggleExpand: (() -> Unit)? = null
     @EpoxyAttribute var expanded: Boolean = false
     @EpoxyAttribute var hasChildren: Boolean = false
     @EpoxyAttribute var indent: Int = 0
-    @EpoxyAttribute var countState : UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
+    @EpoxyAttribute var countState: UnreadCounterBadgeView.State = UnreadCounterBadgeView.State(0, false)
 
     override fun bind(holder: Holder) {
         super.bind(holder)
@@ -64,21 +63,18 @@ abstract class SubSpaceSummaryItem : VectorEpoxyModel<SubSpaceSummaryItem.Holder
             holder.moreView.isVisible = false
         }
 
-        if (hasChildren) {
-            holder.collapseIndicator.isVisible = true
-            holder.collapseIndicator.setImageDrawable(
-                    ContextCompat.getDrawable(holder.view.context,
-                            if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more
-                    )
-            )
-            holder.collapseIndicator.setOnClickListener(
-                    DebouncedClickListener({ _ ->
-                        toggleExpand?.invoke()
-                    })
-            )
-        } else {
-            holder.collapseIndicator.isGone = true
-        }
+        holder.collapseIndicator.setImageDrawable(
+                ContextCompat.getDrawable(holder.view.context,
+                        if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more
+                )
+        )
+        holder.collapseIndicator.setOnClickListener(
+                DebouncedClickListener({ _ ->
+                    toggleExpand?.invoke()
+                })
+        )
+
+        holder.collapseIndicator.isVisible = hasChildren
 
         holder.indentSpace.isVisible = indent > 0
         holder.indentSpace.updateLayoutParams {

From 1799dcbd0c63af71c489b0514a90ecf467c02f48 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 12 May 2021 09:20:55 +0200
Subject: [PATCH 340/350] Fix lint

---
 vector/src/main/res/layout/item_generic_pill_footer.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/item_generic_pill_footer.xml b/vector/src/main/res/layout/item_generic_pill_footer.xml
index 160fbc5210..a0b19db32f 100644
--- a/vector/src/main/res/layout/item_generic_pill_footer.xml
+++ b/vector/src/main/res/layout/item_generic_pill_footer.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -13,8 +14,9 @@
         android:id="@+id/itemGenericPillImage"
         android:layout_width="20dp"
         android:layout_height="20dp"
+        android:importantForAccessibility="no"
         android:src="@drawable/ic_info"
-        android:tint="?riotx_text_secondary" />
+        app:tint="?riotx_text_secondary" />
 
     <TextView
         android:id="@+id/itemGenericPillText"

From 03f2b516a09ab2dfeb0b4b84d56f8e1c05dbc7cc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 May 2021 10:17:33 +0200
Subject: [PATCH 341/350] Please the code quality checker

---
 .../app/features/home/UnreadMessagesSharedViewModel.kt      | 6 +++---
 .../im/vector/app/features/spaces/SpacesListViewModel.kt    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index 79450321ba..9b506b6ed7 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -129,9 +129,9 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                         is RoomGroupingMethod.BySpace       -> {
                             val selectedSpace = appStateHandler.safeActiveSpaceId()
 
-                            val inviteCount = session.getRoomSummaries(roomSummaryQueryParams {
-                                this.memberships = listOf(Membership.INVITE)
-                            }).size
+                            val inviteCount = session.getRoomSummaries(
+                                    roomSummaryQueryParams { this.memberships = listOf(Membership.INVITE) }
+                            ).size
 
                             val totalCount = session.getNotificationCountForRooms(
                                     roomSummaryQueryParams {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
index eec604d318..d7d7af4ca5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
@@ -119,9 +119,9 @@ class SpacesListViewModel @AssistedInject constructor(@Assisted initialState: Sp
                 .throttleFirst(300, TimeUnit.MILLISECONDS)
                 .observeOn(Schedulers.computation())
                 .subscribe {
-                    val inviteCount = session.getRoomSummaries(roomSummaryQueryParams {
-                        this.memberships = listOf(Membership.INVITE)
-                    }).size
+                    val inviteCount = session.getRoomSummaries(
+                            roomSummaryQueryParams { this.memberships = listOf(Membership.INVITE) }
+                    ).size
 
                     val totalCount = session.getNotificationCountForRooms(
                             roomSummaryQueryParams {

From eb18b23528de732d4a37c872172fa01b2794ee52 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 12 May 2021 10:07:51 +0200
Subject: [PATCH 342/350] Add option to send beta feedback

---
 tools/check/forbidden_strings_in_code.txt     |   2 +-
 .../vector/app/features/home/HomeActivity.kt  |   8 +-
 .../features/home/HomeActivitySharedAction.kt |   1 +
 .../features/rageshake/BugReportActivity.kt   | 109 +++++++++++++-----
 .../app/features/rageshake/BugReporter.kt     |  33 +++---
 .../features/spaces/SpaceBetaHeaderItem.kt    |  17 ++-
 .../app/features/spaces/SpaceListFragment.kt  |   4 +
 .../spaces/SpaceSettingsMenuBottomSheet.kt    |   7 ++
 .../features/spaces/SpaceSummaryController.kt |  10 +-
 vector/src/main/res/drawable/ic_feedback.xml  |  14 +++
 .../main/res/layout/activity_bug_report.xml   |   9 ++
 .../layout/bottom_sheet_space_settings.xml    |  14 ++-
 .../res/layout/item_space_beta_header.xml     |  13 +++
 vector/src/main/res/values/strings.xml        |   8 ++
 14 files changed, 195 insertions(+), 54 deletions(-)
 create mode 100644 vector/src/main/res/drawable/ic_feedback.xml

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 8f9cc852a7..b55487e8c0 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -161,7 +161,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===99
+enum class===100
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 1de1ff1c3e..766955f354 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -55,6 +55,7 @@ import im.vector.app.features.permalink.PermalinkHandler
 import im.vector.app.features.popup.DefaultVectorAlert
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
+import im.vector.app.features.rageshake.ReportType
 import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.VectorSettingsActivity
@@ -216,6 +217,9 @@ class HomeActivity :
                             SpaceInviteBottomSheet.newInstance(sharedAction.spaceId)
                                     .show(supportFragmentManager, "SPACE_INVITE")
                         }
+                        HomeActivitySharedAction.SendSpaceFeedBack -> {
+                            bugReporter.openBugReportScreen(this, ReportType.SPACE_BETA_FEEDBACK)
+                        }
                     }.exhaustive
                 }
                 .disposeOnDestroy()
@@ -449,11 +453,11 @@ class HomeActivity :
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menu_home_suggestion -> {
-                bugReporter.openBugReportScreen(this, true)
+                bugReporter.openBugReportScreen(this, ReportType.SUGGESTION)
                 return true
             }
             R.id.menu_home_report_bug -> {
-                bugReporter.openBugReportScreen(this, false)
+                bugReporter.openBugReportScreen(this, ReportType.BUG_REPORT)
                 return true
             }
             R.id.menu_home_init_sync_legacy -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
index d79f24fc4c..6047a1e55e 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt
@@ -29,4 +29,5 @@ sealed class HomeActivitySharedAction : VectorSharedAction {
     data class OpenSpacePreview(val spaceId: String) : HomeActivitySharedAction()
     data class OpenSpaceInvite(val spaceId: String) : HomeActivitySharedAction()
     data class ShowSpaceSettings(val spaceId: String) : HomeActivitySharedAction()
+    object SendSpaceFeedBack : HomeActivitySharedAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index 024d84f27b..4017a30519 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -16,6 +16,8 @@
 
 package im.vector.app.features.rageshake
 
+import android.content.Context
+import android.content.Intent
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
@@ -27,10 +29,17 @@ import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityBugReportBinding
+import org.matrix.android.sdk.api.extensions.tryOrNull
 
 import timber.log.Timber
 import javax.inject.Inject
 
+enum class ReportType {
+    BUG_REPORT,
+    SUGGESTION,
+    SPACE_BETA_FEEDBACK
+}
+
 /**
  * Form to send a bug report
  */
@@ -46,7 +55,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
     private val viewModel: BugReportViewModel by viewModel()
 
-    private var forSuggestion: Boolean = false
+    private var reportType: ReportType = ReportType.BUG_REPORT
 
     override fun initUiAndData() {
         configureToolbar(views.bugReportToolbar)
@@ -60,32 +69,50 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
             views.bugReportButtonIncludeScreenshot.isEnabled = false
         }
 
-        forSuggestion = intent.getBooleanExtra("FOR_SUGGESTION", false)
+        reportType = intent.getStringExtra(REPORT_TYPE_EXTRA)?.let {
+            tryOrNull { ReportType.valueOf(it) }
+        } ?: ReportType.BUG_REPORT
 
         // Default screen is for bug report, so modify it for suggestion
-        if (forSuggestion) {
-            supportActionBar?.setTitle(R.string.send_suggestion)
+        when (reportType) {
+            ReportType.BUG_REPORT -> {
+                supportActionBar?.setTitle(R.string.title_activity_bug_report)
+                views.bugReportButtonContactMe.isVisible = false
+            }
+            ReportType.SUGGESTION -> {
+                supportActionBar?.setTitle(R.string.send_suggestion)
 
-            views.bugReportFirstText.setText(R.string.send_suggestion_content)
-            views.bugReportTextInputLayout.hint = getString(R.string.send_suggestion_report_placeholder)
+                views.bugReportFirstText.setText(R.string.send_suggestion_content)
+                views.bugReportTextInputLayout.hint = getString(R.string.send_suggestion_report_placeholder)
+                views.bugReportButtonContactMe.isVisible = true
 
-            views.bugReportLogsDescription.isVisible = false
+                hideBugReportOptions()
+            }
+            ReportType.SPACE_BETA_FEEDBACK -> {
+                supportActionBar?.setTitle(R.string.send_feedback_space_title)
 
-            views.bugReportButtonIncludeLogs.isChecked = false
-            views.bugReportButtonIncludeLogs.isVisible = false
+                views.bugReportFirstText.setText(R.string.send_feedback_space_info)
+                views.bugReportTextInputLayout.hint = getString(R.string.feedback)
+                views.bugReportButtonContactMe.isVisible = true
 
-            views.bugReportButtonIncludeCrashLogs.isChecked = false
-            views.bugReportButtonIncludeCrashLogs.isVisible = false
-
-            views.bugReportButtonIncludeKeyShareHistory.isChecked = false
-            views.bugReportButtonIncludeKeyShareHistory.isVisible = false
-
-            // Keep the screenshot
-        } else {
-            supportActionBar?.setTitle(R.string.title_activity_bug_report)
+                hideBugReportOptions()
+            }
         }
     }
 
+    private fun hideBugReportOptions() {
+        views.bugReportLogsDescription.isVisible = false
+
+        views.bugReportButtonIncludeLogs.isChecked = false
+        views.bugReportButtonIncludeLogs.isVisible = false
+
+        views.bugReportButtonIncludeCrashLogs.isChecked = false
+        views.bugReportButtonIncludeCrashLogs.isVisible = false
+
+        views.bugReportButtonIncludeKeyShareHistory.isChecked = false
+        views.bugReportButtonIncludeKeyShareHistory.isVisible = false
+    }
+
     private fun setupViews() {
         views.bugReportEditText.doOnTextChanged { _, _, _, _ -> textChanged() }
         views.bugReportButtonIncludeScreenshot.setOnCheckedChangeListener { _, _ -> onSendScreenshotChanged() }
@@ -134,23 +161,31 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
         views.bugReportProgressView.progress = 0
 
         bugReporter.sendBugReport(this,
-                forSuggestion,
+                reportType,
                 views.bugReportButtonIncludeLogs.isChecked,
                 views.bugReportButtonIncludeCrashLogs.isChecked,
                 views.bugReportButtonIncludeKeyShareHistory.isChecked,
                 views.bugReportButtonIncludeScreenshot.isChecked,
                 views.bugReportEditText.text.toString(),
                 state.serverVersion,
+                views.bugReportButtonContactMe.isChecked,
                 object : BugReporter.IMXBugReportListener {
                     override fun onUploadFailed(reason: String?) {
                         try {
                             if (!reason.isNullOrEmpty()) {
-                                if (forSuggestion) {
-                                    Toast.makeText(this@BugReportActivity,
-                                            getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show()
-                                } else {
-                                    Toast.makeText(this@BugReportActivity,
-                                            getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show()
+                                when (reportType) {
+                                    ReportType.BUG_REPORT          -> {
+                                        Toast.makeText(this@BugReportActivity,
+                                                getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show()
+                                    }
+                                    ReportType.SUGGESTION          -> {
+                                        Toast.makeText(this@BugReportActivity,
+                                                getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show()
+                                    }
+                                    ReportType.SPACE_BETA_FEEDBACK -> {
+                                        Toast.makeText(this@BugReportActivity,
+                                                getString(R.string.space_feedback_failed, reason), Toast.LENGTH_LONG).show()
+                                    }
                                 }
                             }
                         } catch (e: Exception) {
@@ -178,10 +213,16 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
                     override fun onUploadSucceed() {
                         try {
-                            if (forSuggestion) {
-                                Toast.makeText(this@BugReportActivity, R.string.send_suggestion_sent, Toast.LENGTH_LONG).show()
-                            } else {
-                                Toast.makeText(this@BugReportActivity, R.string.send_bug_report_sent, Toast.LENGTH_LONG).show()
+                            when (reportType) {
+                                ReportType.BUG_REPORT          -> {
+                                    Toast.makeText(this@BugReportActivity, R.string.send_bug_report_sent, Toast.LENGTH_LONG).show()
+                                }
+                                ReportType.SUGGESTION          -> {
+                                    Toast.makeText(this@BugReportActivity, R.string.send_suggestion_sent, Toast.LENGTH_LONG).show()
+                                }
+                                ReportType.SPACE_BETA_FEEDBACK -> {
+                                    Toast.makeText(this@BugReportActivity, R.string.space_feedback_sent, Toast.LENGTH_LONG).show()
+                                }
                             }
                         } catch (e: Exception) {
                             Timber.e(e, "## onUploadSucceed() : failed to dismiss the toast")
@@ -214,4 +255,14 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
 
         super.onBackPressed()
     }
+
+    companion object {
+        private const val REPORT_TYPE_EXTRA = "REPORT_TYPE_EXTRA"
+
+        fun intent(context: Context, reportType: ReportType): Intent {
+            return Intent(context, BugReportActivity::class.java).apply {
+                putExtra(REPORT_TYPE_EXTRA, reportType.name)
+            }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 15fd18039b..6ef8bbca55 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -149,7 +149,7 @@ class BugReporter @Inject constructor(
      * Send a bug report.
      *
      * @param context           the application context
-     * @param forSuggestion     true to send a suggestion
+     * @param reportType        The report type (bug, suggestion, feedback)
      * @param withDevicesLogs   true to include the device log
      * @param withCrashLogs     true to include the crash logs
      * @param withKeyRequestHistory true to include the crash logs
@@ -159,13 +159,14 @@ class BugReporter @Inject constructor(
      */
     @SuppressLint("StaticFieldLeak")
     fun sendBugReport(context: Context,
-                      forSuggestion: Boolean,
+                      reportType: ReportType,
                       withDevicesLogs: Boolean,
                       withCrashLogs: Boolean,
                       withKeyRequestHistory: Boolean,
                       withScreenshot: Boolean,
                       theBugDescription: String,
                       serverVersion: String,
+                      canContact: Boolean = false,
                       listener: IMXBugReportListener?) {
         // enumerate files to delete
         val mBugReportFiles: MutableList<File> = ArrayList()
@@ -246,13 +247,11 @@ class BugReporter @Inject constructor(
                 }
 
                 if (!mIsCancelled) {
-                    val text = "[Element] " +
-                            if (forSuggestion) {
-                                "[Suggestion] "
-                            } else {
-                                ""
-                            } +
-                            bugDescription
+                    val text = when (reportType) {
+                        ReportType.BUG_REPORT -> "[Element] $bugDescription"
+                        ReportType.SUGGESTION -> "[Element] [Suggestion] $bugDescription"
+                        ReportType.SPACE_BETA_FEEDBACK -> "[Element] [spaces-feedback] $bugDescription"
+                    }
 
                     // build the multi part request
                     val builder = BugReporterMultipartBody.Builder()
@@ -260,6 +259,7 @@ class BugReporter @Inject constructor(
                             .addFormDataPart("app", "riot-android")
                             .addFormDataPart("user_agent", Matrix.getInstance(context).getUserAgent())
                             .addFormDataPart("user_id", userId)
+                            .addFormDataPart("can_contact", canContact.toString())
                             .addFormDataPart("device_id", deviceId)
                             .addFormDataPart("version", versionProvider.getVersion(longFormat = true, useBuildNumber = false))
                             .addFormDataPart("branch_name", context.getString(R.string.git_branch_name))
@@ -321,9 +321,12 @@ class BugReporter @Inject constructor(
                     // Special for RiotX
                     builder.addFormDataPart("label", "[Element]")
 
-                    // Suggestion
-                    if (forSuggestion) {
-                        builder.addFormDataPart("label", "[Suggestion]")
+                    when (reportType) {
+                        ReportType.BUG_REPORT -> {
+                            /* nop */
+                        }
+                        ReportType.SUGGESTION -> builder.addFormDataPart("label", "[Suggestion]")
+                        ReportType.SPACE_BETA_FEEDBACK -> builder.addFormDataPart("label", "spaces-feedback")
                     }
 
                     if (getCrashFile(context).exists()) {
@@ -447,16 +450,14 @@ class BugReporter @Inject constructor(
     /**
      * Send a bug report either with email or with Vector.
      */
-    fun openBugReportScreen(activity: FragmentActivity, forSuggestion: Boolean = false) {
+    fun openBugReportScreen(activity: FragmentActivity, reportType: ReportType = ReportType.BUG_REPORT) {
         screenshot = takeScreenshot(activity)
         activeSessionHolder.getSafeActiveSession()?.let {
             it.logDbUsageInfo()
             it.cryptoService().logDbUsageInfo()
         }
 
-        val intent = Intent(activity, BugReportActivity::class.java)
-        intent.putExtra("FOR_SUGGESTION", forSuggestion)
-        activity.startActivity(intent)
+        activity.startActivity(BugReportActivity.intent(activity, reportType))
     }
 
 // ==============================================================================================================
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
index 8014dfad3d..1fbaee4b22 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
@@ -16,13 +16,28 @@
 
 package im.vector.app.features.spaces
 
+import android.view.View
+import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.utils.DebouncedClickListener
 
 @EpoxyModelClass(layout = R.layout.item_space_beta_header)
 abstract class SpaceBetaHeaderItem : VectorEpoxyModel<SpaceBetaHeaderItem.Holder>() {
 
-    class Holder : VectorEpoxyHolder()
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var clickAction: View.OnClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.feedBackAction.setOnClickListener(DebouncedClickListener({
+            clickAction?.onClick(it)
+        }))
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val feedBackAction by bind<View>(R.id.spaceBetaFeedbackAction)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index f1627cc6b6..f50ba90221 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -101,4 +101,8 @@ class SpaceListFragment @Inject constructor(
     override fun onGroupSelected(groupSummary: GroupSummary?) {
         viewModel.handle(SpaceListAction.SelectLegacyGroup(groupSummary))
     }
+
+    override fun sendFeedBack() {
+        sharedActionViewModel.post(HomeActivitySharedAction.SendSpaceFeedBack)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
index c39a9a93fa..1586b16ff6 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
@@ -33,6 +33,8 @@ import im.vector.app.databinding.BottomSheetSpaceSettingsBinding
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import im.vector.app.features.rageshake.BugReporter
+import im.vector.app.features.rageshake.ReportType
 import im.vector.app.features.roomprofile.RoomProfileActivity
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.spaces.manage.ManageType
@@ -58,6 +60,7 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var avatarRenderer: AvatarRenderer
     @Inject lateinit var vectorPreferences: VectorPreferences
+    @Inject lateinit var bugReporter: BugReporter
 
     private val spaceArgs: SpaceBottomSheetSettingsArgs by args()
 
@@ -106,6 +109,10 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
                     views.addRooms.isVisible = canAddChild
                 }.disposeOnDestroyView()
 
+        views.spaceBetaTag.setOnClickListener {
+            bugReporter.openBugReportScreen(requireActivity(), ReportType.SPACE_BETA_FEEDBACK)
+        }
+
         views.invitePeople.views.bottomSheetActionClickableZone.debouncedClicks {
             dismiss()
             interactionListener?.onShareSpaceSelected(spaceArgs.spaceId)
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 33e4b23047..0d5d26ceb3 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.spaces
 
+import android.view.View
 import com.airbnb.epoxy.EpoxyController
 import im.vector.app.R
 import im.vector.app.RoomGroupingMethod
@@ -109,7 +110,12 @@ class SpaceSummaryController @Inject constructor(
             text(stringProvider.getString(R.string.spaces_header))
         }
 
-        spaceBetaHeaderItem { id("beta_header") }
+        spaceBetaHeaderItem {
+            id("beta_header")
+            clickAction(View.OnClickListener {
+                callback?.sendFeedBack()
+            })
+        }
 
         // show invites on top
 
@@ -221,7 +227,7 @@ class SpaceSummaryController @Inject constructor(
         fun onSpaceSettings(spaceSummary: RoomSummary)
         fun onToggleExpand(spaceSummary: RoomSummary)
         fun onAddSpaceSelected()
-
         fun onGroupSelected(groupSummary: GroupSummary?)
+        fun sendFeedBack()
     }
 }
diff --git a/vector/src/main/res/drawable/ic_feedback.xml b/vector/src/main/res/drawable/ic_feedback.xml
new file mode 100644
index 0000000000..b9f5584177
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_feedback.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6.2887,10.748C8.7036,10.748 10.6612,8.7897 10.6612,6.374C10.6612,3.9583 8.7036,2 6.2887,2C3.8739,2 1.9163,3.9583 1.9163,6.374C1.9163,7.038 2.0642,7.6674 2.3288,8.2311L1.6,9.7683C1.2011,10.6099 2.0682,11.492 2.9165,11.1074L4.5258,10.378C5.0651,10.6159 5.6615,10.748 6.2887,10.748Z"
+      android:fillColor="#238CF5"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.6608,7.3739C12.6608,9.7896 10.7032,11.7479 8.2883,11.7479C7.8421,11.7479 7.4114,11.681 7.0059,11.5568C7.7732,12.2953 8.8076,12.7479 9.9456,12.7479C10.5605,12.7479 11.1451,12.6158 11.6737,12.3778L13.211,13.0887C14.0564,13.4796 14.9301,12.6043 14.5376,11.7597L13.8272,10.2308C14.0865,9.6672 14.2315,9.0378 14.2315,8.3739C14.2315,6.4535 13.0188,4.8221 11.3323,4.2339C12.1516,5.0289 12.6608,6.1419 12.6608,7.3739Z"
+      android:fillColor="#238CF5"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/layout/activity_bug_report.xml b/vector/src/main/res/layout/activity_bug_report.xml
index 78a0139e1d..f21d2cda48 100644
--- a/vector/src/main/res/layout/activity_bug_report.xml
+++ b/vector/src/main/res/layout/activity_bug_report.xml
@@ -133,6 +133,15 @@
                     android:checked="false"
                     android:text="@string/send_bug_report_include_key_share_history" />
 
+                <com.google.android.material.switchmaterial.SwitchMaterial
+                    android:id="@+id/bug_report_button_contact_me"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:checked="false"
+                    android:text="@string/you_may_contact_me" />
+
                 <com.google.android.material.switchmaterial.SwitchMaterial
                     android:id="@+id/bug_report_button_include_screenshot"
                     android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index b473c7b03d..fc29be1899 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -30,7 +30,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
-            android:layout_marginEnd="8dp"
             android:duplicateParentState="true"
             android:ellipsize="end"
             android:maxLines="1"
@@ -39,12 +38,21 @@
             android:textStyle="bold"
             app:layout_constrainedWidth="true"
             app:layout_constraintBottom_toTopOf="@+id/spaceDescription"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/spaceBetaTag"
             app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="@sample/matrix.json/data/displayName" />
 
+        <ImageView
+            android:id="@+id/spaceBetaTag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:src="@drawable/ic_beta_pill"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:id="@+id/spaceDescription"
             android:layout_width="0dp"
@@ -97,7 +105,7 @@
         app:actionTitle="@string/settings"
         app:leftIcon="@drawable/ic_settings_root_general"
         app:tint="?attr/riotx_text_primary"
-        app:titleTextColor="?attr/riotx_text_primary"/>
+        app:titleTextColor="?attr/riotx_text_primary" />
 
     <im.vector.app.core.ui.views.BottomSheetActionButton
         android:id="@+id/exploreRooms"
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 77e260d9fd..1827c691d4 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -39,6 +39,19 @@
                 android:text="@string/spaces_beta_welcome_to_spaces_desc"
                 android:textColor="?riotx_text_secondary"
                 android:textSize="15sp" />
+
+            <TextView
+                android:id="@+id/spaceBetaFeedbackAction"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="4dp"
+                android:paddingBottom="4dp"
+                android:layout_marginBottom="4dp"
+                android:text="@string/give_feedback"
+                android:drawableStart="@drawable/ic_feedback"
+                android:drawablePadding="8dp"
+                android:textColor="@color/vector_info_color"
+                android:textSize="15sp" />
         </LinearLayout>
 
     </FrameLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index cdd33b9a92..6c46600f43 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2167,6 +2167,14 @@
     <string name="send_suggestion_sent">Thanks, the suggestion has been successfully sent</string>
     <string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
 
+    <string name="send_feedback_space_title">Spaces feedback</string>
+    <string name="feedback">Feedback</string>
+    <string name="send_feedback_space_info">You’re using a beta version of spaces.  Your feedback will help inform the next versions.  Your platform and username will be noted to help us use your feedback as much as we can. To leave the beta, visit your settings.</string>
+    <string name="you_may_contact_me">You may contact me if you have any follow up questions</string>
+    <string name="space_feedback_sent">Thanks, your feedback has been successfully sent</string>
+    <string name="space_feedback_failed">The feedback failed to be sent (%s)</string>
+    <string name="give_feedback">Give Feedback</string>
+
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">"Show complete history in encrypted rooms"</string>
 

From aefcb4841b7eaae76c0514c4c6cbea842b050b0d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 12 May 2021 10:22:57 +0200
Subject: [PATCH 343/350] Cleaning

---
 .../features/rageshake/BugReportActivity.kt   |  6 -----
 .../app/features/rageshake/BugReporter.kt     |  1 -
 .../app/features/rageshake/ReportType.kt      | 23 +++++++++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/rageshake/ReportType.kt

diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index 4017a30519..2b7c3db490 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -34,12 +34,6 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
 import timber.log.Timber
 import javax.inject.Inject
 
-enum class ReportType {
-    BUG_REPORT,
-    SUGGESTION,
-    SPACE_BETA_FEEDBACK
-}
-
 /**
  * Form to send a bug report
  */
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 6ef8bbca55..5202d78f1a 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.rageshake
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.os.Build
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/ReportType.kt b/vector/src/main/java/im/vector/app/features/rageshake/ReportType.kt
new file mode 100644
index 0000000000..44682efb40
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/rageshake/ReportType.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.rageshake
+
+enum class ReportType {
+    BUG_REPORT,
+    SUGGESTION,
+    SPACE_BETA_FEEDBACK
+}

From df3d3b63c88d5df7316cb2dd30d8a9ad6af49b73 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 12 May 2021 11:04:54 +0200
Subject: [PATCH 344/350] Code review

---
 .../app/features/rageshake/BugReportActivity.kt   | 15 +++++----------
 vector/src/main/res/values/strings.xml            |  8 +++-----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index 2b7c3db490..d6d80673b0 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -71,7 +71,7 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
         when (reportType) {
             ReportType.BUG_REPORT -> {
                 supportActionBar?.setTitle(R.string.title_activity_bug_report)
-                views.bugReportButtonContactMe.isVisible = false
+                views.bugReportButtonContactMe.isVisible = true
             }
             ReportType.SUGGESTION -> {
                 supportActionBar?.setTitle(R.string.send_suggestion)
@@ -172,13 +172,10 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
                                         Toast.makeText(this@BugReportActivity,
                                                 getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show()
                                     }
-                                    ReportType.SUGGESTION          -> {
-                                        Toast.makeText(this@BugReportActivity,
-                                                getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show()
-                                    }
+                                    ReportType.SUGGESTION,
                                     ReportType.SPACE_BETA_FEEDBACK -> {
                                         Toast.makeText(this@BugReportActivity,
-                                                getString(R.string.space_feedback_failed, reason), Toast.LENGTH_LONG).show()
+                                                getString(R.string.feedback_failed, reason), Toast.LENGTH_LONG).show()
                                     }
                                 }
                             }
@@ -211,11 +208,9 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
                                 ReportType.BUG_REPORT          -> {
                                     Toast.makeText(this@BugReportActivity, R.string.send_bug_report_sent, Toast.LENGTH_LONG).show()
                                 }
-                                ReportType.SUGGESTION          -> {
-                                    Toast.makeText(this@BugReportActivity, R.string.send_suggestion_sent, Toast.LENGTH_LONG).show()
-                                }
+                                ReportType.SUGGESTION,
                                 ReportType.SPACE_BETA_FEEDBACK -> {
-                                    Toast.makeText(this@BugReportActivity, R.string.space_feedback_sent, Toast.LENGTH_LONG).show()
+                                    Toast.makeText(this@BugReportActivity, R.string.feedback_sent, Toast.LENGTH_LONG).show()
                                 }
                             }
                         } catch (e: Exception) {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 6c46600f43..48e53419d9 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2164,15 +2164,13 @@
     <string name="send_suggestion">Make a suggestion</string>
     <string name="send_suggestion_content">Please write your suggestion below.</string>
     <string name="send_suggestion_report_placeholder">Describe your suggestion here</string>
-    <string name="send_suggestion_sent">Thanks, the suggestion has been successfully sent</string>
-    <string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
 
     <string name="send_feedback_space_title">Spaces feedback</string>
     <string name="feedback">Feedback</string>
-    <string name="send_feedback_space_info">You’re using a beta version of spaces.  Your feedback will help inform the next versions.  Your platform and username will be noted to help us use your feedback as much as we can. To leave the beta, visit your settings.</string>
+    <string name="send_feedback_space_info">You’re using a beta version of spaces. Your feedback will help inform the next versions. Your platform and username will be noted to help us use your feedback as much as we can.</string>
     <string name="you_may_contact_me">You may contact me if you have any follow up questions</string>
-    <string name="space_feedback_sent">Thanks, your feedback has been successfully sent</string>
-    <string name="space_feedback_failed">The feedback failed to be sent (%s)</string>
+    <string name="feedback_sent">Thanks, your feedback has been successfully sent</string>
+    <string name="feedback_failed">The feedback failed to be sent (%s)</string>
     <string name="give_feedback">Give Feedback</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>

From 391e952fbde009d5469aafd85e4c6a3ea916dcd2 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 12 May 2021 12:23:14 +0200
Subject: [PATCH 345/350] Review + design update

---
 .../app/core/ui/list/GenericItemHeader.kt     | 11 +++++++
 .../features/rageshake/BugReportActivity.kt   |  9 ++++--
 .../features/spaces/SpaceSummaryController.kt |  8 ++---
 vector/src/main/res/drawable/ic_feedback.xml  |  4 +--
 .../res/layout/item_space_beta_header.xml     | 29 ++++++++-----------
 vector/src/main/res/values/strings.xml        |  4 ++-
 6 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt
index d0c65aff95..bc5446e836 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt
@@ -16,12 +16,14 @@
 package im.vector.app.core.ui.list
 
 import android.widget.TextView
+import androidx.annotation.ColorInt
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.features.themes.ThemeUtils
 
 /**
  * A generic list item header left aligned with notice color.
@@ -32,9 +34,18 @@ abstract class GenericItemHeader : VectorEpoxyModel<GenericItemHeader.Holder>()
     @EpoxyAttribute
     var text: String? = null
 
+    @EpoxyAttribute
+    @ColorInt
+    var textColor: Int? = null
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.text.setTextOrHide(text)
+        if (textColor != null) {
+            holder.text.setTextColor(textColor!!)
+        } else {
+            holder.text.setTextColor(ThemeUtils.getColor(holder.view.context, R.attr.vctr_notice_text_color))
+        }
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
index d6d80673b0..27adefd50f 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
@@ -172,7 +172,10 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
                                         Toast.makeText(this@BugReportActivity,
                                                 getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show()
                                     }
-                                    ReportType.SUGGESTION,
+                                    ReportType.SUGGESTION          -> {
+                                        Toast.makeText(this@BugReportActivity,
+                                                getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show()
+                                    }
                                     ReportType.SPACE_BETA_FEEDBACK -> {
                                         Toast.makeText(this@BugReportActivity,
                                                 getString(R.string.feedback_failed, reason), Toast.LENGTH_LONG).show()
@@ -208,7 +211,9 @@ class BugReportActivity : VectorBaseActivity<ActivityBugReportBinding>() {
                                 ReportType.BUG_REPORT          -> {
                                     Toast.makeText(this@BugReportActivity, R.string.send_bug_report_sent, Toast.LENGTH_LONG).show()
                                 }
-                                ReportType.SUGGESTION,
+                                ReportType.SUGGESTION          -> {
+                                    Toast.makeText(this@BugReportActivity, R.string.send_suggestion_sent, Toast.LENGTH_LONG).show()
+                                }
                                 ReportType.SPACE_BETA_FEEDBACK -> {
                                     Toast.makeText(this@BugReportActivity, R.string.feedback_sent, Toast.LENGTH_LONG).show()
                                 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 0d5d26ceb3..8f48c3c2f1 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -20,6 +20,7 @@ import android.view.View
 import com.airbnb.epoxy.EpoxyController
 import im.vector.app.R
 import im.vector.app.RoomGroupingMethod
+import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItemHeader
@@ -39,6 +40,7 @@ import javax.inject.Inject
 
 class SpaceSummaryController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
+        private val colorProvider: ColorProvider,
         private val stringProvider: StringProvider) : EpoxyController() {
 
     var callback: Callback? = null
@@ -73,6 +75,7 @@ class SpaceSummaryController @Inject constructor(
             genericItemHeader {
                 id("legacy_groups")
                 text(stringProvider.getString(R.string.groups_header))
+                textColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
             }
 
             // add home for communities
@@ -105,11 +108,6 @@ class SpaceSummaryController @Inject constructor(
                                  rootSpaces: List<RoomSummary>?,
                                  expandedStates: Map<String, Boolean>,
                                  homeCount: RoomAggregateNotificationCount) {
-        genericItemHeader {
-            id("spaces")
-            text(stringProvider.getString(R.string.spaces_header))
-        }
-
         spaceBetaHeaderItem {
             id("beta_header")
             clickAction(View.OnClickListener {
diff --git a/vector/src/main/res/drawable/ic_feedback.xml b/vector/src/main/res/drawable/ic_feedback.xml
index b9f5584177..e774a8ab5c 100644
--- a/vector/src/main/res/drawable/ic_feedback.xml
+++ b/vector/src/main/res/drawable/ic_feedback.xml
@@ -5,10 +5,10 @@
     android:viewportHeight="16">
   <path
       android:pathData="M6.2887,10.748C8.7036,10.748 10.6612,8.7897 10.6612,6.374C10.6612,3.9583 8.7036,2 6.2887,2C3.8739,2 1.9163,3.9583 1.9163,6.374C1.9163,7.038 2.0642,7.6674 2.3288,8.2311L1.6,9.7683C1.2011,10.6099 2.0682,11.492 2.9165,11.1074L4.5258,10.378C5.0651,10.6159 5.6615,10.748 6.2887,10.748Z"
-      android:fillColor="#238CF5"
+      android:fillColor="#368BD6"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M12.6608,7.3739C12.6608,9.7896 10.7032,11.7479 8.2883,11.7479C7.8421,11.7479 7.4114,11.681 7.0059,11.5568C7.7732,12.2953 8.8076,12.7479 9.9456,12.7479C10.5605,12.7479 11.1451,12.6158 11.6737,12.3778L13.211,13.0887C14.0564,13.4796 14.9301,12.6043 14.5376,11.7597L13.8272,10.2308C14.0865,9.6672 14.2315,9.0378 14.2315,8.3739C14.2315,6.4535 13.0188,4.8221 11.3323,4.2339C12.1516,5.0289 12.6608,6.1419 12.6608,7.3739Z"
-      android:fillColor="#238CF5"
+      android:fillColor="#368BD6"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 1827c691d4..9df9e26386 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="16dp">
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp">
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/rounded_rect_stroke_8"
-        android:padding="8dp">
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -16,26 +16,21 @@
             android:layout_marginTop="8dp"
             android:orientation="vertical">
 
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_beta_pill" />
-
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:text="@string/spaces_beta_welcome_to_spaces"
+                android:text="@string/spaces_header"
                 android:textColor="?riotx_text_primary"
                 android:textSize="15sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                app:drawableEndCompat="@drawable/ic_beta_pill" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginBottom="4dp"
                 android:text="@string/spaces_beta_welcome_to_spaces_desc"
                 android:textColor="?riotx_text_secondary"
                 android:textSize="15sp" />
@@ -44,14 +39,14 @@
                 android:id="@+id/spaceBetaFeedbackAction"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:drawablePadding="8dp"
                 android:paddingTop="4dp"
                 android:paddingBottom="4dp"
-                android:layout_marginBottom="4dp"
                 android:text="@string/give_feedback"
-                android:drawableStart="@drawable/ic_feedback"
-                android:drawablePadding="8dp"
                 android:textColor="@color/vector_info_color"
-                android:textSize="15sp" />
+                android:textSize="15sp"
+                app:drawableStartCompat="@drawable/ic_feedback" />
         </LinearLayout>
 
     </FrameLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 48e53419d9..3cac228c6b 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2164,6 +2164,8 @@
     <string name="send_suggestion">Make a suggestion</string>
     <string name="send_suggestion_content">Please write your suggestion below.</string>
     <string name="send_suggestion_report_placeholder">Describe your suggestion here</string>
+    <string name="send_suggestion_sent">Thanks, the suggestion has been successfully sent</string>
+    <string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
 
     <string name="send_feedback_space_title">Spaces feedback</string>
     <string name="feedback">Feedback</string>
@@ -3353,7 +3355,7 @@
 
     <string name="space_add_existing_rooms">Add existing rooms and space</string>
     <string name="spaces_beta_welcome_to_spaces">Welcome to Spaces!</string>
-    <string name="spaces_beta_welcome_to_spaces_desc">Spaces are ways to group rooms and people for work, fun or just yourself.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Spaces are a new way to group rooms and people.</string>
     <string name="you_are_invited">You are invited</string>
 
 

From 0d5b66f92b92a7bd7b92d2a7f5917c3f0bb00e1c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 May 2021 13:53:03 +0200
Subject: [PATCH 346/350] Flatten View hierarchy

---
 .../res/layout/item_space_beta_header.xml     | 76 ++++++++-----------
 1 file changed, 32 insertions(+), 44 deletions(-)

diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 9df9e26386..47891814a4 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -1,55 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingStart="16dp"
+    android:paddingTop="8dp"
     android:paddingEnd="16dp">
 
-    <FrameLayout
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/spaces_header"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:drawableEndCompat="@drawable/ic_beta_pill" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:orientation="vertical">
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="4dp"
+        android:text="@string/spaces_beta_welcome_to_spaces_desc"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="15sp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/spaces_header"
-                android:textColor="?riotx_text_primary"
-                android:textSize="15sp"
-                android:textStyle="bold"
-                app:drawableEndCompat="@drawable/ic_beta_pill" />
+    <TextView
+        android:id="@+id/spaceBetaFeedbackAction"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:drawablePadding="8dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
+        android:text="@string/give_feedback"
+        android:textColor="@color/vector_info_color"
+        android:textSize="15sp"
+        app:drawableStartCompat="@drawable/ic_feedback" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="4dp"
-                android:text="@string/spaces_beta_welcome_to_spaces_desc"
-                android:textColor="?riotx_text_secondary"
-                android:textSize="15sp" />
-
-            <TextView
-                android:id="@+id/spaceBetaFeedbackAction"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:drawablePadding="8dp"
-                android:paddingTop="4dp"
-                android:paddingBottom="4dp"
-                android:text="@string/give_feedback"
-                android:textColor="@color/vector_info_color"
-                android:textSize="15sp"
-                app:drawableStartCompat="@drawable/ic_feedback" />
-        </LinearLayout>
-
-    </FrameLayout>
-
-
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>

From 5d052cda79cd2b68ca501725d45f50b63754de8a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 May 2021 13:55:47 +0200
Subject: [PATCH 347/350] Increase clickable area (no layout rendering change)

---
 vector/src/main/res/layout/item_space_beta_header.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 47891814a4..4ae5f8e9a2 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -22,19 +22,19 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:layout_marginBottom="4dp"
         android:text="@string/spaces_beta_welcome_to_spaces_desc"
         android:textColor="?riotx_text_secondary"
         android:textSize="15sp" />
 
     <TextView
         android:id="@+id/spaceBetaFeedbackAction"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
         android:drawablePadding="8dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp"
+        android:paddingStart="0dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp"
         android:text="@string/give_feedback"
         android:textColor="@color/vector_info_color"
         android:textSize="15sp"

From 6af9fda7df5dbb2a0ef21945fe77c814991822d2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 May 2021 14:06:59 +0200
Subject: [PATCH 348/350] Fix lint issue

---
 vector/src/main/res/layout/bottom_sheet_space_settings.xml      | 1 +
 .../src/main/res/layout/fragment_matrix_to_room_space_card.xml  | 2 +-
 vector/src/main/res/values/strings.xml                          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_space_settings.xml b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
index fc29be1899..9f17267334 100644
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@@ -49,6 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
+            android:contentDescription="@string/a11y_beta"
             android:src="@drawable/ic_beta_pill"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
index 85ec04ba50..3b12a05c92 100644
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@@ -33,7 +33,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/layout_vertical_margin_big"
-            android:importantForAccessibility="no"
+            android:contentDescription="@string/a11y_beta"
             android:src="@drawable/ic_beta_pill"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 3cac228c6b..da195f78cb 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2294,6 +2294,7 @@
     <string name="a11y_show_password">Show password</string>
     <string name="a11y_hide_password">Hide password</string>
     <string name="a11y_jump_to_bottom">Jump to bottom</string>
+    <string name="a11y_beta">This feature is undergoing beta testing</string>
 
     <!-- Read receipts list a11y -->
     <plurals name="two_and_some_others_read">

From 72e343ad5ad66a48e4b994ea5b84e7db7158d195 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 May 2021 14:26:20 +0200
Subject: [PATCH 349/350] Better wording

---
 vector/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index da195f78cb..aa85a52ec3 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2294,7 +2294,7 @@
     <string name="a11y_show_password">Show password</string>
     <string name="a11y_hide_password">Hide password</string>
     <string name="a11y_jump_to_bottom">Jump to bottom</string>
-    <string name="a11y_beta">This feature is undergoing beta testing</string>
+    <string name="a11y_beta">This feature is in beta</string>
 
     <!-- Read receipts list a11y -->
     <plurals name="two_and_some_others_read">

From 2f37c703a4943cf3ddb61c0ac5b4ae4370c529b8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 12 May 2021 15:13:51 +0200
Subject: [PATCH 350/350] Prepare release 1.1.7

---
 CHANGES.md                                              | 8 +-------
 fastlane/metadata/android/en-US/changelogs/40101070.txt | 2 ++
 2 files changed, 3 insertions(+), 7 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40101070.txt

diff --git a/CHANGES.md b/CHANGES.md
index 89121bdf54..c1d3b8b733 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-Changes in Element 1.1.7 (2021-XX-XX)
+Changes in Element 1.1.7 (2021-05-12)
 ===================================================
 
 Features ✨:
@@ -28,9 +28,6 @@ Bugfix 🐛:
  - Fix read marker visibility/position when filtering some events 
  - Fix user invitation in case of restricted profile api (#3306)
 
-Translations 🗣:
- -
-
 SDK API changes ⚠️:
  - RegistrationWizard.createAccount() parameters are now all optional, following Matrix spec (#3205)
 
@@ -39,9 +36,6 @@ Build 🧱:
  - https://github.com/Piasy/BigImageViewer is now hosted on mavenCentral()
  - Upgrade Realm to version 10.4.0
 
-Test:
- -
-
 Other changes:
  - New store descriptions
  - `master` branch has been renamed to `main`. To apply change to your dev environment, run:
diff --git a/fastlane/metadata/android/en-US/changelogs/40101070.txt b/fastlane/metadata/android/en-US/changelogs/40101070.txt
new file mode 100644
index 0000000000..254e4c0f62
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40101070.txt
@@ -0,0 +1,2 @@
+Main changes in this version: beta support for Spaces. Compress video before sending.
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.7
\ No newline at end of file