Fix connection being disconnected

Author: Mygod

README.md

@@ -39,7 +39,7 @@ Other features:
    ]
    ```
    where the fingerprint can be obtained via `keytool -list -v -keystore /path/to/keystore`.
-   (If you prefer to using Android Studio to create this file with a wizard, see [here]( https://developer.android.com/studio/write/app-link-indexing#associatesite) for instructions.)
+   (If you prefer to using Android Studio to create this file with a wizard, see [here](https://developer.android.com/studio/write/app-link-indexing#associatesite) for instructions.)
 3. (Optional) Make modifications to the source code if you wish.
 
 ### Build instructions

app/src/main/java/be/mygod/reactmap/webkit/ReactMapFragment.kt

@@ -36,7 +36,6 @@ import be.mygod.reactmap.util.CreateDynamicDocument
 import be.mygod.reactmap.util.findErrorStream
 import com.google.firebase.analytics.FirebaseAnalytics
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
@@ -210,11 +209,9 @@ class ReactMapFragment @JvmOverloads constructor(private val overrideUri: Uri? =
 
     private fun buildResponse(request: WebResourceRequest, transform: (Reader) -> String) = try {
         val url = request.url.toString()
-        val conn = runBlocking {
-            ReactMapHttpEngine.connectWithCookie(url) { conn ->
-                conn.requestMethod = request.method
-                for ((key, value) in request.requestHeaders) conn.addRequestProperty(key, value)
-            }
+        val conn = ReactMapHttpEngine.connectWithCookie(url) { conn ->
+            conn.requestMethod = request.method
+            for ((key, value) in request.requestHeaders) conn.addRequestProperty(key, value)
         }
         WebResourceResponse(conn.contentType?.substringBefore(';'), conn.contentEncoding, conn.responseCode,
             conn.responseMessage.let { if (it.isNullOrBlank()) "N/A" else it },

app/src/main/java/be/mygod/reactmap/webkit/ReactMapHttpEngine.kt

@@ -43,11 +43,12 @@ object ReactMapHttpEngine {
         path("/graphql")
     }.build().toString()
 
+    private fun openConnection(url: String) = (if (Build.VERSION.SDK_INT >= 34 || Build.VERSION.SDK_INT >=
+        Build.VERSION_CODES.S && SdkExtensions.getExtensionVersion(Build.VERSION_CODES.S) >= 7) {
+        engine.openConnection(URL(url))
+    } else URL(url).openConnection()) as HttpURLConnection
     suspend fun <T> connectCancellable(url: String, block: suspend (HttpURLConnection) -> T): T {
-        val conn = (if (Build.VERSION.SDK_INT >= 34 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
-            SdkExtensions.getExtensionVersion(Build.VERSION_CODES.S) >= 7) {
-            engine.openConnection(URL(url))
-        } else @Suppress("BlockingMethodInNonBlockingContext") URL(url).openConnection()) as HttpURLConnection
+        val conn = openConnection(url)
         return suspendCancellableCoroutine { cont ->
             val job = GlobalScope.launch(Dispatchers.IO) {
                 try {
@@ -65,7 +66,7 @@ object ReactMapHttpEngine {
         }
     }
 
-    suspend fun connectWithCookie(url: String, setup: (HttpURLConnection) -> Unit) = connectCancellable(url) { conn ->
+    fun connectWithCookie(url: String, setup: (HttpURLConnection) -> Unit) = openConnection(url).also { conn ->
         if (app.userManager.isUserUnlocked) {
             val cookie = CookieManager.getInstance()
             cookie.getCookie(url)?.let { conn.addRequestProperty("Cookie", it) }
@@ -75,7 +76,6 @@ object ReactMapHttpEngine {
             app.pref.getString(KEY_COOKIE, null)?.let { conn.addRequestProperty("Cookie", it) }
             setup(conn)
         }
-        conn
     }
 
     fun updateCookie() = app.pref.edit {