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

Show file tree
Hide file tree
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
Next Next commit
update APIs
  • Loading branch information
@yschimke
yschimke committed Apr 20, 2024
commit d1aeb2d80ac9c02f0daa391f7bb4ea2b38807084
32 changes: 31 additions & 1 deletion okhttp-android/api/okhttp-android.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ public final class okhttp3/android/AndroidAsyncDns : okhttp3/AsyncDns {
public static final field Companion Lokhttp3/android/AndroidAsyncDns$Companion;
public fun <init> (Lokhttp3/AsyncDns$DnsClass;Landroid/net/Network;)V
public synthetic fun <init> (Lokhttp3/AsyncDns$DnsClass;Landroid/net/Network;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun query (Ljava/lang/String;Lokhttp3/AsyncDns$Callback;)V
public fun query (Ljava/lang/String;Lokhttp3/Call;Lokhttp3/AsyncDns$Callback;)V
}

public final class okhttp3/android/AndroidAsyncDns$Companion {
public final fun forNetwork (Landroid/net/Network;)Lokhttp3/AsyncDns;
public final fun getDEFAULT ()Lokhttp3/AsyncDns;
public final fun getIPv4 ()Lokhttp3/android/AndroidAsyncDns;
public final fun getIPv6 ()Lokhttp3/android/AndroidAsyncDns;
}
Expand All @@ -17,3 +19,31 @@ public final class okhttp3/android/AndroidLoggingKt {
public static synthetic fun androidLogging$default (Lokhttp3/logging/LoggingEventListener$Companion;ILjava/lang/String;ILjava/lang/Object;)Lokhttp3/logging/LoggingEventListener$Factory;
}

public final class okhttp3/android/AndroidSocketFactory : javax/net/SocketFactory {
public fun <init> (Landroid/net/Network;)V
public fun createSocket (Ljava/lang/String;I)Ljava/net/Socket;
public fun createSocket (Ljava/lang/String;ILjava/net/InetAddress;I)Ljava/net/Socket;
public fun createSocket (Ljava/net/InetAddress;I)Ljava/net/Socket;
public fun createSocket (Ljava/net/InetAddress;ILjava/net/InetAddress;I)Ljava/net/Socket;
public fun equals (Ljava/lang/Object;)Z
public final fun getNetwork ()Landroid/net/Network;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}

public final class okhttp3/android/NetworkPin {
public fun <init> (Landroid/net/Network;)V
public final fun component1 ()Landroid/net/Network;
public final fun copy (Landroid/net/Network;)Lokhttp3/android/NetworkPin;
public static synthetic fun copy$default (Lokhttp3/android/NetworkPin;Landroid/net/Network;ILjava/lang/Object;)Lokhttp3/android/NetworkPin;
public fun equals (Ljava/lang/Object;)Z
public final fun getNetwork ()Landroid/net/Network;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}

public final class okhttp3/android/NetworkSelection {
public static final field INSTANCE Lokhttp3/android/NetworkSelection;
public final fun withNetwork (Lokhttp3/OkHttpClient$Builder;Landroid/net/Network;)Lokhttp3/OkHttpClient$Builder;
}

9 changes: 5 additions & 4 deletions okhttp/api/okhttp.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,19 @@ public abstract interface class okhttp3/AsyncDns {
public static final field Companion Lokhttp3/AsyncDns$Companion;
public static final field TYPE_A I
public static final field TYPE_AAAA I
public abstract fun query (Ljava/lang/String;Lokhttp3/AsyncDns$Callback;)V
public fun asBlocking ()Lokhttp3/Dns;
public abstract fun query (Ljava/lang/String;Lokhttp3/Call;Lokhttp3/AsyncDns$Callback;)V
}

public abstract interface class okhttp3/AsyncDns$Callback {
public abstract fun onFailure (Ljava/lang/String;Ljava/io/IOException;)V
public abstract fun onResponse (Ljava/lang/String;Ljava/util/List;)V
public abstract fun onAddresses (ZLjava/lang/String;Ljava/util/List;)V
public abstract fun onFailure (ZLjava/lang/String;Ljava/io/IOException;)V
}

public final class okhttp3/AsyncDns$Companion {
public static final field TYPE_A I
public static final field TYPE_AAAA I
public final fun toDns ([Lokhttp3/AsyncDns;)Lokhttp3/Dns;
public final fun union ([Lokhttp3/AsyncDns;)Lokhttp3/AsyncDns;
}

public final class okhttp3/AsyncDns$DnsClass : java/lang/Enum {
Expand Down
Loading