Benoit Marty
2 years ago
7 changed files with 88 additions and 9 deletions
@ -0,0 +1,33 @@
@@ -0,0 +1,33 @@
|
||||
package io.element.android.x.features.login.error |
||||
|
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.ui.res.stringResource |
||||
import io.element.android.x.core.uri.isValidUrl |
||||
import io.element.android.x.features.login.LoginFormState |
||||
import io.element.android.x.element.resources.R as ElementR |
||||
|
||||
@Composable |
||||
fun loginError( |
||||
data: LoginFormState, |
||||
throwable: Throwable? |
||||
): String { |
||||
return when { |
||||
data.login.isEmpty() -> "Please enter a login" |
||||
data.password.isEmpty() -> "Please enter a password" |
||||
throwable != null -> stringResource(id = ElementR.string.auth_invalid_login_param) |
||||
else -> "No error provided" |
||||
} |
||||
} |
||||
|
||||
@Composable |
||||
fun changeServerError( |
||||
data: String, |
||||
throwable: Throwable? |
||||
): String { |
||||
return when { |
||||
data.isEmpty() -> "Please enter a server URL" |
||||
!data.isValidUrl() -> stringResource(id = ElementR.string.login_error_invalid_home_server) |
||||
throwable != null -> "That server doesn’t seem right. Please check the address." |
||||
else -> "No error provided" |
||||
} |
||||
} |
@ -0,0 +1,31 @@
@@ -0,0 +1,31 @@
|
||||
package io.element.android.x.core.uri |
||||
|
||||
import java.net.URL |
||||
|
||||
fun String.isValidUrl(): Boolean { |
||||
return try { |
||||
URL(this) |
||||
true |
||||
} catch (t: Throwable) { |
||||
false |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* Ensure string starts with "http". If it is not the case, "https://" is added, only if the String is not empty |
||||
*/ |
||||
fun String.ensureProtocol(): String { |
||||
return when { |
||||
isEmpty() -> this |
||||
!startsWith("http") -> "https://$this" |
||||
else -> this |
||||
} |
||||
} |
||||
|
||||
fun String.ensureTrailingSlash(): String { |
||||
return when { |
||||
isEmpty() -> this |
||||
!endsWith("/") -> "$this/" |
||||
else -> this |
||||
} |
||||
} |
Loading…
Reference in new issue