Bugdroid/Bugdroid-Front
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Исправление текста ошибки при неправильных данных

Browse Source
This commit is contained in:
yastruckov 2025-02-19 18:45:02 +03:00
parent 8aa252ea12
commit f8bc61d090
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/ru/myitschool/work/data/login/LoginNetworkDataSource.kt
View File

@ -1,5 +1,6 @@
package ru.myitschool.work.data.login package ru.myitschool.work.data.login
import android.content.Context
import io.ktor.client.call.body import io.ktor.client.call.body
import io.ktor.client.request.basicAuth import io.ktor.client.request.basicAuth
import io.ktor.client.request.post import io.ktor.client.request.post
@ -8,10 +9,13 @@ import io.ktor.http.HttpStatusCode
import io.ktor.http.headers import io.ktor.http.headers
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import ru.myitschool.work.R
import ru.myitschool.work.core.Constants import ru.myitschool.work.core.Constants
import ru.myitschool.work.utils.NetworkModule import ru.myitschool.work.utils.NetworkModule
class LoginNetworkDataSource { class LoginNetworkDataSource(
private val context: Context
) {
private val client = NetworkModule.httpClient private val client = NetworkModule.httpClient
suspend fun login(username: String, password: String):Result<Unit> = withContext(Dispatchers.IO){ suspend fun login(username: String, password: String):Result<Unit> = withContext(Dispatchers.IO){
runCatching { runCatching {
@ -21,7 +25,10 @@ class LoginNetworkDataSource {
basicAuth(username, password) basicAuth(username, password)
} }
} }
if (result.status != HttpStatusCode.OK) { if(result.status == HttpStatusCode.Unauthorized){
error(context.getString(R.string.login_unauthorized))
}
else if (result.status != HttpStatusCode.OK) {
error("Status ${result.status}") error("Status ${result.status}")
} }
println(result.bodyAsText()) println(result.bodyAsText())

2
app/src/main/java/ru/myitschool/work/ui/login/LoginFragment.kt
View File

@ -49,8 +49,10 @@ class LoginFragment : Fragment(R.layout.fragment_login) {
when(state){ when(state){
is LoginViewModel.State.Error -> { is LoginViewModel.State.Error -> {
error.visibility = View.VISIBLE error.visibility = View.VISIBLE
error.text = state.message
loading.visibility = View.GONE loading.visibility = View.GONE
username.isEnabled = true username.isEnabled = true
} }
is LoginViewModel.State.Idle -> { is LoginViewModel.State.Idle -> {
loading.visibility = View.GONE loading.visibility = View.GONE

5
app/src/main/java/ru/myitschool/work/ui/login/LoginViewModel.kt
View File

@ -31,7 +31,6 @@ class LoginViewModel(
if(username != "" && password != "") if(username != "" && password != "")
login(username, password) login(username, password)
} }
} }
sealed class State { sealed class State {
@ -63,7 +62,9 @@ class LoginViewModel(
val Factory: ViewModelProvider.Factory = object : ViewModelProvider.Factory { val Factory: ViewModelProvider.Factory = object : ViewModelProvider.Factory {
override fun <T : ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T { override fun <T : ViewModel> create(modelClass: Class<T>, extras: CreationExtras): T {
val repoImpl = LoginRepoImpl( val repoImpl = LoginRepoImpl(
networkDataSource = LoginNetworkDataSource() networkDataSource = LoginNetworkDataSource(
context = extras[ViewModelProvider.AndroidViewModelFactory.APPLICATION_KEY] as Application
)
) )
val useCase = LoginUseCase(repoImpl) val useCase = LoginUseCase(repoImpl)