Cleanup and avoid duplicate
This commit is contained in:
parent
893ebd9690
commit
ed4676bb6c
|
@ -111,7 +111,7 @@ internal class DefaultStateService @AssistedInject constructor(@Assisted private
|
||||||
eventType = EventType.STATE_ROOM_CANONICAL_ALIAS,
|
eventType = EventType.STATE_ROOM_CANONICAL_ALIAS,
|
||||||
body = RoomCanonicalAliasContent(
|
body = RoomCanonicalAliasContent(
|
||||||
canonicalAlias = alias,
|
canonicalAlias = alias,
|
||||||
alternativeAliases = altAliases
|
alternativeAliases = altAliases.distinct()
|
||||||
).toContent(),
|
).toContent(),
|
||||||
callback = callback,
|
callback = callback,
|
||||||
stateKey = null
|
stateKey = null
|
||||||
|
|
|
@ -142,21 +142,20 @@ class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: Roo
|
||||||
|
|
||||||
override fun handle(action: RoomAliasAction) {
|
override fun handle(action: RoomAliasAction) {
|
||||||
when (action) {
|
when (action) {
|
||||||
is RoomAliasAction.SetNewAlias -> handleSetNewAlias(action)
|
is RoomAliasAction.SetNewAlias -> handleSetNewAlias(action)
|
||||||
is RoomAliasAction.AddAlias -> handleAddAlias()
|
is RoomAliasAction.AddAlias -> handleAddAlias()
|
||||||
is RoomAliasAction.RemoveAlias -> handleRemoveAlias(action)
|
is RoomAliasAction.RemoveAlias -> handleRemoveAlias(action)
|
||||||
is RoomAliasAction.SetCanonicalAlias -> handleSetCanonicalAlias(action)
|
is RoomAliasAction.SetCanonicalAlias -> handleSetCanonicalAlias(action)
|
||||||
is RoomAliasAction.SetNewLocalAliasLocalPart -> handleSetNewLocalAliasLocalPart(action)
|
is RoomAliasAction.SetNewLocalAliasLocalPart -> handleSetNewLocalAliasLocalPart(action)
|
||||||
RoomAliasAction.AddLocalAlias -> handleAddLocalAlias()
|
RoomAliasAction.AddLocalAlias -> handleAddLocalAlias()
|
||||||
is RoomAliasAction.RemoveLocalAlias -> handleRemoveLocalAlias(action)
|
is RoomAliasAction.RemoveLocalAlias -> handleRemoveLocalAlias(action)
|
||||||
}.exhaustive
|
}.exhaustive
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleSetNewAlias(action: RoomAliasAction.SetNewAlias) {
|
private fun handleSetNewAlias(action: RoomAliasAction.SetNewAlias) {
|
||||||
setState {
|
setState {
|
||||||
copy(
|
copy(
|
||||||
newAlias = action.aliasLocalPart,
|
newAlias = action.aliasLocalPart
|
||||||
asyncNewAliasRequest = Uninitialized
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -195,7 +194,12 @@ class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: Roo
|
||||||
postLoading(true)
|
postLoading(true)
|
||||||
room.updateCanonicalAlias(canonicalAlias, alternativeAliases, object : MatrixCallback<Unit> {
|
room.updateCanonicalAlias(canonicalAlias, alternativeAliases, object : MatrixCallback<Unit> {
|
||||||
override fun onSuccess(data: Unit) {
|
override fun onSuccess(data: Unit) {
|
||||||
postLoading(false)
|
setState {
|
||||||
|
copy(
|
||||||
|
isLoading = false,
|
||||||
|
newAlias = ""
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onFailure(failure: Throwable) {
|
override fun onFailure(failure: Throwable) {
|
||||||
|
@ -228,6 +232,7 @@ class RoomAliasViewModel @AssistedInject constructor(@Assisted initialState: Roo
|
||||||
setState {
|
setState {
|
||||||
copy(
|
copy(
|
||||||
isLoading = false,
|
isLoading = false,
|
||||||
|
newLocalAlias = "",
|
||||||
asyncNewLocalAliasRequest = Uninitialized
|
asyncNewLocalAliasRequest = Uninitialized
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,6 @@ data class RoomAliasViewState(
|
||||||
val canonicalAlias: String? = null,
|
val canonicalAlias: String? = null,
|
||||||
val alternativeAliases: List<String> = emptyList(),
|
val alternativeAliases: List<String> = emptyList(),
|
||||||
val newAlias: String = "",
|
val newAlias: String = "",
|
||||||
val asyncNewAliasRequest: Async<Unit> = Uninitialized,
|
|
||||||
val localAliases: Async<List<String>> = Uninitialized,
|
val localAliases: Async<List<String>> = Uninitialized,
|
||||||
val newLocalAlias: String = "",
|
val newLocalAlias: String = "",
|
||||||
val asyncNewLocalAliasRequest: Async<Unit> = Uninitialized
|
val asyncNewLocalAliasRequest: Async<Unit> = Uninitialized
|
||||||
|
|
Loading…
Reference in New Issue