Browse Source

Rename `InlineErrorMessage` to simple `Error` to not consider how the error will be used (actually used in a dialog now)

feature/fga/small_timeline_improvements
Benoit Marty 1 year ago
parent
commit
ee38aee147
  1. 2
      features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
  2. 4
      features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
  3. 2
      features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt

@ -39,7 +39,7 @@ fun ChangeServerView( @@ -39,7 +39,7 @@ fun ChangeServerView(
when (state.changeServerAction) {
is Async.Failure -> {
when (val error = state.changeServerAction.error) {
is ChangeServerError.InlineErrorMessage -> {
is ChangeServerError.Error -> {
ErrorDialog(
modifier = modifier,
content = error.message(),

4
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt

@ -23,7 +23,7 @@ import io.element.android.features.login.impl.R @@ -23,7 +23,7 @@ import io.element.android.features.login.impl.R
import io.element.android.libraries.matrix.api.auth.AuthenticationException
sealed class ChangeServerError : Throwable() {
data class InlineErrorMessage(@StringRes val messageId: Int) : ChangeServerError() {
data class Error(@StringRes val messageId: Int) : ChangeServerError() {
@Composable
fun message(): String = stringResource(messageId)
}
@ -32,7 +32,7 @@ sealed class ChangeServerError : Throwable() { @@ -32,7 +32,7 @@ sealed class ChangeServerError : Throwable() {
companion object {
fun from(error: Throwable): ChangeServerError = when (error) {
is AuthenticationException.SlidingSyncNotAvailable -> SlidingSyncAlert
else -> InlineErrorMessage(R.string.screen_change_server_error_invalid_homeserver)
else -> Error(R.string.screen_change_server_error_invalid_homeserver)
}
}
}

2
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt

@ -112,7 +112,7 @@ fun ConfirmAccountProviderView( @@ -112,7 +112,7 @@ fun ConfirmAccountProviderView(
when (state.loginFlow) {
is Async.Failure -> {
when (val error = state.loginFlow.error) {
is ChangeServerError.InlineErrorMessage -> {
is ChangeServerError.Error -> {
ErrorDialog(
content = error.message(),
onDismiss = {

Loading…
Cancel
Save