From 30c299ebe15c764d69cdc008a5891cc58e02708a Mon Sep 17 00:00:00 2001 From: Valere Date: Mon, 12 Jul 2021 14:38:28 +0200 Subject: [PATCH] cleaning --- .../createroom/CreateRoomController.kt | 3 + .../advanced/ChangeJoinRuleViewModelTask.kt | 69 ------------------- 2 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/ChangeJoinRuleViewModelTask.kt 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 fe6a2c41f0..2676096b6b 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 @@ -122,6 +122,9 @@ class CreateRoomController @Inject constructor( action = { host.listener?.selectVisibility() } ) } + else -> { + // not yet supported + } } settingsSectionTitleItem { diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/ChangeJoinRuleViewModelTask.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/ChangeJoinRuleViewModelTask.kt deleted file mode 100644 index 36dd3ed0d3..0000000000 --- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/joinrule/advanced/ChangeJoinRuleViewModelTask.kt +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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.roomprofile.settings.joinrule.advanced - -import im.vector.app.core.platform.ViewModelTask -import org.matrix.android.sdk.api.session.Session -import org.matrix.android.sdk.api.session.room.model.RoomJoinRules -import javax.inject.Inject - -sealed class ChangeJoinRuleTaskResult { - - object Success : ChangeJoinRuleTaskResult() - - data class Failure(val error: Throwable) : ChangeJoinRuleTaskResult() -} - -data class ChangeJoinRuleParams( - val roomId: String, - val newJoinRule: RoomJoinRules, - val newAllowIfRestricted: List? = null -) - -class ChangeJoinRuleViewModelTask @Inject constructor( - private val session: Session -) : ViewModelTask { - - override suspend fun execute(params: ChangeJoinRuleParams): ChangeJoinRuleTaskResult { - val room = session.getRoom(params.roomId) ?: return ChangeJoinRuleTaskResult.Failure(IllegalArgumentException("Unknown room")) - - try { - when (params.newJoinRule) { - RoomJoinRules.PUBLIC, - RoomJoinRules.INVITE -> { - room.updateJoinRule(params.newJoinRule, null) - } - RoomJoinRules.RESTRICTED -> updateRestrictedJoinRule(params.roomId, params.newAllowIfRestricted.orEmpty()) - RoomJoinRules.KNOCK, - RoomJoinRules.PRIVATE -> { - return ChangeJoinRuleTaskResult.Failure(UnsupportedOperationException()) - } - } - } catch (failure: Throwable) { - return ChangeJoinRuleTaskResult.Failure(failure) - } - - return ChangeJoinRuleTaskResult.Success - } - - fun updateRestrictedJoinRule(roomId: String, allowList: List) { - // let's compute correct via list - allowList.map { - session.getRoomSummary(it) - } - } -}