From 5f1306e4ce7d4f671b45122306aa1b090a4a311b Mon Sep 17 00:00:00 2001
From: Andrew Datsenko <asd@meta.com>
Date: Thu, 25 Jul 2024 07:54:39 -0700
Subject: [PATCH] 
 xplat/js/react-native-github/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java

Summary: Changelog: [Internal]

Differential Revision: D60233395
---
 .../ReactAndroid/api/ReactAndroid.api         |  5 +--
 .../react/common/network/OkHttpCallUtil.java  | 36 -------------------
 .../react/common/network/OkHttpCallUtil.kt    | 31 ++++++++++++++++
 3 files changed, 34 insertions(+), 38 deletions(-)
 delete mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
 create mode 100644 packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.kt

diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api
index 8afeee79e05f9f..ca40df2f043782 100644
--- a/packages/react-native/ReactAndroid/api/ReactAndroid.api
+++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api
@@ -1957,8 +1957,9 @@ public final class com/facebook/react/common/mapbuffer/WritableMapBuffer : com/f
 	public final fun put (IZ)Lcom/facebook/react/common/mapbuffer/WritableMapBuffer;
 }
 
-public class com/facebook/react/common/network/OkHttpCallUtil {
-	public static fun cancelTag (Lokhttp3/OkHttpClient;Ljava/lang/Object;)V
+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/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
deleted file mode 100644
index a71f7113dc0e9f..00000000000000
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
+++ /dev/null
@@ -1,36 +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 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
new file mode 100644
index 00000000000000..db5b356efd6c76
--- /dev/null
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.kt
@@ -0,0 +1,31 @@
+/*
+ * 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
+      }
+    }
+  }
+}