From e097bd8117fea84a3e8f47d8ed81d59222449dab Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Sat, 11 Jul 2020 22:15:26 +0200 Subject: [PATCH] Rename CreateRoomParamsBuilder to CreateRoomParams for clarity --- CHANGES.md | 2 +- .../src/main/java/im/vector/matrix/rx/RxSession.kt | 4 ++-- .../vector/matrix/android/common/CryptoTestHelper.kt | 6 +++--- .../android/internal/crypto/gossiping/KeyShareTests.kt | 4 ++-- .../matrix/android/api/session/room/RoomService.kt | 4 ++-- ...{CreateRoomParamsBuilder.kt => CreateRoomParams.kt} | 2 +- .../internal/session/room/DefaultRoomService.kt | 4 ++-- .../room/create/CreateRoomParamsInternalBuilder.kt | 10 +++++----- .../internal/session/room/create/CreateRoomTask.kt | 8 ++++---- .../features/createdirect/CreateDirectRoomViewModel.kt | 4 ++-- .../verification/VerificationBottomSheetViewModel.kt | 4 ++-- .../roomdirectory/createroom/CreateRoomViewModel.kt | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) rename matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/{CreateRoomParamsBuilder.kt => CreateRoomParams.kt} (98%) diff --git a/CHANGES.md b/CHANGES.md index 3978038b8d..8f9d4f956b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -29,7 +29,7 @@ Translations 🗣: - SDK API changes ⚠️: - - CreateRoomParams has been replaced by CreateRoomParamsBuilder + - CreateRoomParams has been updated Build 🧱: - Upgrade some dependencies diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt index 93e2dcae19..ca0bb46f4b 100644 --- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt +++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt @@ -32,7 +32,7 @@ import im.vector.matrix.android.api.session.pushers.Pusher import im.vector.matrix.android.api.session.room.RoomSummaryQueryParams import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.api.session.sync.SyncState import im.vector.matrix.android.api.session.user.model.User import im.vector.matrix.android.api.session.widgets.model.Widget @@ -110,7 +110,7 @@ class RxSession(private val session: Session) { .startWithCallable { session.getThreePids() } } - fun createRoom(roomParams: CreateRoomParamsBuilder): Single = singleBuilder { + fun createRoom(roomParams: CreateRoomParams): Single = singleBuilder { session.createRoom(roomParams, it) } diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt index 7e8410a440..26c425241d 100644 --- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt +++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/common/CryptoTestHelper.kt @@ -30,7 +30,7 @@ import im.vector.matrix.android.api.session.events.model.toContent import im.vector.matrix.android.api.session.room.Room import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.api.session.room.roomSummaryQueryParams import im.vector.matrix.android.api.session.room.timeline.Timeline import im.vector.matrix.android.api.session.room.timeline.TimelineEvent @@ -65,7 +65,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) { val aliceSession = mTestHelper.createAccount(TestConstants.USER_ALICE, defaultSessionParams) val roomId = mTestHelper.doSync { - aliceSession.createRoom(CreateRoomParamsBuilder().apply { name = "MyRoom" }, it) + aliceSession.createRoom(CreateRoomParams().apply { name = "MyRoom" }, it) } if (encryptedRoom) { @@ -286,7 +286,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) { fun createDM(alice: Session, bob: Session): String { val roomId = mTestHelper.doSync { alice.createRoom( - CreateRoomParamsBuilder().apply { + CreateRoomParams().apply { invitedUserIds.add(bob.myUserId) setDirectMessage() enableEncryptionIfInvitedUsersSupportIt = true diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/KeyShareTests.kt index e90822a0c7..a5c0913909 100644 --- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/KeyShareTests.kt +++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/KeyShareTests.kt @@ -27,7 +27,7 @@ import im.vector.matrix.android.api.session.crypto.verification.VerificationTran import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.common.CommonTestHelper import im.vector.matrix.android.common.CryptoTestHelper import im.vector.matrix.android.common.SessionTestParams @@ -66,7 +66,7 @@ class KeyShareTests : InstrumentedTest { // Create an encrypted room and add a message val roomId = mTestHelper.doSync { aliceSession.createRoom( - CreateRoomParamsBuilder().apply { + CreateRoomParams().apply { visibility = RoomDirectoryVisibility.PRIVATE enableEncryption() }, diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt index 788a074c65..4e7b973bba 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/RoomService.kt @@ -20,7 +20,7 @@ import androidx.lifecycle.LiveData import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.api.util.Cancelable import im.vector.matrix.android.api.util.Optional @@ -32,7 +32,7 @@ interface RoomService { /** * Create a room asynchronously */ - fun createRoom(createRoomParams: CreateRoomParamsBuilder, + fun createRoom(createRoomParams: CreateRoomParams, callback: MatrixCallback): Cancelable /** diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParamsBuilder.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt similarity index 98% rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParamsBuilder.kt rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt index c6799a956f..8611395071 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParamsBuilder.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt @@ -22,7 +22,7 @@ import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM -class CreateRoomParamsBuilder { +class CreateRoomParams { var visibility: RoomDirectoryVisibility? = null var roomAliasName: String? = null var name: String? = null diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt index 7d5b8ac341..b8b4c968b1 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoomService.kt @@ -23,7 +23,7 @@ import im.vector.matrix.android.api.session.room.RoomService import im.vector.matrix.android.api.session.room.RoomSummaryQueryParams import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.api.util.Cancelable import im.vector.matrix.android.api.util.Optional import im.vector.matrix.android.internal.session.room.alias.GetRoomIdByAliasTask @@ -49,7 +49,7 @@ internal class DefaultRoomService @Inject constructor( private val taskExecutor: TaskExecutor ) : RoomService { - override fun createRoom(createRoomParams: CreateRoomParamsBuilder, callback: MatrixCallback): Cancelable { + override fun createRoom(createRoomParams: CreateRoomParams, callback: MatrixCallback): Cancelable { return createRoomTask .configureWith(createRoomParams) { this.callback = callback diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomParamsInternalBuilder.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomParamsInternalBuilder.kt index f7088841b8..afc5066ac9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomParamsInternalBuilder.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomParamsInternalBuilder.kt @@ -22,7 +22,7 @@ import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.events.model.toContent import im.vector.matrix.android.api.session.identity.IdentityServiceError import im.vector.matrix.android.api.session.identity.toMedium -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.internal.crypto.DeviceListManager import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM import im.vector.matrix.android.internal.di.AuthenticatedIdentity @@ -43,7 +43,7 @@ internal class CreateRoomParamsInternalBuilder @Inject constructor( private val accessTokenProvider: AccessTokenProvider ) { - suspend fun build(builder: CreateRoomParamsBuilder): CreateRoomBody { + suspend fun build(builder: CreateRoomParams): CreateRoomBody { val invite3pids = builder.invite3pids .takeIf { it.isNotEmpty() } .let { @@ -85,7 +85,7 @@ internal class CreateRoomParamsInternalBuilder @Inject constructor( ) } - private fun buildHistoryVisibilityEvent(builder: CreateRoomParamsBuilder): Event? { + private fun buildHistoryVisibilityEvent(builder: CreateRoomParams): Event? { return builder.historyVisibility ?.let { val contentMap = mapOf("history_visibility" to it) @@ -100,7 +100,7 @@ internal class CreateRoomParamsInternalBuilder @Inject constructor( /** * Add the crypto algorithm to the room creation parameters. */ - private suspend fun buildEncryptionWithAlgorithmEvent(builder: CreateRoomParamsBuilder): Event? { + private suspend fun buildEncryptionWithAlgorithmEvent(builder: CreateRoomParams): Event? { if (builder.algorithm == null && canEnableEncryption(builder)) { // Enable the encryption @@ -121,7 +121,7 @@ internal class CreateRoomParamsInternalBuilder @Inject constructor( } } - private suspend fun canEnableEncryption(builder: CreateRoomParamsBuilder): Boolean { + private suspend fun canEnableEncryption(builder: CreateRoomParams): Boolean { return (builder.enableEncryptionIfInvitedUsersSupportIt && crossSigningService.isCrossSigningVerified() && builder.invite3pids.isEmpty()) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt index e32f8e39ab..d0b746af7d 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt @@ -18,7 +18,7 @@ package im.vector.matrix.android.internal.session.room.create import com.zhuinden.monarchy.Monarchy import im.vector.matrix.android.api.session.room.failure.CreateRoomFailure -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.internal.database.awaitNotEmptyResult import im.vector.matrix.android.internal.database.model.RoomEntity import im.vector.matrix.android.internal.database.model.RoomEntityFields @@ -38,7 +38,7 @@ import org.greenrobot.eventbus.EventBus import java.util.concurrent.TimeUnit import javax.inject.Inject -internal interface CreateRoomTask : Task +internal interface CreateRoomTask : Task internal class DefaultCreateRoomTask @Inject constructor( private val roomAPI: RoomAPI, @@ -52,7 +52,7 @@ internal class DefaultCreateRoomTask @Inject constructor( private val eventBus: EventBus ) : CreateRoomTask { - override suspend fun execute(params: CreateRoomParamsBuilder): String { + override suspend fun execute(params: CreateRoomParams): String { val createRoomParams = createRoomParamsInternalBuilder.build(params) val createRoomResponse = executeRequest(eventBus) { @@ -75,7 +75,7 @@ internal class DefaultCreateRoomTask @Inject constructor( return roomId } - private suspend fun handleDirectChatCreation(params: CreateRoomParamsBuilder, roomId: String) { + private suspend fun handleDirectChatCreation(params: CreateRoomParams, roomId: String) { val otherUserId = params.getFirstInvitedUserId() ?: throw IllegalStateException("You can't create a direct room without an invitedUser") diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt index da81c13747..319671b230 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt @@ -22,7 +22,7 @@ import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.rx.rx import im.vector.riotx.core.extensions.exhaustive import im.vector.riotx.core.platform.VectorViewModel @@ -54,7 +54,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted } private fun createRoomAndInviteSelectedUsers(invitees: Set) { - val roomParams = CreateRoomParamsBuilder() + val roomParams = CreateRoomParams() .apply { invitees.forEach { when (it) { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt index 1833688c35..53c9deb296 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt @@ -43,7 +43,7 @@ import im.vector.matrix.android.api.session.crypto.verification.VerificationServ import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState import im.vector.matrix.android.api.session.events.model.LocalEcho -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.toMatrixItem import im.vector.matrix.android.internal.crypto.crosssigning.fromBase64 @@ -235,7 +235,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor( pendingRequest = Loading() ) } - val roomParams = CreateRoomParamsBuilder() + val roomParams = CreateRoomParams() .apply { invitedUserIds.add(otherUserId) setDirectMessage() diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt index 5cb279c848..b75e9444fe 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt @@ -28,7 +28,7 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility -import im.vector.matrix.android.api.session.room.model.create.CreateRoomParamsBuilder +import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.api.session.room.model.create.CreateRoomPreset import im.vector.riotx.core.platform.EmptyViewEvents import im.vector.riotx.core.platform.VectorViewModel @@ -84,7 +84,7 @@ class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: Cr copy(asyncCreateRoomRequest = Loading()) } - val createRoomParams = CreateRoomParamsBuilder() + val createRoomParams = CreateRoomParams() .apply { name = state.roomName.takeIf { it.isNotBlank() } // Directory visibility