Fix blocked message in Suggested Edits, and use coroutines. (#4882)

* Fix blocked message in Suggested Edits, and use coroutines. * Fix tests. * t! --------- Co-authored-by: Cooltey Feng <[email protected]>
wikimedia · Aug 20, 2024 · ed1c57c · ed1c57c
1 parent 1fbda7f
commit ed1c57c
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 60 deletions.
diff --git a/app/src/main/java/org/wikipedia/dataclient/Service.kt b/app/src/main/java/org/wikipedia/dataclient/Service.kt
@@ -171,10 +171,10 @@ interface Service {
     suspend fun getSiteInfoWithMagicWords(): MwQueryResponse
 
     @GET(MW_API_PREFIX + "action=parse&prop=text&mobileformat=1")
-    fun parsePage(@Query("page") pageTitle: String): Observable<MwParseResponse>
+    suspend fun parsePage(@Query("page") pageTitle: String): MwParseResponse
 
     @GET(MW_API_PREFIX + "action=parse&prop=text&mobileformat=1")
-    fun parseText(@Query("text") text: String): Observable<MwParseResponse>
+    suspend fun parseText(@Query("text") text: String): MwParseResponse
 
     @GET(MW_API_PREFIX + "action=parse&prop=text&mobileformat=1&mainpage=1")
     suspend fun parseTextForMainPage(@Query("page") mainPageTitle: String): MwParseResponse
@@ -317,10 +317,7 @@ interface Service {
     @get:GET(MW_API_PREFIX + "action=query&meta=authmanagerinfo|tokens&amirequestsfor=create&type=createaccount")
     val authManagerInfo: Observable<MwQueryResponse>
 
-    @get:GET(MW_API_PREFIX + "action=query&meta=userinfo&uiprop=groups|blockinfo|editcount|latestcontrib|hasmsg")
-    val userInfo: Observable<MwQueryResponse>
-
-    @GET(MW_API_PREFIX + "action=query&meta=userinfo&uiprop=groups|blockinfo|editcount|latestcontrib|hasmsg")
+    @GET(MW_API_PREFIX + "action=query&meta=userinfo&uiprop=groups|blockinfo|editcount|latestcontrib|hasmsg|options")
     suspend fun getUserInfo(): MwQueryResponse
 
     @GET(MW_API_PREFIX + "action=query&list=users&usprop=editcount|groups|registration|rights")

diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.kt b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwServiceError.kt
@@ -1,11 +1,14 @@
 package org.wikipedia.dataclient.mwapi
 
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import org.wikipedia.dataclient.ServiceError
 import org.wikipedia.util.DateUtil
 import org.wikipedia.util.StringUtil
 import org.wikipedia.util.ThrowableUtil
+import org.wikipedia.util.log.L
 import java.util.*
 
 @Serializable
@@ -36,7 +39,11 @@ class MwServiceError(val code: String? = null,
     init {
         // Special case: if it's a Blocked error, parse the blockinfo structure ourselves.
         if (("blocked" == code || "autoblocked" == code) && data?.blockinfo != null) {
-            html = ThrowableUtil.getBlockMessageHtml(data.blockinfo)
+            runBlocking(CoroutineExceptionHandler { _, t ->
+                L.e(t)
+            }) {
+                html = ThrowableUtil.getBlockMessageHtml(data.blockinfo)
+            }
         }
     }
 

diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt
@@ -21,10 +21,13 @@ import androidx.core.os.postDelayed
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.widget.doAfterTextChanged
+import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.schedulers.Schedulers
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.launch
 import org.wikipedia.Constants
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
@@ -41,7 +44,6 @@ import org.wikipedia.databinding.DialogWithCheckboxBinding
 import org.wikipedia.databinding.ItemEditActionbarButtonBinding
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.dataclient.mwapi.MwException
-import org.wikipedia.dataclient.mwapi.MwParseResponse
 import org.wikipedia.dataclient.mwapi.MwServiceError
 import org.wikipedia.dataclient.okhttp.OkHttpConnectionFactory
 import org.wikipedia.edit.insertmedia.InsertMediaActivity
@@ -418,23 +420,24 @@ class EditSectionActivity : BaseActivity(), ThemeChooserDialog.Callback, EditPre
      */
     private fun handleEditingException(caught: MwException) {
         val code = caught.title
-
-        // In the case of certain AbuseFilter responses, they are sent as a code, instead of a
-        // fully parsed response. We need to make one more API call to get the parsed message:
-        if (code.startsWith("abusefilter-") && caught.message.contains("abusefilter-") && caught.message.length < 100) {
-            disposables.add(ServiceFactory.get(pageTitle.wikiSite).parsePage("MediaWiki:" + StringUtil.sanitizeAbuseFilterCode(caught.message))
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe({ response: MwParseResponse -> showError(MwException(MwServiceError(code, response.text))) }) { showError(it) })
-        } else if ("editconflict" == code) {
-            MaterialAlertDialogBuilder(this@EditSectionActivity)
+        lifecycleScope.launch(CoroutineExceptionHandler { _, t ->
+            showError(t)
+        }) {
+            // In the case of certain AbuseFilter responses, they are sent as a code, instead of a
+            // fully parsed response. We need to make one more API call to get the parsed message:
+            if (code.startsWith("abusefilter-") && caught.message.contains("abusefilter-") && caught.message.length < 100) {
+                val response = ServiceFactory.get(pageTitle.wikiSite).parsePage("MediaWiki:" + StringUtil.sanitizeAbuseFilterCode(caught.message))
+                showError(MwException(MwServiceError(code, response.text)))
+            } else if ("editconflict" == code) {
+                MaterialAlertDialogBuilder(this@EditSectionActivity)
                     .setTitle(R.string.edit_conflict_title)
                     .setMessage(R.string.edit_conflict_message)
                     .setPositiveButton(R.string.edit_conflict_dialog_ok_button_text, null)
                     .show()
-            resetToStart()
-        } else {
-            showError(caught)
+                resetToStart()
+            } else {
+                showError(caught)
+            }
         }
     }
 

diff --git a/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsTasksFragment.kt b/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsTasksFragment.kt
@@ -209,6 +209,12 @@ class SuggestedEditsTasksFragment : Fragment() {
 
         setUpTasks()
 
+        if (displayedTasks.isEmpty() && !viewModel.blockMessageWikipedia.isNullOrEmpty()) {
+            clearContents()
+            setIPBlockedStatus()
+            return
+        }
+
         binding.tasksRecyclerView.adapter!!.notifyDataSetChanged()
         setUserStatsViewsAndTooltips()
 
@@ -376,10 +382,6 @@ class SuggestedEditsTasksFragment : Fragment() {
             displayedTasks.add(addImageCaptionsTask)
             displayedTasks.add(addImageTagsTask)
         }
-
-        if (displayedTasks.isEmpty() && !viewModel.blockMessageWikipedia.isNullOrEmpty()) {
-            setIPBlockedStatus()
-        }
     }
 
     private inner class TaskViewCallback : SuggestedEditsTaskView.Callback {

diff --git a/app/src/main/java/org/wikipedia/util/ThrowableUtil.kt b/app/src/main/java/org/wikipedia/util/ThrowableUtil.kt
@@ -1,8 +1,9 @@
 package org.wikipedia.util
 
 import android.content.Context
-import androidx.annotation.WorkerThread
-import io.reactivex.rxjava3.core.Observable
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.withContext
 import org.json.JSONException
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
@@ -13,7 +14,6 @@ import org.wikipedia.dataclient.mwapi.MwException
 import org.wikipedia.dataclient.mwapi.MwServiceError
 import org.wikipedia.dataclient.okhttp.HttpStatusException
 import org.wikipedia.login.LoginFailedException
-import org.wikipedia.util.log.L
 import java.net.SocketException
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
@@ -91,17 +91,16 @@ object ThrowableUtil {
         return t is MwException && t.error.code?.contains("notloggedin") == true
     }
 
-    @WorkerThread
-    fun getBlockMessageHtml(blockInfo: MwServiceError.BlockInfo, wikiSite: WikiSite = WikipediaApp.instance.wikiSite): String {
+    suspend fun getBlockMessageHtml(blockInfo: MwServiceError.BlockInfo, wikiSite: WikiSite = WikipediaApp.instance.wikiSite): String {
         var html = ""
-        Observable.zip(ServiceFactory.get(wikiSite).userInfo,
-            ServiceFactory.get(wikiSite).parsePage("MediaWiki:Blockedtext"),
-            ServiceFactory.get(wikiSite).parseText(blockInfo.blockReason)) { userInfoResponse, blockedParseResponse, reasonParseResponse ->
-            parseBlockedError(
-                blockedParseResponse.text, blockInfo,
-                reasonParseResponse.text, userInfoResponse.query?.userInfo!!.name
-            )
-        }.blockingSubscribe({ html = it }) { L.e(it) }
+        withContext(Dispatchers.IO) {
+            val userInfoCall = async { ServiceFactory.get(wikiSite).getUserInfo() }
+            val blockedPageCall = async { ServiceFactory.get(wikiSite).parsePage("MediaWiki:Blockedtext") }
+            val reasonTextCall = async { ServiceFactory.get(wikiSite).parseText(blockInfo.blockReason) }
+
+            html = parseBlockedError(blockedPageCall.await().text, blockInfo,
+                reasonTextCall.await().text, userInfoCall.await().query?.userInfo!!.name)
+        }
         return html
     }
 

diff --git a/app/src/test/java/org/wikipedia/login/UserExtendedInfoClientTest.kt b/app/src/test/java/org/wikipedia/login/UserExtendedInfoClientTest.kt
@@ -1,5 +1,6 @@
 package org.wikipedia.login
 
+import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.wikipedia.test.MockRetrofitTest
 
@@ -9,27 +10,10 @@ class UserExtendedInfoClientTest : MockRetrofitTest() {
     fun testRequestSuccess() {
         enqueueFromFile("user_extended_info.json")
         val id = 24531888
-        apiService.userInfo.test().await()
-            .assertComplete().assertNoErrors()
-            .assertValue {
-                it.query?.userInfo?.id == id &&
-                        it.query?.getUserResponse("USER")?.name == "USER"
-            }
-    }
-
-    @Test
-    @Throws(Throwable::class)
-    fun testRequestResponse404() {
-        enqueue404()
-        apiService.userInfo.test().await()
-            .assertError(Exception::class.java)
-    }
-
-    @Test
-    @Throws(Throwable::class)
-    fun testRequestResponseMalformed() {
-        enqueueMalformed()
-        apiService.userInfo.test().await()
-            .assertError(Exception::class.java)
+        runBlocking {
+            val userInfo = apiService.getUserInfo()
+            assert(userInfo.query?.userInfo?.id == id)
+            assert(userInfo.query?.getUserResponse("USER")?.name == "USER")
+        }
     }
 }