Only reset legacy TCP connections

Author: Mygod

app/src/main/java/be/mygod/reactmap/util/UnblockCentral.kt

@@ -27,12 +27,4 @@ object UnblockCentral {
                 Int::class.java)
         }
     }
-    private val classStructLinger by lazy { init.let { Class.forName("android.system.StructLinger") } }
-    val lingerReset by lazy {
-        classStructLinger.getDeclaredConstructor(Int::class.java, Int::class.java).newInstance(1, 0)
-    }
-    val setsockoptLinger by lazy {
-        Os::class.java.getDeclaredMethod("setsockoptLinger", FileDescriptor::class.java, Int::class.java,
-            Int::class.java, classStructLinger)
-    }
 }

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

@@ -398,6 +398,7 @@ abstract class BaseReactMapFragment : Fragment(), DownloadListener {
 
     fun terminate() {
         web.destroy()
+        ReactMapHttpEngine.reset()
         try {
             for (file in File("/proc/self/fd").listFiles() ?: emptyArray()) try {
                 val fdInt = file.name.toInt()
@@ -408,10 +409,9 @@ abstract class BaseReactMapFragment : Fragment(), DownloadListener {
                     if (e.errno == OsConstants.EBADF || e.errno == OsConstants.ENOTSOCK) continue else throw e
                 }
                 if (endpoint !is InetSocketAddress) continue
-                val isTcp = when (val type = UnblockCentral.getsockoptInt(null, fd, OsConstants.SOL_SOCKET,
-                    OsConstants.SO_TYPE)) {
-                    OsConstants.SOCK_STREAM -> true
-                    OsConstants.SOCK_DGRAM -> false
+                when (val type = UnblockCentral.getsockoptInt(null, fd, OsConstants.SOL_SOCKET, OsConstants.SO_TYPE)) {
+                    OsConstants.SOCK_STREAM -> { }
+                    OsConstants.SOCK_DGRAM -> continue
                     else -> {
                         Timber.w(Exception("Unknown $type to $endpoint"))
                         continue
@@ -423,12 +423,8 @@ abstract class BaseReactMapFragment : Fragment(), DownloadListener {
                     Timber.w(e)
                     0
                 } else 0
-                Timber.d("Resetting $fdInt owned by $ownerTag if is 0 -> $endpoint $isTcp")
-                if (ownerTag != 0L) continue
-                if (isTcp) {
-                    UnblockCentral.setsockoptLinger(null, fd, OsConstants.SOL_SOCKET,
-                        OsConstants.SO_LINGER, UnblockCentral.lingerReset)
-                } else Os.dup2(nullFd, fdInt)
+                Timber.d("Resetting $fdInt owned by $ownerTag if is 0 -> $endpoint")
+                if (ownerTag == 0L) Os.dup2(nullFd, fdInt)
             } catch (e: Exception) {
                 Timber.w(e)
             }

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

@@ -1,5 +1,6 @@
 package be.mygod.reactmap.webkit
 
+import android.annotation.SuppressLint
 import android.net.Uri
 import android.net.http.ConnectionMigrationOptions
 import android.net.http.HttpEngine
@@ -33,10 +34,11 @@ object ReactMapHttpEngine {
 
     val isCronet get() = Build.VERSION.SDK_INT >= 34 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
             SdkExtensions.getExtensionVersion(Build.VERSION_CODES.S) >= 7
+    private var engineInternal: HttpEngine? = null
     @get:RequiresExtension(Build.VERSION_CODES.S, 7)
-    val engine by lazy @RequiresExtension(Build.VERSION_CODES.S, 7) {
-        val cache = File(app.deviceStorage.cacheDir, "httpEngine")
-        HttpEngine.Builder(app.deviceStorage).apply {
+    val engine get() = synchronized(ReactMapHttpEngine) {
+        engineInternal ?: HttpEngine.Builder(app.deviceStorage).apply {
+            val cache = File(app.deviceStorage.cacheDir, "httpEngine")
             if (cache.mkdirs() || cache.isDirectory) {
                 setStoragePath(cache.absolutePath)
                 setEnableHttpCache(HttpEngine.Builder.HTTP_CACHE_DISK, 512 * 1024 * 1024)
@@ -46,7 +48,21 @@ object ReactMapHttpEngine {
                 setPathDegradationMigration(ConnectionMigrationOptions.MIGRATION_OPTION_ENABLED)
             }.build())
             setEnableBrotli(true)
-        }.build()
+        }.build().also {
+            engineInternal = it
+            Timber.d("HttpEngine ${HttpEngine.getVersionString()} initialized")
+        }
+    }
+    @SuppressLint("NewApi")
+    fun reset() = synchronized(ReactMapHttpEngine) {
+        engineInternal?.apply {
+            try {
+                shutdown()
+            } catch (e: IllegalStateException) {
+                Timber.d(e)
+            }
+            engineInternal = null
+        }
     }
 
     fun apiUrl(base: Uri) = base.buildUpon().apply {