diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index 004d1e44d7b..00819defed3 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -1936,9 +1936,8 @@ public final class com/facebook/react/common/mapbuffer/WritableMapBuffer : com/f public final fun put (IZ)Lcom/facebook/react/common/mapbuffer/WritableMapBuffer; } -public final class com/facebook/react/common/network/OkHttpCallUtil { - public static final field INSTANCE Lcom/facebook/react/common/network/OkHttpCallUtil; - public static final fun cancelTag (Lokhttp3/OkHttpClient;Ljava/lang/Object;)V +public class com/facebook/react/common/network/OkHttpCallUtil { + public static fun cancelTag (Lokhttp3/OkHttpClient;Ljava/lang/Object;)V } public class com/facebook/react/config/ReactFeatureFlags { diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java new file mode 100644 index 00000000000..a71f7113dc0 --- /dev/null +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +package com.facebook.react.common.network; + +import com.facebook.infer.annotation.Nullsafe; +import okhttp3.Call; +import okhttp3.OkHttpClient; + +/** + * Helper class that provides the necessary methods for canceling queued and running OkHttp calls + */ +@Nullsafe(Nullsafe.Mode.LOCAL) +public class OkHttpCallUtil { + + private OkHttpCallUtil() {} + + public static void cancelTag(OkHttpClient client, Object tag) { + for (Call call : client.dispatcher().queuedCalls()) { + if (tag.equals(call.request().tag())) { + call.cancel(); + return; + } + } + for (Call call : client.dispatcher().runningCalls()) { + if (tag.equals(call.request().tag())) { + call.cancel(); + return; + } + } + } +} diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.kt deleted file mode 100644 index 0bd4a0f1123..00000000000 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -package com.facebook.react.common.network - -import okhttp3.OkHttpClient - -/** - * Helper class that provides the necessary methods for canceling queued and running OkHttp calls - */ -public object OkHttpCallUtil { - - @JvmStatic - public fun cancelTag(client: OkHttpClient, tag: Any) { - for (call in client.dispatcher().queuedCalls()) { - if (tag == call.request().tag()) { - call.cancel() - return - } - } - for (call in client.dispatcher().runningCalls()) { - if (tag == call.request().tag()) { - call.cancel() - return - } - } - } -}