RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: graceful server unavailability handling in login screen 

Signed-off-by: Infi <infi@infi.sh>
This commit is contained in:
Infi 2024-10-22 18:22:20 +02:00
parent 13e8107f4d
commit 8ceda0c4e6
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
View File

@ -38,6 +38,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import androidx.navigation.NavController import androidx.navigation.NavController
import chat.revolt.R import chat.revolt.R
import chat.revolt.RevoltApplication
import chat.revolt.api.REVOLT_SUPPORT import chat.revolt.api.REVOLT_SUPPORT
import chat.revolt.api.RevoltAPI import chat.revolt.api.RevoltAPI
import chat.revolt.api.routes.account.EmailPasswordAssessment import chat.revolt.api.routes.account.EmailPasswordAssessment
@ -79,7 +80,14 @@ class LoginViewModel @Inject constructor(
_error = null _error = null
viewModelScope.launch { viewModelScope.launch {
val response = negotiateAuthentication(_email, _password) val response = try {
negotiateAuthentication(_email, _password)
} catch (e: Exception) {
_error = if (e.message?.startsWith("Unexpected JSON token") == true) {
RevoltApplication.instance.getString(R.string.service_health_alert_body_default)
} else e.message ?: "Unknown error"
return@launch
}
if (response.error != null) { if (response.error != null) {
_error = response.error.type _error = response.error.type
} else { } else {

10
app/src/main/java/chat/revolt/screens/register/RegisterDetailsScreen.kt
View File

@ -35,6 +35,7 @@ import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController import androidx.navigation.NavController
import chat.revolt.R import chat.revolt.R
import chat.revolt.RevoltApplication
import chat.revolt.api.routes.account.RegistrationBody import chat.revolt.api.routes.account.RegistrationBody
import chat.revolt.api.routes.account.register import chat.revolt.api.routes.account.register
import chat.revolt.api.routes.misc.getRootRoute import chat.revolt.api.routes.misc.getRootRoute
@ -53,7 +54,14 @@ class RegisterDetailsScreenViewModel : ViewModel() {
fun initCaptcha(context: Context, onSuccess: () -> Unit) { fun initCaptcha(context: Context, onSuccess: () -> Unit) {
viewModelScope.launch { viewModelScope.launch {
val root = getRootRoute() val root = try {
getRootRoute()
} catch (e: Exception) {
error = if (e.message?.startsWith("Expected response body of the type") == true) {
RevoltApplication.instance.getString(R.string.service_health_alert_body_default)
} else e.message
return@launch
}
if (!root.features.captcha.enabled) { if (!root.features.captcha.enabled) {
onSuccess() onSuccess()