Skip to content

Commit 2578fd1

Browse files
cortinicofacebook-github-bot
authored andcommitted
1 parent 4487697 commit 2578fd1

4 files changed

Lines changed: 10 additions & 41 deletions

File tree

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3025,12 +3025,6 @@ public final class com/facebook/react/modules/network/OkHttpClientProvider {
30253025
public static final fun setOkHttpClientFactory (Lcom/facebook/react/modules/network/OkHttpClientFactory;)V
30263026
}
30273027

3028-
public final class com/facebook/react/modules/network/OkHttpCompat {
3029-
public static final field INSTANCE Lcom/facebook/react/modules/network/OkHttpCompat;
3030-
public final fun getCookieJarContainer (Lokhttp3/OkHttpClient;)Lcom/facebook/react/modules/network/CookieJarContainer;
3031-
public final fun getHeadersFromMap (Ljava/util/Map;)Lokhttp3/Headers;
3032-
}
3033-
30343028
public abstract interface class com/facebook/react/modules/network/ProgressListener {
30353029
public abstract fun onProgress (JJZ)V
30363030
}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
2222
import com.facebook.react.common.ReactConstants
2323
import com.facebook.react.module.annotations.ReactModule
2424
import com.facebook.react.modules.common.ModuleDataCleaner
25+
import com.facebook.react.modules.network.CookieJarContainer
2526
import com.facebook.react.modules.network.ForwardingCookieHandler
2627
import com.facebook.react.modules.network.OkHttpClientProvider
27-
import com.facebook.react.modules.network.OkHttpCompat
2828
import com.facebook.react.turbomodule.core.interfaces.TurboModule
2929
import okhttp3.JavaNetCookieJar
3030

@@ -156,7 +156,10 @@ constructor(
156156

157157
// make sure to forward cookies for any requests via the okHttpClient
158158
// so that image requests to endpoints that use cookies still work
159-
val container = OkHttpCompat.getCookieJarContainer(client)
159+
160+
@Suppress("DEPRECATION_ERROR") // Conflicting okhttp versions
161+
val container = client.cookieJar() as CookieJarContainer
162+
160163
val handler = ForwardingCookieHandler()
161164
container.setCookieJar(JavaNetCookieJar(handler))
162165
val builder =

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/ReactOkHttpNetworkFetcher.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import android.os.SystemClock
1111
import com.facebook.imagepipeline.backends.okhttp3.OkHttpNetworkFetcher
1212
import com.facebook.imagepipeline.producers.NetworkFetcher
1313
import com.facebook.react.bridge.ReadableMap
14-
import com.facebook.react.modules.network.OkHttpCompat
1514
import java.util.concurrent.TimeUnit
1615
import okhttp3.CacheControl
16+
import okhttp3.Headers
1717
import okhttp3.OkHttpClient
1818
import okhttp3.Request
1919

@@ -57,7 +57,10 @@ internal class ReactOkHttpNetworkFetcher(okHttpClient: OkHttpClient) :
5757
} else {
5858
cacheControlBuilder.noStore()
5959
}
60-
val headers = OkHttpCompat.getHeadersFromMap(requestHeaders)
60+
61+
@Suppress("DEPRECATION_ERROR") // Conflicting okhttp versions
62+
val headers = Headers.of(requestHeaders ?: emptyMap())
63+
6164
val request =
6265
Request.Builder()
6366
.headers(headers)

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpCompat.kt

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)