Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OkHttpClient.Builder network pinning on Android #8376

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

OkHttpClient.Builder network pinning on Android #8376

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c02e8c8
Draft of network pinning on Android
yschimke Apr 20, 2024
d1aeb2d
update APIs
yschimke Apr 20, 2024
21a41d3
Review comments
yschimke Apr 20, 2024
018d1d9
Fix
yschimke Apr 20, 2024
6145e18
Fix android test
yschimke Apr 21, 2024
45f5073
Fixes
yschimke Apr 21, 2024
d158dd2
Fixes
yschimke Apr 21, 2024
9cf2f5c
Fixes
yschimke Apr 21, 2024
16ba61f
Fixes
yschimke Apr 21, 2024
22b799b
Cleanup
yschimke Apr 22, 2024
141263e
Hide the Async API
yschimke Apr 22, 2024
9006108
Hide the Async API
yschimke Apr 22, 2024
2eabf48
Merge branch 'refs/heads/master' into clean_pin_network
yschimke Apr 24, 2024
3d58e60
More tests
yschimke Apr 24, 2024
d47c07c
Fixes
yschimke Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fixes
  • Loading branch information
@yschimke
yschimke committed Apr 24, 2024
commit d47c07cf970755d69541889cdd7f77adbfc00758
4 changes: 2 additions & 2 deletions okhttp-android/src/androidTest/kotlin/okhttp3/android/AndroidDnsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ import java.net.UnknownHostException
import java.util.concurrent.CountDownLatch
import mockwebserver3.MockResponse
import mockwebserver3.junit4.MockWebServerRule
import okhttp3.AsyncDns
import okhttp3.Dns
import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.android.internal.AsyncDns
import okhttp3.tls.HandshakeCertificates
import okhttp3.tls.HeldCertificate
import okio.IOException
Expand Down Expand Up @@ -131,7 +131,7 @@ class AndroidDnsTest {
val latch = CountDownLatch(1)

// assumes an IPv4 address
AndroidDns.IPv4.query(
AndroidDns(AndroidDns.DnsClass.IPV4).query(
hostname = hostname,
originatingCall = null,
callback =
Expand Down