Skip to content

Follow-up to Csrf coroutine refactor. #4991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2024
Merged

Follow-up to Csrf coroutine refactor. #4991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/src/main/java/org/wikipedia/csrf/CsrfTokenClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.wikipedia.csrf
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.core.Observable
import io.reactivex.rxjava3.schedulers.Schedulers
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
Expand Down Expand Up @@ -36,6 +37,8 @@ object CsrfTokenClient {
// Log in explicitly
try {
LoginClient().loginBlocking(site, AccountUtil.userName, AccountUtil.password!!, "")
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
L.e(e)
lastError = e
Expand All @@ -51,6 +54,8 @@ object CsrfTokenClient {
if (AccountUtil.isLoggedIn && token == ANON_TOKEN) {
throw RuntimeException("App believes we're logged in, but got anonymous token.")
}
} catch (e: CancellationException) {
throw e
} catch (e: Exception) {
L.e(e)
lastError = e
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/wikipedia/descriptions/DescriptionEditViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class DescriptionEditViewModel(bundle: Bundle) : ViewModel() {
if (shouldWriteToLocalWiki()) pageTitle.wikiSite else Constants.wikidataWikiSite
}

val csrfToken = withContext(Dispatchers.IO) { CsrfTokenClient.getToken(csrfSite).blockingSingle() }
val csrfToken = CsrfTokenClient.getTokenBlocking(csrfSite)

val response = if (shouldWriteToLocalWiki()) {
// If the description is being applied to an article on English Wikipedia, it
Expand Down
Loading