DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Kitsu toasting "Logged in" when there is an error (#4329)

Browse Source
This commit is contained in:
Andreas 2021-01-22 00:05:22 +01:00 committed by GitHub
parent 837d8f5f30
commit 2a5102a457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt
View File

@ -101,14 +101,10 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
} }
override suspend fun login(username: String, password: String) { override suspend fun login(username: String, password: String) {
try { val token = api.login(username, password)
val token = api.login(username, password) interceptor.newAuth(token)
interceptor.newAuth(token) val userId = api.getCurrentUser()
val userId = api.getCurrentUser() saveCredentials(username, userId)
saveCredentials(username, userId)
} catch (e: Throwable) {
logout()
}
} }
override fun logout() { override fun logout() {

1
app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt
View File

@ -48,6 +48,7 @@ class TrackLoginDialog(
dialog?.dismiss() dialog?.dismiss()
withUIContext { view?.context?.toast(R.string.login_success) } withUIContext { view?.context?.toast(R.string.login_success) }
} catch (e: Throwable) { } catch (e: Throwable) {
service.logout()
binding?.login?.progress = -1 binding?.login?.progress = -1
binding?.login?.setText(R.string.unknown_error) binding?.login?.setText(R.string.unknown_error)
withUIContext { e.message?.let { view?.context?.toast(it) } } withUIContext { e.message?.let { view?.context?.toast(it) } }