From 33b494bfa21b8ffc084fb4e774ce7d3c1b8d56ae Mon Sep 17 00:00:00 2001 From: weihanyau Date: Wed, 7 Jan 2026 23:35:09 +0800 Subject: [PATCH 1/2] fix(android): fix ontimeout --- .../com/facebook/react/modules/network/NetworkEventUtil.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt index 997b446b7de3..3cabb15f075d 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt @@ -17,7 +17,7 @@ import com.facebook.react.bridge.WritableMap import com.facebook.react.bridge.buildReadableArray import com.facebook.react.common.build.ReactBuildConfig import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags -import java.net.SocketTimeoutException +import java.io.InterruptedIOException import okhttp3.Headers import okhttp3.Protocol import okhttp3.Request @@ -197,7 +197,7 @@ internal object NetworkEventUtil { buildReadableArray { add(requestId) add(error) - if (e?.javaClass == SocketTimeoutException::class.java) { + if (e?.javaClass == InterruptedIOException::class.java) { add(true) // last argument is a time out boolean } }, From a9ef2054c931b3bdb9a7153be9e763dc616a3d33 Mon Sep 17 00:00:00 2001 From: weihanyau Date: Thu, 8 Jan 2026 00:49:40 +0800 Subject: [PATCH 2/2] fix(android): fix tcp ontimeout --- .../com/facebook/react/modules/network/NetworkEventUtil.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt index 3cabb15f075d..05ca5e8edf90 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt @@ -18,6 +18,7 @@ import com.facebook.react.bridge.buildReadableArray import com.facebook.react.common.build.ReactBuildConfig import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags import java.io.InterruptedIOException +import java.net.SocketTimeoutException import okhttp3.Headers import okhttp3.Protocol import okhttp3.Request @@ -197,7 +198,7 @@ internal object NetworkEventUtil { buildReadableArray { add(requestId) add(error) - if (e?.javaClass == InterruptedIOException::class.java) { + if (e?.javaClass == SocketTimeoutException::class.java || e?.javaClass === InterruptedIOException::class.java) { add(true) // last argument is a time out boolean } },