kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 15:30:31 +05:30
Code Issues Projects Releases Wiki Activity

Better login/register error messages

Browse Source
This commit is contained in:
Bnyro 2023-02-18 10:20:49 +01:00
parent 933cff7ae6
commit c673b7464b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
View File

@ -7,13 +7,17 @@ import android.widget.Toast
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.api.JsonHelper
import com.github.libretube.api.RetrofitInstance import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.obj.Login import com.github.libretube.api.obj.Login
import com.github.libretube.api.obj.Token
import com.github.libretube.databinding.DialogLoginBinding import com.github.libretube.databinding.DialogLoginBinding
import com.github.libretube.extensions.TAG import com.github.libretube.extensions.TAG
import com.github.libretube.helpers.PreferenceHelper import com.github.libretube.helpers.PreferenceHelper
import com.github.libretube.util.TextUtils import com.github.libretube.util.TextUtils
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.serialization.decodeFromString
import retrofit2.HttpException
class LoginDialog( class LoginDialog(
private val onLogin: () -> Unit private val onLogin: () -> Unit
@ -76,6 +80,12 @@ class LoginDialog(
} else { } else {
RetrofitInstance.authApi.login(login) RetrofitInstance.authApi.login(login)
} }
} catch (e: HttpException) {
val errorMessage = e.response()?.errorBody()?.string()?.let {
JsonHelper.json.decodeFromString<Token>(it).error
} ?: context?.getString(R.string.server_error) ?: ""
Toast.makeText(context, errorMessage, Toast.LENGTH_SHORT).show()
return@launchWhenCreated
} catch (e: Exception) { } catch (e: Exception) {
Log.e(TAG(), e.toString()) Log.e(TAG(), e.toString())
Toast.makeText(context, e.localizedMessage, Toast.LENGTH_SHORT).show() Toast.makeText(context, e.localizedMessage, Toast.LENGTH_SHORT).show()